rubygems-update 3.2.0.rc.1 → 3.2.3

data/test/rubygems/test_gem_commands_cert_command.rb

@@ -2,7 +2,7 @@
 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
 
@@ -11,7 +11,6 @@ if Gem.java_platform?
 end
 
 class TestGemCommandsCertCommand < Gem::TestCase
-
   ALTERNATE_CERT = load_cert 'alternate'
   EXPIRED_PUBLIC_CERT = load_cert 'expired'
 
@@ -806,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) && !Gem.java_platform?
+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]
@@ -211,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] = []
@@ -278,5 +288,4 @@ class TestGemCommandsCleanupCommand < Gem::TestCase
     assert_path_exists d_1.gem_dir
     assert_path_exists d_2.gem_dir
   end
-
 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
 
@@ -228,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]
 
@@ -239,7 +238,7 @@ lib/foo.rb
     expected = [
       [RbConfig::CONFIG['bindir'], 'default_command'],
       [RbConfig::CONFIG['rubylibdir'], 'default/gem.rb'],
-      [RbConfig::CONFIG['archdir'], 'default_gem.so']
+      [RbConfig::CONFIG['archdir'], 'default_gem.so'],
     ].sort.map{|a|File.join a }.join "\n"
 
     assert_equal expected, @ui.output.chomp
@@ -268,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
@@ -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
 
@@ -141,5 +140,4 @@ class TestGemCommandsEnvironmentCommand < Gem::TestCase
     assert_equal "#{Gem.platforms.join File::PATH_SEPARATOR}\n", @ui.output
     assert_equal '', @ui.error
   end
-
 end

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
 
@@ -78,5 +77,4 @@ class TestGemCommandsGenerateIndexCommand < Gem::TestCase
       "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

data/test/rubygems/test_gem_commands_help_command.rb

@@ -6,7 +6,6 @@ require "rubygems/package"
 require "rubygems/command_manager"
 
 class TestGemCommandsHelpCommand < Gem::TestCase
-
   def setup
     super
 
@@ -41,10 +40,12 @@ class TestGemCommandsHelpCommand < Gem::TestCase
 
     util_gem 'commands' do |out, err|
       mgr.command_names.each do |cmd|
-        assert_match(/\s+#{cmd}\s+\S+/, out)
+        unless mgr[cmd].deprecated?
+          assert_match(/\s+#{cmd}\s+\S+/, out)
+        end
       end
 
-      if defined?(OpenSSL::SSL)
+      if Gem::HAVE_OPENSSL
         assert_empty err
 
         refute_match 'No command found for ', out
@@ -52,6 +53,17 @@ class TestGemCommandsHelpCommand < Gem::TestCase
     end
   end
 
+  def test_gem_help_commands_omits_deprecated_commands
+    mgr = Gem::CommandManager.new
+
+    util_gem 'commands' do |out, err|
+      deprecated_commands = mgr.command_names.select {|cmd| mgr[cmd].deprecated? }
+      deprecated_commands.each do |cmd|
+        refute_match(/\A\s+#{cmd}\s+\S+\z/, out)
+      end
+    end
+  end
+
   def test_gem_no_args_shows_help
     util_gem do |out, err|
       assert_match(/Usage:/, out)
@@ -71,5 +83,4 @@ class TestGemCommandsHelpCommand < Gem::TestCase
 
     yield @ui.output, @ui.error
   end
-
 end

data/test/rubygems/test_gem_commands_info_command.rb

@@ -3,7 +3,6 @@ require 'rubygems/test_case'
 require 'rubygems/commands/info_command'
 
 class TestGemCommandsInfoCommand < Gem::TestCase
-
   def setup
     super
 
@@ -41,5 +40,4 @@ class TestGemCommandsInfoCommand < Gem::TestCase
     assert_match %r{#{@gem.summary}\n}, @ui.output
     assert_match "", @ui.error
   end
-
 end

data/test/rubygems/test_gem_commands_install_command.rb

@@ -5,7 +5,6 @@ require 'rubygems/request_set'
 require 'rubygems/rdoc'
 
 class TestGemCommandsInstallCommand < Gem::TestCase
-
   def setup
     super
     common_installer_setup
@@ -411,7 +410,7 @@ ERROR:  Possible alternatives: non_existent_with_hint
 
     expected = [
       "ERROR:  Could not find a valid gem 'non-existent_with-hint' (>= 0) in any repository",
-      "ERROR:  Possible alternatives: nonexistent-with_hint"
+      "ERROR:  Possible alternatives: nonexistent-with_hint",
     ]
 
     output = @ui.error.split "\n"
@@ -505,6 +504,137 @@ ERROR:  Possible alternatives: non_existent_with_hint
     assert_equal %w[a-2], @cmd.installed_specs.map {|spec| spec.full_name }
   end
 
+  def test_execute_required_ruby_version
+    next_ruby = Gem.ruby_version.segments.map.with_index{|n, i| i == 1 ? n + 1 : n }.join(".")
+
+    local = Gem::Platform.local
+    spec_fetcher do |fetcher|
+      fetcher.download 'a', 2
+      fetcher.download 'a', 2 do |s|
+        s.required_ruby_version = "< #{RUBY_VERSION}.a"
+        s.platform = local
+      end
+      fetcher.download 'a', 3 do |s|
+        s.required_ruby_version = ">= #{next_ruby}"
+      end
+      fetcher.download 'a', 3 do |s|
+        s.required_ruby_version = ">= #{next_ruby}"
+        s.platform = local
+      end
+    end
+
+    @cmd.options[:args] = %w[a]
+
+    use_ui @ui do
+      assert_raises Gem::MockGemUi::SystemExitException, @ui.error do
+        @cmd.execute
+      end
+    end
+
+    assert_equal %w[a-2], @cmd.installed_specs.map {|spec| spec.full_name }
+  end
+
+  def test_execute_required_ruby_version_upper_bound
+    local = Gem::Platform.local
+    spec_fetcher do |fetcher|
+      fetcher.gem 'a', 2.0
+      fetcher.gem 'a', 2.0 do |s|
+        s.required_ruby_version = "< #{RUBY_VERSION}.a"
+        s.platform = local
+      end
+    end
+
+    @cmd.options[:args] = %w[a]
+
+    use_ui @ui do
+      assert_raises Gem::MockGemUi::SystemExitException, @ui.error do
+        @cmd.execute
+      end
+    end
+
+    assert_equal %w[a-2.0], @cmd.installed_specs.map {|spec| spec.full_name }
+  end
+
+  def test_execute_required_ruby_version_specific_not_met
+    spec_fetcher do |fetcher|
+      fetcher.gem 'a', '1.0' do |s|
+        s.required_ruby_version = '= 1.4.6'
+      end
+    end
+
+    @cmd.options[:args] = %w[a]
+
+    use_ui @ui do
+      assert_raises Gem::MockGemUi::TermError do
+        @cmd.execute
+      end
+    end
+
+    errs = @ui.error.split("\n")
+    assert_equal "ERROR:  Error installing a:", errs.shift
+    assert_equal "\ta-1.0 requires Ruby version = 1.4.6. The current ruby version is #{Gem.ruby_version}.", errs.shift
+  end
+
+  def test_execute_required_ruby_version_specific_prerelease_met
+    spec_fetcher do |fetcher|
+      fetcher.gem 'a', '1.0' do |s|
+        s.required_ruby_version = '>= 1.4.6.preview2'
+      end
+    end
+
+    @cmd.options[:args] = %w[a]
+
+    use_ui @ui do
+      assert_raises Gem::MockGemUi::SystemExitException, @ui.error do
+        @cmd.execute
+      end
+    end
+
+    assert_equal %w[a-1.0], @cmd.installed_specs.map {|spec| spec.full_name }
+  end
+
+  def test_execute_required_ruby_version_specific_prerelease_not_met
+    next_ruby_pre = Gem.ruby_version.segments.map.with_index{|n, i| i == 1 ? n + 1 : n }.join(".") + ".a"
+
+    spec_fetcher do |fetcher|
+      fetcher.gem 'a', '1.0' do |s|
+        s.required_ruby_version = "> #{next_ruby_pre}"
+      end
+    end
+
+    @cmd.options[:args] = %w[a]
+
+    use_ui @ui do
+      assert_raises Gem::MockGemUi::TermError do
+        @cmd.execute
+      end
+    end
+
+    errs = @ui.error.split("\n")
+    assert_equal "ERROR:  Error installing a:", errs.shift
+    assert_equal "\ta-1.0 requires Ruby version > #{next_ruby_pre}. The current ruby version is #{Gem.ruby_version}.", errs.shift
+  end
+
+  def test_execute_required_rubygems_version_wrong
+    spec_fetcher do |fetcher|
+      fetcher.gem 'a', '1.0' do |s|
+        s.required_rubygems_version = '< 0'
+      end
+    end
+
+    @cmd.options[:args] = %w[a]
+
+    use_ui @ui do
+      assert_raises Gem::MockGemUi::TermError do
+        @cmd.execute
+      end
+    end
+
+    errs = @ui.error.split("\n")
+    assert_equal "ERROR:  Error installing a:", errs.shift
+    assert_equal "\ta-1.0 requires RubyGems version < 0. The current RubyGems version is #{Gem.rubygems_version}. Try 'gem update --system' to update RubyGems itself.", errs.shift
+  end
+
   def test_execute_rdoc
     specs = spec_fetcher do |fetcher|
       fetcher.gem 'a', 2
@@ -1346,5 +1476,4 @@ ERROR:  Possible alternatives: non_existent_with_hint
     assert_equal "  a-3", out.shift
     assert_empty out
   end
-
 end

data/test/rubygems/test_gem_commands_list_command.rb

@@ -3,7 +3,6 @@ require 'rubygems/test_case'
 require 'rubygems/commands/list_command'
 
 class TestGemCommandsListCommand < Gem::TestCase
-
   def setup
     super
 
@@ -30,5 +29,4 @@ class TestGemCommandsListCommand < Gem::TestCase
     assert_equal "true\n", @ui.output
     assert_equal '', @ui.error
   end
-
 end

data/test/rubygems/test_gem_commands_lock_command.rb

@@ -3,7 +3,6 @@ require 'rubygems/test_case'
 require 'rubygems/commands/lock_command'
 
 class TestGemCommandsLockCommand < Gem::TestCase
-
   def setup
     super
 
@@ -64,5 +63,4 @@ gem 'd', '= 1'
 
     assert_equal 'Could not find gem c-1, try using the full name', e.message
   end
-
 end

data/test/rubygems/test_gem_commands_mirror.rb

@@ -3,7 +3,6 @@ require 'rubygems/test_case'
 require 'rubygems/commands/mirror_command'
 
 class TestGemCommandsMirrorCommand < Gem::TestCase
-
   def setup
     super
 
@@ -17,5 +16,4 @@ class TestGemCommandsMirrorCommand < Gem::TestCase
 
     assert_match %r{Install the rubygems-mirror}i, @ui.error
   end
-
 end

data/test/rubygems/test_gem_commands_open_command.rb

@@ -3,7 +3,6 @@ require 'rubygems/test_case'
 require 'rubygems/commands/open_command'
 
 class TestGemCommandsOpenCommand < Gem::TestCase
-
   def setup
     super
 
@@ -96,5 +95,4 @@ class TestGemCommandsOpenCommand < Gem::TestCase
     assert_match %r{'foo' is a default gem and can't be opened\.} , @ui.output
     assert_equal "", @ui.error
   end
-
 end