rubygems-update 1.8.30 → 2.0.0.preview2

data/test/rubygems/test_gem_uninstaller.rb

@@ -6,19 +6,17 @@ class TestGemUninstaller < Gem::InstallerTestCase
   def setup
     super
 
-    @user_spec.executables = ["executable"]
-
     build_rake_in do
       use_ui ui do
         @installer.install
-        @user_installer.install
-
-        Gem.use_paths @gemhome, Gem.user_dir
+        @spec = @installer.spec
 
-        @spec      = Gem::Specification.find_by_name 'a'
-        @user_spec = Gem::Specification.find_by_name 'b'
+        @user_installer.install
+        @user_spec = @user_installer.spec
       end
     end
+
+    Gem::Specification.reset
   end
 
   def test_initialize_expand_path
@@ -42,7 +40,7 @@ class TestGemUninstaller < Gem::InstallerTestCase
   def test_remove_executables_force_keep
     uninstaller = Gem::Uninstaller.new nil, :executables => false
 
-    executable = File.join Gem.user_dir, 'bin', 'executable'
+    executable = File.join Gem.bindir(@user_spec.base_dir), 'executable'
     assert File.exist?(executable), 'executable not written'
 
     use_ui @ui do
@@ -57,7 +55,7 @@ class TestGemUninstaller < Gem::InstallerTestCase
   def test_remove_executables_force_remove
     uninstaller = Gem::Uninstaller.new nil, :executables => true
 
-    executable = File.join Gem.user_dir, 'bin', 'executable'
+    executable = File.join Gem.bindir(@user_spec.base_dir), 'executable'
     assert File.exist?(executable), 'executable not written'
 
     use_ui @ui do
@@ -77,7 +75,7 @@ class TestGemUninstaller < Gem::InstallerTestCase
     end
 
     exec_path = File.join Gem.user_dir, 'bin', 'executable'
-    assert_equal false, File.exist?(exec_path), 'removed exec from bin dir'
+    refute File.exist?(exec_path), 'exec still exists in user bin dir'
 
     assert_equal "Removing executable\n", @ui.output
   end
@@ -200,7 +198,7 @@ class TestGemUninstaller < Gem::InstallerTestCase
                                        :executables  => true,
                                        :user_install => true)
 
-    gem_dir = File.join Gem.user_dir, 'gems', @user_spec.full_name
+    gem_dir = File.join @user_spec.gem_dir
 
     Gem.pre_uninstall do
       assert_path_exists gem_dir
@@ -218,18 +216,143 @@ class TestGemUninstaller < Gem::InstallerTestCase
     assert_same uninstaller, @post_uninstall_hook_arg
   end
 
+  def test_uninstall_wrong_repo
+    Gem.use_paths "#{@gemhome}2", [@gemhome]
+
+    uninstaller = Gem::Uninstaller.new @spec.name, :executables => true
+
+    e = assert_raises Gem::InstallError do
+      uninstaller.uninstall
+    end
+
+    expected = <<-MESSAGE.strip
+#{@spec.name} is not installed in GEM_HOME, try:
+\tgem uninstall -i #{@gemhome} a
+    MESSAGE
+
+    assert_equal expected, e.message
+  end
+
   def test_uninstall_selection_greater_than_one
     util_make_gems
-    
+
     list = Gem::Specification.find_all_by_name('a')
 
     uninstaller = Gem::Uninstaller.new('a')
 
-    use_ui Gem::MockGemUi.new("2\n") do
+    use_ui Gem::MockGemUi.new("2\ny\n") do
       uninstaller.uninstall
     end
 
     updated_list = Gem::Specification.find_all_by_name('a')
     assert_equal list.length - 1, updated_list.length
   end
+
+  def test_uninstall_prompts_about_broken_deps
+    util_gem 'r', '1', 'q' => '= 1'
+    util_gem 'q', '1'
+
+    un = Gem::Uninstaller.new('q')
+    ui = Gem::MockGemUi.new("y\n")
+
+    use_ui ui do
+      un.uninstall
+    end
+
+    lines = ui.output.split("\n")
+    lines.shift
+
+    assert_match %r!You have requested to uninstall the gem:!, lines.shift
+    lines.shift
+    lines.shift
+
+    assert_match %r!r-1 depends on q \(= 1\)!, lines.shift
+    assert_match %r!Successfully uninstalled q-1!, lines.last
+  end
+
+  def test_uninstall_only_lists_unsatified_deps
+    util_gem 'r', '1', 'q' => '~> 1.0'
+    util_gem 'x', '1', 'q' => '= 1.0'
+    util_gem 'q', '1.0'
+    util_gem 'q', '1.1'
+
+    un = Gem::Uninstaller.new('q', :version => "1.0")
+    ui = Gem::MockGemUi.new("y\n")
+
+    use_ui ui do
+      un.uninstall
+    end
+
+    lines = ui.output.split("\n")
+    lines.shift
+
+    assert_match %r!You have requested to uninstall the gem:!, lines.shift
+    lines.shift
+    lines.shift
+
+    assert_match %r!x-1 depends on q \(= 1.0\)!, lines.shift
+    assert_match %r!Successfully uninstalled q-1.0!, lines.last
+  end
+
+  def test_uninstall_doesnt_prompt_when_other_gem_satifies_requirement
+    util_gem 'r', '1', 'q' => '~> 1.0'
+    util_gem 'q', '1.0'
+    util_gem 'q', '1.1'
+
+    un = Gem::Uninstaller.new('q', :version => "1.0")
+    ui = Gem::MockGemUi.new("y\n")
+
+    use_ui ui do
+      un.uninstall
+    end
+
+    lines = ui.output.split("\n")
+
+    assert_equal "Successfully uninstalled q-1.0", lines.shift
+  end
+
+  def test_uninstall_doesnt_prompt_when_removing_a_dev_dep
+    util_gem('r', '1') do |s|
+      s.add_development_dependency "q", "= 1.0"
+    end
+
+    util_gem 'q', '1.0'
+
+    un = Gem::Uninstaller.new('q', :version => "1.0")
+    ui = Gem::MockGemUi.new("y\n")
+
+    use_ui ui do
+      un.uninstall
+    end
+
+    lines = ui.output.split("\n")
+
+    assert_equal "Successfully uninstalled q-1.0", lines.shift
+  end
+
+
+  def test_uninstall_prompt_includes_dep_type
+    util_gem 'r', '1' do |s|
+      s.add_development_dependency 'q', '= 1'
+    end
+
+    util_gem 'q', '1'
+
+    un = Gem::Uninstaller.new('q', :check_dev => true)
+    ui = Gem::MockGemUi.new("y\n")
+
+    use_ui ui do
+      un.uninstall
+    end
+
+    lines = ui.output.split("\n")
+    lines.shift
+
+    assert_match %r!You have requested to uninstall the gem:!, lines.shift
+    lines.shift
+    lines.shift
+
+    assert_match %r!r-1 depends on q \(= 1, development\)!, lines.shift
+    assert_match %r!Successfully uninstalled q-1!, lines.last
+  end
 end

data/test/rubygems/test_gem_validator.rb

@@ -11,53 +11,26 @@ class TestGemValidator < Gem::TestCase
     @validator = Gem::Validator.new
   end
 
-  def test_verify_gem_file
-    gem_file = File.join @tempdir, 'simple_gem.gem'
-    File.open gem_file, 'wb' do |fp| fp.write @simple_gem end
-
-    assert_equal nil, @validator.verify_gem_file(gem_file)
-  end
-
-  def test_verify_gem_file_empty
-    e = assert_raises Gem::VerificationError do
-      @validator.verify_gem_file ''
-    end
-
-    assert_equal 'missing gem file ', e.message
-  end
-
-  def test_verify_gem_file_nonexistent
-    file = '/nonexistent/nonexistent.gem'
-    e = assert_raises Gem::VerificationError do
-      @validator.verify_gem_file file
+  def test_alien
+    @spec = quick_gem 'a' do |s|
+      s.files = %w[lib/a.rb lib/b.rb]
     end
 
-    assert_equal "missing gem file #{file}", e.message
-  end
-
-  def test_verify_gem
-    assert_equal nil, @validator.verify_gem(@simple_gem)
-  end
-
-  def test_verify_gem_empty
-    e = assert_raises Gem::VerificationError do
-      @validator.verify_gem ''
-    end
+    util_build_gem @spec
 
-    assert_equal 'empty gem file', e.message
-  end
+    FileUtils.rm    File.join(@spec.gem_dir, 'lib/b.rb')
+    FileUtils.touch File.join(@spec.gem_dir, 'lib/c.rb')
 
-  def test_verify_gem_invalid_checksum
-    e = assert_raises Gem::VerificationError do
-      @validator.verify_gem @simple_gem.upcase
-    end
+    alien = @validator.alien 'a'
 
-    assert_equal 'invalid checksum for gem file', e.message
-  end
+    expected = {
+      @spec.file_name => [
+        Gem::Validator::ErrorData.new('lib/b.rb', 'Missing file'),
+        Gem::Validator::ErrorData.new('lib/c.rb', 'Extra file'),
+      ]
+    }
 
-  def test_verify_gem_no_sum
-    assert_equal nil, @validator.verify_gem('words')
+    assert_equal expected, alien
   end
-
 end
 

data/test/rubygems/test_gem_version.rb

@@ -33,7 +33,7 @@ class TestGemVersion < Gem::TestCase
     assert_same  fake, Gem::Version.create(fake)
     assert_nil   Gem::Version.create(nil)
     assert_equal v("5.1"), Gem::Version.create("5.1")
-    
+
     ver = '1.1'.freeze
     assert_equal v('1.1'), Gem::Version.create(ver)
   end
@@ -59,7 +59,7 @@ class TestGemVersion < Gem::TestCase
   end
 
   def test_initialize
-    ["1.0", "1.0 ", " 1.0 ", "1.0\n", "\n1.0\n"].each do |good|
+    ["1.0", "1.0 ", " 1.0 ", "1.0\n", "\n1.0\n", "1.0".freeze].each do |good|
       assert_version_equal "1.0", good
     end
 
@@ -67,18 +67,12 @@ class TestGemVersion < Gem::TestCase
   end
 
   def test_initialize_bad
-    %W[
-      junk
-      1.0\n2.0
-      1..2
-      1.2\ 3.4
-      1-2-3
-    ].each do |bad|
-      e = assert_raises ArgumentError, bad do
+    ["junk", "1.0\n2.0"].each do |bad|
+      e = assert_raises ArgumentError do
         Gem::Version.new bad
       end
 
-      assert_equal "Malformed version number string #{bad}", e.message, bad
+      assert_equal "Malformed version number string #{bad}", e.message
     end
   end
 
@@ -115,13 +109,13 @@ class TestGemVersion < Gem::TestCase
     assert_nil v("1.0") <=> "whatever"
   end
 
-  def test_spermy_recommendation
-    assert_spermy_equal "~> 1.0", "1"
-    assert_spermy_equal "~> 1.0", "1.0"
-    assert_spermy_equal "~> 1.2", "1.2"
-    assert_spermy_equal "~> 1.2", "1.2.0"
-    assert_spermy_equal "~> 1.2", "1.2.3"
-    assert_spermy_equal "~> 1.2", "1.2.3.a.4"
+  def test_approximate_recommendation
+    assert_approximate_equal "~> 1.0", "1"
+    assert_approximate_equal "~> 1.0", "1.0"
+    assert_approximate_equal "~> 1.2", "1.2"
+    assert_approximate_equal "~> 1.2", "1.2.0"
+    assert_approximate_equal "~> 1.2", "1.2.3"
+    assert_approximate_equal "~> 1.2", "1.2.3.a.4"
   end
 
   def test_to_s
@@ -134,10 +128,10 @@ class TestGemVersion < Gem::TestCase
     assert v(version).prerelease?, "#{version} is a prerelease"
   end
 
-  # Assert that +expected+ is the "spermy" recommendation for +version".
+  # Assert that +expected+ is the "approximate" recommendation for +version".
 
-  def assert_spermy_equal expected, version
-    assert_equal expected, v(version).spermy_recommendation
+  def assert_approximate_equal expected, version
+    assert_equal expected, v(version).approximate_recommendation
   end
 
   # Assert that bumping the +unbumped+ version yields the +expected+.

data/test/rubygems/test_require.rb

@@ -0,0 +1,193 @@
+require 'rubygems/test_case'
+require 'rubygems'
+
+class TestGemRequire < Gem::TestCase
+  def assert_require(path)
+    assert require(path), "'#{path}' was already required"
+  end
+
+  def test_require_is_not_lazy_with_exact_req
+    a1 = new_spec "a", "1", {"b" => "= 1"}, "lib/a.rb"
+    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
+
+    save_loaded_features do
+      assert_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
+  end
+
+  def test_require_is_lazy_with_inexact_req
+    a1 = new_spec "a", "1", {"b" => ">= 1"}, "lib/a.rb"
+    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
+
+    save_loaded_features do
+      assert_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
+  end
+
+  def test_require_is_not_lazy_with_one_possible
+    a1 = new_spec "a", "1", {"b" => ">= 1"}, "lib/a.rb"
+    b1 = new_spec "b", "1", nil, "lib/b/c.rb"
+
+    install_specs a1, b1
+
+    save_loaded_features do
+      assert_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
+  end
+
+  def test_activate_via_require_respects_loaded_files
+    save_loaded_features do
+      require 'benchmark' # stdlib
+
+      a1 = new_spec "a", "1", {"b" => ">= 1"}, "lib/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
+
+      require 'a'
+      assert_equal unresolved_names, ["b (>= 1)"]
+
+      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.
+
+      assert_equal %w(a-1 b-2), loaded_spec_names
+    end
+  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")
+
+      install_specs a1, b1, b2, c1, c2
+
+      a1.activate
+      c1.activate
+      assert_equal %w(a-1 c-1), loaded_spec_names
+      assert_equal ["b (> 0)"], unresolved_names
+
+      assert require("ib")
+
+      assert_equal %w(a-1 b-1 c-1), loaded_spec_names
+      assert_equal [], unresolved_names
+    end
+  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
+    end
+  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"
+
+      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
+
+      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
+
+      assert_equal "unable to find a version of 'b' to activate", e.message
+    end
+  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
+  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
+  end
+
+  def loaded_spec_names
+    Gem.loaded_specs.values.map(&:full_name).sort
+  end
+
+  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