rubygems-update 3.0.6 → 3.2.14

data/test/rubygems/test_gem_commands_cert_command.rb

@@ -2,12 +2,15 @@
 require 'rubygems/test_case'
 require 'rubygems/commands/cert_command'
 
-unless defined?(OpenSSL::SSL)
+unless Gem::HAVE_OPENSSL
   warn 'Skipping `gem cert` tests.  openssl not found.'
 end
 
-class TestGemCommandsCertCommand < Gem::TestCase
+if Gem.java_platform?
+  warn 'Skipping `gem cert` tests on jruby.'
+end
 
+class TestGemCommandsCertCommand < Gem::TestCase
   ALTERNATE_CERT = load_cert 'alternate'
   EXPIRED_PUBLIC_CERT = load_cert 'expired'
 
@@ -26,6 +29,14 @@ class TestGemCommandsCertCommand < Gem::TestCase
     @cmd = Gem::Commands::CertCommand.new
 
     @trust_dir = Gem::Security.trust_dir
+
+    @cleanup = []
+  end
+
+  def teardown
+    FileUtils.rm_f(@cleanup)
+
+    super
   end
 
   def test_certificates_matching
@@ -593,6 +604,7 @@ ERROR:  --private-key not specified and ~/.gem/gem-private_key.pem does not exis
     assert_equal '/CN=nobody/DC=example', EXPIRED_PUBLIC_CERT.issuer.to_s
 
     tmp_expired_cert_file = File.join(Dir.tmpdir, File.basename(EXPIRED_PUBLIC_CERT_FILE))
+    @cleanup << tmp_expired_cert_file
     File.write(tmp_expired_cert_file, File.read(EXPIRED_PUBLIC_CERT_FILE))
 
     @cmd.handle_options %W[
@@ -624,6 +636,7 @@ ERROR:  --private-key not specified and ~/.gem/gem-private_key.pem does not exis
     assert_equal '/CN=nobody/DC=example', EXPIRED_PUBLIC_CERT.issuer.to_s
 
     tmp_expired_cert_file = File.join(Dir.tmpdir, File.basename(EXPIRED_PUBLIC_CERT_FILE))
+    @cleanup << tmp_expired_cert_file
     File.write(tmp_expired_cert_file, File.read(EXPIRED_PUBLIC_CERT_FILE))
 
     @cmd.handle_options %W[
@@ -661,12 +674,12 @@ ERROR:  --private-key not specified and ~/.gem/gem-private_key.pem does not exis
     ]
 
     assert_equal [PUBLIC_CERT.to_pem, ALTERNATE_CERT.to_pem],
-                 @cmd.options[:add].map { |cert| cert.to_pem }
+                 @cmd.options[:add].map {|cert| cert.to_pem }
 
     assert_equal %w[nobody example], @cmd.options[:remove]
 
     assert_equal %w[nobody@example other@example],
-                 @cmd.options[:build].map { |name| name.to_s }
+                 @cmd.options[:build].map {|name| name.to_s }
 
     assert_equal ['', 'example'], @cmd.options[:list]
   end
@@ -792,5 +805,4 @@ ERROR:  --private-key not specified and ~/.gem/gem-private_key.pem does not exis
     assert_equal "invalid argument: --sign #{nonexistent}: does not exist",
                  e.message
   end
-
-end if defined?(OpenSSL::SSL)
+end if Gem::HAVE_OPENSSL && !Gem.java_platform?

data/test/rubygems/test_gem_commands_check_command.rb

@@ -3,7 +3,6 @@ require 'rubygems/test_case'
 require 'rubygems/commands/check_command'
 
 class TestGemCommandsCheckCommand < Gem::TestCase
-
   def setup
     super
 
@@ -65,5 +64,4 @@ class TestGemCommandsCheckCommand < Gem::TestCase
     refute_path_exists b.gem_dir
     refute_path_exists b.spec_file
   end
-
 end

data/test/rubygems/test_gem_commands_cleanup_command.rb

@@ -4,7 +4,6 @@ require 'rubygems/commands/cleanup_command'
 require 'rubygems/installer'
 
 class TestGemCommandsCleanupCommand < Gem::TestCase
-
   def setup
     super
 
@@ -23,10 +22,21 @@ class TestGemCommandsCleanupCommand < Gem::TestCase
   end
 
   def test_handle_options_dry_run
-    @cmd.handle_options %w[--dryrun]
+    @cmd.handle_options %w[--dry-run]
     assert @cmd.options[:dryrun]
   end
 
+  def test_handle_options_deprecated_dry_run
+    use_ui @ui do
+      @cmd.handle_options %w[--dryrun]
+      assert @cmd.options[:dryrun]
+    end
+
+    assert_equal \
+      "WARNING:  The \"--dryrun\" option has been deprecated and will be removed in future versions of Rubygems. Use --dry-run instead\n",
+      @ui.error
+  end
+
   def test_handle_options_n
     @cmd.handle_options %w[-n]
     assert @cmd.options[:dryrun]
@@ -56,8 +66,13 @@ class TestGemCommandsCleanupCommand < Gem::TestCase
   end
 
   def test_execute_all_dependencies
-    @b_1 = util_spec 'b', 1 do |s| s.add_dependency 'a', '1' end
-    @b_2 = util_spec 'b', 2 do |s| s.add_dependency 'a', '2' end
+    @b_1 = util_spec 'b', 1 do |s|
+      s.add_dependency 'a', '1'
+    end
+
+    @b_2 = util_spec 'b', 2 do |s|
+      s.add_dependency 'a', '2'
+    end
 
     install_gem @b_1
     install_gem @b_2
@@ -71,8 +86,13 @@ class TestGemCommandsCleanupCommand < Gem::TestCase
   end
 
   def test_execute_dev_dependencies
-    @b_1 = util_spec 'b', 1 do |s| s.add_development_dependency 'a', '1' end
-    @c_1 = util_spec 'c', 1 do |s| s.add_development_dependency 'a', '2' end
+    @b_1 = util_spec 'b', 1 do |s|
+      s.add_development_dependency 'a', '1'
+    end
+
+    @c_1 = util_spec 'c', 1 do |s|
+      s.add_development_dependency 'a', '2'
+    end
 
     install_gem @b_1
     install_gem @c_1
@@ -85,8 +105,13 @@ class TestGemCommandsCleanupCommand < Gem::TestCase
   end
 
   def test_execute_without_dev_dependencies
-    @b_1 = util_spec 'b', 1 do |s| s.add_development_dependency 'a', '1' end
-    @c_1 = util_spec 'c', 1 do |s| s.add_development_dependency 'a', '2' end
+    @b_1 = util_spec 'b', 1 do |s|
+      s.add_development_dependency 'a', '1'
+    end
+
+    @c_1 = util_spec 'c', 1 do |s|
+      s.add_development_dependency 'a', '2'
+    end
 
     install_gem @b_1
     install_gem @c_1
@@ -196,7 +221,7 @@ class TestGemCommandsCleanupCommand < Gem::TestCase
     @b_2 = util_spec 'b', 3
 
     install_gem @b_1
-    install_default_specs @b_default
+    install_default_gems @b_default
     install_gem @b_2
 
     @cmd.options[:args] = []
@@ -205,7 +230,7 @@ class TestGemCommandsCleanupCommand < Gem::TestCase
       @cmd.execute
     end
 
-    assert_match %r%^Skipped default gems: b-2%, @ui.output
+    assert_match %r{^Skipped default gems: b-2}, @ui.output
     assert_empty @ui.error
   end
 

data/test/rubygems/test_gem_commands_contents_command.rb

@@ -3,7 +3,6 @@ require 'rubygems/test_case'
 require 'rubygems/commands/contents_command'
 
 class TestGemCommandsContentsCommand < Gem::TestCase
-
   def setup
     super
 
@@ -27,8 +26,8 @@ class TestGemCommandsContentsCommand < Gem::TestCase
       @cmd.execute
     end
 
-    assert_match %r|lib/foo\.rb|, @ui.output
-    assert_match %r|Rakefile|, @ui.output
+    assert_match %r{lib/foo\.rb}, @ui.output
+    assert_match %r{Rakefile}, @ui.output
     assert_equal "", @ui.error
   end
 
@@ -42,9 +41,9 @@ class TestGemCommandsContentsCommand < Gem::TestCase
       @cmd.execute
     end
 
-    assert_match %r|lib/foo\.rb|, @ui.output
-    assert_match %r|lib/bar\.rb|, @ui.output
-    assert_match %r|Rakefile|, @ui.output
+    assert_match %r{lib/foo\.rb}, @ui.output
+    assert_match %r{lib/bar\.rb}, @ui.output
+    assert_match %r{Rakefile}, @ui.output
     assert_equal "", @ui.error
   end
 
@@ -57,8 +56,8 @@ class TestGemCommandsContentsCommand < Gem::TestCase
       end
     end
 
-    assert_match %r|Unable to find gem 'foo' in default gem paths|, @ui.output
-    assert_match %r|Directories searched:|, @ui.output
+    assert_match %r{Unable to find gem 'foo' in default gem paths}, @ui.output
+    assert_match %r{Directories searched:}, @ui.output
     assert_equal "", @ui.error
   end
 
@@ -71,8 +70,8 @@ class TestGemCommandsContentsCommand < Gem::TestCase
       @cmd.execute
     end
 
-    assert_match %r|lib/foo\.rb|, @ui.output
-    assert_match %r|Rakefile|, @ui.output
+    assert_match %r{lib/foo\.rb}, @ui.output
+    assert_match %r{Rakefile}, @ui.output
     assert_equal "", @ui.error
   end
 
@@ -86,8 +85,8 @@ class TestGemCommandsContentsCommand < Gem::TestCase
       @cmd.execute
     end
 
-    assert_match %r|lib/foo\.rb|, @ui.output
-    refute_match %r|Rakefile|, @ui.output
+    assert_match %r{lib/foo\.rb}, @ui.output
+    refute_match %r{Rakefile}, @ui.output
 
     assert_equal "", @ui.error
   end
@@ -105,6 +104,22 @@ class TestGemCommandsContentsCommand < Gem::TestCase
     assert_empty @ui.error
   end
 
+  def test_execute_missing_version
+    @cmd.options[:args] = %w[foo]
+    @cmd.options[:version] = Gem::Requirement.new '= 2'
+
+    gem 'foo', 1
+
+    assert_raises Gem::MockGemUi::TermError do
+      use_ui @ui do
+        @cmd.execute
+      end
+    end
+
+    assert_match "Unable to find gem 'foo'", @ui.output
+    assert_empty @ui.error
+  end
+
   def test_execute_missing_multiple
     @cmd.options[:args] = %w[foo bar]
 
@@ -130,9 +145,9 @@ class TestGemCommandsContentsCommand < Gem::TestCase
       @cmd.execute
     end
 
-    assert_match %r|lib/foo\.rb|, @ui.output
-    assert_match %r|lib/bar\.rb|, @ui.output
-    assert_match %r|Rakefile|, @ui.output
+    assert_match %r{lib/foo\.rb}, @ui.output
+    assert_match %r{lib/bar\.rb}, @ui.output
+    assert_match %r{Rakefile}, @ui.output
     assert_equal "", @ui.error
   end
 
@@ -152,6 +167,23 @@ class TestGemCommandsContentsCommand < Gem::TestCase
     assert_equal "", @ui.error
   end
 
+  def test_execute_show_install_dir_latest_version
+    @cmd.options[:args] = %w[foo]
+    @cmd.options[:show_install_dir] = true
+
+    gem 'foo', 1
+    gem 'foo', 2
+
+    use_ui @ui do
+      @cmd.execute
+    end
+
+    expected = File.join @gemhome, 'gems', 'foo-2'
+
+    assert_equal "#{expected}\n", @ui.output
+    assert_equal "", @ui.error
+  end
+
   def test_execute_show_install_dir_version
     @cmd.options[:args] = %w[foo]
     @cmd.options[:show_install_dir] = true
@@ -195,7 +227,7 @@ lib/foo.rb
                                         nil, "default/gem.rb")
     default_gem_spec.executables = ["default_command"]
     default_gem_spec.files += ["default_gem.so"]
-    install_default_specs(default_gem_spec)
+    install_default_gems(default_gem_spec)
 
     @cmd.options[:args] = %w[default]
 
@@ -206,8 +238,8 @@ lib/foo.rb
     expected = [
       [RbConfig::CONFIG['bindir'], 'default_command'],
       [RbConfig::CONFIG['rubylibdir'], 'default/gem.rb'],
-      [RbConfig::CONFIG['archdir'], 'default_gem.so']
-    ].sort.map{|a|File.join a}.join "\n"
+      [RbConfig::CONFIG['archdir'], 'default_gem.so'],
+    ].sort.map{|a|File.join a }.join "\n"
 
     assert_equal expected, @ui.output.chomp
     assert_equal "", @ui.error
@@ -235,5 +267,4 @@ lib/foo.rb
     assert_equal Gem::Requirement.new('0.0.2'), @cmd.options[:version]
     assert @cmd.options[:show_install_dir]
   end
-
 end

data/test/rubygems/test_gem_commands_dependency_command.rb

@@ -3,7 +3,6 @@ require 'rubygems/test_case'
 require 'rubygems/commands/dependency_command'
 
 class TestGemCommandsDependencyCommand < Gem::TestCase
-
   def setup
     super
     @stub_ui = Gem::MockGemUi.new
@@ -101,7 +100,7 @@ Gem x-2
       fetcher.spec 'b',      2
     end
 
-    @cmd.options[:args] = %w[/[ab]/]
+    @cmd.options[:args] = %w[[ab]]
 
     use_ui @stub_ui do
       @cmd.execute
@@ -225,5 +224,4 @@ ERROR:  Only reverse dependencies for local gems are supported.
     assert_equal "Gem a-2.a\n\n", @stub_ui.output
     assert_equal '', @stub_ui.error
   end
-
 end

data/test/rubygems/test_gem_commands_environment_command.rb

@@ -3,7 +3,6 @@ require 'rubygems/test_case'
 require 'rubygems/commands/environment_command'
 
 class TestGemCommandsEnvironmentCommand < Gem::TestCase
-
   def setup
     super
 
@@ -22,29 +21,29 @@ class TestGemCommandsEnvironmentCommand < Gem::TestCase
       @cmd.execute
     end
 
-    assert_match %r|RUBYGEMS VERSION: (\d\.)+\d|, @ui.output
-    assert_match %r|RUBY VERSION: \d+\.\d+\.\d+ \(.*\) \[.*\]|, @ui.output
-    assert_match %r|INSTALLATION DIRECTORY: #{Regexp.escape @gemhome}|,
+    assert_match %r{RUBYGEMS VERSION: (\d\.)+\d}, @ui.output
+    assert_match %r{RUBY VERSION: \d+\.\d+\.\d+ \(.*\) \[.*\]}, @ui.output
+    assert_match %r{INSTALLATION DIRECTORY: #{Regexp.escape @gemhome}},
                  @ui.output
-    assert_match %r|RUBYGEMS PREFIX: |, @ui.output
-    assert_match %r|RUBY EXECUTABLE:.*#{RbConfig::CONFIG['ruby_install_name']}|,
+    assert_match %r{RUBYGEMS PREFIX: }, @ui.output
+    assert_match %r{RUBY EXECUTABLE:.*#{RbConfig::CONFIG['ruby_install_name']}},
                  @ui.output
-    assert_match %r|GIT EXECUTABLE: #{@cmd.send(:git_path)}|, @ui.output
-    assert_match %r|SYSTEM CONFIGURATION DIRECTORY:|, @ui.output
-    assert_match %r|EXECUTABLE DIRECTORY:|, @ui.output
-    assert_match %r|RUBYGEMS PLATFORMS:|, @ui.output
-    assert_match %r|- #{Gem::Platform.local}|, @ui.output
-    assert_match %r|GEM PATHS:|, @ui.output
-    assert_match %r|- #{Regexp.escape @gemhome}|, @ui.output
-    assert_match %r|GEM CONFIGURATION:|, @ui.output
-    assert_match %r|"gemcutter_key" => "\*\*\*\*"|, @ui.output
-    assert_match %r|:verbose => |, @ui.output
-    assert_match %r|REMOTE SOURCES:|, @ui.output
-
-    assert_match %r|- SHELL PATH:|,     @ui.output
-    assert_match %r|- /usr/local/bin$|, @ui.output
-    assert_match %r|- /usr/bin$|,       @ui.output
-    assert_match %r|- /bin$|,           @ui.output
+    assert_match %r{GIT EXECUTABLE: #{@cmd.send(:git_path)}}, @ui.output
+    assert_match %r{SYSTEM CONFIGURATION DIRECTORY:}, @ui.output
+    assert_match %r{EXECUTABLE DIRECTORY:}, @ui.output
+    assert_match %r{RUBYGEMS PLATFORMS:}, @ui.output
+    assert_match %r{- #{Gem::Platform.local}}, @ui.output
+    assert_match %r{GEM PATHS:}, @ui.output
+    assert_match %r{- #{Regexp.escape @gemhome}}, @ui.output
+    assert_match %r{GEM CONFIGURATION:}, @ui.output
+    assert_match %r{"gemcutter_key" => "\*\*\*\*"}, @ui.output
+    assert_match %r{:verbose => }, @ui.output
+    assert_match %r{REMOTE SOURCES:}, @ui.output
+
+    assert_match %r{- SHELL PATH:},     @ui.output
+    assert_match %r{- /usr/local/bin$}, @ui.output
+    assert_match %r{- /usr/bin$},       @ui.output
+    assert_match %r{- /bin$},           @ui.output
 
     assert_empty @ui.error
 
@@ -90,17 +89,6 @@ class TestGemCommandsEnvironmentCommand < Gem::TestCase
     assert_equal '', @ui.error
   end
 
-  def test_execute_packageversion
-    @cmd.send :handle_options, %w[packageversion]
-
-    use_ui @ui do
-      @cmd.execute
-    end
-
-    assert_equal "#{Gem::RubyGemsPackageVersion}\n", @ui.output
-    assert_equal '', @ui.error
-  end
-
   def test_execute_remotesources
     orig_sources = Gem.sources.dup
     Gem.sources.replace %w[http://gems.example.com]

data/test/rubygems/test_gem_commands_fetch_command.rb

@@ -5,7 +5,6 @@ require 'rubygems/security'
 require 'rubygems/commands/fetch_command'
 
 class TestGemCommandsFetchCommand < Gem::TestCase
-
   def setup
     super
 
@@ -122,5 +121,4 @@ class TestGemCommandsFetchCommand < Gem::TestCase
     assert_path_exists(File.join(@tempdir, a1.file_name),
                        "#{a1.full_name} not fetched")
   end
-
 end

data/test/rubygems/test_gem_commands_generate_index_command.rb

@@ -4,7 +4,6 @@ require 'rubygems/indexer'
 require 'rubygems/commands/generate_index_command'
 
 class TestGemCommandsGenerateIndexCommand < Gem::TestCase
-
   def setup
     super
 
@@ -22,6 +21,18 @@ class TestGemCommandsGenerateIndexCommand < Gem::TestCase
     assert File.exist?(specs), specs
   end
 
+  def test_execute_no_modern
+    @cmd.options[:modern] = false
+
+    use_ui @ui do
+      @cmd.execute
+    end
+
+    specs = File.join @gemhome, "specs.4.8.gz"
+
+    assert File.exist?(specs), specs
+  end
+
   def test_handle_options_directory
     return if win_platform?
     refute_equal '/nonexistent', @cmd.options[:directory]
@@ -47,4 +58,23 @@ class TestGemCommandsGenerateIndexCommand < Gem::TestCase
     assert @cmd.options[:update]
   end
 
-end if ''.respond_to? :to_xs
+  def test_handle_options_modern
+    use_ui @ui do
+      @cmd.handle_options %w[--modern]
+    end
+
+    assert_equal \
+      "WARNING:  The \"--modern\" option has been deprecated and will be removed in Rubygems 4.0. Modern indexes (specs, latest_specs, and prerelease_specs) are always generated, so this option is not needed.\n",
+      @ui.error
+  end
+
+  def test_handle_options_no_modern
+    use_ui @ui do
+      @cmd.handle_options %w[--no-modern]
+    end
+
+    assert_equal \
+      "WARNING:  The \"--no-modern\" option has been deprecated and will be removed in Rubygems 4.0. The `--no-modern` option is currently ignored. Modern indexes (specs, latest_specs, and prerelease_specs) are always generated.\n",
+      @ui.error
+  end
+end