rubygems-update 3.2.0.rc.1 → 3.2.3

data/test/rubygems/test_gem_commands_signin_command.rb

@@ -4,7 +4,6 @@ require 'rubygems/commands/signin_command'
 require 'rubygems/installer'
 
 class TestGemCommandsSigninCommand < Gem::TestCase
-
   def setup
     super
 
@@ -74,14 +73,38 @@ class TestGemCommandsSigninCommand < Gem::TestCase
     assert_equal api_key, credentials[:rubygems_api_key]
   end
 
+  def test_excute_with_key_name_and_scope
+    email     = 'you@example.com'
+    password  = 'secret'
+    api_key   = '1234'
+    fetcher   = Gem::RemoteFetcher.fetcher
+
+    key_name_ui = Gem::MockGemUi.new "#{email}\n#{password}\ntest-key\n\ny\n\n\n\n\n\n"
+    util_capture(key_name_ui, nil, api_key, fetcher) { @cmd.execute }
+
+    user = ENV["USER"] || ENV["USERNAME"]
+
+    assert_match "API Key name [#{Socket.gethostname}-#{user}", key_name_ui.output
+    assert_match "index_rubygems [y/N]", key_name_ui.output
+    assert_match "push_rubygem [y/N]", key_name_ui.output
+    assert_match "yank_rubygem [y/N]", key_name_ui.output
+    assert_match "add_owner [y/N]", key_name_ui.output
+    assert_match "remove_owner [y/N]", key_name_ui.output
+    assert_match "access_webhooks [y/N]", key_name_ui.output
+    assert_match "show_dashboard [y/N]", key_name_ui.output
+    assert_equal "name=test-key&push_rubygem=true", fetcher.last_request.body
+
+    credentials = YAML.load_file Gem.configuration.credentials_path
+    assert_equal api_key, credentials[:rubygems_api_key]
+  end
+
   # Utility method to capture IO/UI within the block passed
 
-  def util_capture(ui_stub = nil, host = nil, api_key = nil)
+  def util_capture(ui_stub = nil, host = nil, api_key = nil, fetcher = Gem::FakeFetcher.new)
     api_key ||= 'a5fdbb6ba150cbb83aad2bb2fede64cf040453903'
     response  = [api_key, 200, 'OK']
     email     = 'you@example.com'
     password  = 'secret'
-    fetcher   = Gem::FakeFetcher.new
 
     # Set the expected response for the Web-API supplied
     ENV['RUBYGEMS_HOST']       = host || Gem::DEFAULT_HOST
@@ -89,7 +112,7 @@ class TestGemCommandsSigninCommand < Gem::TestCase
     fetcher.data[data_key]     = response
     Gem::RemoteFetcher.fetcher = fetcher
 
-    sign_in_ui = ui_stub || Gem::MockGemUi.new("#{email}\n#{password}\n")
+    sign_in_ui = ui_stub || Gem::MockGemUi.new("#{email}\n#{password}\n\n\n\n\n\n\n\n\n")
 
     use_ui sign_in_ui do
       yield
@@ -97,5 +120,4 @@ class TestGemCommandsSigninCommand < Gem::TestCase
 
     sign_in_ui
   end
-
 end

data/test/rubygems/test_gem_commands_signout_command.rb

@@ -5,7 +5,6 @@ require 'rubygems/commands/signout_command'
 require 'rubygems/installer'
 
 class TestGemCommandsSignoutCommand < Gem::TestCase
-
   def setup
     super
     @cmd = Gem::Commands::SignoutCommand.new
@@ -28,5 +27,4 @@ class TestGemCommandsSignoutCommand < Gem::TestCase
 
     assert_match %r{You are not currently signed in}, @sign_out_ui.error
   end
-
 end

data/test/rubygems/test_gem_commands_sources_command.rb

@@ -3,7 +3,6 @@ require 'rubygems/test_case'
 require 'rubygems/commands/sources_command'
 
 class TestGemCommandsSourcesCommand < Gem::TestCase
-
   def setup
     super
 
@@ -108,6 +107,36 @@ class TestGemCommandsSourcesCommand < Gem::TestCase
     assert_empty ui.error
   end
 
+  def test_execute_add_allow_typo_squatting_source_forced
+    rubygems_org = "https://rubyems.org"
+
+    spec_fetcher do |fetcher|
+      fetcher.spec("a", 1)
+    end
+
+    specs = Gem::Specification.map do |spec|
+      [spec.name, spec.version, spec.original_platform]
+    end
+
+    specs_dump_gz = StringIO.new
+    Zlib::GzipWriter.wrap(specs_dump_gz) do |io|
+      Marshal.dump(specs, io)
+    end
+
+    @fetcher.data["#{rubygems_org}/specs.#{@marshal_version}.gz"] = specs_dump_gz.string
+    @cmd.handle_options %W[--force --add #{rubygems_org}]
+
+    @cmd.execute
+
+    expected = "https://rubyems.org added to sources\n"
+    assert_equal expected, ui.output
+
+    source = Gem::Source.new(rubygems_org)
+    assert Gem.sources.include?(source)
+
+    assert_empty ui.error
+  end
+
   def test_execute_add_deny_typo_squatting_source
     rubygems_org = "https://rubyems.org"
 
@@ -284,6 +313,36 @@ source http://gems.example.com/ already present in the cache
     assert_empty @ui.error
   end
 
+  def test_execute_add_http_rubygems_org_forced
+    rubygems_org = "http://rubygems.org"
+
+    spec_fetcher do |fetcher|
+      fetcher.spec("a", 1)
+    end
+
+    specs = Gem::Specification.map do |spec|
+      [spec.name, spec.version, spec.original_platform]
+    end
+
+    specs_dump_gz = StringIO.new
+    Zlib::GzipWriter.wrap(specs_dump_gz) do |io|
+      Marshal.dump(specs, io)
+    end
+
+    @fetcher.data["#{rubygems_org}/specs.#{@marshal_version}.gz"] = specs_dump_gz.string
+    @cmd.handle_options %W[--force --add #{rubygems_org}]
+
+    @cmd.execute
+
+    expected = "http://rubygems.org added to sources\n"
+    assert_equal expected, ui.output
+
+    source = Gem::Source.new(rubygems_org)
+    assert Gem.sources.include?(source)
+
+    assert_empty ui.error
+  end
+
   def test_execute_add_https_rubygems_org
     https_rubygems_org = 'https://rubygems.org/'
 
@@ -422,5 +481,4 @@ beta-gems.example.com is not a URI
     assert_equal "source cache successfully updated\n", @ui.output
     assert_equal '', @ui.error
   end
-
 end

data/test/rubygems/test_gem_commands_specification_command.rb

@@ -3,7 +3,6 @@ require 'rubygems/test_case'
 require 'rubygems/commands/specification_command'
 
 class TestGemCommandsSpecificationCommand < Gem::TestCase
-
   def setup
     super
 
@@ -187,6 +186,34 @@ class TestGemCommandsSpecificationCommand < Gem::TestCase
     assert_equal Gem::Version.new("1"), spec.version
   end
 
+  def test_execute_remote_with_version_and_platform
+    original_platforms = Gem.platforms.dup
+
+    spec_fetcher do |fetcher|
+      fetcher.spec 'foo', "1"
+      fetcher.spec 'foo', "1" do |s|
+        s.platform = 'x86_64-linux'
+      end
+    end
+
+    @cmd.options[:args] = %w[foo]
+    @cmd.options[:version] = "1"
+    @cmd.options[:domain] = :remote
+    @cmd.options[:added_platform] = true
+    Gem.platforms = [Gem::Platform::RUBY, Gem::Platform.new("x86_64-linux")]
+
+    use_ui @ui do
+      @cmd.execute
+    end
+
+    spec = Gem::Specification.from_yaml @ui.output
+
+    assert_equal Gem::Version.new("1"), spec.version
+    assert_equal Gem::Platform.new("x86_64-linux"), spec.platform
+  ensure
+    Gem.platforms = original_platforms
+  end
+
   def test_execute_remote_without_prerelease
     spec_fetcher do |fetcher|
       fetcher.spec 'foo', '2.0.0'
@@ -246,5 +273,4 @@ class TestGemCommandsSpecificationCommand < Gem::TestCase
     assert_match %r{s.name = "foo"}, @ui.output
     assert_equal '', @ui.error
   end
-
 end

data/test/rubygems/test_gem_commands_stale_command.rb

@@ -3,7 +3,6 @@ require 'rubygems/test_case'
 require 'rubygems/commands/stale_command'
 
 class TestGemCommandsStaleCommand < Gem::TestCase
-
   def setup
     super
     @stub_ui = Gem::MockGemUi.new
@@ -40,5 +39,4 @@ class TestGemCommandsStaleCommand < Gem::TestCase
     assert_equal("#{foo_bar.name}-#{foo_bar.version}", lines[0].split.first)
     assert_equal("#{bar_baz.name}-#{bar_baz.version}", lines[1].split.first)
   end
-
 end

data/test/rubygems/test_gem_commands_uninstall_command.rb

@@ -3,7 +3,6 @@ require 'rubygems/installer_test_case'
 require 'rubygems/commands/uninstall_command'
 
 class TestGemCommandsUninstallCommand < Gem::InstallerTestCase
-
   def setup
     super
     @cmd = Gem::Commands::UninstallCommand.new
@@ -502,5 +501,4 @@ WARNING:  Use your OS package manager to uninstall vendor gems
       end
     end
   end
-
 end

data/test/rubygems/test_gem_commands_unpack_command.rb

@@ -3,7 +3,6 @@ require 'rubygems/test_case'
 require 'rubygems/commands/unpack_command'
 
 class TestGemCommandsUnpackCommand < Gem::TestCase
-
   def setup
     super
 
@@ -221,5 +220,4 @@ class TestGemCommandsUnpackCommand < Gem::TestCase
 
     assert @cmd.options[:spec]
   end
-
 end

data/test/rubygems/test_gem_commands_update_command.rb

@@ -3,7 +3,6 @@ require 'rubygems/test_case'
 require 'rubygems/commands/update_command'
 
 class TestGemCommandsUpdateCommand < Gem::TestCase
-
   def setup
     super
     common_installer_setup
@@ -159,6 +158,26 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
     assert_empty out
   end
 
+  def test_execute_system_specific_older_than_minimum_supported_rubygems
+    spec_fetcher do |fetcher|
+      fetcher.download 'rubygems-update', "2.5.1" do |s|
+        s.files = %w[setup.rb]
+      end
+    end
+
+    @cmd.options[:args]          = []
+    @cmd.options[:system]        = "2.5.1"
+
+    assert_raises Gem::MockGemUi::TermError do
+      use_ui @ui do
+        @cmd.execute
+      end
+    end
+
+    assert_empty @ui.output
+    assert_equal "ERROR:  rubygems 2.5.1 is not supported. The oldest supported version is 2.5.2\n", @ui.error
+  end
+
   def test_execute_system_specific_older_than_3_2_removes_plugins_dir
     spec_fetcher do |fetcher|
       fetcher.download 'rubygems-update', 3.1 do |s|
@@ -179,13 +198,13 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
 
   def test_execute_system_specific_newer_than_or_equal_to_3_2_leaves_plugins_dir_alone
     spec_fetcher do |fetcher|
-      fetcher.download 'rubygems-update', 3.2 do |s|
+      fetcher.download 'rubygems-update', "3.2.a" do |s|
         s.files = %w[setup.rb]
       end
     end
 
     @cmd.options[:args]          = []
-    @cmd.options[:system]        = "3.2"
+    @cmd.options[:system]        = "3.2.a"
 
     FileUtils.mkdir_p Gem.plugindir
     plugin_file = File.join(Gem.plugindir, 'a_plugin.rb')
@@ -257,6 +276,34 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
     Gem.disable_system_update_message = old_disable_system_update_message
   end
 
+  # The other style of `gem update --system` tests don't actually run
+  # setup.rb, so we just check that setup.rb gets the `--silent` flag.
+  def test_execute_system_silent_passed_to_setuprb
+    @cmd.options[:args] = []
+    @cmd.options[:system] = true
+    @cmd.options[:silent] = true
+
+    assert_equal true, @cmd.update_rubygems_arguments.include?('--silent')
+  end
+
+  def test_execute_system_silent
+    spec_fetcher do |fetcher|
+      fetcher.download 'rubygems-update', 9 do |s|
+        s.files = %w[setup.rb]
+      end
+    end
+
+    @cmd.options[:args]          = []
+    @cmd.options[:system]        = true
+    @cmd.options[:silent]        = true
+
+    use_ui @ui do
+      @cmd.execute
+    end
+
+    assert_empty @ui.output
+  end
+
   # before:
   #   a1 -> c1.2
   # after:
@@ -647,5 +694,4 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
     assert_equal "  a-2", out.shift
     assert_empty out
   end
-
 end

data/test/rubygems/test_gem_commands_which_command.rb

@@ -3,7 +3,6 @@ require 'rubygems/test_case'
 require 'rubygems/commands/which_command'
 
 class TestGemCommandsWhichCommand < Gem::TestCase
-
   def setup
     super
     Gem::Specification.reset
@@ -82,5 +81,4 @@ class TestGemCommandsWhichCommand < Gem::TestCase
       FileUtils.touch filename
     end
   end
-
 end

data/test/rubygems/test_gem_commands_yank_command.rb

@@ -3,7 +3,6 @@ require 'rubygems/test_case'
 require 'rubygems/commands/yank_command'
 
 class TestGemCommandsYankCommand < Gem::TestCase
-
   def setup
     super
 
@@ -71,7 +70,7 @@ class TestGemCommandsYankCommand < Gem::TestCase
     yank_uri = 'http://example/api/v1/gems/yank'
     @fetcher.data[yank_uri] = [
       [response_fail, 401, 'Unauthorized'],
-      ['Successfully yanked', 200, 'OK']
+      ['Successfully yanked', 200, 'OK'],
     ]
 
     @cmd.options[:args]           = %w[a]
@@ -149,4 +148,33 @@ class TestGemCommandsYankCommand < Gem::TestCase
     assert_equal [yank_uri], @fetcher.paths
   end
 
+  def test_yank_gem_unathorized_api_key
+    response_forbidden = "The API key doesn't have access"
+    response_success   = 'Successfully yanked'
+    host               = 'http://example'
+
+    @fetcher.data["#{host}/api/v1/gems/yank"] = [
+      [response_forbidden, 403, 'Forbidden'],
+      [response_success, 200, "OK"],
+    ]
+
+    @fetcher.data["#{host}/api/v1/api_key"] = ["", 200, "OK"]
+    @cmd.options[:args]           = %w[a]
+    @cmd.options[:added_platform] = true
+    @cmd.options[:version]        = req('= 1.0')
+    @cmd.instance_variable_set :@host, host
+    @cmd.instance_variable_set :@scope, :yank_rubygem
+
+    @ui = Gem::MockGemUi.new "some@mail.com\npass\n"
+    use_ui @ui do
+      @cmd.execute
+    end
+
+    access_notice = "The existing key doesn't have access of yank_rubygem on http://example. Please sign in to update access."
+    assert_match access_notice, @ui.output
+    assert_match "Email:", @ui.output
+    assert_match "Password:", @ui.output
+    assert_match "Added yank_rubygem scope to the existing API key", @ui.output
+    assert_match response_success, @ui.output
+  end
 end

data/test/rubygems/test_gem_config_file.rb

@@ -3,7 +3,6 @@ require 'rubygems/test_case'
 require 'rubygems/config_file'
 
 class TestGemConfigFile < Gem::TestCase
-
   def setup
     super
 
@@ -492,5 +491,4 @@ if you believe they were disclosed to a third party.
     util_config_file
     assert_equal(true, @cfg.disable_default_gem_server)
   end
-
 end

data/test/rubygems/test_gem_dependency.rb

@@ -3,7 +3,6 @@ require 'rubygems/test_case'
 require 'rubygems/dependency'
 
 class TestGemDependency < Gem::TestCase
-
   def test_initialize
     d = dep "pkg", "> 1.0"
 
@@ -391,5 +390,4 @@ class TestGemDependency < Gem::TestCase
     assert_equal dep("a", " >= 1.a").identity, :abs_latest
     assert_equal dep("a").identity, :latest
   end
-
 end

data/test/rubygems/test_gem_dependency_installer.rb

@@ -4,7 +4,6 @@ require 'rubygems/dependency_installer'
 require 'rubygems/security'
 
 class TestGemDependencyInstaller < Gem::TestCase
-
   def setup
     super
     common_installer_setup
@@ -529,6 +528,40 @@ class TestGemDependencyInstaller < Gem::TestCase
     assert_equal %w[a-1 e-1], inst.installed_gems.map {|s| s.full_name }
   end
 
+  def test_install_no_minimal_deps
+    util_setup_gems
+
+    _, e1_gem = util_gem 'e', '1' do |s|
+      s.add_dependency 'b'
+    end
+
+    _, b2_gem = util_gem 'b', '2' do |s|
+      s.add_dependency 'a'
+    end
+
+    FileUtils.mv @a1_gem, @tempdir
+    FileUtils.mv @b1_gem, @tempdir
+    FileUtils.mv  b2_gem, @tempdir
+    FileUtils.mv  e1_gem, @tempdir
+
+    inst = nil
+
+    Dir.chdir @tempdir do
+      inst = Gem::DependencyInstaller.new :ignore_dependencies => true
+      inst.install 'b', req('= 1')
+    end
+
+    assert_equal %w[b-1], inst.installed_gems.map {|s| s.full_name },
+                 'sanity check'
+
+    Dir.chdir @tempdir do
+      inst = Gem::DependencyInstaller.new :minimal_deps => false
+      inst.install 'e'
+    end
+
+    assert_equal %w[a-1 b-2 e-1], inst.installed_gems.map {|s| s.full_name }
+  end
+
   def test_install_no_document
     util_setup_gems
 
@@ -750,7 +783,7 @@ class TestGemDependencyInstaller < Gem::TestCase
     inst = nil
 
     Dir.chdir @tempdir do
-      inst = Gem::DependencyInstaller.new
+      inst = Gem::DependencyInstaller.new :force => true
       inst.install 'a'
     end
 
@@ -841,7 +874,9 @@ class TestGemDependencyInstaller < Gem::TestCase
     assert_equal %w[a-1-cpu-other_platform-1], inst.installed_gems.map {|s| s.full_name }
   end
 
-  if defined? OpenSSL
+  require 'rubygems/openssl'
+
+  if Gem::HAVE_OPENSSL
     def test_install_security_policy
       util_setup_gems
 
@@ -1128,5 +1163,4 @@ class TestGemDependencyInstaller < Gem::TestCase
                               @d1, @d2, @x1_m, @x1_o, @w1, @y1,
                               @y1_1_p, @z1].compact)
   end
-
 end