diff options
| -rw-r--r-- | lib/rubygems/commands/yank_command.rb | 2 | ||||
| -rw-r--r-- | lib/rubygems/specification.rb | 4 | ||||
| -rw-r--r-- | test/rdoc/test_rdoc_options.rb | 4 | ||||
| -rw-r--r-- | test/rdoc/test_rdoc_parser_c.rb | 2 | ||||
| -rw-r--r-- | test/rdoc/test_rdoc_text.rb | 4 | ||||
| -rw-r--r-- | test/rubygems/test_gem_config_file.rb | 2 | ||||
| -rw-r--r-- | test/rubygems/test_gem_dependency_installer.rb | 4 | ||||
| -rw-r--r-- | test/rubygems/test_gem_package.rb | 2 | ||||
| -rw-r--r-- | test/rubygems/test_gem_version.rb | 2 | ||||
| -rw-r--r-- | vm_backtrace.c | 1 |
10 files changed, 13 insertions, 14 deletions
diff --git a/lib/rubygems/commands/yank_command.rb b/lib/rubygems/commands/yank_command.rb index da0cf7ad3b..df4142d395 100644 --- a/lib/rubygems/commands/yank_command.rb +++ b/lib/rubygems/commands/yank_command.rb @@ -29,7 +29,7 @@ class Gem::Commands::YankCommand < Gem::Command add_option('--undo') do |value, options| options[:undo] = true end - + add_option('-k', '--key KEY_NAME', 'Use API key from your gem credentials file') do |value, options| options[:key] = value diff --git a/lib/rubygems/specification.rb b/lib/rubygems/specification.rb index 1d290c8af5..d1f8e5e385 100644 --- a/lib/rubygems/specification.rb +++ b/lib/rubygems/specification.rb @@ -900,7 +900,7 @@ class Gem::Specification spec.instance_eval { @specification_version ||= NONEXISTENT_SPECIFICATION_VERSION } spec.reset_nil_attributes_to_default - + spec end @@ -2527,7 +2527,7 @@ class Gem::Specification ## # Reset nil attributes to their default values to make the spec valid - + def reset_nil_attributes_to_default nil_attributes = self.class.non_nil_attributes.find_all do |name| !instance_variable_defined?("@#{name}") || instance_variable_get("@#{name}").nil? diff --git a/test/rdoc/test_rdoc_options.rb b/test/rdoc/test_rdoc_options.rb index 7fa0c10869..440c77bec3 100644 --- a/test/rdoc/test_rdoc_options.rb +++ b/test/rdoc/test_rdoc_options.rb @@ -504,7 +504,7 @@ rdoc_include: end assert_equal 0, e.status - + assert File.exist? '.rdoc_options' end ensure @@ -583,7 +583,7 @@ rdoc_include: def test_write_options temp_dir do |dir| @options.write_options - + assert File.exist? '.rdoc_options' assert_equal @options, YAML.load(File.read('.rdoc_options')) diff --git a/test/rdoc/test_rdoc_parser_c.rb b/test/rdoc/test_rdoc_parser_c.rb index f2e2473cfa..e739476b74 100644 --- a/test/rdoc/test_rdoc_parser_c.rb +++ b/test/rdoc/test_rdoc_parser_c.rb @@ -491,7 +491,7 @@ void Init_File(void) { rb_include_module(rb_cIO, rb_mFConst); /* Document-const: LOCK_SH - * + * * Shared lock */ rb_file_const("LOCK_SH", INT2FIX(LOCK_SH)); diff --git a/test/rdoc/test_rdoc_text.rb b/test/rdoc/test_rdoc_text.rb index 78d5fdec27..473bd3cadd 100644 --- a/test/rdoc/test_rdoc_text.rb +++ b/test/rdoc/test_rdoc_text.rb @@ -153,7 +153,7 @@ The comments associated with text = <<-TEXT /* * we don't worry too much. - * + * * The comments associated with */ TEXT @@ -171,7 +171,7 @@ The comments associated with text = <<-TEXT /* * we don't worry too much. - * + * * The comments associated with */ TEXT diff --git a/test/rubygems/test_gem_config_file.rb b/test/rubygems/test_gem_config_file.rb index ab6f87e2fd..0781e16540 100644 --- a/test/rubygems/test_gem_config_file.rb +++ b/test/rubygems/test_gem_config_file.rb @@ -327,7 +327,7 @@ class TestGemConfigFile < Gem::TestCase end # Avoid writing stuff to output when running tests - Gem::ConfigFile.class_eval { def warn(args); end } + Gem::ConfigFile.class_eval { def warn(args); end } # This should not raise exception util_config_file diff --git a/test/rubygems/test_gem_dependency_installer.rb b/test/rubygems/test_gem_dependency_installer.rb index c021568800..01e28d144b 100644 --- a/test/rubygems/test_gem_dependency_installer.rb +++ b/test/rubygems/test_gem_dependency_installer.rb @@ -229,7 +229,7 @@ class TestGemDependencyInstaller < Gem::TestCase FileUtils.mv @a1_gem, @tempdir FileUtils.mv a2_gem, @tempdir # not in index FileUtils.mv @b1_gem, @tempdir - FileUtils.mv a3_gem, @tempdir + FileUtils.mv a3_gem, @tempdir inst = nil @@ -771,7 +771,7 @@ class TestGemDependencyInstaller < Gem::TestCase set = inst.find_gems_with_sources(dep) assert_kind_of Gem::AvailableSet, set - + s = set.set.first assert_equal @b1, s.spec diff --git a/test/rubygems/test_gem_package.rb b/test/rubygems/test_gem_package.rb index a668f180d9..9768515a33 100644 --- a/test/rubygems/test_gem_package.rb +++ b/test/rubygems/test_gem_package.rb @@ -151,7 +151,7 @@ class TestGemPackage < Gem::Package::TarTestCase reader = Gem::Package.new spec.file_name assert_equal spec, reader.spec - assert_equal %w[metadata.gz data.tar.gz checksums.yaml.gz], + assert_equal %w[metadata.gz data.tar.gz checksums.yaml.gz], reader.files assert_equal %w[lib/code.rb], reader.contents diff --git a/test/rubygems/test_gem_version.rb b/test/rubygems/test_gem_version.rb index 4a7c223474..da3b87dbca 100644 --- a/test/rubygems/test_gem_version.rb +++ b/test/rubygems/test_gem_version.rb @@ -33,7 +33,7 @@ class TestGemVersion < Gem::TestCase assert_same fake, Gem::Version.create(fake) assert_nil Gem::Version.create(nil) assert_equal v("5.1"), Gem::Version.create("5.1") - + ver = '1.1'.freeze assert_equal v('1.1'), Gem::Version.create(ver) end diff --git a/vm_backtrace.c b/vm_backtrace.c index de429ab44e..6a43fbf943 100644 --- a/vm_backtrace.c +++ b/vm_backtrace.c @@ -941,7 +941,6 @@ rb_debug_inspector_open(rb_debug_inspector_func_t func, void *data) TH_POP_TAG(); /* invalidate bindings? */ - if (state) { JUMP_TAG(state); |