rubygems-update 1.1.1 → 1.2.0

data/test/test_config.rb

@@ -12,11 +12,6 @@ require 'rubygems'
 
 class TestConfig < RubyGemTestCase
 
-  def test_gem_original_datadir
-    datadir = Config::CONFIG['datadir']
-    assert_equal "#{datadir}/xyz", Config.gem_original_datadir('xyz')
-  end
-
   def test_datadir
     datadir = Config::CONFIG['datadir']
     assert_equal "#{datadir}/xyz", Config.datadir('xyz')

data/test/test_gem.rb

@@ -28,6 +28,14 @@ class TestGem < RubyGemTestCase
     assert_equal expected, Gem.all_load_paths.sort
   end
 
+  def test_self_available?
+    util_make_gems
+    assert(Gem.available?("a"))
+    assert(Gem.available?("a", "1"))
+    assert(Gem.available?("a", ">1"))
+    assert(!Gem.available?("monkeys"))
+  end
+
   def test_self_bindir
     assert_equal File.join(@gemhome, 'bin'), Gem.bindir
     assert_equal File.join(@gemhome, 'bin'), Gem.bindir(Gem.dir)
@@ -129,7 +137,7 @@ class TestGem < RubyGemTestCase
   end
 
   def test_self_default_sources
-    assert_equal %w[http://gems.rubyforge.org], Gem.default_sources
+    assert_equal %w[http://gems.rubyforge.org/], Gem.default_sources
   end
 
   def test_self_dir
@@ -237,6 +245,18 @@ class TestGem < RubyGemTestCase
     assert_equal [Gem.dir], Gem.path
   end
 
+  def test_self_path_default
+    if defined? APPLE_GEM_HOME
+      orig_APPLE_GEM_HOME = APPLE_GEM_HOME
+      Object.send :remove_const, :APPLE_GEM_HOME
+    end
+    Gem.instance_variable_set :@gem_path, nil
+
+    assert_equal [Gem.default_path, Gem.dir].flatten, Gem.path
+  ensure
+    Object.const_set :APPLE_GEM_HOME, orig_APPLE_GEM_HOME
+  end
+
   unless win_platform?
     def test_self_path_APPLE_GEM_HOME
       Gem.clear_paths
@@ -382,7 +402,7 @@ class TestGem < RubyGemTestCase
   end
 
   def test_self_sources
-    assert_equal %w[http://gems.example.com], Gem.sources
+    assert_equal %w[http://gems.example.com/], Gem.sources
   end
 
   def test_ssl_available_eh

data/test/test_gem_command_manager.rb

@@ -66,7 +66,7 @@ class TestGemCommandManager < RubyGemTestCase
       assert_equal :both, check_options[:domain]
       assert_equal true, check_options[:wrappers]
       assert_equal Gem::Requirement.default, check_options[:version]
-      assert_equal Gem.dir, check_options[:install_dir]
+      assert_equal nil, check_options[:install_dir]
       assert_equal nil, check_options[:bin_dir]
 
       #check settings

data/test/test_gem_commands_dependency_command.rb

@@ -9,6 +9,8 @@ class TestGemCommandsDependencyCommand < RubyGemTestCase
 
     @cmd = Gem::Commands::DependencyCommand.new
     @cmd.options[:domain] = :local
+
+    util_setup_fake_fetcher
   end
 
   def test_execute
@@ -16,13 +18,43 @@ class TestGemCommandsDependencyCommand < RubyGemTestCase
       gem.add_dependency 'bar', '> 1'
     end
 
+    Gem.source_index = nil
+
     @cmd.options[:args] = %w[foo]
 
     use_ui @ui do
       @cmd.execute
     end
 
-    assert_equal "Gem foo-2\n  bar (> 1)\n\n", @ui.output
+    assert_equal "Gem foo-2\n  bar (> 1, runtime)\n\n", @ui.output
+    assert_equal '', @ui.error
+  end
+
+  def test_execute_no_args
+    Gem.source_index = nil
+
+    @cmd.options[:args] = []
+
+    use_ui @ui do
+      @cmd.execute
+    end
+
+    expected = <<-EOF
+Gem a-1
+
+Gem a-2
+
+Gem a_evil-9
+
+Gem b-2
+
+Gem c-1.2
+
+Gem pl-1-x86-linux
+
+    EOF
+
+    assert_equal expected, @ui.output
     assert_equal '', @ui.error
   end
 
@@ -35,7 +67,7 @@ class TestGemCommandsDependencyCommand < RubyGemTestCase
       end
     end
 
-    assert_equal "No match found for foo (>= 0)\n", @ui.output
+    assert_equal "No gems found matching foo (>= 0)\n", @ui.output
     assert_equal '', @ui.error
   end
 
@@ -55,6 +87,30 @@ class TestGemCommandsDependencyCommand < RubyGemTestCase
     assert_equal '', @ui.error
   end
 
+  def test_execute_regexp
+    Gem.source_index = nil
+
+    @cmd.options[:args] = %w[/[ab]/]
+
+    use_ui @ui do
+      @cmd.execute
+    end
+
+    expected = <<-EOF
+Gem a-1
+
+Gem a-2
+
+Gem a_evil-9
+
+Gem b-2
+
+    EOF
+
+    assert_equal expected, @ui.output
+    assert_equal '', @ui.error
+  end
+
   def test_execute_reverse
     quick_gem 'foo' do |gem|
       gem.add_dependency 'bar', '> 1'
@@ -64,6 +120,8 @@ class TestGemCommandsDependencyCommand < RubyGemTestCase
       gem.add_dependency 'foo'
     end
 
+    Gem.source_index = nil
+
     @cmd.options[:args] = %w[foo]
     @cmd.options[:reverse_dependencies] = true
 
@@ -73,9 +131,9 @@ class TestGemCommandsDependencyCommand < RubyGemTestCase
 
     expected = <<-EOF
 Gem foo-2
-  bar (> 1)
+  bar (> 1, runtime)
   Used by
-    baz-2 (foo (>= 0))
+    baz-2 (foo (>= 0, runtime))
 
     EOF
 
@@ -83,12 +141,34 @@ Gem foo-2
     assert_equal '', @ui.error
   end
 
+  def test_execute_reverse_remote
+    @cmd.options[:args] = %w[foo]
+    @cmd.options[:reverse_dependencies] = true
+    @cmd.options[:domain] = :remote
+
+    assert_raise MockGemUi::TermError do
+      use_ui @ui do
+        @cmd.execute
+      end
+    end
+
+    expected = <<-EOF
+ERROR:  Only reverse dependencies for local gems are supported.
+    EOF
+
+    assert_equal '', @ui.output
+    assert_equal expected, @ui.error
+  end
+
   def test_execute_remote
     foo = quick_gem 'foo' do |gem|
       gem.add_dependency 'bar', '> 1'
     end
 
-    util_setup_source_info_cache foo
+    @fetcher = Gem::FakeFetcher.new
+    Gem::RemoteFetcher.fetcher = @fetcher
+
+    util_setup_spec_fetcher foo
 
     FileUtils.rm File.join(@gemhome, 'specifications',
                            "#{foo.full_name}.gemspec")
@@ -100,9 +180,48 @@ Gem foo-2
       @cmd.execute
     end
 
-    assert_equal "Gem foo-2\n  bar (> 1)\n\n", @ui.output
+    assert_equal "Gem foo-2\n  bar (> 1, runtime)\n\n", @ui.output
     assert_equal '', @ui.error
   end
 
+  def test_execute_remote_legacy
+    foo = quick_gem 'foo' do |gem|
+      gem.add_dependency 'bar', '> 1'
+    end
+
+    @fetcher = Gem::FakeFetcher.new
+    Gem::RemoteFetcher.fetcher = @fetcher
+
+    Gem::SpecFetcher.fetcher = nil
+    si = util_setup_source_info_cache foo
+
+    @fetcher.data["#{@gem_repo}yaml"] = YAML.dump si
+    @fetcher.data["#{@gem_repo}Marshal.#{Gem.marshal_version}"] =
+      si.dump
+
+    @fetcher.data["#{@gem_repo}latest_specs.#{Gem.marshal_version}.gz"] = nil
+
+    FileUtils.rm File.join(@gemhome, 'specifications',
+                           "#{foo.full_name}.gemspec")
+
+    @cmd.options[:args] = %w[foo]
+    @cmd.options[:domain] = :remote
+
+    use_ui @ui do
+      @cmd.execute
+    end
+
+    assert_equal "Gem foo-2\n  bar (> 1, runtime)\n\n", @ui.output
+
+    expected = <<-EOF
+WARNING:  RubyGems 1.2+ index not found for:
+\t#{@gem_repo}
+
+RubyGems will revert to legacy indexes degrading performance.
+    EOF
+
+    assert_equal expected, @ui.error
+  end
+
 end
 

data/test/test_gem_commands_environment_command.rb

@@ -27,6 +27,7 @@ class TestGemCommandsEnvironmentCommand < RubyGemTestCase
     assert_match %r|RUBYGEMS PREFIX: |, @ui.output
     assert_match %r|RUBY EXECUTABLE:.*#{Gem::ConfigMap[:RUBY_INSTALL_NAME]}|,
                  @ui.output
+    assert_match %r|EXECUTABLE DIRECTORY:|, @ui.output
     assert_match %r|RUBYGEMS PLATFORMS:|, @ui.output
     assert_match %r|- #{Gem::Platform.local}|, @ui.output
     assert_match %r|GEM PATHS:|, @ui.output

data/test/test_gem_commands_fetch_command.rb

@@ -14,10 +14,9 @@ class TestGemCommandsFetchCommand < RubyGemTestCase
 
   def test_execute
     util_setup_fake_fetcher
+    util_setup_spec_fetcher @a2
 
-    @fetcher.data["#{@gem_repo}/Marshal.#{@marshal_version}"] =
-      @source_index.dump
-    @fetcher.data["#{@gem_repo}/gems/#{@a2.full_name}.gem"] =
+    @fetcher.data["#{@gem_repo}gems/#{@a2.full_name}.gem"] =
       File.read(File.join(@gemhome, 'cache', "#{@a2.full_name}.gem"))
 
     @cmd.options[:args] = [@a2.name]
@@ -28,7 +27,28 @@ class TestGemCommandsFetchCommand < RubyGemTestCase
       end
     end
 
-    assert File.exist?(File.join(@tempdir, "#{@a2.full_name}.gem"))
+    assert File.exist?(File.join(@tempdir, "#{@a2.full_name}.gem")),
+           "#{@a2.full_name} fetched"
+  end
+
+  def test_execute_legacy
+    util_setup_fake_fetcher
+    util_setup_source_info_cache @a2
+
+    @fetcher.data["#{@gem_repo}yaml"] = ''
+    @fetcher.data["#{@gem_repo}gems/#{@a2.full_name}.gem"] =
+      File.read(File.join(@gemhome, 'cache', "#{@a2.full_name}.gem"))
+
+    @cmd.options[:args] = [@a2.name]
+
+    use_ui @ui do
+      Dir.chdir @tempdir do
+        @cmd.execute
+      end
+    end
+
+    assert File.exist?(File.join(@tempdir, "#{@a2.full_name}.gem")),
+           "#{@a2.full_name} fetched"
   end
 
 end

data/test/test_gem_commands_install_command.rb

@@ -72,7 +72,7 @@ class TestGemCommandsInstallCommand < RubyGemTestCase
     end
 
     # HACK no repository was checked
-    assert_equal "ERROR:  could not find no_such_gem locally or in a repository\n",
+    assert_equal "ERROR:  could not find gem no_such_gem locally or in a repository\n",
                  @ui.error
   end
 
@@ -86,8 +86,7 @@ class TestGemCommandsInstallCommand < RubyGemTestCase
 
   def test_execute_nonexistent
     util_setup_fake_fetcher
-    @fetcher.data["#{@gem_repo}/Marshal.#{@marshal_version}"] =
-      @source_index.dump
+    util_setup_spec_fetcher
 
     @cmd.options[:args] = %w[nonexistent]
 
@@ -98,18 +97,18 @@ class TestGemCommandsInstallCommand < RubyGemTestCase
       assert_equal 2, e.exit_code
     end
 
-    assert_equal "ERROR:  could not find nonexistent locally or in a repository\n",
+    assert_equal "ERROR:  could not find gem nonexistent locally or in a repository\n",
                  @ui.error
   end
 
   def test_execute_remote
     @cmd.options[:generate_rdoc] = true
     @cmd.options[:generate_ri] = true
+
     util_setup_fake_fetcher
+    util_setup_spec_fetcher @a2
 
-    @fetcher.data["#{@gem_repo}/Marshal.#{@marshal_version}"] =
-      @source_index.dump
-    @fetcher.data["#{@gem_repo}/gems/#{@a2.full_name}.gem"] =
+    @fetcher.data["#{@gem_repo}gems/#{@a2.full_name}.gem"] =
       read_binary(File.join(@gemhome, 'cache', "#{@a2.full_name}.gem"))
 
     @cmd.options[:args] = [@a2.name]
@@ -122,7 +121,6 @@ class TestGemCommandsInstallCommand < RubyGemTestCase
     end
 
     out = @ui.output.split "\n"
-    assert_match %r|Bulk updating|, out.shift
     assert_equal "Successfully installed #{@a2.full_name}", out.shift
     assert_equal "1 gem installed", out.shift
     assert_equal "Installing ri documentation for #{@a2.full_name}...",

data/test/{test_gem_outdated_command.rb → test_gem_commands_outdated_command.rb}

@@ -2,7 +2,7 @@ require 'test/unit'
 require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities')
 require 'rubygems/commands/outdated_command'
 
-class TestGemOutdatedCommand < RubyGemTestCase
+class TestGemCommandsOutdatedCommand < RubyGemTestCase
 
   def setup
     super
@@ -28,7 +28,10 @@ class TestGemOutdatedCommand < RubyGemTestCase
                                  remote_20.full_name + ".gemspec"
     FileUtils.rm remote_spec_file
 
-    util_setup_source_info_cache remote_10, remote_20
+    @fetcher = Gem::FakeFetcher.new
+    Gem::RemoteFetcher.fetcher = @fetcher
+
+    util_setup_spec_fetcher remote_10, remote_20
 
     use_ui @ui do @cmd.execute end
 

data/test/test_gem_commands_pristine_command.rb

@@ -18,16 +18,24 @@ class TestGemCommandsPristineCommand < RubyGemTestCase
 
     install_gem a
 
+    foo_path = File.join @gemhome, 'gems', a.full_name, 'bin', 'foo'
+
+    File.open foo_path, 'w' do |io|
+      io.puts 'I changed it!'
+    end
+
     @cmd.options[:args] = %w[a]
 
     use_ui @ui do
       @cmd.execute
     end
 
+    assert_equal "#!/usr/bin/ruby\n", File.read(foo_path), foo_path
+
     out = @ui.output.split "\n"
 
     assert_equal "Restoring gem(s) to pristine condition...", out.shift
-    assert_equal "#{a.full_name} is in pristine condition", out.shift
+    assert_equal "Restored #{a.full_name}", out.shift
     assert out.empty?, out.inspect
   end
 
@@ -40,7 +48,7 @@ class TestGemCommandsPristineCommand < RubyGemTestCase
 
     install_gem a
 
-    gem_bin = File.join @gemhome, 'gems', "#{a.full_name}", 'bin', 'foo'
+    gem_bin = File.join @gemhome, 'gems', a.full_name, 'bin', 'foo'
 
     FileUtils.rm gem_bin
 
@@ -50,11 +58,12 @@ class TestGemCommandsPristineCommand < RubyGemTestCase
       @cmd.execute
     end
 
+    assert File.exist?(gem_bin)
+
     out = @ui.output.split "\n"
 
     assert_equal "Restoring gem(s) to pristine condition...", out.shift
-    assert_equal "Restoring 1 file to #{a.full_name}...", out.shift
-    assert_equal "  #{gem_bin}", out.shift
+    assert_equal "Restored #{a.full_name}", out.shift
     assert out.empty?, out.inspect
   end
 

data/test/test_gem_commands_query_command.rb

@@ -7,33 +7,18 @@ class TestGemCommandsQueryCommand < RubyGemTestCase
   def setup
     super
 
-    util_make_gems
-
-    @a2.summary = 'This is a lot of text. ' * 4
-
     @cmd = Gem::Commands::QueryCommand.new
 
-    @si = util_setup_source_info_cache @a1, @a2, @pl1
     util_setup_fake_fetcher
 
-    @fetcher.data["#{@gem_repo}/Marshal.#{Gem.marshal_version}"] = proc do
+    @si = util_setup_spec_fetcher @a1, @a2, @pl1
+
+    @fetcher.data["#{@gem_repo}Marshal.#{Gem.marshal_version}"] = proc do
       raise Gem::RemoteFetcher::FetchError
     end
   end
 
   def test_execute
-    cache = Gem::SourceInfoCache.cache
-    cache.update
-    cache.write_cache
-    cache.reset_cache_data
-    Gem::SourceInfoCache.reset
-
-    a2_name = @a2.full_name
-    @fetcher.data["#{@gem_repo}/quick/latest_index.rz"] = util_zip a2_name
-    @fetcher.data["#{@gem_repo}/quick/Marshal.#{Gem.marshal_version}/#{a2_name}.gemspec.rz"] = util_zip Marshal.dump(@a2)
-    @fetcher.data["#{@gem_repo}/Marshal.#{Gem.marshal_version}"] =
-      Marshal.dump @si
-
     @cmd.handle_options %w[-r]
 
     use_ui @ui do
@@ -44,10 +29,8 @@ class TestGemCommandsQueryCommand < RubyGemTestCase
 
 *** REMOTE GEMS ***
 
-Updating metadata for 1 gems from http://gems.example.com/
-.
-complete
 a (2)
+pl (1)
     EOF
 
     assert_equal expected, @ui.output
@@ -55,21 +38,8 @@ a (2)
   end
 
   def test_execute_all
-    cache = Gem::SourceInfoCache.cache
-    cache.update
-    cache.write_cache
-    cache.reset_cache_data
-    Gem::SourceInfoCache.reset
-
     a1_name = @a1.full_name
     a2_name = @a2.full_name
-    @fetcher.data["#{@gem_repo}/quick/index.rz"] =
-        util_zip [a1_name, a2_name].join("\n")
-    @fetcher.data["#{@gem_repo}/quick/latest_index.rz"] = util_zip a2_name
-    @fetcher.data["#{@gem_repo}/quick/Marshal.#{Gem.marshal_version}/#{a1_name}.gemspec.rz"] = util_zip Marshal.dump(@a1)
-    @fetcher.data["#{@gem_repo}/quick/Marshal.#{Gem.marshal_version}/#{a2_name}.gemspec.rz"] = util_zip Marshal.dump(@a2)
-    @fetcher.data["#{@gem_repo}/Marshal.#{Gem.marshal_version}"] =
-      Marshal.dump @si
 
     @cmd.handle_options %w[-r --all]
 
@@ -81,10 +51,8 @@ a (2)
 
 *** REMOTE GEMS ***
 
-Updating metadata for 2 gems from http://gems.example.com/
-..
-complete
 a (2, 1)
+pl (1)
     EOF
 
     assert_equal expected, @ui.output
@@ -92,6 +60,13 @@ a (2, 1)
   end
 
   def test_execute_details
+    @a2.summary = 'This is a lot of text. ' * 4
+    @a2.authors = ['Abraham Lincoln', 'Hirohito']
+    @a2.homepage = 'http://a.example.com/'
+    @a2.rubyforge_project = 'rubygems'
+
+    @si = util_setup_spec_fetcher @a1, @a2, @pl1
+
     @cmd.handle_options %w[-r -d]
 
     use_ui @ui do
@@ -103,10 +78,17 @@ a (2, 1)
 *** REMOTE GEMS ***
 
 a (2)
+    Authors: Abraham Lincoln, Hirohito
+    Rubyforge: http://rubyforge.org/projects/rubygems
+    Homepage: http://a.example.com/
+
     This is a lot of text. This is a lot of text. This is a lot of text.
     This is a lot of text.
 
 pl (1)
+    Author: A User
+    Homepage: http://example.com
+
     this is a summary
     EOF
 
@@ -126,6 +108,7 @@ pl (1)
     assert_equal 0, e.exit_code
 
     assert_equal "true\n", @ui.output
+
     assert_equal '', @ui.error
   end
 
@@ -189,6 +172,99 @@ pl (1)
     assert_equal 1, e.exit_code
   end
 
+  def test_execute_legacy
+    Gem::SpecFetcher.fetcher = nil
+    si = util_setup_source_info_cache @a1, @a2, @pl1
+
+    @fetcher.data["#{@gem_repo}yaml"] = YAML.dump si
+    @fetcher.data["#{@gem_repo}Marshal.#{Gem.marshal_version}"] =
+      si.dump
+
+    @fetcher.data["#{@gem_repo}latest_specs.#{Gem.marshal_version}.gz"] = nil
+
+    @cmd.handle_options %w[-r]
+
+    use_ui @ui do
+      @cmd.execute
+    end
+
+    expected = <<-EOF
+
+*** REMOTE GEMS ***
+
+a (2)
+pl (1)
+    EOF
+
+    assert_equal expected, @ui.output
+
+    expected = <<-EOF
+WARNING:  RubyGems 1.2+ index not found for:
+\t#{@gem_repo}
+
+RubyGems will revert to legacy indexes degrading performance.
+    EOF
+
+    assert_equal expected, @ui.error
+  end
+
+  def test_execute_local_details
+    @a2.summary = 'This is a lot of text. ' * 4
+    @a2.authors = ['Abraham Lincoln', 'Hirohito']
+    @a2.homepage = 'http://a.example.com/'
+    @a2.rubyforge_project = 'rubygems'
+
+    @cmd.handle_options %w[--local --details]
+
+    use_ui @ui do
+      @cmd.execute
+    end
+
+    expected = <<-EOF
+
+*** LOCAL GEMS ***
+
+a (2, 1)
+    Author: A User
+    Homepage: http://example.com
+    Installed at (2): #{@gemhome}
+                 (1): #{@gemhome}
+
+    this is a summary
+
+a_evil (9)
+    Author: A User
+    Homepage: http://example.com
+    Installed at: #{@gemhome}
+
+    this is a summary
+
+b (2)
+    Author: A User
+    Homepage: http://example.com
+    Installed at: #{@gemhome}
+
+    this is a summary
+
+c (1.2)
+    Author: A User
+    Homepage: http://example.com
+    Installed at: #{@gemhome}
+
+    this is a summary
+
+pl (1)
+    Author: A User
+    Homepage: http://example.com
+    Installed at: #{@gemhome}
+
+    this is a summary
+    EOF
+
+    assert_equal expected, @ui.output
+    assert_equal '', @ui.error
+  end
+
   def test_execute_no_versions
     @cmd.handle_options %w[-r --no-versions]