rubygems-update 2.1.11 → 2.2.0.rc.1

data/test/rubygems/test_gem_available_set.rb

@@ -22,6 +22,25 @@ class TestGemAvailableSet < Gem::TestCase
     assert_equal [a1], set.all_specs
   end
 
+  def test_find_all
+    a1, a1_gem = util_gem 'a', 1
+
+    source = Gem::Source::SpecificFile.new a1_gem
+
+    set = Gem::AvailableSet.new
+    set.add a1, source
+
+    dep = Gem::Resolver::DependencyRequest.new dep('a'), nil
+
+    specs = set.find_all dep
+
+    spec = specs.first
+
+    assert_kind_of Gem::Resolver::LocalSpecification, spec
+
+    assert_equal 'a-1', spec.full_name
+  end
+
   def test_match_platform
     a1, _ = util_gem 'a', '1' do |g|
       g.platform = "something-weird-yep"

data/test/rubygems/test_gem_commands_build_command.rb

@@ -7,7 +7,7 @@ class TestGemCommandsBuildCommand < Gem::TestCase
   def setup
     super
 
-    @gem = quick_spec 'some_gem' do |s|
+    @gem = util_spec 'some_gem' do |s|
       s.rubyforge_project = 'example'
     end
 

data/test/rubygems/test_gem_commands_cert_command.rb

@@ -108,7 +108,7 @@ Added '/CN=alternate/DC=example'
       @cmd.execute
     end
 
-    output = @build_ui.output.split "\n"
+    output = @build_ui.output.squeeze("\n").split "\n"
 
     assert_equal "Passphrase for your Private Key:  ",
                  output.shift
@@ -142,7 +142,7 @@ Added '/CN=alternate/DC=example'
         @cmd.execute
       end
 
-      output = @build_ui.output.split "\n"
+      output = @build_ui.output.squeeze("\n").split "\n"
 
       assert_equal "Passphrase for your Private Key:  ",
                    output.shift

data/test/rubygems/test_gem_commands_cleanup_command.rb

@@ -8,8 +8,8 @@ class TestGemCommandsCleanupCommand < Gem::TestCase
 
     @cmd = Gem::Commands::CleanupCommand.new
 
-    @a_1 = quick_spec 'a', 1
-    @a_2 = quick_spec 'a', 2
+    @a_1 = util_spec 'a', 1
+    @a_2 = util_spec 'a', 2
 
     install_gem @a_1
     install_gem @a_2
@@ -39,8 +39,8 @@ class TestGemCommandsCleanupCommand < Gem::TestCase
   end
 
   def test_execute_all_dependencies
-    @b_1 = quick_spec 'b', 1 do |s| s.add_dependency 'a', '1' end
-    @b_2 = quick_spec 'b', 2 do |s| s.add_dependency 'a', '2' end
+    @b_1 = util_spec 'b', 1 do |s| s.add_dependency 'a', '1' end
+    @b_2 = util_spec 'b', 2 do |s| s.add_dependency 'a', '2' end
 
     install_gem @b_1
     install_gem @b_2
@@ -60,8 +60,8 @@ class TestGemCommandsCleanupCommand < Gem::TestCase
 
     Gem.use_paths @gemhome, gemhome2
 
-    @b_1 = quick_spec 'b', 1
-    @b_2 = quick_spec 'b', 2
+    @b_1 = util_spec 'b', 1
+    @b_2 = util_spec 'b', 2
 
     install_gem @b_1
     install_gem @b_2
@@ -78,7 +78,7 @@ class TestGemCommandsCleanupCommand < Gem::TestCase
   end
 
   def test_execute_all_user
-    @a_1_1 = quick_spec 'a', '1.1'
+    @a_1_1 = util_spec 'a', '1.1'
     @a_1_1 = install_gem_user @a_1_1 # pick up user install path
 
     Gem::Specification.dirs = [Gem.dir, Gem.user_dir]
@@ -97,7 +97,7 @@ class TestGemCommandsCleanupCommand < Gem::TestCase
   def test_execute_all_user_no_sudo
     FileUtils.chmod 0555, @gemhome
 
-    @a_1_1 = quick_spec 'a', '1.1'
+    @a_1_1 = util_spec 'a', '1.1'
     @a_1_1 = install_gem_user @a_1_1 # pick up user install path
 
     Gem::Specification.dirs = [Gem.dir, Gem.user_dir]
@@ -125,10 +125,10 @@ class TestGemCommandsCleanupCommand < Gem::TestCase
   end
 
   def test_execute_keeps_older_versions_with_deps
-    @b_1 = quick_spec 'b', 1
-    @b_2 = quick_spec 'b', 2
+    @b_1 = util_spec 'b', 1
+    @b_2 = util_spec 'b', 2
 
-    @c = quick_spec 'c', 1 do |s|
+    @c = util_spec 'c', 1 do |s|
       s.add_dependency 'b', '1'
     end
 
@@ -146,9 +146,9 @@ class TestGemCommandsCleanupCommand < Gem::TestCase
   def test_execute_ignore_default_gem_verbose
     Gem.configuration.verbose = :really
 
-    @b_1 = quick_spec 'b', 1
+    @b_1 = util_spec 'b', 1
     @b_default = new_default_spec "b", "2"
-    @b_2 = quick_spec 'b', 3
+    @b_2 = util_spec 'b', 3
 
     install_gem @b_1
     install_default_specs @b_default

data/test/rubygems/test_gem_commands_dependency_command.rb

@@ -8,8 +8,6 @@ class TestGemCommandsDependencyCommand < Gem::TestCase
 
     @cmd = Gem::Commands::DependencyCommand.new
     @cmd.options[:domain] = :local
-
-    util_setup_fake_fetcher true
   end
 
   def test_execute
@@ -30,6 +28,13 @@ class TestGemCommandsDependencyCommand < Gem::TestCase
   end
 
   def test_execute_no_args
+    spec_fetcher do |fetcher|
+      fetcher.spec 'a', 1
+      fetcher.spec 'a', '2.a'
+      fetcher.spec 'dep_x', 1, 'x' => '>= 1'
+      fetcher.legacy_platform
+    end
+
     @cmd.options[:args] = []
 
     use_ui @ui do
@@ -41,23 +46,11 @@ Gem a-1
 
 Gem a-2.a
 
-Gem a-2
-
-Gem a-3.a
-
-Gem a_evil-9
-
-Gem b-2
-
-Gem c-1.2
-
 Gem dep_x-1
   x (>= 1)
 
 Gem pl-1-x86-linux
 
-Gem x-1
-
     EOF
 
     assert_equal expected, @ui.output
@@ -78,7 +71,7 @@ Gem x-1
   end
 
   def test_execute_pipe_format
-    quick_spec 'foo' do |gem|
+    util_spec 'foo' do |gem|
       gem.add_dependency 'bar', '> 1'
     end
 
@@ -94,6 +87,13 @@ Gem x-1
   end
 
   def test_execute_regexp
+    spec_fetcher do |fetcher|
+      fetcher.spec 'a',      1
+      fetcher.spec 'a',      '2.a'
+      fetcher.spec 'a_evil', 9
+      fetcher.spec 'b',      2
+    end
+
     @cmd.options[:args] = %w[/[ab]/]
 
     use_ui @ui do
@@ -105,10 +105,6 @@ Gem a-1
 
 Gem a-2.a
 
-Gem a-2
-
-Gem a-3.a
-
 Gem a_evil-9
 
 Gem b-2
@@ -168,17 +164,10 @@ ERROR:  Only reverse dependencies for local gems are supported.
   end
 
   def test_execute_remote
-    foo = quick_gem 'foo' do |gem|
-      gem.add_dependency 'bar', '> 1'
+    spec_fetcher do |fetcher|
+      fetcher.spec 'foo', 2, 'bar' => '> 1'
     end
 
-    @fetcher = Gem::FakeFetcher.new
-    Gem::RemoteFetcher.fetcher = @fetcher
-
-    util_setup_spec_fetcher foo
-
-    FileUtils.rm File.join(@gemhome, 'specifications', foo.spec_name)
-
     @cmd.options[:args] = %w[foo]
     @cmd.options[:domain] = :remote
 
@@ -194,7 +183,10 @@ ERROR:  Only reverse dependencies for local gems are supported.
     @fetcher = Gem::FakeFetcher.new
     Gem::RemoteFetcher.fetcher = @fetcher
 
-    util_setup_spec_fetcher @a1, @a2
+    spec_fetcher do |fetcher|
+      fetcher.spec 'a', 1
+      fetcher.spec 'a', 2
+    end
 
     @cmd.options[:args] = %w[a]
     @cmd.options[:domain] = :remote
@@ -209,11 +201,9 @@ ERROR:  Only reverse dependencies for local gems are supported.
   end
 
   def test_execute_prerelease
-    @fetcher = Gem::FakeFetcher.new
-    Gem::RemoteFetcher.fetcher = @fetcher
-
-    util_clear_gems
-    util_setup_spec_fetcher @a2_pre
+    spec_fetcher do |fetcher|
+      fetcher.spec 'a', '2.a'
+    end
 
     @cmd.options[:args] = %w[a]
     @cmd.options[:domain] = :remote

data/test/rubygems/test_gem_commands_fetch_command.rb

@@ -12,15 +12,13 @@ class TestGemCommandsFetchCommand < Gem::TestCase
   end
 
   def test_execute
-    util_setup_fake_fetcher
-    util_setup_spec_fetcher @a2
-
-    @fetcher.data["#{@gem_repo}gems/#{@a2.file_name}"] =
-      File.read(@a2.cache_file)
+    specs = spec_fetcher do |fetcher|
+      fetcher.gem 'a', 2
+    end
 
     refute_path_exists File.join(@tempdir, 'cache'), 'sanity check'
 
-    @cmd.options[:args] = [@a2.name]
+    @cmd.options[:args] = %w[a]
 
     use_ui @ui do
       Dir.chdir @tempdir do
@@ -28,24 +26,23 @@ class TestGemCommandsFetchCommand < Gem::TestCase
       end
     end
 
-    assert_path_exists(File.join(@tempdir, @a2.file_name),
-                       "#{@a2.full_name} not fetched")
+    a2 = specs['a-2']
+
+    assert_path_exists(File.join(@tempdir, a2.file_name),
+                       "#{a2.full_name} not fetched")
     refute_path_exists File.join(@tempdir, 'cache'),
                        'gem repository directories must not be created'
   end
 
   def test_execute_latest
-    util_setup_fake_fetcher
-    util_setup_spec_fetcher @a1, @a2
-
-    @fetcher.data["#{@gem_repo}gems/#{@a1.file_name}"] =
-      File.read(@a1.cache_file)
-    @fetcher.data["#{@gem_repo}gems/#{@a2.file_name}"] =
-      File.read(@a2.cache_file)
+    specs = spec_fetcher do |fetcher|
+      fetcher.gem 'a', 1
+      fetcher.gem 'a', 2
+    end
 
     refute_path_exists File.join(@tempdir, 'cache'), 'sanity check'
 
-    @cmd.options[:args] = [@a2.name]
+    @cmd.options[:args] = %w[a]
     @cmd.options[:version] = req('>= 0.1')
 
     use_ui @ui do
@@ -54,23 +51,20 @@ class TestGemCommandsFetchCommand < Gem::TestCase
       end
     end
 
-    assert_path_exists(File.join(@tempdir, @a2.file_name),
-                       "#{@a2.full_name} not fetched")
+    a2 = specs['a-2']
+    assert_path_exists(File.join(@tempdir, a2.file_name),
+                       "#{a2.full_name} not fetched")
     refute_path_exists File.join(@tempdir, 'cache'),
                        'gem repository directories must not be created'
   end
 
   def test_execute_prerelease
-    util_setup_fake_fetcher true
-    util_clear_gems
-    util_setup_spec_fetcher @a2, @a2_pre
-
-    @fetcher.data["#{@gem_repo}gems/#{@a2.file_name}"] =
-      File.read(@a2.cache_file)
-    @fetcher.data["#{@gem_repo}gems/#{@a2_pre.file_name}"] =
-      File.read(@a2_pre.cache_file)
+    specs = spec_fetcher do |fetcher|
+      fetcher.gem 'a', 2
+      fetcher.gem 'a', '2.a'
+    end
 
-    @cmd.options[:args] = [@a2.name]
+    @cmd.options[:args] = %w[a]
     @cmd.options[:prerelease] = true
 
     use_ui @ui do
@@ -79,21 +73,19 @@ class TestGemCommandsFetchCommand < Gem::TestCase
       end
     end
 
-    assert_path_exists(File.join(@tempdir, @a2.file_name),
-                       "#{@a2.full_name} not fetched")
+    a2 = specs['a-2']
+
+    assert_path_exists(File.join(@tempdir, a2.file_name),
+                       "#{a2.full_name} not fetched")
   end
 
   def test_execute_specific_prerelease
-    util_setup_fake_fetcher true
-    util_clear_gems
-    util_setup_spec_fetcher @a2, @a2_pre
-
-    @fetcher.data["#{@gem_repo}gems/#{@a2.file_name}"] =
-      File.read(@a2.cache_file)
-    @fetcher.data["#{@gem_repo}gems/#{@a2_pre.file_name}"] =
-      File.read(@a2_pre.cache_file)
+    specs = spec_fetcher do |fetcher|
+      fetcher.gem 'a', 2
+      fetcher.gem 'a', '2.a'
+    end
 
-    @cmd.options[:args] = [@a2.name]
+    @cmd.options[:args] = %w[a]
     @cmd.options[:prerelease] = true
     @cmd.options[:version] = "2.a"
 
@@ -103,18 +95,19 @@ class TestGemCommandsFetchCommand < Gem::TestCase
       end
     end
 
-    assert_path_exists(File.join(@tempdir, @a2_pre.file_name),
-                       "#{@a2_pre.full_name} not fetched")
+    a2_pre = specs['a-2.a']
+
+    assert_path_exists(File.join(@tempdir, a2_pre.file_name),
+                       "#{a2_pre.full_name} not fetched")
   end
 
   def test_execute_version
-    util_setup_fake_fetcher
-    util_setup_spec_fetcher @a1, @a2
-
-    @fetcher.data["#{@gem_repo}gems/#{@a1.file_name}"] =
-      File.read(@a1.cache_file)
+    specs = spec_fetcher do |fetcher|
+      fetcher.gem 'a', 1
+      fetcher.gem 'a', 2
+    end
 
-    @cmd.options[:args] = [@a2.name]
+    @cmd.options[:args] = %w[a]
     @cmd.options[:version] = Gem::Requirement.new '1'
 
     use_ui @ui do
@@ -123,8 +116,10 @@ class TestGemCommandsFetchCommand < Gem::TestCase
       end
     end
 
-    assert_path_exists(File.join(@tempdir, @a1.file_name),
-                       "#{@a1.full_name} not fetched")
+    a1 = specs['a-1']
+
+    assert_path_exists(File.join(@tempdir, a1.file_name),
+                       "#{a1.full_name} not fetched")
   end
 
 end

data/test/rubygems/test_gem_commands_install_command.rb

@@ -13,76 +13,76 @@ class TestGemCommandsInstallCommand < Gem::TestCase
 
     @gemdeps = "tmp_install_gemdeps"
     @orig_args = Gem::Command.build_args
+
+    common_installer_setup
   end
 
   def teardown
     super
 
+    common_installer_teardown
+
     Gem::Command.build_args = @orig_args
     File.unlink @gemdeps if File.file? @gemdeps
   end
 
   def test_execute_exclude_prerelease
-    util_setup_fake_fetcher :prerelease
-    util_setup_spec_fetcher
-
-    @fetcher.data["#{@gem_repo}gems/#{@a2.file_name}"] =
-      read_binary(@a2.cache_file)
-    @fetcher.data["#{@gem_repo}gems/#{@a2_pre.file_name}"] =
-      read_binary(@a2_pre.cache_file)
+    spec_fetcher do |fetcher|
+      fetcher.gem 'a', 2
+      fetcher.gem 'a', '2.pre'
+    end
 
-    @cmd.options[:args] = [@a2.name]
+    @cmd.options[:args] = %w[a]
 
     use_ui @ui do
-      e = assert_raises Gem::SystemExitException do
+      assert_raises Gem::MockGemUi::SystemExitException, @ui.error do
         @cmd.execute
       end
-      assert_equal 0, e.exit_code, @ui.error
     end
 
     assert_equal %w[a-2], @cmd.installed_specs.map { |spec| spec.full_name }
   end
 
   def test_execute_explicit_version_includes_prerelease
-    util_setup_fake_fetcher :prerelease
-    util_setup_spec_fetcher
+    specs = spec_fetcher do |fetcher|
+      fetcher.gem 'a', 2
+      fetcher.gem 'a', '2.a'
+    end
 
-    @fetcher.data["#{@gem_repo}gems/#{@a2.file_name}"] =
-      read_binary(@a2.cache_file)
-    @fetcher.data["#{@gem_repo}gems/#{@a2_pre.file_name}"] =
-      read_binary(@a2_pre.cache_file)
+    a2_pre = specs['a-2.a']
 
-    @cmd.handle_options [@a2_pre.name, '--version', @a2_pre.version.to_s,
+    @cmd.handle_options [a2_pre.name, '--version', a2_pre.version.to_s,
                          "--no-ri", "--no-rdoc"]
     assert @cmd.options[:prerelease]
-    assert @cmd.options[:version].satisfied_by?(@a2_pre.version)
+    assert @cmd.options[:version].satisfied_by?(a2_pre.version)
 
     use_ui @ui do
-      e = assert_raises Gem::SystemExitException do
+      assert_raises Gem::MockGemUi::SystemExitException, @ui.error do
         @cmd.execute
       end
-      assert_equal 0, e.exit_code, @ui.error
     end
 
     assert_equal %w[a-2.a], @cmd.installed_specs.map { |spec| spec.full_name }
   end
 
   def test_execute_local
-    util_setup_fake_fetcher
+    specs = spec_fetcher do |fetcher|
+      fetcher.gem 'a', 2
+    end
+
     @cmd.options[:domain] = :local
 
-    FileUtils.mv @a2.cache_file, @tempdir
+    FileUtils.mv specs['a-2'].cache_file, @tempdir
 
-    @cmd.options[:args] = [@a2.name]
+    @cmd.options[:args] = %w[a]
 
     use_ui @ui do
       orig_dir = Dir.pwd
       begin
         Dir.chdir @tempdir
-        e = assert_raises Gem::SystemExitException do
+        assert_raises Gem::MockGemUi::SystemExitException, @ui.error do
           @cmd.execute
         end
-        assert_equal 0, e.exit_code
       ensure
         Dir.chdir orig_dir
       end
@@ -90,20 +90,21 @@ class TestGemCommandsInstallCommand < Gem::TestCase
 
     assert_equal %w[a-2], @cmd.installed_specs.map { |spec| spec.full_name }
 
-    out = @ui.output.split "\n"
-    assert_equal "1 gem installed", out.shift
-    assert out.empty?, out.inspect
+    assert_match "1 gem installed", @ui.output
   end
 
   def test_execute_no_user_install
     skip 'skipped on MS Windows (chmod has no effect)' if win_platform?
 
-    util_setup_fake_fetcher
+    specs = spec_fetcher do |fetcher|
+      fetcher.gem 'a', 2
+    end
+
     @cmd.options[:user_install] = false
 
-    FileUtils.mv @a2.cache_file, @tempdir
+    FileUtils.mv specs['a-2'].cache_file, @tempdir
 
-    @cmd.options[:args] = [@a2.name]
+    @cmd.options[:args] = %w[a]
 
     use_ui @ui do
       orig_dir = Dir.pwd
@@ -123,13 +124,14 @@ class TestGemCommandsInstallCommand < Gem::TestCase
   end
 
   def test_execute_local_missing
-    util_setup_fake_fetcher
+    spec_fetcher
+
     @cmd.options[:domain] = :local
 
     @cmd.options[:args] = %w[no_such_gem]
 
     use_ui @ui do
-      e = assert_raises Gem::SystemExitException do
+      e = assert_raises Gem::MockGemUi::TermError do
         @cmd.execute
       end
       assert_equal 2, e.exit_code
@@ -148,13 +150,12 @@ class TestGemCommandsInstallCommand < Gem::TestCase
   end
 
   def test_execute_nonexistent
-    util_setup_fake_fetcher
-    util_setup_spec_fetcher
+    spec_fetcher
 
     @cmd.options[:args] = %w[nonexistent]
 
     use_ui @ui do
-      e = assert_raises Gem::SystemExitException do
+      e = assert_raises Gem::MockGemUi::TermError do
         @cmd.execute
       end
       assert_equal 2, e.exit_code
@@ -164,8 +165,7 @@ class TestGemCommandsInstallCommand < Gem::TestCase
   end
 
   def test_execute_bad_source
-    util_setup_fake_fetcher
-    util_setup_spec_fetcher
+    spec_fetcher
 
     # This is needed because we need to exercise the cache path
     # within SpecFetcher
@@ -182,7 +182,7 @@ class TestGemCommandsInstallCommand < Gem::TestCase
     @cmd.options[:args] = %w[nonexistent]
 
     use_ui @ui do
-      e = assert_raises Gem::SystemExitException do
+      e = assert_raises Gem::MockGemUi::TermError do
         @cmd.execute
       end
       assert_equal 2, e.exit_code
@@ -198,13 +198,14 @@ class TestGemCommandsInstallCommand < Gem::TestCase
     misspelled = "nonexistent_with_hint"
     correctly_spelled = "non_existent_with_hint"
 
-    util_setup_fake_fetcher
-    util_setup_spec_fetcher quick_spec(correctly_spelled, '2')
+    spec_fetcher do |fetcher|
+      fetcher.spec correctly_spelled, 2
+    end
 
     @cmd.options[:args] = [misspelled]
 
     use_ui @ui do
-      e = assert_raises Gem::SystemExitException do
+      e = assert_raises Gem::MockGemUi::TermError do
         @cmd.execute
       end
 
@@ -222,13 +223,15 @@ ERROR:  Possible alternatives: non_existent_with_hint
     misspelled = "non-existent_with-hint"
     correctly_spelled = "nonexistent-with_hint"
 
-    util_setup_fake_fetcher
-    util_setup_spec_fetcher quick_spec(correctly_spelled, '2')
+    spec_fetcher do |fetcher|
+      fetcher.spec correctly_spelled, 2
+      fetcher.clear
+    end
 
     @cmd.options[:args] = [misspelled]
 
     use_ui @ui do
-      e = assert_raises Gem::SystemExitException do
+      e = assert_raises Gem::MockGemUi::TermError do
         @cmd.execute
       end
 
@@ -258,85 +261,74 @@ ERROR:  Possible alternatives: non_existent_with_hint
   end
 
   def test_execute_prerelease_skipped_when_no_flag_set
-    util_setup_fake_fetcher :prerelease
-    util_clear_gems
-    util_setup_spec_fetcher @a1, @a2_pre
-
-    @fetcher.data["#{@gem_repo}gems/#{@a1.file_name}"] =
-      read_binary(@a1.cache_file)
-    @fetcher.data["#{@gem_repo}gems/#{@a2_pre.file_name}"] =
-      read_binary(@a2_pre.cache_file)
+    spec_fetcher do |fetcher|
+      fetcher.gem 'a', 1
+      fetcher.gem 'a', '3.a'
+    end
 
     @cmd.options[:prerelease] = false
-    @cmd.options[:args] = [@a2_pre.name]
+    @cmd.options[:args] = %w[a]
 
     use_ui @ui do
-      e = assert_raises Gem::SystemExitException do
+      assert_raises Gem::MockGemUi::SystemExitException, @ui.error do
         @cmd.execute
       end
-      assert_equal 0, e.exit_code, @ui.error
     end
 
     assert_equal %w[a-1], @cmd.installed_specs.map { |spec| spec.full_name }
   end
 
   def test_execute_prerelease_wins_over_previous_ver
-    util_setup_fake_fetcher :prerelease
-    util_clear_gems
-    util_setup_spec_fetcher @a1, @a2_pre
-
-    @fetcher.data["#{@gem_repo}gems/#{@a1.file_name}"] =
-      read_binary(@a1.cache_file)
-    @fetcher.data["#{@gem_repo}gems/#{@a2_pre.file_name}"] =
-      read_binary(@a2_pre.cache_file)
+    spec_fetcher do |fetcher|
+      fetcher.gem 'a', 1
+      fetcher.gem 'a', '2.a'
+      fetcher.clear
+    end
 
     @cmd.options[:prerelease] = true
-    @cmd.options[:args] = [@a2_pre.name]
+    @cmd.options[:args] = %w[a]
 
     use_ui @ui do
-      e = assert_raises Gem::SystemExitException do
+      assert_raises Gem::MockGemUi::SystemExitException, @ui.error do
         @cmd.execute
       end
-      assert_equal 0, e.exit_code, @ui.error
     end
 
     assert_equal %w[a-2.a], @cmd.installed_specs.map { |spec| spec.full_name }
   end
 
   def test_execute_prerelease_skipped_when_non_pre_available
-    util_setup_fake_fetcher :prerelease
-    util_clear_gems
-    util_setup_spec_fetcher @a2, @a2_pre
-
-    @fetcher.data["#{@gem_repo}gems/#{@a2.file_name}"] =
-      read_binary(@a2.cache_file)
-    @fetcher.data["#{@gem_repo}gems/#{@a2_pre.file_name}"] =
-      read_binary(@a2_pre.cache_file)
+    spec_fetcher do |fetcher|
+      fetcher.gem 'a', '2.pre'
+      fetcher.gem 'a', 2
+    end
 
     @cmd.options[:prerelease] = true
-    @cmd.options[:args] = [@a2_pre.name]
+    @cmd.options[:args] = %w[a]
 
     use_ui @ui do
-      e = assert_raises Gem::SystemExitException do
+      assert_raises Gem::MockGemUi::SystemExitException, @ui.error do
         @cmd.execute
       end
-      assert_equal 0, e.exit_code, @ui.error
     end
 
     assert_equal %w[a-2], @cmd.installed_specs.map { |spec| spec.full_name }
   end
 
   def test_execute_rdoc
-    util_setup_fake_fetcher
+    specs = spec_fetcher do |fetcher|
+      fetcher.gem 'a', 2
+    end
 
     Gem.done_installing(&Gem::RDoc.method(:generation_hook))
 
     @cmd.options[:document] = %w[rdoc ri]
     @cmd.options[:domain] = :local
 
-    FileUtils.mv @a2.cache_file, @tempdir
+    a2 = specs['a-2']
+    FileUtils.mv a2.cache_file, @tempdir
 
-    @cmd.options[:args] = [@a2.name]
+    @cmd.options[:args] = %w[a]
 
     use_ui @ui do
       # Don't use Dir.chdir with a block, it warnings a lot because
@@ -345,34 +337,35 @@ ERROR:  Possible alternatives: non_existent_with_hint
 
       begin
         Dir.chdir @tempdir
-        e = assert_raises Gem::SystemExitException do
+        assert_raises Gem::MockGemUi::SystemExitException, @ui.error do
           @cmd.execute
         end
       ensure
         Dir.chdir old
       end
-
-      assert_equal 0, e.exit_code
     end
 
     wait_for_child_process_to_exit
 
-    assert_path_exists File.join(@a2.doc_dir, 'ri')
-    assert_path_exists File.join(@a2.doc_dir, 'rdoc')
+    assert_path_exists File.join(a2.doc_dir, 'ri')
+    assert_path_exists File.join(a2.doc_dir, 'rdoc')
   end
 
   def test_execute_saves_build_args
-    util_setup_fake_fetcher
+    specs = spec_fetcher do |fetcher|
+      fetcher.gem 'a', 2
+    end
 
     args = %w!--with-awesome=true --more-awesome=yes!
 
     Gem::Command.build_args = args
 
-    @cmd.options[:domain] = :local
+    a2 = specs['a-2']
+    FileUtils.mv a2.cache_file, @tempdir
 
-    FileUtils.mv @a2.cache_file, @tempdir
+    @cmd.options[:domain] = :local
 
-    @cmd.options[:args] = [@a2.name]
+    @cmd.options[:args] = %w[a]
 
     use_ui @ui do
       # Don't use Dir.chdir with a block, it warnings a lot because
@@ -381,60 +374,56 @@ ERROR:  Possible alternatives: non_existent_with_hint
 
       begin
         Dir.chdir @tempdir
-        e = assert_raises Gem::SystemExitException do
+        assert_raises Gem::MockGemUi::SystemExitException, @ui.error do
           @cmd.execute
         end
       ensure
         Dir.chdir old
       end
-
-      assert_equal 0, e.exit_code
     end
 
-    path = @a2.build_info_file
+    path = a2.build_info_file
     assert_path_exists path
 
-    assert_equal args, @a2.build_args
+    assert_equal args, a2.build_args
   end
 
 
   def test_execute_remote
-    util_setup_fake_fetcher
-    util_setup_spec_fetcher
-
-    @fetcher.data["#{@gem_repo}gems/#{@a2.file_name}"] =
-      read_binary(@a2.cache_file)
+    spec_fetcher do |fetcher|
+      fetcher.gem 'a', 2
+    end
 
-    @cmd.options[:args] = [@a2.name]
+    @cmd.options[:args] = %w[a]
 
     use_ui @ui do
-      e = assert_raises Gem::SystemExitException do
-        capture_io do
-          @cmd.execute
-        end
+      assert_raises Gem::MockGemUi::SystemExitException, @ui.error do
+        @cmd.execute
       end
-      assert_equal 0, e.exit_code
     end
 
     assert_equal %w[a-2], @cmd.installed_specs.map { |spec| spec.full_name }
 
-    out = @ui.output.split "\n"
-    assert_equal "1 gem installed", out.shift
-    assert out.empty?, out.inspect
+    assert_match "1 gem installed", @ui.output
   end
 
   def test_execute_remote_ignores_files
-    util_setup_fake_fetcher
-    util_setup_spec_fetcher
+    specs = spec_fetcher do |fetcher|
+      fetcher.gem 'a', 1
+      fetcher.gem 'a', 2
+    end
 
     @cmd.options[:domain] = :remote
 
-    FileUtils.mv @a2.cache_file, @tempdir
+    a1 = specs['a-1']
+    a2 = specs['a-2']
 
-    @fetcher.data["#{@gem_repo}gems/#{@a2.file_name}"] =
-      read_binary(@a1.cache_file)
+    FileUtils.mv a2.cache_file, @tempdir
 
-    @cmd.options[:args] = [@a2.name]
+    @fetcher.data["#{@gem_repo}gems/#{a2.file_name}"] =
+      read_binary(a1.cache_file)
+
+    @cmd.options[:args] = [a2.name]
 
     gemdir     = File.join @gemhome, 'specifications'
 
@@ -448,18 +437,15 @@ ERROR:  Possible alternatives: non_existent_with_hint
 
     use_ui @ui do
       Dir.chdir @tempdir do
-        e = assert_raises Gem::SystemExitException do
+        assert_raises Gem::MockGemUi::SystemExitException, @ui.error do
           @cmd.execute
         end
-        assert_equal 0, e.exit_code
       end
     end
 
     assert_equal %w[a-1], @cmd.installed_specs.map { |spec| spec.full_name }
 
-    out = @ui.output.split "\n"
-    assert_equal "1 gem installed", out.shift
-    assert out.empty?, out.inspect
+    assert_match "1 gem installed", @ui.output
 
     fin = Dir["#{gemdir}/*"]
 
@@ -467,23 +453,25 @@ ERROR:  Possible alternatives: non_existent_with_hint
   end
 
   def test_execute_two
-    util_setup_fake_fetcher
-    @cmd.options[:domain] = :local
+    specs = spec_fetcher do |fetcher|
+      fetcher.gem 'a', 2
+      fetcher.gem 'b', 2
+    end
 
-    FileUtils.mv @a2.cache_file, @tempdir
+    FileUtils.mv specs['a-2'].cache_file, @tempdir
+    FileUtils.mv specs['b-2'].cache_file, @tempdir
 
-    FileUtils.mv @b2.cache_file, @tempdir
+    @cmd.options[:domain] = :local
 
-    @cmd.options[:args] = [@a2.name, @b2.name]
+    @cmd.options[:args] = %w[a b]
 
     use_ui @ui do
       orig_dir = Dir.pwd
       begin
         Dir.chdir @tempdir
-        e = assert_raises Gem::SystemExitException do
+        assert_raises Gem::MockGemUi::SystemExitException, @ui.error do
           @cmd.execute
         end
-        assert_equal 0, e.exit_code
       ensure
         Dir.chdir orig_dir
       end
@@ -491,9 +479,7 @@ ERROR:  Possible alternatives: non_existent_with_hint
 
     assert_equal %w[a-2 b-2], @cmd.installed_specs.map { |spec| spec.full_name }
 
-    out = @ui.output.split "\n"
-    assert_equal "2 gems installed", out.shift
-    assert out.empty?, out.inspect
+    assert_match "2 gems installed", @ui.output
   end
 
   def test_execute_two_version
@@ -517,23 +503,23 @@ ERROR:  Possible alternatives: non_existent_with_hint
   end
 
   def test_execute_conservative
-    util_setup_fake_fetcher
-    util_setup_spec_fetcher
+    spec_fetcher do |fetcher|
+      fetcher.gem 'b', 2
 
-    @fetcher.data["#{@gem_repo}gems/#{@b2.file_name}"] =
-      read_binary(@b2.cache_file)
+      fetcher.clear
 
-    uninstall_gem(@b2)
+      fetcher.gem 'a', 2
+    end
 
     @cmd.options[:conservative] = true
 
-    @cmd.options[:args] = [@a2.name, @b2.name]
+    @cmd.options[:args] = %w[a b]
 
     use_ui @ui do
       orig_dir = Dir.pwd
       begin
         Dir.chdir @tempdir
-        assert_raises Gem::SystemExitException do
+        assert_raises Gem::MockGemUi::SystemExitException do
           @cmd.execute
         end
       ensure
@@ -543,21 +529,19 @@ ERROR:  Possible alternatives: non_existent_with_hint
 
     assert_equal %w[b-2], @cmd.installed_specs.map { |spec| spec.full_name }
 
-    out = @ui.output.split "\n"
     assert_equal "", @ui.error
-    assert_equal "1 gem installed", out.shift
-    assert out.empty?, out.inspect
+    assert_match "1 gem installed", @ui.output
   end
 
   def test_parses_requirement_from_gemname
-    util_setup_fake_fetcher
-    @cmd.options[:domain] = :local
-
-    FileUtils.mv @a2.cache_file, @tempdir
+    spec_fetcher do |fetcher|
+      fetcher.gem 'a', 2
+      fetcher.gem 'b', 2
+    end
 
-    FileUtils.mv @b2.cache_file, @tempdir
+    @cmd.options[:domain] = :local
 
-    req = "#{@a2.name}:10.0"
+    req = "a:10.0"
 
     @cmd.options[:args] = [req]
 
@@ -566,7 +550,7 @@ ERROR:  Possible alternatives: non_existent_with_hint
       orig_dir = Dir.pwd
       begin
         Dir.chdir @tempdir
-        e = assert_raises Gem::SystemExitException do
+        e = assert_raises Gem::MockGemUi::TermError do
           @cmd.execute
         end
       ensure
@@ -588,7 +572,7 @@ ERROR:  Possible alternatives: non_existent_with_hint
       orig_dir = Dir.pwd
       begin
         Dir.chdir @tempdir
-        e = assert_raises Gem::SystemExitException do
+        e = assert_raises Gem::MockGemUi::TermError do
           @cmd.execute
         end
       ensure
@@ -602,30 +586,24 @@ ERROR:  Possible alternatives: non_existent_with_hint
   end
 
   def test_show_source_problems_even_on_success
-    util_setup_fake_fetcher
-    util_setup_spec_fetcher
+    spec_fetcher do |fetcher|
+      fetcher.gem 'a', 2
+      fetcher.clear
+    end
 
     Gem.sources << "http://nonexistent.example"
 
-    @fetcher.data["#{@gem_repo}gems/#{@a2.file_name}"] =
-      read_binary(@a2.cache_file)
-
-    @cmd.options[:args] = [@a2.name]
+    @cmd.options[:args] = %w[a]
 
     use_ui @ui do
-      e = assert_raises Gem::SystemExitException do
-        capture_io do
-          @cmd.execute
-        end
+      assert_raises Gem::MockGemUi::SystemExitException, @ui.error do
+        @cmd.execute
       end
-      assert_equal 0, e.exit_code
     end
 
     assert_equal %w[a-2], @cmd.installed_specs.map { |spec| spec.full_name }
 
-    out = @ui.output.split "\n"
-    assert_equal "1 gem installed", out.shift
-    assert out.empty?, out.inspect
+    assert_match "1 gem installed", @ui.output
 
     e = @ui.error
 
@@ -634,11 +612,9 @@ ERROR:  Possible alternatives: non_existent_with_hint
   end
 
   def test_execute_uses_from_a_gemdeps
-    util_setup_fake_fetcher
-    util_setup_spec_fetcher
-
-    @fetcher.data["#{@gem_repo}gems/#{@a2.file_name}"] =
-      read_binary(@a2.cache_file)
+    spec_fetcher do |fetcher|
+      fetcher.gem 'a', 2
+    end
 
     File.open @gemdeps, "w" do |f|
       f << "gem 'a'"
@@ -647,28 +623,21 @@ ERROR:  Possible alternatives: non_existent_with_hint
     @cmd.options[:gemdeps] = @gemdeps
 
     use_ui @ui do
-      e = assert_raises Gem::SystemExitException do
-        capture_io do
-          @cmd.execute
-        end
+      assert_raises Gem::MockGemUi::SystemExitException, @ui.error do
+        @cmd.execute
       end
-      assert_equal 0, e.exit_code
     end
 
     assert_equal %w[], @cmd.installed_specs.map { |spec| spec.full_name }
 
-    out = @ui.output.split "\n"
-    assert_equal "Using a (2)", out.shift
-    assert out.empty?, out.inspect
+    assert_match "Using a (2)", @ui.output
   end
 
   def test_execute_installs_from_a_gemdeps
-    util_setup_fake_fetcher
-    util_setup_spec_fetcher @a2
-    util_clear_gems
-
-    @fetcher.data["#{@gem_repo}gems/#{@a2.file_name}"] =
-      read_binary(@a2.cache_file)
+    spec_fetcher do |fetcher|
+      fetcher.gem 'a', 2
+      fetcher.clear
+    end
 
     File.open @gemdeps, "w" do |f|
       f << "gem 'a'"
@@ -677,31 +646,22 @@ ERROR:  Possible alternatives: non_existent_with_hint
     @cmd.options[:gemdeps] = @gemdeps
 
     use_ui @ui do
-      e = assert_raises Gem::SystemExitException do
-        capture_io do
-          @cmd.execute
-        end
+      assert_raises Gem::MockGemUi::SystemExitException, @ui.error do
+        @cmd.execute
       end
-      assert_equal 0, e.exit_code
     end
 
     assert_equal %w[a-2], @cmd.installed_specs.map { |spec| spec.full_name }
 
-    out = @ui.output.split "\n"
-    assert_equal "Installing a (2)", out.shift
-    assert out.empty?, out.inspect
+    assert_match "Installing a (2)", @ui.output
   end
 
   def test_execute_installs_deps_a_gemdeps
-    q, q_gem = util_gem 'q', '1.0'
-    r, r_gem = util_gem 'r', '2.0', 'q' => nil
-
-    util_setup_fake_fetcher
-    util_setup_spec_fetcher q, r
-    util_clear_gems
-
-    add_to_fetcher q, q_gem
-    add_to_fetcher r, r_gem
+    spec_fetcher do |fetcher|
+      fetcher.gem 'q', '1.0'
+      fetcher.gem 'r', '2.0', 'q' => nil
+      fetcher.clear
+    end
 
     File.open @gemdeps, "w" do |f|
       f << "gem 'r'"
@@ -710,35 +670,27 @@ ERROR:  Possible alternatives: non_existent_with_hint
     @cmd.options[:gemdeps] = @gemdeps
 
     use_ui @ui do
-      e = assert_raises Gem::SystemExitException do
-        capture_io do
-          @cmd.execute
-        end
+      assert_raises Gem::MockGemUi::SystemExitException, @ui.error do
+        @cmd.execute
       end
-      assert_equal 0, e.exit_code
     end
 
     names = @cmd.installed_specs.map { |spec| spec.full_name }
 
     assert_equal %w[q-1.0 r-2.0], names
 
-    out = @ui.output.split "\n"
-    assert_equal "Installing q (1.0)", out.shift
-    assert_equal "Installing r (2.0)", out.shift
-    assert out.empty?, out.inspect
+    assert_match "Installing q (1.0)", @ui.output
+    assert_match "Installing r (2.0)", @ui.output
   end
 
   def test_execute_uses_deps_a_gemdeps
-    q, _     = util_gem 'q', '1.0'
-    r, r_gem = util_gem 'r', '2.0', 'q' => nil
+    spec_fetcher do |fetcher|
+      fetcher.gem 'r', '2.0', 'q' => nil
 
-    util_setup_fake_fetcher
-    util_setup_spec_fetcher q, r
-    util_clear_gems
+      fetcher.clear
 
-    add_to_fetcher r, r_gem
-
-    Gem::Specification.add_specs q
+      fetcher.spec 'q', '1.0'
+    end
 
     File.open @gemdeps, "w" do |f|
       f << "gem 'r'"
@@ -747,34 +699,25 @@ ERROR:  Possible alternatives: non_existent_with_hint
     @cmd.options[:gemdeps] = @gemdeps
 
     use_ui @ui do
-      e = assert_raises Gem::SystemExitException do
-        capture_io do
-          @cmd.execute
-        end
+      assert_raises Gem::MockGemUi::SystemExitException, @ui.error do
+        @cmd.execute
       end
-      assert_equal 0, e.exit_code
     end
 
     names = @cmd.installed_specs.map { |spec| spec.full_name }
 
     assert_equal %w[r-2.0], names
 
-    out = @ui.output.split "\n"
-    assert_equal "Using q (1.0)", out.shift
-    assert_equal "Installing r (2.0)", out.shift
-    assert out.empty?, out.inspect
+    assert_match "Using q (1.0)",      @ui.output
+    assert_match "Installing r (2.0)", @ui.output
   end
 
   def test_execute_installs_deps_a_gemdeps_into_a_path
-    q, q_gem = util_gem 'q', '1.0'
-    r, r_gem = util_gem 'r', '2.0', 'q' => nil
-
-    util_setup_fake_fetcher
-    util_setup_spec_fetcher q, r
-    util_clear_gems
-
-    add_to_fetcher q, q_gem
-    add_to_fetcher r, r_gem
+    spec_fetcher do |fetcher|
+      fetcher.gem 'q', '1.0'
+      fetcher.gem 'r', '2.0', 'q' => nil
+      fetcher.clear
+    end
 
     File.open @gemdeps, "w" do |f|
       f << "gem 'r'"
@@ -784,39 +727,30 @@ ERROR:  Possible alternatives: non_existent_with_hint
     @cmd.options[:gemdeps] = @gemdeps
 
     use_ui @ui do
-      e = assert_raises Gem::SystemExitException do
-        capture_io do
-          @cmd.execute
-        end
+      assert_raises Gem::MockGemUi::SystemExitException, @ui.error do
+        @cmd.execute
       end
-      assert_equal 0, e.exit_code
     end
 
     names = @cmd.installed_specs.map { |spec| spec.full_name }
 
     assert_equal %w[q-1.0 r-2.0], names
 
-    out = @ui.output.split "\n"
-    assert_equal "Installing q (1.0)", out.shift
-    assert_equal "Installing r (2.0)", out.shift
-    assert out.empty?, out.inspect
+    assert_match "Installing q (1.0)", @ui.output
+    assert_match "Installing r (2.0)", @ui.output
 
     assert File.file?("gf-path/specifications/q-1.0.gemspec"), "not installed"
     assert File.file?("gf-path/specifications/r-2.0.gemspec"), "not installed"
   end
 
   def test_execute_with_gemdeps_path_ignores_system
-    q, q_gem = util_gem 'q', '1.0'
-    r, r_gem = util_gem 'r', '2.0', 'q' => nil
-
-    util_setup_fake_fetcher
-    util_setup_spec_fetcher q, r
-    util_clear_gems
-
-    add_to_fetcher q, q_gem
-    add_to_fetcher r, r_gem
+    specs = spec_fetcher do |fetcher|
+      fetcher.gem 'q', '1.0'
+      fetcher.gem 'r', '2.0', 'q' => nil
+      fetcher.clear
+    end
 
-    Gem::Specification.add_specs q
+    Gem::Specification.add_specs specs['q-1.0']
 
     File.open @gemdeps, "w" do |f|
       f << "gem 'r'"
@@ -826,38 +760,29 @@ ERROR:  Possible alternatives: non_existent_with_hint
     @cmd.options[:gemdeps] = @gemdeps
 
     use_ui @ui do
-      e = assert_raises Gem::SystemExitException do
-        capture_io do
-          @cmd.execute
-        end
+      assert_raises Gem::MockGemUi::SystemExitException, @ui.error do
+        @cmd.execute
       end
-      assert_equal 0, e.exit_code
     end
 
     names = @cmd.installed_specs.map { |spec| spec.full_name }
 
     assert_equal %w[q-1.0 r-2.0], names
 
-    out = @ui.output.split "\n"
-    assert_equal "Installing q (1.0)", out.shift
-    assert_equal "Installing r (2.0)", out.shift
-    assert out.empty?, out.inspect
+    assert_match "Installing q (1.0)", @ui.output
+    assert_match "Installing r (2.0)", @ui.output
 
     assert File.file?("gf-path/specifications/q-1.0.gemspec"), "not installed"
     assert File.file?("gf-path/specifications/r-2.0.gemspec"), "not installed"
   end
 
   def test_execute_uses_deps_a_gemdeps_with_a_path
-    q, q_gem = util_gem 'q', '1.0'
-    r, r_gem = util_gem 'r', '2.0', 'q' => nil
-
-    util_setup_fake_fetcher
-    util_setup_spec_fetcher q, r
-    util_clear_gems
-
-    add_to_fetcher r, r_gem
+    specs = spec_fetcher do |fetcher|
+      fetcher.gem 'q', '1.0'
+      fetcher.gem 'r', '2.0', 'q' => nil
+    end
 
-    i = Gem::Installer.new q_gem, :install_dir => "gf-path"
+    i = Gem::Installer.new specs['q-1.0'].cache_file, :install_dir => "gf-path"
     i.install
 
     assert File.file?("gf-path/specifications/q-1.0.gemspec"), "not installed"
@@ -870,23 +795,63 @@ ERROR:  Possible alternatives: non_existent_with_hint
     @cmd.options[:gemdeps] = @gemdeps
 
     use_ui @ui do
-      e = assert_raises Gem::SystemExitException do
-        capture_io do
-          @cmd.execute
-        end
+      assert_raises Gem::MockGemUi::SystemExitException, @ui.error do
+        @cmd.execute
       end
-      assert_equal 0, e.exit_code
     end
 
     names = @cmd.installed_specs.map { |spec| spec.full_name }
 
     assert_equal %w[r-2.0], names
 
-    out = @ui.output.split "\n"
-    assert_equal "Using q (1.0)", out.shift
-    assert_equal "Installing r (2.0)", out.shift
-    assert out.empty?, out.inspect
+    assert_match "Using q (1.0)", @ui.output
+    assert_match "Installing r (2.0)", @ui.output
+  end
+
+  def test_handle_options_file
+    FileUtils.touch 'Gemfile'
+
+    @cmd.handle_options %w[-g Gemfile]
+
+    assert_equal 'Gemfile', @cmd.options[:gemdeps]
+
+    FileUtils.rm 'Gemfile'
+
+    FileUtils.touch 'gem.deps.rb'
+
+    @cmd.handle_options %w[--file gem.deps.rb]
+
+    assert_equal 'gem.deps.rb', @cmd.options[:gemdeps]
+
+    FileUtils.rm 'gem.deps.rb'
+
+    FileUtils.touch 'Isolate'
+
+    @cmd.handle_options %w[-g]
+
+    assert_equal 'Isolate', @cmd.options[:gemdeps]
+
+    FileUtils.touch 'Gemfile'
+
+    @cmd.handle_options %w[-g]
+
+    assert_equal 'Gemfile', @cmd.options[:gemdeps]
+
+    FileUtils.touch 'gem.deps.rb'
+
+    @cmd.handle_options %w[-g]
+
+    assert_equal 'gem.deps.rb', @cmd.options[:gemdeps]
   end
 
+  def test_handle_options_without
+    @cmd.handle_options %w[--without test]
+
+    assert_equal [:test], @cmd.options[:without_groups]
+
+    @cmd.handle_options %w[--without test,development]
+
+    assert_equal [:test, :development], @cmd.options[:without_groups]
+  end
 
 end