rubygems-update 2.4.8 → 2.5.0

data/test/rubygems/test_gem_stream_ui.rb

@@ -38,7 +38,7 @@ class TestGemStreamUI < Gem::TestCase
     skip 'TTY detection broken on windows' if
       Gem.win_platform? unless RUBY_VERSION > '1.9.2'
 
-    timeout(1) do
+    Timeout.timeout(1) do
       expected_answer = "Arthur, King of the Britons"
       @in.string = "#{expected_answer}\n"
       actual_answer = @sui.ask("What is your name?")
@@ -52,7 +52,7 @@ class TestGemStreamUI < Gem::TestCase
 
     @in.tty = false
 
-    timeout(0.1) do
+    Timeout.timeout(0.1) do
       answer = @sui.ask("what is your favorite color?")
       assert_equal nil, answer
     end
@@ -62,7 +62,7 @@ class TestGemStreamUI < Gem::TestCase
     skip 'Always uses $stdin on windows' if
       Gem.win_platform? unless RUBY_VERSION > '1.9.2'
 
-    timeout(1) do
+    Timeout.timeout(1) do
       expected_answer = "Arthur, King of the Britons"
       @in.string = "#{expected_answer}\n"
       actual_answer = @sui.ask_for_password("What is your name?")
@@ -76,7 +76,7 @@ class TestGemStreamUI < Gem::TestCase
 
     @in.tty = false
 
-    timeout(0.1) do
+    Timeout.timeout(0.1) do
       answer = @sui.ask_for_password("what is the airspeed velocity of an unladen swallow?")
       assert_equal nil, answer
     end
@@ -88,7 +88,7 @@ class TestGemStreamUI < Gem::TestCase
 
     @in.tty = false
 
-    timeout(0.1) do
+    Timeout.timeout(0.1) do
       answer = @sui.ask_yes_no("do coconuts migrate?", false)
       assert_equal false, answer
 
@@ -103,7 +103,7 @@ class TestGemStreamUI < Gem::TestCase
 
     @in.tty = false
 
-    timeout(0.1) do
+    Timeout.timeout(0.1) do
       assert_raises(Gem::OperationNotSupportedError) do
         @sui.ask_yes_no("do coconuts migrate?")
       end

data/test/rubygems/test_gem_stub_specification.rb

@@ -9,7 +9,7 @@ class TestStubSpecification < Gem::TestCase
   def setup
     super
 
-    @foo = Gem::StubSpecification.new FOO
+    @foo = Gem::StubSpecification.gemspec_stub FOO
   end
 
   def test_initialize
@@ -31,7 +31,7 @@ class TestStubSpecification < Gem::TestCase
   end
 
   def test_initialize_missing_stubline
-    stub = Gem::StubSpecification.new(BAR)
+    stub = Gem::StubSpecification.gemspec_stub(BAR)
     assert_equal "bar", stub.name
     assert_equal Gem::Version.new("0.0.2"), stub.version
     assert_equal Gem::Platform.new("ruby"), stub.platform
@@ -72,6 +72,21 @@ class TestStubSpecification < Gem::TestCase
     assert_equal expected, stub.full_require_paths
   end
 
+  def test_lib_dirs_glob
+    stub = stub_without_extension
+
+    assert_equal File.join(stub.full_gem_path, 'lib'), stub.lib_dirs_glob
+  end
+
+  def test_matches_for_glob
+    stub = stub_without_extension
+    code_rb = File.join stub.gem_dir, 'lib', 'code.rb'
+    FileUtils.mkdir_p File.dirname code_rb
+    FileUtils.touch code_rb
+
+    assert_equal code_rb, stub.matches_for_glob('code*').first
+  end
+
   def test_missing_extensions_eh
     stub = stub_with_extension do |s|
       extconf_rb = File.join s.gem_dir, s.extensions.first
@@ -103,7 +118,7 @@ class TestStubSpecification < Gem::TestCase
       io.write spec.to_ruby_for_cache
     end
 
-    default_spec = Gem::StubSpecification.new spec.loaded_from
+    default_spec = Gem::StubSpecification.gemspec_stub spec.loaded_from
 
     refute default_spec.missing_extensions?
   end
@@ -125,7 +140,7 @@ class TestStubSpecification < Gem::TestCase
   def test_to_spec_with_other_specs_loaded_does_not_warn
     real_foo = util_spec @foo.name, @foo.version
     real_foo.activate
-    bar = Gem::StubSpecification.new BAR
+    bar = Gem::StubSpecification.gemspec_stub BAR
     refute_predicate Gem.loaded_specs, :empty?
     assert bar.to_spec
   end
@@ -164,7 +179,7 @@ end
 
       io.flush
 
-      stub = Gem::StubSpecification.new io.path
+      stub = Gem::StubSpecification.gemspec_stub io.path
 
       yield stub if block_given?
 
@@ -187,7 +202,7 @@ end
 
       io.flush
 
-      stub = Gem::StubSpecification.new io.path
+      stub = Gem::StubSpecification.gemspec_stub io.path
 
       yield stub if block_given?
 

data/test/rubygems/test_gem_text.rb

@@ -64,6 +64,8 @@ Without the wrapping, the text might not look good in the RSS feed.
   def test_levenshtein_distance_remove
     assert_equal 3, levenshtein_distance("zentest", "zentestxxx")
     assert_equal 3, levenshtein_distance("zentestxxx", "zentest")
+    assert_equal 13, levenshtein_distance("cat", "thundercatsarego")
+    assert_equal 13, levenshtein_distance("thundercatsarego", "cat")
   end
 
   def test_levenshtein_distance_replace

data/test/rubygems/test_gem_uninstaller.rb

@@ -158,6 +158,7 @@ class TestGemUninstaller < Gem::InstallerTestCase
     uninstaller = Gem::Uninstaller.new nil
 
     @spec.loaded_from = @spec.loaded_from.gsub @spec.full_name, '\&-legacy'
+    @spec.internal_init # blow out cache. but why did ^^ depend on cache?
     @spec.platform = 'legacy'
 
     assert_equal true, uninstaller.path_ok?(@gemhome, @spec)
@@ -236,7 +237,7 @@ create_makefile '#{@spec.name}'
     use_ui @ui do
       path = Gem::Package.build @spec
 
-      installer = Gem::Installer.new path
+      installer = Gem::Installer.at path
       installer.install
     end
 

data/test/rubygems/test_gem_util.rb

@@ -27,5 +27,13 @@ class TestGemUtil < Gem::TestCase
     assert_equal File.join(@tempdir, 'a'),     enum.next
   end
 
+  def test_linked_list_find
+    list = [1,2,3,4,5].inject(Gem::List.new(0)) { |m,o|
+      Gem::List.new o, m
+    }
+    assert_equal 5, list.find { |x| x == 5 }
+    assert_equal 4, list.find { |x| x == 4 }
+  end
+
 end
 

data/test/rubygems/test_require.rb

@@ -26,11 +26,11 @@ class TestGemRequire < Gem::TestCase
   def setup
     super
 
+    @old_loaded_features = $LOADED_FEATURES.dup
     assert_raises LoadError do
-      save_loaded_features do
-        require 'test_gem_require_a'
-      end
+      require 'test_gem_require_a'
     end
+    $LOADED_FEATURES.replace @old_loaded_features
   end
 
   def assert_require(path)
@@ -49,7 +49,39 @@ class TestGemRequire < Gem::TestCase
     end
   end
 
+  # Providing -I on the commandline should always beat gems
+  def test_dash_i_beats_gems
+    a1 = new_spec "a", "1", {"b" => "= 1"}, "lib/test_gem_require_a.rb"
+    b1 = new_spec "b", "1", {"c" => "> 0"}, "lib/b/c.rb"
+    c1 = new_spec "c", "1", nil, "lib/c/c.rb"
+    c2 = new_spec "c", "2", nil, "lib/c/c.rb"
+
+    install_specs c1, c2, b1, a1
+
+    dir = Dir.mktmpdir
+    dash_i_arg = File.join dir, 'lib'
+
+    c_rb = File.join dash_i_arg, 'b', 'c.rb'
+
+    FileUtils.mkdir_p File.dirname c_rb
+    File.open(c_rb, 'w') { |f| f.write "class Object; HELLO = 'world' end" }
+
+    lp = $LOAD_PATH.dup
+
+    # Pretend to provide a commandline argument that overrides a file in gem b
+    $LOAD_PATH.unshift dash_i_arg
+
+    assert_require 'test_gem_require_a'
+    assert_require 'b/c' # this should be required from -I
+    assert_equal "world", ::Object::HELLO
+  ensure
+    $LOAD_PATH.replace lp
+    Object.send :remove_const, :HELLO if Object.const_defined? :HELLO
+  end
+
   def test_concurrent_require
+    skip 'deadlock' if /^1\.8\./ =~ RUBY_VERSION
+
     Object.const_set :FILE_ENTERED_LATCH, Latch.new(2)
     Object.const_set :FILE_EXIT_LATCH, Latch.new(1)
 
@@ -73,6 +105,8 @@ class TestGemRequire < Gem::TestCase
     assert t1.join, "thread 1 should exit"
     assert t2.join, "thread 2 should exit"
   ensure
+    return if $! # skipping
+
     Object.send :remove_const, :FILE_ENTERED_LATCH
     Object.send :remove_const, :FILE_EXIT_LATCH
   end
@@ -82,16 +116,14 @@ class TestGemRequire < Gem::TestCase
     b1 = new_spec "b", "1", nil, "lib/b/c.rb"
     b2 = new_spec "b", "2", nil, "lib/b/c.rb"
 
-    install_specs a1, b1, b2
+    install_specs b1, b2, a1
 
-    save_loaded_features do
-      assert_require 'test_gem_require_a'
-      assert_equal %w(a-1 b-1), loaded_spec_names
-      assert_equal unresolved_names, []
+    assert_require 'test_gem_require_a'
+    assert_equal %w(a-1 b-1), loaded_spec_names
+    assert_equal unresolved_names, []
 
-      assert_require "b/c"
-      assert_equal %w(a-1 b-1), loaded_spec_names
-    end
+    assert_require "b/c"
+    assert_equal %w(a-1 b-1), loaded_spec_names
   end
 
   def test_require_is_lazy_with_inexact_req
@@ -99,32 +131,28 @@ class TestGemRequire < Gem::TestCase
     b1 = new_spec "b", "1", nil, "lib/b/c.rb"
     b2 = new_spec "b", "2", nil, "lib/b/c.rb"
 
-    install_specs a1, b1, b2
+    install_specs b1, b2, a1
 
-    save_loaded_features do
-      assert_require 'test_gem_require_a'
-      assert_equal %w(a-1), loaded_spec_names
-      assert_equal unresolved_names, ["b (>= 1)"]
+    assert_require 'test_gem_require_a'
+    assert_equal %w(a-1), loaded_spec_names
+    assert_equal unresolved_names, ["b (>= 1)"]
 
-      assert_require "b/c"
-      assert_equal %w(a-1 b-2), loaded_spec_names
-    end
+    assert_require "b/c"
+    assert_equal %w(a-1 b-2), loaded_spec_names
   end
 
   def test_require_is_not_lazy_with_one_possible
     a1 = new_spec "a", "1", {"b" => ">= 1"}, "lib/test_gem_require_a.rb"
     b1 = new_spec "b", "1", nil, "lib/b/c.rb"
 
-    install_specs a1, b1
+    install_specs b1, a1
 
-    save_loaded_features do
-      assert_require 'test_gem_require_a'
-      assert_equal %w(a-1 b-1), loaded_spec_names
-      assert_equal unresolved_names, []
+    assert_require 'test_gem_require_a'
+    assert_equal %w(a-1 b-1), loaded_spec_names
+    assert_equal unresolved_names, []
 
-      assert_require "b/c"
-      assert_equal %w(a-1 b-1), loaded_spec_names
-    end
+    assert_require "b/c"
+    assert_equal %w(a-1 b-1), loaded_spec_names
   end
 
   def test_require_can_use_a_pathname_object
@@ -132,129 +160,140 @@ class TestGemRequire < Gem::TestCase
 
     install_specs a1
 
-    save_loaded_features do
-      assert_require Pathname.new 'test_gem_require_a'
-      assert_equal %w(a-1), loaded_spec_names
-      assert_equal unresolved_names, []
-    end
+    assert_require Pathname.new 'test_gem_require_a'
+    assert_equal %w(a-1), loaded_spec_names
+    assert_equal unresolved_names, []
   end
 
   def test_activate_via_require_respects_loaded_files
-    require 'benchmark' # stdlib
-    save_loaded_features do
-      a1 = new_spec "a", "1", {"b" => ">= 1"}, "lib/test_gem_require_a.rb"
-      b1 = new_spec "b", "1", nil, "lib/benchmark.rb"
-      b2 = new_spec "b", "2", nil, "lib/benchmark.rb"
+    a1 = new_spec "a", "1", {"b" => ">= 1"}, "lib/test_gem_require_a.rb"
+    b1 = new_spec "b", "1", nil, "lib/benchmark.rb"
+    b2 = new_spec "b", "2", nil, "lib/benchmark.rb"
 
-      install_specs a1, b1, b2
+    install_specs b1, b2, a1
 
-      require 'test_gem_require_a'
-      assert_equal unresolved_names, ["b (>= 1)"]
+    require 'test_gem_require_a'
+    assert_equal unresolved_names, ["b (>= 1)"]
 
-      refute require('benchmark'), "benchmark should have already been loaded"
+    refute require('benchmark'), "benchmark should have already been loaded"
 
-      # We detected that we should activate b-2, so we did so, but
-      # then original_require decided "I've already got benchmark.rb" loaded.
-      # This case is fine because our lazy loading is provided exactly
-      # the same behavior as eager loading would have.
+    # We detected that we should activate b-2, so we did so, but
+    # then original_require decided "I've already got benchmark.rb" loaded.
+    # This case is fine because our lazy loading is provided exactly
+    # the same behavior as eager loading would have.
 
-      assert_equal %w(a-1 b-2), loaded_spec_names
-    end
+    assert_equal %w(a-1 b-2), loaded_spec_names
   end
 
   def test_already_activated_direct_conflict
-    save_loaded_features do
-      a1 = new_spec "a", "1", { "b" => "> 0" }
-      b1 = new_spec "b", "1", { "c" => ">= 1" }, "lib/ib.rb"
-      b2 = new_spec "b", "2", { "c" => ">= 2" }, "lib/ib.rb"
-      c1 = new_spec "c", "1", nil, "lib/d.rb"
-      c2 = new_spec("c", "2", nil, "lib/d.rb")
+    a1 = new_spec "a", "1", { "b" => "> 0" }
+    b1 = new_spec "b", "1", { "c" => ">= 1" }, "lib/ib.rb"
+    b2 = new_spec "b", "2", { "c" => ">= 2" }, "lib/ib.rb"
+    c1 = new_spec "c", "1", nil, "lib/d.rb"
+    c2 = new_spec("c", "2", nil, "lib/d.rb")
 
-      install_specs a1, b1, b2, c1, c2
+    install_specs c1, c2, b1, b2, a1
 
-      a1.activate
-      c1.activate
-      assert_equal %w(a-1 c-1), loaded_spec_names
-      assert_equal ["b (> 0)"], unresolved_names
+    a1.activate
+    c1.activate
+    assert_equal %w(a-1 c-1), loaded_spec_names
+    assert_equal ["b (> 0)"], unresolved_names
 
-      assert require("ib")
+    assert require("ib")
 
-      assert_equal %w(a-1 b-1 c-1), loaded_spec_names
-      assert_equal [], unresolved_names
-    end
+    assert_equal %w(a-1 b-1 c-1), loaded_spec_names
+    assert_equal [], unresolved_names
   end
 
   def test_multiple_gems_with_the_same_path
-    save_loaded_features do
-      a1 = new_spec "a", "1", { "b" => "> 0", "x" => "> 0" }
-      b1 = new_spec "b", "1", { "c" => ">= 1" }, "lib/ib.rb"
-      b2 = new_spec "b", "2", { "c" => ">= 2" }, "lib/ib.rb"
-      x1 = new_spec "x", "1", nil, "lib/ib.rb"
-      x2 = new_spec "x", "2", nil, "lib/ib.rb"
-      c1 = new_spec "c", "1", nil, "lib/d.rb"
-      c2 = new_spec("c", "2", nil, "lib/d.rb")
-
-      install_specs a1, b1, b2, c1, c2, x1, x2
-
-      a1.activate
-      c1.activate
-      assert_equal %w(a-1 c-1), loaded_spec_names
-      assert_equal ["b (> 0)", "x (> 0)"], unresolved_names
-
-      e = assert_raises(Gem::LoadError) do
-        require("ib")
-      end
-
-      assert_equal "ib found in multiple gems: b, x", e.message
+    a1 = new_spec "a", "1", { "b" => "> 0", "x" => "> 0" }
+    b1 = new_spec "b", "1", { "c" => ">= 1" }, "lib/ib.rb"
+    b2 = new_spec "b", "2", { "c" => ">= 2" }, "lib/ib.rb"
+    x1 = new_spec "x", "1", nil, "lib/ib.rb"
+    x2 = new_spec "x", "2", nil, "lib/ib.rb"
+    c1 = new_spec "c", "1", nil, "lib/d.rb"
+    c2 = new_spec("c", "2", nil, "lib/d.rb")
+
+    install_specs c1, c2, x1, x2, b1, b2, a1
+
+    a1.activate
+    c1.activate
+    assert_equal %w(a-1 c-1), loaded_spec_names
+    assert_equal ["b (> 0)", "x (> 0)"], unresolved_names
+
+    e = assert_raises(Gem::LoadError) do
+      require("ib")
     end
+
+    assert_equal "ib found in multiple gems: b, x", e.message
   end
 
   def test_unable_to_find_good_unresolved_version
-    save_loaded_features do
-      a1 = new_spec "a", "1", { "b" => "> 0" }
-      b1 = new_spec "b", "1", { "c" => ">= 2" }, "lib/ib.rb"
-      b2 = new_spec "b", "2", { "c" => ">= 3" }, "lib/ib.rb"
+    a1 = new_spec "a", "1", { "b" => "> 0" }
+    b1 = new_spec "b", "1", { "c" => ">= 2" }, "lib/ib.rb"
+    b2 = new_spec "b", "2", { "c" => ">= 3" }, "lib/ib.rb"
 
-      c1 = new_spec "c", "1", nil, "lib/d.rb"
-      c2 = new_spec "c", "2", nil, "lib/d.rb"
-      c3 = new_spec "c", "3", nil, "lib/d.rb"
+    c1 = new_spec "c", "1", nil, "lib/d.rb"
+    c2 = new_spec "c", "2", nil, "lib/d.rb"
+    c3 = new_spec "c", "3", nil, "lib/d.rb"
 
-      install_specs a1, b1, b2, c1, c2, c3
+    install_specs c1, c2, c3, b1, b2, a1
 
-      a1.activate
-      c1.activate
-      assert_equal %w(a-1 c-1), loaded_spec_names
-      assert_equal ["b (> 0)"], unresolved_names
-
-      e = assert_raises(Gem::LoadError) do
-        require("ib")
-      end
+    a1.activate
+    c1.activate
+    assert_equal %w(a-1 c-1), loaded_spec_names
+    assert_equal ["b (> 0)"], unresolved_names
 
-      assert_equal "unable to find a version of 'b' to activate", e.message
+    e = assert_raises(Gem::LoadError) do
+      require("ib")
     end
+
+    assert_equal "unable to find a version of 'b' to activate", e.message
+  end
+
+  def test_require_works_after_cleanup
+    a1 = new_default_spec "a", "1.0", nil, "a/b.rb"
+    b1 = new_default_spec "b", "1.0", nil, "b/c.rb"
+    b2 = new_default_spec "b", "2.0", nil, "b/d.rb"
+
+    install_default_gems a1
+    install_default_gems b1
+    install_default_gems b2
+
+    # Load default ruby gems fresh as if we've just started a ruby script.
+    Gem::Specification.reset
+    require 'rubygems'
+    Gem::Specification.stubs
+
+    # Remove an old default gem version directly from disk as if someone ran
+    # gem cleanup.
+    FileUtils.rm_rf(File.join @default_dir, "#{b1.full_name}")
+    FileUtils.rm_rf(File.join @default_spec_dir, "#{b1.full_name}.gemspec")
+
+    # Require gems that have not been removed.
+    assert_require 'a/b'
+    assert_equal %w(a-1.0), loaded_spec_names
+    assert_require 'b/d'
+    assert_equal %w(a-1.0 b-2.0), loaded_spec_names
   end
 
   def test_default_gem_only
-    save_loaded_features do
-      default_gem_spec = new_default_spec("default", "2.0.0.0",
-                                          nil, "default/gem.rb")
-      install_default_specs(default_gem_spec)
-      assert_require "default/gem"
-      assert_equal %w(default-2.0.0.0), loaded_spec_names
-    end
+    default_gem_spec = new_default_spec("default", "2.0.0.0",
+                                        nil, "default/gem.rb")
+    install_default_specs(default_gem_spec)
+    assert_require "default/gem"
+    assert_equal %w(default-2.0.0.0), loaded_spec_names
   end
 
   def test_default_gem_and_normal_gem
-    save_loaded_features do
-      default_gem_spec = new_default_spec("default", "2.0.0.0",
-                                          nil, "default/gem.rb")
-      install_default_specs(default_gem_spec)
-      normal_gem_spec = new_spec("default", "3.0", nil,
-                                 "lib/default/gem.rb")
-      install_specs(normal_gem_spec)
-      assert_require "default/gem"
-      assert_equal %w(default-3.0), loaded_spec_names
-    end
+    default_gem_spec = new_default_spec("default", "2.0.0.0",
+                                        nil, "default/gem.rb")
+    install_default_specs(default_gem_spec)
+    normal_gem_spec = new_spec("default", "3.0", nil,
+                               "lib/default/gem.rb")
+    install_specs(normal_gem_spec)
+    assert_require "default/gem"
+    assert_equal %w(default-3.0), loaded_spec_names
   end
 
   def loaded_spec_names
@@ -264,12 +303,4 @@ class TestGemRequire < Gem::TestCase
   def unresolved_names
     Gem::Specification.unresolved_deps.values.map(&:to_s).sort
   end
-
-  def save_loaded_features
-    old_loaded_features = $LOADED_FEATURES.dup
-    yield
-  ensure
-    $LOADED_FEATURES.replace old_loaded_features
-  end
-
 end