rubygems-update 2.7.11 → 3.0.0

data/test/rubygems/test_gem_commands_lock_command.rb

@@ -66,4 +66,3 @@ gem 'd', '= 1'
   end
 
 end
-

data/test/rubygems/test_gem_commands_open_command.rb

@@ -68,4 +68,33 @@ class TestGemCommandsOpenCommand < Gem::TestCase
     assert_equal "", @ui.error
   end
 
+  def test_default_gem
+    @cmd.options[:version] = "1.0"
+    @cmd.options[:args] = %w[foo]
+
+    version = @cmd.options[:version]
+    @cmd.define_singleton_method(:spec_for) do |name|
+      spec = Gem::Specification.find_all_by_name(name, version).first
+
+      spec.define_singleton_method(:default_gem?) do
+        true
+      end
+
+      return spec if spec
+
+      say "Unable to find gem '#{name}'"
+    end
+
+    gem("foo", "1.0")
+
+    assert_raises Gem::MockGemUi::TermError do
+      use_ui @ui do
+        @cmd.execute
+      end
+    end
+
+    assert_match %r|'foo' is a default gem and can't be opened\.| , @ui.output
+    assert_equal "", @ui.error
+  end
+
 end

data/test/rubygems/test_gem_commands_outdated_command.rb

@@ -30,4 +30,3 @@ class TestGemCommandsOutdatedCommand < Gem::TestCase
     assert_equal "", @ui.error
   end
 end
-

data/test/rubygems/test_gem_commands_owner_command.rb

@@ -8,8 +8,10 @@ class TestGemCommandsOwnerCommand < Gem::TestCase
     super
 
     ENV["RUBYGEMS_HOST"] = nil
-    @fetcher = Gem::FakeFetcher.new
-    Gem::RemoteFetcher.fetcher = @fetcher
+    @stub_ui = Gem::MockGemUi.new
+    @stub_fetcher = Gem::FakeFetcher.new
+    Gem::RemoteFetcher.fetcher = @stub_fetcher
+    Gem.configuration = nil
     Gem.configuration.rubygems_api_key = "ed244fbf2b1a52e012da8616c512fa47f9aa5250"
 
     @cmd = Gem::Commands::OwnerCommand.new
@@ -27,20 +29,20 @@ class TestGemCommandsOwnerCommand < Gem::TestCase
 - id: 4
 EOF
 
-    @fetcher.data["#{Gem.host}/api/v1/gems/freewill/owners.yaml"] = [response, 200, 'OK']
+    @stub_fetcher.data["#{Gem.host}/api/v1/gems/freewill/owners.yaml"] = [response, 200, 'OK']
 
-    use_ui @ui do
+    use_ui @stub_ui do
       @cmd.show_owners("freewill")
     end
 
-    assert_equal Net::HTTP::Get, @fetcher.last_request.class
-    assert_equal Gem.configuration.rubygems_api_key, @fetcher.last_request["Authorization"]
+    assert_equal Net::HTTP::Get, @stub_fetcher.last_request.class
+    assert_equal Gem.configuration.rubygems_api_key, @stub_fetcher.last_request["Authorization"]
 
-    assert_match %r{Owners for gem: freewill}, @ui.output
-    assert_match %r{- user1@example.com}, @ui.output
-    assert_match %r{- user2@example.com}, @ui.output
-    assert_match %r{- user3}, @ui.output
-    assert_match %r{- 4}, @ui.output
+    assert_match %r{Owners for gem: freewill}, @stub_ui.output
+    assert_match %r{- user1@example.com}, @stub_ui.output
+    assert_match %r{- user2@example.com}, @stub_ui.output
+    assert_match %r{- user3}, @stub_ui.output
+    assert_match %r{- 4}, @stub_ui.output
   end
 
   def test_show_owners_dont_load_objects
@@ -57,14 +59,13 @@ EOF
 - id: 4
 EOF
 
-    @fetcher.data["#{Gem.host}/api/v1/gems/freewill/owners.yaml"] = [response, 200, 'OK']
+    @stub_fetcher.data["#{Gem.host}/api/v1/gems/freewill/owners.yaml"] = [response, 200, 'OK']
 
     assert_raises Psych::DisallowedClass do
       use_ui @ui do
         @cmd.show_owners("freewill")
       end
     end
-
   end
 
 
@@ -73,14 +74,14 @@ EOF
     host = "http://rubygems.example"
     ENV["RUBYGEMS_HOST"] = host
 
-    @fetcher.data["#{host}/api/v1/gems/freewill/owners.yaml"] = [response, 200, 'OK']
+    @stub_fetcher.data["#{host}/api/v1/gems/freewill/owners.yaml"] = [response, 200, 'OK']
 
-    use_ui @ui do
+    use_ui @stub_ui do
       @cmd.show_owners("freewill")
     end
 
-    assert_match %r{Owners for gem: freewill}, @ui.output
-    assert_match %r{- user1@example.com}, @ui.output
+    assert_match %r{Owners for gem: freewill}, @stub_ui.output
+    assert_match %r{- user1@example.com}, @stub_ui.output
   end
 
   def test_show_owners_setting_up_host
@@ -88,32 +89,32 @@ EOF
     host = "http://rubygems.example"
     @cmd.host = host
 
-    @fetcher.data["#{host}/api/v1/gems/freewill/owners.yaml"] = [response, 200, 'OK']
+    @stub_fetcher.data["#{host}/api/v1/gems/freewill/owners.yaml"] = [response, 200, 'OK']
 
-    use_ui @ui do
+    use_ui @stub_ui do
       @cmd.show_owners("freewill")
     end
 
-    assert_match %r{Owners for gem: freewill}, @ui.output
-    assert_match %r{- user1@example.com}, @ui.output
+    assert_match %r{Owners for gem: freewill}, @stub_ui.output
+    assert_match %r{- user1@example.com}, @stub_ui.output
   end
 
   def test_show_owners_denied
     response = "You don't have permission to push to this gem"
-    @fetcher.data["#{Gem.host}/api/v1/gems/freewill/owners.yaml"] = [response, 403, 'Forbidden']
+    @stub_fetcher.data["#{Gem.host}/api/v1/gems/freewill/owners.yaml"] = [response, 403, 'Forbidden']
 
     assert_raises Gem::MockGemUi::TermError do
-      use_ui @ui do
+      use_ui @stub_ui do
         @cmd.show_owners("freewill")
       end
     end
 
-    assert_match response, @ui.output
+    assert_match response, @stub_ui.output
   end
 
   def test_show_owners_key
     response = "- email: user1@example.com\n"
-    @fetcher.data["#{Gem.host}/api/v1/gems/freewill/owners.yaml"] = [response, 200, 'OK']
+    @stub_fetcher.data["#{Gem.host}/api/v1/gems/freewill/owners.yaml"] = [response, 200, 'OK']
     File.open Gem.configuration.credentials_path, 'a' do |f|
       f.write ':other: 701229f217cdf23b1344c7b4b54ca97'
     end
@@ -122,56 +123,56 @@ EOF
     @cmd.handle_options %w(-k other)
     @cmd.show_owners('freewill')
 
-    assert_equal '701229f217cdf23b1344c7b4b54ca97', @fetcher.last_request['Authorization']
+    assert_equal '701229f217cdf23b1344c7b4b54ca97', @stub_fetcher.last_request['Authorization']
   end
 
   def test_add_owners
     response = "Owner added successfully."
-    @fetcher.data["#{Gem.host}/api/v1/gems/freewill/owners"] = [response, 200, 'OK']
+    @stub_fetcher.data["#{Gem.host}/api/v1/gems/freewill/owners"] = [response, 200, 'OK']
 
-    use_ui @ui do
+    use_ui @stub_ui do
       @cmd.add_owners("freewill", ["user-new1@example.com"])
     end
 
-    assert_equal Net::HTTP::Post, @fetcher.last_request.class
-    assert_equal Gem.configuration.rubygems_api_key, @fetcher.last_request["Authorization"]
-    assert_equal "email=user-new1%40example.com", @fetcher.last_request.body
+    assert_equal Net::HTTP::Post, @stub_fetcher.last_request.class
+    assert_equal Gem.configuration.rubygems_api_key, @stub_fetcher.last_request["Authorization"]
+    assert_equal "email=user-new1%40example.com", @stub_fetcher.last_request.body
 
-    assert_match response, @ui.output
+    assert_match response, @stub_ui.output
   end
 
   def test_add_owners_denied
     response = "You don't have permission to push to this gem"
-    @fetcher.data["#{Gem.host}/api/v1/gems/freewill/owners"] = [response, 403, 'Forbidden']
+    @stub_fetcher.data["#{Gem.host}/api/v1/gems/freewill/owners"] = [response, 403, 'Forbidden']
 
-    use_ui @ui do
+    use_ui @stub_ui do
       @cmd.add_owners("freewill", ["user-new1@example.com"])
     end
 
-    assert_match response, @ui.output
+    assert_match response, @stub_ui.output
   end
 
   def test_add_owner_with_host_option_through_execute
     host = "http://rubygems.example"
     add_owner_response = "Owner added successfully."
     show_owners_response = "- email: user1@example.com\n"
-    @fetcher.data["#{host}/api/v1/gems/freewill/owners"] = [add_owner_response, 200, 'OK']
-    @fetcher.data["#{host}/api/v1/gems/freewill/owners.yaml"] = [show_owners_response, 200, 'OK']
+    @stub_fetcher.data["#{host}/api/v1/gems/freewill/owners"] = [add_owner_response, 200, 'OK']
+    @stub_fetcher.data["#{host}/api/v1/gems/freewill/owners.yaml"] = [show_owners_response, 200, 'OK']
 
     @cmd.handle_options %W[--host #{host} --add user-new1@example.com freewill]
 
-    use_ui @ui do
+    use_ui @stub_ui do
       @cmd.execute
     end
 
-    assert_match add_owner_response, @ui.output
-    assert_match %r{Owners for gem: freewill}, @ui.output
-    assert_match %r{- user1@example.com}, @ui.output
+    assert_match add_owner_response, @stub_ui.output
+    assert_match %r{Owners for gem: freewill}, @stub_ui.output
+    assert_match %r{- user1@example.com}, @stub_ui.output
   end
 
   def test_add_owners_key
     response = "Owner added successfully."
-    @fetcher.data["#{Gem.host}/api/v1/gems/freewill/owners"] = [response, 200, 'OK']
+    @stub_fetcher.data["#{Gem.host}/api/v1/gems/freewill/owners"] = [response, 200, 'OK']
     File.open Gem.configuration.credentials_path, 'a' do |f|
       f.write ':other: 701229f217cdf23b1344c7b4b54ca97'
     end
@@ -180,38 +181,38 @@ EOF
     @cmd.handle_options %w(-k other)
     @cmd.add_owners('freewill', ['user-new1@example.com'])
 
-    assert_equal '701229f217cdf23b1344c7b4b54ca97', @fetcher.last_request['Authorization']
+    assert_equal '701229f217cdf23b1344c7b4b54ca97', @stub_fetcher.last_request['Authorization']
   end
 
   def test_remove_owners
     response = "Owner removed successfully."
-    @fetcher.data["#{Gem.host}/api/v1/gems/freewill/owners"] = [response, 200, 'OK']
+    @stub_fetcher.data["#{Gem.host}/api/v1/gems/freewill/owners"] = [response, 200, 'OK']
 
-    use_ui @ui do
+    use_ui @stub_ui do
       @cmd.remove_owners("freewill", ["user-remove1@example.com"])
     end
 
-    assert_equal Net::HTTP::Delete, @fetcher.last_request.class
-    assert_equal Gem.configuration.rubygems_api_key, @fetcher.last_request["Authorization"]
-    assert_equal "email=user-remove1%40example.com", @fetcher.last_request.body
+    assert_equal Net::HTTP::Delete, @stub_fetcher.last_request.class
+    assert_equal Gem.configuration.rubygems_api_key, @stub_fetcher.last_request["Authorization"]
+    assert_equal "email=user-remove1%40example.com", @stub_fetcher.last_request.body
 
-    assert_match response, @ui.output
+    assert_match response, @stub_ui.output
   end
 
   def test_remove_owners_denied
     response = "You don't have permission to push to this gem"
-    @fetcher.data["#{Gem.host}/api/v1/gems/freewill/owners"] = [response, 403, 'Forbidden']
+    @stub_fetcher.data["#{Gem.host}/api/v1/gems/freewill/owners"] = [response, 403, 'Forbidden']
 
-    use_ui @ui do
+    use_ui @stub_ui do
       @cmd.remove_owners("freewill", ["user-remove1@example.com"])
     end
 
-    assert_match response, @ui.output
+    assert_match response, @stub_ui.output
   end
 
   def test_remove_owners_key
     response = "Owner removed successfully."
-    @fetcher.data["#{Gem.host}/api/v1/gems/freewill/owners"] = [response, 200, 'OK']
+    @stub_fetcher.data["#{Gem.host}/api/v1/gems/freewill/owners"] = [response, 200, 'OK']
     File.open Gem.configuration.credentials_path, 'a' do |f|
       f.write ':other: 701229f217cdf23b1344c7b4b54ca97'
     end
@@ -220,18 +221,53 @@ EOF
     @cmd.handle_options %w(-k other)
     @cmd.remove_owners('freewill', ['user-remove1@example.com'])
 
-    assert_equal '701229f217cdf23b1344c7b4b54ca97', @fetcher.last_request['Authorization']
+    assert_equal '701229f217cdf23b1344c7b4b54ca97', @stub_fetcher.last_request['Authorization']
   end
 
   def test_remove_owners_missing
     response = 'Owner could not be found.'
-    @fetcher.data["#{Gem.host}/api/v1/gems/freewill/owners"] = [response, 404, 'Not Found']
+    @stub_fetcher.data["#{Gem.host}/api/v1/gems/freewill/owners"] = [response, 404, 'Not Found']
 
-    use_ui @ui do
+    use_ui @stub_ui do
       @cmd.remove_owners("freewill", ["missing@example"])
     end
 
-    assert_equal "Removing missing@example: #{response}\n", @ui.output
+    assert_equal "Removing missing@example: #{response}\n", @stub_ui.output
+  end
+
+  def test_otp_verified_success
+    response_fail = "You have enabled multifactor authentication but your request doesn't have the correct OTP code. Please check it and retry."
+    response_success = "Owner added successfully."
+
+    @stub_fetcher.data["#{Gem.host}/api/v1/gems/freewill/owners"] = proc do
+      @call_count ||= 0
+      (@call_count += 1).odd? ? [response_fail, 401, 'Unauthorized'] : [response_success, 200, 'OK']
+    end
+
+    @otp_ui = Gem::MockGemUi.new "111111\n"
+    use_ui @otp_ui do
+      @cmd.add_owners("freewill", ["user-new1@example.com"])
+    end
+
+    assert_match 'You have enabled multi-factor authentication. Please enter OTP code.', @otp_ui.output
+    assert_match 'Code: ', @otp_ui.output
+    assert_match response_success, @otp_ui.output
+    assert_equal '111111', @stub_fetcher.last_request['OTP']
+  end
+
+  def test_otp_verified_failure
+    response = "You have enabled multifactor authentication but your request doesn't have the correct OTP code. Please check it and retry."
+    @stub_fetcher.data["#{Gem.host}/api/v1/gems/freewill/owners"] = [response, 401, 'Unauthorized']
+
+    @otp_ui = Gem::MockGemUi.new "111111\n"
+    use_ui @otp_ui do
+      @cmd.add_owners("freewill", ["user-new1@example.com"])
+    end
+
+    assert_match response, @otp_ui.output
+    assert_match 'You have enabled multi-factor authentication. Please enter OTP code.', @otp_ui.output
+    assert_match 'Code: ', @otp_ui.output
+    assert_equal '111111', @stub_fetcher.last_request['OTP']
   end
 
 end

data/test/rubygems/test_gem_commands_pristine_command.rb

@@ -253,6 +253,31 @@ class TestGemCommandsPristineCommand < Gem::TestCase
     assert_empty out, out.inspect
   end
 
+  def test_skip_many_gems
+    a = util_spec 'a'
+    b = util_spec 'b'
+    c = util_spec 'c'
+
+    install_gem a
+    install_gem b
+    install_gem c
+
+    @cmd.options[:args] = %w[a b c]
+    @cmd.options[:skip] = ['a', 'c']
+
+    use_ui @ui do
+      @cmd.execute
+    end
+
+    out = @ui.output.split "\n"
+
+    assert_equal "Restoring gems to pristine condition...", out.shift
+    assert_equal "Skipped #{a.full_name}, it was given through options", out.shift
+    assert_equal "Restored #{b.full_name}", out.shift
+    assert_equal "Skipped #{c.full_name}, it was given through options", out.shift
+    assert_empty out, out.inspect
+  end
+
   def test_execute_many_multi_repo
     a = util_spec 'a'
     install_gem a
@@ -408,6 +433,39 @@ class TestGemCommandsPristineCommand < Gem::TestCase
     refute File.exist? gem_lib
   end
 
+  def test_execute_bindir
+    a = util_spec 'a' do |s|
+      s.name = "test_gem"
+      s.executables = %w[foo]
+      s.files = %w[bin/foo]
+    end
+
+    write_file File.join(@tempdir, 'bin', 'foo') do |fp|
+      fp.puts "#!/usr/bin/ruby"
+    end
+
+    write_file File.join(@tempdir, 'test_bin', 'foo') do |fp|
+      fp.puts "#!/usr/bin/ruby"
+    end
+
+    install_gem a
+
+    gem_exec = File.join @gemhome, 'bin', 'foo'
+    gem_bindir = File.join @tempdir, 'test_bin', 'foo'
+
+    FileUtils.rm gem_exec
+    FileUtils.rm gem_bindir
+
+    @cmd.handle_options ["--all", "--only-executables", "--bindir", "#{gem_bindir}"]
+
+    use_ui @ui do
+      @cmd.execute
+    end
+
+    refute File.exist? gem_exec
+    assert File.exist? gem_bindir
+  end
+
   def test_execute_unknown_gem_at_remote_source
     install_specs util_spec 'a'
 
@@ -437,38 +495,16 @@ class TestGemCommandsPristineCommand < Gem::TestCase
       @cmd.execute
     end
 
-    assert_equal([
-                   "Restoring gems to pristine condition...",
-                   "Skipped default-2.0.0.0, it is a default gem",
-                 ],
-                 @ui.output.split("\n"))
+    assert_equal(
+      [
+        "Restoring gems to pristine condition...",
+        "Skipped default-2.0.0.0, it is a default gem",
+      ],
+      @ui.output.split("\n")
+    )
     assert_empty(@ui.error)
   end
 
-  def test_execute_bundled_gem_on_old_rubies
-    util_set_RUBY_VERSION '1.9.3', 551
-
-    spec = util_spec 'bigdecimal', '1.1.0' do |s|
-      s.summary = "This bigdecimal is bundled with Ruby"
-    end
-    install_specs spec
-
-    @cmd.options[:args] = %w[bigdecimal]
-
-    use_ui @ui do
-      @cmd.execute
-    end
-
-    assert_equal([
-      "Restoring gems to pristine condition...",
-      "Skipped bigdecimal-1.1.0, it is bundled with old Ruby"
-    ], @ui.output.split("\n"))
-
-    assert_empty @ui.error
-  ensure
-    util_restore_RUBY_VERSION
-  end
-
   def test_handle_options
     @cmd.handle_options %w[]
 
@@ -488,4 +524,3 @@ class TestGemCommandsPristineCommand < Gem::TestCase
   end
 
 end
-