rubygems-update 3.0.9 → 3.1.0.pre1

data/test/rubygems/test_gem_commands_yank_command.rb

@@ -3,6 +3,7 @@ require 'rubygems/test_case'
 require 'rubygems/commands/yank_command'
 
 class TestGemCommandsYankCommand < Gem::TestCase
+
   def setup
     super
 
@@ -12,7 +13,7 @@ class TestGemCommandsYankCommand < Gem::TestCase
     @fetcher = Gem::RemoteFetcher.fetcher
 
     Gem.configuration.rubygems_api_key = 'key'
-    Gem.configuration.api_keys[:KEY]  = 'other'
+    Gem.configuration.api_keys[:KEY] = 'other'
   end
 
   def test_handle_options
@@ -57,6 +58,50 @@ class TestGemCommandsYankCommand < Gem::TestCase
     assert_equal [yank_uri], @fetcher.paths
   end
 
+  def test_execute_with_otp_success
+    response_fail = 'You have enabled multifactor authentication but your request doesn\'t have the correct OTP code. Please check it and retry.'
+    yank_uri = 'http://example/api/v1/gems/yank'
+    @fetcher.data[yank_uri] = [
+      [response_fail, 401, 'Unauthorized'],
+      ['Successfully yanked', 200, 'OK']
+    ]
+
+    @cmd.options[:args]           = %w[a]
+    @cmd.options[:added_platform] = true
+    @cmd.options[:version]        = req('= 1.0')
+
+    @otp_ui = Gem::MockGemUi.new "111111\n"
+    use_ui @otp_ui do
+      @cmd.execute
+    end
+
+    assert_match 'You have enabled multi-factor authentication. Please enter OTP code.', @otp_ui.output
+    assert_match 'Code: ', @otp_ui.output
+    assert_match %r%Yanking gem from http://example%, @otp_ui.output
+    assert_match %r%Successfully yanked%,      @otp_ui.output
+    assert_equal '111111', @fetcher.last_request['OTP']
+  end
+
+  def test_execute_with_otp_failure
+    response = 'You have enabled multifactor authentication but your request doesn\'t have the correct OTP code. Please check it and retry.'
+    yank_uri = 'http://example/api/v1/gems/yank'
+    @fetcher.data[yank_uri] = [response, 401, 'Unauthorized']
+
+    @cmd.options[:args]           = %w[a]
+    @cmd.options[:added_platform] = true
+    @cmd.options[:version]        = req('= 1.0')
+
+    @otp_ui = Gem::MockGemUi.new "111111\n"
+    use_ui @otp_ui do
+      @cmd.execute
+    end
+
+    assert_match 'You have enabled multi-factor authentication. Please enter OTP code.', @otp_ui.output
+    assert_match response, @otp_ui.output
+    assert_match 'Code: ', @otp_ui.output
+    assert_equal '111111', @fetcher.last_request['OTP']
+  end
+
   def test_execute_key
     yank_uri = 'http://example/api/v1/gems/yank'
     @fetcher.data[yank_uri] = ['Successfully yanked', 200, 'OK']

data/test/rubygems/test_gem_config_file.rb

@@ -157,8 +157,8 @@ class TestGemConfigFile < Gem::TestCase
     File.open conf3, 'w' do |fp|
       fp.puts ':verbose: :loud'
     end
-
-    ENV['GEMRC'] = conf1 + ':' + conf2 + ';' + conf3
+    ps = File::PATH_SEPARATOR
+    ENV['GEMRC'] = conf1 + ps + conf2 + ps + conf3
 
     util_config_file
 
@@ -167,6 +167,12 @@ class TestGemConfigFile < Gem::TestCase
     assert_equal 2048, @cfg.bulk_threshold
   end
 
+  def test_set_config_file_name_from_environment_variable
+    ENV['GEMRC'] = "/tmp/.gemrc"
+    cfg = Gem::ConfigFile.new([])
+    assert_equal cfg.config_file_name, "/tmp/.gemrc"
+  end
+
   def test_api_keys
     assert_nil @cfg.instance_variable_get :@api_keys
 
@@ -489,4 +495,5 @@ 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

@@ -385,5 +385,11 @@ class TestGemDependency < Gem::TestCase
     assert_match "Could not find 'b' (= 2.0) among 1 total gem(s)", e.message
   end
 
+  def test_identity
+    assert_equal dep("a", "= 1").identity, :released
+    assert_equal dep("a", "= 1.a").identity, :complete
+    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

@@ -26,22 +26,25 @@ class TestGemDependencyInstaller < Gem::TestCase
   end
 
   def util_setup_gems
-    @a1, @a1_gem         = util_gem 'a', '1' do |s| s.executables << 'a_bin' end
+    @a1, @a1_gem = util_gem 'a', '1' do |s|
+      s.executables << 'a_bin'
+    end
+
     @a1_pre, @a1_pre_gem = util_gem 'a', '1.a'
-    @b1, @b1_gem         = util_gem 'b', '1' do |s|
+
+    @b1, @b1_gem = util_gem 'b', '1' do |s|
       s.add_dependency 'a'
       s.add_development_dependency 'aa'
     end
 
-    @c1, @c1_gem         = util_gem 'c', '1' do |s|
+    @c1, @c1_gem = util_gem 'c', '1' do |s|
       s.add_development_dependency 'b'
     end
 
-    @d1, @d1_gem         = util_gem 'd', '1' do |s|
+    @d1, @d1_gem = util_gem 'd', '1' do |s|
       s.add_development_dependency 'c'
     end
 
-    util_clear_gems
     util_reset_gems
   end
 
@@ -52,7 +55,9 @@ class TestGemDependencyInstaller < Gem::TestCase
 
     inst = Gem::DependencyInstaller.new
 
-    available = inst.available_set_for 'a', Gem::Requirement.default
+    available = Gem::Deprecate.skip_during do
+      inst.available_set_for 'a', Gem::Requirement.default
+    end
 
     assert_equal %w[a-1], available.set.map { |s| s.spec.full_name }
   end
@@ -64,7 +69,9 @@ class TestGemDependencyInstaller < Gem::TestCase
 
     inst = Gem::DependencyInstaller.new :prerelease => true
 
-    available = inst.available_set_for 'a', Gem::Requirement.default
+    available = Gem::Deprecate.skip_during do
+      inst.available_set_for 'a', Gem::Requirement.default
+    end
 
     assert_equal %w[a-10.a],
                  available.sorted.map { |s| s.spec.full_name }
@@ -79,7 +86,9 @@ class TestGemDependencyInstaller < Gem::TestCase
 
     dep = Gem::Dependency.new 'a', Gem::Requirement.default
 
-    available = inst.available_set_for dep, Gem::Requirement.default
+    available = Gem::Deprecate.skip_during do
+      inst.available_set_for dep, Gem::Requirement.default
+    end
 
     assert_equal %w[a-1], available.set.map { |s| s.spec.full_name }
   end
@@ -94,7 +103,9 @@ class TestGemDependencyInstaller < Gem::TestCase
     dep = Gem::Dependency.new 'a', Gem::Requirement.default
     dep.prerelease = true
 
-    available = inst.available_set_for dep, Gem::Requirement.default
+    available = Gem::Deprecate.skip_during do
+      inst.available_set_for dep, Gem::Requirement.default
+    end
 
     assert_equal %w[a-10.a],
                  available.sorted.map { |s| s.spec.full_name }
@@ -121,7 +132,6 @@ class TestGemDependencyInstaller < Gem::TestCase
     p1a, gem = util_gem 'a', '10.a'
 
     util_setup_spec_fetcher(p1a, @a1, @a1_pre)
-    util_clear_gems
 
     p1a_data = Gem.read_binary(gem)
 
@@ -160,7 +170,6 @@ class TestGemDependencyInstaller < Gem::TestCase
     p1a, gem = util_gem 'p', '1.a'
 
     util_setup_spec_fetcher(p1a)
-    util_clear_gems
 
     p1a_data = Gem.read_binary(gem)
 
@@ -180,7 +189,6 @@ class TestGemDependencyInstaller < Gem::TestCase
     util_setup_gems
 
     util_setup_spec_fetcher(@a1, @a1_pre)
-    util_clear_gems
 
     p1a_data = Gem.read_binary(@a1_gem)
 
@@ -201,8 +209,6 @@ class TestGemDependencyInstaller < Gem::TestCase
       s.add_dependency 'b'
     end
 
-    util_clear_gems
-
     FileUtils.mv @a1_gem, @tempdir
     FileUtils.mv @b1_gem, @tempdir
     FileUtils.mv  e1_gem, @tempdir
@@ -563,8 +569,6 @@ class TestGemDependencyInstaller < Gem::TestCase
       s.add_dependency 'a'
     end
 
-    util_clear_gems
-
     FileUtils.mv @a1_gem, @tempdir
     FileUtils.mv @b1_gem, @tempdir
     FileUtils.mv  b2_gem, @tempdir
@@ -865,15 +869,18 @@ class TestGemDependencyInstaller < Gem::TestCase
 
     si = util_setup_spec_fetcher @a1, a2_o
 
-    util_clear_gems
-
     @fetcher.data['http://gems.example.com/gems/yaml'] = si.to_yaml
 
     a1_data = nil
     a2_o_data = nil
 
-    File.open @a1_gem, 'rb' do |fp| a1_data = fp.read end
-    File.open a2_o_gem, 'rb' do |fp| a2_o_data = fp.read end
+    File.open @a1_gem, 'rb' do |fp|
+      a1_data = fp.read
+    end
+
+    File.open a2_o_gem, 'rb' do |fp|
+      a2_o_data = fp.read
+    end
 
     @fetcher.data["http://gems.example.com/gems/#{@a1.file_name}"] =
       a1_data
@@ -975,7 +982,9 @@ class TestGemDependencyInstaller < Gem::TestCase
 
     Gem::Specification.reset
 
-    set = inst.find_gems_with_sources(dep)
+    set = Gem::Deprecate.skip_during do
+      inst.find_gems_with_sources(dep)
+    end
 
     assert_kind_of Gem::AvailableSet, set
 
@@ -993,7 +1002,9 @@ class TestGemDependencyInstaller < Gem::TestCase
 
     inst = Gem::DependencyInstaller.new
 
-    available = inst.find_spec_by_name_and_version('*.gem')
+    available = Gem::Deprecate.skip_during do
+      inst.find_spec_by_name_and_version('*.gem')
+    end
 
     assert_equal %w[a-1], available.each_spec.map { |spec| spec.full_name }
   end
@@ -1004,7 +1015,9 @@ class TestGemDependencyInstaller < Gem::TestCase
     inst = Gem::DependencyInstaller.new
 
     assert_raises Gem::Package::FormatError do
-      inst.find_spec_by_name_and_version '*.gem'
+      Gem::Deprecate.skip_during do
+        inst.find_spec_by_name_and_version '*.gem'
+      end
     end
   end
 
@@ -1014,7 +1027,9 @@ class TestGemDependencyInstaller < Gem::TestCase
     inst = Gem::DependencyInstaller.new
 
     e = assert_raises Gem::Package::FormatError do
-      inst.find_spec_by_name_and_version 'rdoc.gem'
+      Gem::Deprecate.skip_during do
+        inst.find_spec_by_name_and_version 'rdoc.gem'
+      end
     end
 
     full_path = File.join @tempdir, 'rdoc.gem'
@@ -1027,7 +1042,9 @@ class TestGemDependencyInstaller < Gem::TestCase
     inst = Gem::DependencyInstaller.new
 
     e = assert_raises Gem::SpecificGemNotFoundException do
-      inst.find_spec_by_name_and_version 'rdoc'
+      Gem::Deprecate.skip_during do
+        inst.find_spec_by_name_and_version 'rdoc'
+      end
     end
 
     assert_equal "Could not find a valid gem 'rdoc' (>= 0) " +
@@ -1041,7 +1058,9 @@ class TestGemDependencyInstaller < Gem::TestCase
     inst = Gem::DependencyInstaller.new
 
     e = assert_raises Gem::SpecificGemNotFoundException do
-      inst.find_spec_by_name_and_version 'rdoc'
+      Gem::Deprecate.skip_during do
+        inst.find_spec_by_name_and_version 'rdoc'
+      end
     end
 
     assert_equal "Could not find a valid gem 'rdoc' (>= 0) " +
@@ -1058,7 +1077,9 @@ class TestGemDependencyInstaller < Gem::TestCase
     set = nil
 
     Dir.chdir @tempdir do
-      set = inst.find_gems_with_sources dep
+      set = Gem::Deprecate.skip_during do
+        inst.find_gems_with_sources dep
+      end
     end
 
     gems = set.sorted
@@ -1082,16 +1103,22 @@ class TestGemDependencyInstaller < Gem::TestCase
 
     dependency = Gem::Dependency.new('a', Gem::Requirement.default)
 
-    releases =
-      installer.find_gems_with_sources(dependency).all_specs
+    set = Gem::Deprecate.skip_during do
+      installer.find_gems_with_sources(dependency)
+    end
+
+    releases = set.all_specs
 
     assert releases.any? { |s| s.name == 'a' and s.version.to_s == '1' }
     refute releases.any? { |s| s.name == 'a' and s.version.to_s == '1.a' }
 
     dependency.prerelease = true
 
-    prereleases =
-      installer.find_gems_with_sources(dependency).all_specs
+    set = Gem::Deprecate.skip_during do
+      installer.find_gems_with_sources(dependency)
+    end
+
+    prereleases = set.all_specs
 
     assert_equal [@a1_pre, @a1], prereleases
   end
@@ -1108,8 +1135,11 @@ class TestGemDependencyInstaller < Gem::TestCase
 
     dependency = Gem::Dependency.new('a', Gem::Requirement.default)
 
-    releases =
-      installer.find_gems_with_sources(dependency, true).all_specs
+    set = Gem::Deprecate.skip_during do
+      installer.find_gems_with_sources(dependency, true)
+    end
+
+    releases = set.all_specs
 
     assert_equal [a1_x86_mingw32], releases
   end
@@ -1121,7 +1151,9 @@ class TestGemDependencyInstaller < Gem::TestCase
 
     dep = Gem::Dependency.new('a')
 
-    out = installer.find_gems_with_sources(dep)
+    out = Gem::Deprecate.skip_during do
+      installer.find_gems_with_sources(dep)
+    end
 
     assert out.empty?
     assert_kind_of Gem::SourceFetchProblem, installer.errors.first
@@ -1232,7 +1264,6 @@ class TestGemDependencyInstaller < Gem::TestCase
     util_setup_spec_fetcher(*[@a1, @a1_pre, @b1, @c1_pre,
                               @d1, @d2, @x1_m, @x1_o, @w1, @y1,
                               @y1_1_p, @z1].compact)
-
-    util_clear_gems
   end
+
 end

data/test/rubygems/test_gem_dependency_list.rb

@@ -7,8 +7,6 @@ class TestGemDependencyList < Gem::TestCase
   def setup
     super
 
-    util_clear_gems
-
     @deplist = Gem::DependencyList.new
 
     # TODO: switch to util_spec
@@ -16,13 +14,23 @@ class TestGemDependencyList < Gem::TestCase
     @a2 = util_spec 'a', '2'
     @a3 = util_spec 'a', '3'
 
-    @b1 = util_spec 'b', '1' do |s| s.add_dependency 'a', '>= 1' end
-    @b2 = util_spec 'b', '2' do |s| s.add_dependency 'a', '>= 1' end
+    @b1 = util_spec 'b', '1' do |s|
+      s.add_dependency 'a', '>= 1'
+    end
+
+    @b2 = util_spec 'b', '2' do |s|
+      s.add_dependency 'a', '>= 1'
+    end
+
+    @c1 = util_spec 'c', '1' do |s|
+      s.add_dependency 'b', '>= 1'
+    end
 
-    @c1 = util_spec 'c', '1' do |s| s.add_dependency 'b', '>= 1' end
     @c2 = util_spec 'c', '2'
 
-    @d1 = util_spec 'd', '1' do |s| s.add_dependency 'c', '>= 1' end
+    @d1 = util_spec 'd', '1' do |s|
+      s.add_dependency 'c', '>= 1'
+    end
   end
 
   def test_active_count
@@ -114,8 +122,6 @@ class TestGemDependencyList < Gem::TestCase
   end
 
   def test_ok_eh
-    util_clear_gems
-
     assert @deplist.ok?, 'no dependencies'
 
     @deplist.add @b2
@@ -128,8 +134,6 @@ class TestGemDependencyList < Gem::TestCase
   end
 
   def test_why_not_ok_eh
-    util_clear_gems
-
     assert_equal({},  @deplist.why_not_ok?)
 
     @deplist.add @b2
@@ -165,8 +169,13 @@ class TestGemDependencyList < Gem::TestCase
     a1 = util_spec 'a', '1'
     a2 = util_spec 'a', '2'
 
-    b = util_spec 'b', '1' do |s| s.add_dependency 'a', '= 1' end
-    c = util_spec 'c', '1' do |s| s.add_dependency 'a', '= 2' end
+    b = util_spec 'b', '1' do |s|
+      s.add_dependency 'a', '= 1'
+    end
+
+    c = util_spec 'c', '1' do |s|
+      s.add_dependency 'a', '= 2'
+    end
 
     d = util_spec 'd', '1' do |s|
       s.add_dependency 'b'
@@ -214,8 +223,6 @@ class TestGemDependencyList < Gem::TestCase
   end
 
   def test_remove_by_name
-    util_clear_gems
-
     @deplist.add @a1, @b2
 
     @deplist.remove_by_name "a-1"