rubygems-update 1.8.30 → 2.0.0.preview2

data/test/rubygems/test_gem_commands_sources_command.rb

@@ -99,6 +99,25 @@ Error fetching http://beta-gems.example.com:
     assert_equal '', @ui.error
   end
 
+  def test_execute_add_redundant_source
+    @cmd.handle_options %W[--add #{@gem_repo}]
+
+    util_setup_spec_fetcher
+
+    use_ui @ui do
+      @cmd.execute
+    end
+
+    assert_equal [@gem_repo], Gem.sources
+
+    expected = <<-EOF
+source #{@gem_repo} already present in the cache
+    EOF
+
+    assert_equal expected, @ui.output
+    assert_equal '', @ui.error
+  end
+
   def test_execute_add_bad_uri
     @cmd.handle_options %w[--add beta-gems.example.com]
 
@@ -125,11 +144,6 @@ beta-gems.example.com is not a URI
 
     util_setup_spec_fetcher
 
-    fetcher = Gem::SpecFetcher.fetcher
-
-    # HACK figure out how to force directory creation via fetcher
-    #assert File.directory?(fetcher.dir), 'cache dir exists'
-
     use_ui @ui do
       @cmd.execute
     end
@@ -141,7 +155,8 @@ beta-gems.example.com is not a URI
     assert_equal expected, @ui.output
     assert_equal '', @ui.error
 
-    refute File.exist?(fetcher.dir), 'cache dir removed'
+    dir = File.join Gem.user_home, '.gem', 'specs'
+    refute File.exist?(dir), 'cache dir removed'
   end
 
   def test_execute_remove

data/test/rubygems/test_gem_commands_specification_command.rb

@@ -71,7 +71,21 @@ class TestGemCommandsSpecificationCommand < Gem::TestCase
     end
 
     assert_equal '', @ui.output
-    assert_equal "ERROR:  Unknown gem 'foo'\n", @ui.error
+    assert_equal "ERROR:  No gem matching 'foo (>= 0)' found\n", @ui.error
+  end
+
+  def test_execute_bad_name_with_version
+    @cmd.options[:args] = %w[foo]
+    @cmd.options[:version] = "1.3.2"
+
+    assert_raises Gem::MockGemUi::TermError do
+      use_ui @ui do
+        @cmd.execute
+      end
+    end
+
+    assert_equal '', @ui.output
+    assert_equal "ERROR:  No gem matching 'foo (= 1.3.2)' found\n", @ui.error
   end
 
   def test_execute_exact_match
@@ -103,6 +117,24 @@ class TestGemCommandsSpecificationCommand < Gem::TestCase
     assert_equal "foo", YAML.load(@ui.output)
   end
 
+  def test_execute_file
+    foo = quick_spec 'foo' do |s|
+      s.files = %w[lib/code.rb]
+    end
+
+    util_build_gem foo
+
+    @cmd.options[:args] = [foo.cache_file]
+
+    use_ui @ui do
+      @cmd.execute
+    end
+
+    assert_match %r|Gem::Specification|, @ui.output
+    assert_match %r|name: foo|, @ui.output
+    assert_equal '', @ui.error
+  end
+
   def test_execute_marshal
     foo = new_spec 'foo', '2'
 

data/test/rubygems/test_gem_commands_uninstall_command.rb

@@ -13,49 +13,32 @@ class TestGemCommandsUninstallCommand < Gem::InstallerTestCase
     end
 
     @cmd = Gem::Commands::UninstallCommand.new
-    @cmd.options[:executables] = true
     @executable = File.join(@gemhome, 'bin', 'executable')
   end
 
-  def test_execute_mulitple
-    @other = quick_gem 'c'
-    util_make_exec @other
-    util_build_gem @other
-
-    @other_installer = util_installer @other, @gemhome
-
-    ui = Gem::MockGemUi.new
-    util_setup_gem ui
-
-    build_rake_in do
-      use_ui ui do
-        @other_installer.install
-      end
-    end
-
-    @cmd.options[:args] = [@spec.name, @other.name]
-
-    use_ui @ui do
-      @cmd.execute
+  def test_execute_dependency_order
+    c = quick_gem 'c' do |spec|
+      spec.add_dependency 'a'
     end
 
-    output = @ui.output.split "\n"
+    util_build_gem c
+    installer = util_installer c, @gemhome
+    use_ui @ui do installer.install end
 
-    assert_includes output, "Successfully uninstalled #{@spec.full_name}"
-    assert_includes output, "Successfully uninstalled #{@other.full_name}"
-  end
+    ui = Gem::MockGemUi.new
 
-  def test_execute_mulitple_nonexistent
-    @cmd.options[:args] = %w[x y]
+    @cmd.options[:args] = %w[a c]
+    @cmd.options[:executables] = true
 
-    use_ui @ui do
+    use_ui ui do
       @cmd.execute
     end
 
-    output = @ui.output.split "\n"
+    output = ui.output.split "\n"
 
-    assert_includes output, 'INFO:  gem "x" is not installed'
-    assert_includes output, 'INFO:  gem "y" is not installed'
+    assert_equal 'Successfully uninstalled c-2', output.shift
+    assert_equal "Removing executable",          output.shift
+    assert_equal 'Successfully uninstalled a-2', output.shift
   end
 
   def test_execute_removes_executable
@@ -79,6 +62,7 @@ class TestGemCommandsUninstallCommand < Gem::InstallerTestCase
 
     open @executable, "wb+" do |f| f.puts "binary" end
 
+    @cmd.options[:executables] = true
     @cmd.options[:args] = [@spec.name]
     use_ui @ui do
       @cmd.execute
@@ -102,6 +86,7 @@ class TestGemCommandsUninstallCommand < Gem::InstallerTestCase
     formatted_executable = File.join @gemhome, 'bin', 'foo-executable-bar'
     assert_equal true, File.exist?(formatted_executable)
 
+    @cmd.options[:executables] = true
     @cmd.options[:format_executable] = true
     @cmd.execute
 
@@ -123,6 +108,7 @@ class TestGemCommandsUninstallCommand < Gem::InstallerTestCase
       end
     end
 
+    @cmd.options[:executables] = true
     @cmd.options[:args] = ["pre"]
 
     use_ui @ui do
@@ -133,5 +119,79 @@ class TestGemCommandsUninstallCommand < Gem::InstallerTestCase
     assert_match(/Successfully uninstalled/, output)
   end
 
+  def test_execute_with_force_leaves_executable
+    ui = Gem::MockGemUi.new
+
+    util_make_gems
+    util_setup_gem ui
+
+    @cmd.options[:version] = '1'
+    @cmd.options[:force] = true
+    @cmd.options[:args] = ['a']
+
+    use_ui ui do
+      @cmd.execute
+    end
+
+    assert !Gem::Specification.all_names.include?('a')
+    assert File.exist? File.join(@gemhome, 'bin', 'executable')
+  end
+
+  def test_execute_with_force_uninstalls_all_versions
+    ui = Gem::MockGemUi.new "y\n"
+
+    util_make_gems
+    util_setup_gem ui
+
+    assert Gem::Specification.find_all_by_name('a').length > 1
+
+    @cmd.options[:force] = true
+    @cmd.options[:args] = ['a']
+
+    use_ui ui do
+      @cmd.execute
+    end
+
+    refute_includes Gem::Specification.all_names, 'a'
+  end
+
+  def test_execute_with_force_ignores_dependencies
+    ui = Gem::MockGemUi.new
+
+    util_make_gems
+    util_setup_gem ui
+
+    assert Gem::Specification.find_all_by_name('dep_x').length > 0
+    assert Gem::Specification.find_all_by_name('x').length > 0
+
+    @cmd.options[:force] = true
+    @cmd.options[:args] = ['x']
+
+    use_ui ui do
+      @cmd.execute
+    end
+
+    assert Gem::Specification.find_all_by_name('dep_x').length > 0
+    assert Gem::Specification.find_all_by_name('x').length == 0
+  end
+
+  def test_execute_default_gem
+    default_gem_spec = new_default_spec("default", "2.0.0.0",
+                                        nil, "default/gem.rb")
+    install_default_specs(default_gem_spec)
+
+    ui = Gem::MockGemUi.new
+
+    @cmd.options[:args] = %w[default]
+    @cmd.options[:executables] = true
+
+    use_ui ui do
+      e = assert_raises Gem::InstallError do
+        @cmd.execute
+      end
+      assert_equal "gem \"default\" cannot be uninstalled because it is a default gem",
+                   e.message
+    end
+  end
 end
 

data/test/rubygems/test_gem_commands_unpack_command.rb

@@ -191,8 +191,8 @@ class TestGemCommandsUnpackCommand < Gem::TestCase
 
     use_ui @ui do
       Dir.chdir @tempdir do
-        Gem::Builder.new(foo_spec).build
-        Gem::Builder.new(foo_bar_spec).build
+        Gem::Package.build foo_spec
+        Gem::Package.build foo_bar_spec
       end
     end
 
@@ -209,7 +209,7 @@ class TestGemCommandsUnpackCommand < Gem::TestCase
       end
     end
 
-    assert File.exist?(File.join(@tempdir, foo_spec.full_name))
+    assert_path_exists File.join(@tempdir, foo_spec.full_name)
   end
 
   def test_handle_options_metadata

data/test/rubygems/test_gem_commands_update_command.rb

@@ -14,20 +14,22 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
 
     @cmd = Gem::Commands::UpdateCommand.new
 
-    @cmd.options[:generate_rdoc] = false
-    @cmd.options[:generate_ri]   = false
+    @cmd.options[:document] = []
 
-    util_setup_fake_fetcher
+    util_setup_fake_fetcher(true)
     util_clear_gems
-    util_setup_spec_fetcher @a1, @a2
+    util_setup_spec_fetcher @a1, @a2, @a3a
 
     @a1_path = @a1.cache_file
     @a2_path = @a2.cache_file
+    @a3a_path = @a3a.cache_file
 
     @fetcher.data["#{@gem_repo}gems/#{File.basename @a1_path}"] =
       read_binary @a1_path
     @fetcher.data["#{@gem_repo}gems/#{File.basename @a2_path}"] =
       read_binary @a2_path
+    @fetcher.data["#{@gem_repo}gems/#{File.basename @a3a_path}"] =
+      read_binary @a3a_path
   end
 
   def test_execute
@@ -36,8 +38,6 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
     Gem::Installer.new(@a1_path).install
 
     @cmd.options[:args] = []
-    @cmd.options[:generate_rdoc] = false
-    @cmd.options[:generate_ri]   = false
 
     use_ui @ui do
       @cmd.execute
@@ -46,7 +46,6 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
     out = @ui.output.split "\n"
     assert_equal "Updating installed gems", out.shift
     assert_equal "Updating #{@a2.name}", out.shift
-    assert_equal "Successfully installed #{@a2.full_name}", out.shift
     assert_equal "Gems updated: #{@a2.name}", out.shift
     assert_empty out
   end
@@ -91,8 +90,6 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
 
     @cmd.options[:args]          = []
     @cmd.options[:system]        = true
-    @cmd.options[:generate_rdoc] = false
-    @cmd.options[:generate_ri]   = false
 
     use_ui @ui do
       @cmd.execute
@@ -100,7 +97,6 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
 
     out = @ui.output.split "\n"
     assert_equal "Updating rubygems-update", out.shift
-    assert_equal "Successfully installed rubygems-update-9", out.shift
     assert_equal "Installing RubyGems 9", out.shift
     assert_equal "RubyGems system software updated", out.shift
 
@@ -115,8 +111,6 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
 
     @cmd.options[:args]          = []
     @cmd.options[:system]        = true
-    @cmd.options[:generate_rdoc] = false
-    @cmd.options[:generate_ri]   = false
 
     assert_raises Gem::MockGemUi::SystemExitException do
       use_ui @ui do
@@ -138,8 +132,6 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
 
     @cmd.options[:args]          = []
     @cmd.options[:system]        = true
-    @cmd.options[:generate_rdoc] = false
-    @cmd.options[:generate_ri]   = false
 
     use_ui @ui do
       @cmd.execute
@@ -147,7 +139,6 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
 
     out = @ui.output.split "\n"
     assert_equal "Updating rubygems-update", out.shift
-    assert_equal "Successfully installed rubygems-update-9", out.shift
     assert_equal "Installing RubyGems 9", out.shift
     assert_equal "RubyGems system software updated", out.shift
 
@@ -163,8 +154,6 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
 
     @cmd.options[:args]          = []
     @cmd.options[:system]        = "8"
-    @cmd.options[:generate_rdoc] = false
-    @cmd.options[:generate_ri]   = false
 
     use_ui @ui do
       @cmd.execute
@@ -172,7 +161,6 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
 
     out = @ui.output.split "\n"
     assert_equal "Updating rubygems-update", out.shift
-    assert_equal "Successfully installed rubygems-update-8", out.shift
     assert_equal "Installing RubyGems 8", out.shift
     assert_equal "RubyGems system software updated", out.shift
 
@@ -188,8 +176,6 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
 
     @cmd.options[:args]          = []
     @cmd.options[:system]        = "9"
-    @cmd.options[:generate_rdoc] = false
-    @cmd.options[:generate_ri]   = false
 
     use_ui @ui do
       @cmd.execute
@@ -197,7 +183,6 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
 
     out = @ui.output.split "\n"
     assert_equal "Updating rubygems-update", out.shift
-    assert_equal "Successfully installed rubygems-update-9", out.shift
     assert_equal "Installing RubyGems 9", out.shift
     assert_equal "RubyGems system software updated", out.shift
 
@@ -207,8 +192,6 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
   def test_execute_system_with_gems
     @cmd.options[:args]          = %w[gem]
     @cmd.options[:system]        = true
-    @cmd.options[:generate_rdoc] = false
-    @cmd.options[:generate_ri]   = false
 
     assert_raises Gem::MockGemUi::TermError do
       use_ui @ui do
@@ -270,15 +253,33 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
     out = @ui.output.split "\n"
     assert_equal "Updating installed gems", out.shift
     assert_equal "Updating #{@a2.name}", out.shift
-    assert_equal "Successfully installed #{@c2.full_name}", out.shift
-    assert_equal "Successfully installed #{@b2.full_name}", out.shift
-    assert_equal "Successfully installed #{@a2.full_name}", out.shift
-    assert_equal "Gems updated: #{@c2.name}, #{@b2.name}, #{@a2.name}",
+    assert_equal "Gems updated: #{@c2.name} #{@b2.name} #{@a2.name}",
                  out.shift
 
     assert_empty out
   end
 
+  def test_execute_rdoc
+    Gem.done_installing(&Gem::RDoc.method(:generation_hook))
+
+    @cmd.options[:document] = %w[rdoc ri]
+
+    util_clear_gems
+
+    Gem::Installer.new(@a1_path).install
+
+    @cmd.options[:args] = [@a1.name]
+
+    use_ui @ui do
+      @cmd.execute
+    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')
+  end
+
   def test_execute_named
     util_clear_gems
 
@@ -293,7 +294,6 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
     out = @ui.output.split "\n"
     assert_equal "Updating installed gems", out.shift
     assert_equal "Updating #{@a2.name}", out.shift
-    assert_equal "Successfully installed #{@a2.full_name}", out.shift
     assert_equal "Gems updated: #{@a2.name}", out.shift
 
     assert_empty out
@@ -317,6 +317,26 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
     assert_empty out
   end
 
+  def test_execute_named_up_to_date_prerelease
+    util_clear_gems
+
+    Gem::Installer.new(@a2_path).install
+
+    @cmd.options[:args] = [@a2.name]
+    @cmd.options[:prerelease] = true
+
+    use_ui @ui do
+      @cmd.execute
+    end
+
+    out = @ui.output.split "\n"
+    assert_equal "Updating installed gems", out.shift
+    assert_equal "Updating #{@a3a.name}", out.shift
+    assert_equal "Gems updated: #{@a3a.name}", out.shift
+
+    assert_empty out
+  end
+
   def test_execute_up_to_date
     util_clear_gems
 
@@ -339,11 +359,10 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
     @cmd.handle_options %w[--system]
 
     expected = {
-      :generate_ri   => true,
-      :system        => true,
-      :force         => false,
-      :args          => [],
-      :generate_rdoc => true,
+      :args     => [],
+      :document => %w[rdoc ri],
+      :force    => false,
+      :system   => true,
     }
 
     assert_equal expected, @cmd.options
@@ -359,11 +378,10 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
     @cmd.handle_options %w[--system 1.3.7]
 
     expected = {
-      :generate_ri   => true,
-      :system        => "1.3.7",
-      :force         => false,
-      :args          => [],
-      :generate_rdoc => true,
+      :args     => [],
+      :document => %w[rdoc ri],
+      :force    => false,
+      :system   => "1.3.7",
     }
 
     assert_equal expected, @cmd.options