rubygems-update 1.7.2 → 1.8.0

data/test/rubygems/test_gem_commands_outdated_command.rb

@@ -14,24 +14,25 @@ class TestGemCommandsOutdatedCommand < Gem::TestCase
   end
 
   def test_execute
-    quick_gem 'foo', '0.1'
-    quick_gem 'foo', '0.2'
     remote_10 = quick_spec 'foo', '1.0'
     remote_20 = quick_spec 'foo', '2.0'
 
-    remote_spec_file = File.join @gemhome, 'specifications', remote_10.spec_name
-    remote_spec_file = File.join @gemhome, 'specifications', remote_20.spec_name
-
-    @fetcher = Gem::FakeFetcher.new
-    Gem::RemoteFetcher.fetcher = @fetcher
+    Gem::RemoteFetcher.fetcher = @fetcher = Gem::FakeFetcher.new
 
+    util_clear_gems
     util_setup_spec_fetcher remote_10, remote_20
 
-    use_ui @ui do @cmd.execute end
+    quick_gem 'foo', '0.1'
+    quick_gem 'foo', '0.2'
+
+    Gem::Specification.reset
+
+    use_ui @ui do
+      @cmd.execute
+    end
 
     assert_equal "foo (0.2 < 2.0)\n", @ui.output
     assert_equal "", @ui.error
   end
-
 end
 

data/test/rubygems/test_gem_commands_pristine_command.rb

@@ -10,8 +10,8 @@ class TestGemCommandsPristineCommand < Gem::TestCase
 
   def test_execute
     a = quick_spec 'a' do |s| s.executables = %w[foo] end
-    FileUtils.mkdir_p File.join(@tempdir, 'bin')
-    File.open File.join(@tempdir, 'bin', 'foo'), 'w' do |fp|
+
+    write_file File.join(@tempdir, 'bin', 'foo') do |fp|
       fp.puts "#!/usr/bin/ruby"
     end
 
@@ -19,7 +19,7 @@ class TestGemCommandsPristineCommand < Gem::TestCase
 
     foo_path = File.join @gemhome, 'gems', a.full_name, 'bin', 'foo'
 
-    File.open foo_path, 'w' do |io|
+    write_file foo_path do |io|
       io.puts 'I changed it!'
     end
 
@@ -33,15 +33,14 @@ class TestGemCommandsPristineCommand < Gem::TestCase
 
     out = @ui.output.split "\n"
 
-    assert_equal "Restoring gem(s) to pristine condition...", out.shift
+    assert_equal "Restoring gems to pristine condition...", out.shift
     assert_equal "Restored #{a.full_name}", out.shift
     assert_empty out, out.inspect
   end
 
   def test_execute_all
     a = quick_spec 'a' do |s| s.executables = %w[foo] end
-    FileUtils.mkdir_p File.join(@tempdir, 'bin')
-    File.open File.join(@tempdir, 'bin', 'foo'), 'w' do |fp|
+    write_file File.join(@tempdir, 'bin', 'foo') do |fp|
       fp.puts "#!/usr/bin/ruby"
     end
 
@@ -61,35 +60,76 @@ class TestGemCommandsPristineCommand < Gem::TestCase
 
     out = @ui.output.split "\n"
 
-    assert_equal "Restoring gem(s) to pristine condition...", out.shift
+    assert_equal "Restoring gems to pristine condition...", out.shift
     assert_equal "Restored #{a.full_name}", out.shift
     assert_empty out, out.inspect
   end
 
-  def test_execute_missing_cache_gem
-    a = quick_spec 'a' do |s|
-      s.executables = %w[foo]
+  def test_execute_no_exetension
+    a = quick_spec 'a' do |s| s.extensions << 'ext/a/extconf.rb' end
+
+    ext_path = File.join @tempdir, 'ext', 'a', 'extconf.rb'
+    write_file ext_path do |io|
+      io.write '# extconf.rb'
     end
 
-    FileUtils.mkdir_p File.join(@tempdir, 'bin')
+    util_build_gem a
 
-    File.open File.join(@tempdir, 'bin', 'foo'), 'w' do |fp|
-      fp.puts "#!/usr/bin/ruby"
+    @cmd.options[:args] = %w[a]
+    @cmd.options[:extensions] = false
+
+    use_ui @ui do
+      @cmd.execute
     end
 
+    out = @ui.output.split "\n"
+
+    assert_equal 'Restoring gems to pristine condition...', out.shift
+    assert_equal "Skipped #{a.full_name}, it needs to compile an extension",
+                 out.shift
+    assert_empty out, out.inspect
+  end
+
+  def test_execute_many
+    a = quick_spec 'a'
+    b = quick_spec 'b'
+
     install_gem a
+    install_gem b
+
+    @cmd.options[:args] = %w[a b]
+
+    use_ui @ui do
+      @cmd.execute
+    end
+
+    out = @ui.output.split "\n"
+
+    assert_equal "Restoring gems to pristine condition...", out.shift
+    assert_equal "Restored #{a.full_name}", out.shift
+    assert_equal "Restored #{b.full_name}", out.shift
+    assert_empty out, out.inspect
+  end
+
+  def test_execute_missing_cache_gem
+    a_2 = quick_spec 'a', 2
+    a_3 = quick_spec 'a', 3
+
+    install_gem a_2
+    install_gem a_3
 
-    a_data = nil
-    open File.join(@gemhome, 'cache', a.file_name), 'rb' do |fp|
-      a_data = fp.read
+    a_2_data = nil
+    open File.join(@gemhome, 'cache', a_2.file_name), 'rb' do |fp|
+      a_2_data = fp.read
     end
 
     util_setup_fake_fetcher
-    util_setup_spec_fetcher a
+    util_setup_spec_fetcher a_2
 
-    Gem::RemoteFetcher.fetcher.data["http://gems.example.com/gems/#{a.file_name}"] = a_data
+    url = "http://gems.example.com/gems/#{a_2.file_name}"
+    Gem::RemoteFetcher.fetcher.data[url] = a_2_data
 
-    FileUtils.rm Gem.cache_gem(a.file_name, @gemhome)
+    FileUtils.rm a_2.cache_file
 
     @cmd.options[:args] = %w[a]
 
@@ -100,11 +140,12 @@ class TestGemCommandsPristineCommand < Gem::TestCase
     out = @ui.output.split "\n"
 
     [
-      "Restoring gem\(s\) to pristine condition...",
+      "Restoring gems to pristine condition...",
       "Restored a-1",
       "Cached gem for a-2 not found, attempting to fetch...",
       "Restored a-2",
-      "Restored a-3.a"
+      "Restored a-3.a",
+      "Restored a-3",
     ].each do |line|
       assert_equal line, out.shift
     end
@@ -121,7 +162,7 @@ class TestGemCommandsPristineCommand < Gem::TestCase
       end
     end
 
-    assert_match %r|specify a gem name|, e.message
+    assert_match %r|at least one gem name|, e.message
   end
 
 end

data/test/rubygems/test_gem_commands_push_command.rb

@@ -15,7 +15,7 @@ class TestGemCommandsPushCommand < Gem::TestCase
     super
 
     @gems_dir  = File.join @tempdir, 'gems'
-    @cache_dir = Gem.cache_dir @gemhome
+    @cache_dir = File.join @gemhome, "cache"
 
     FileUtils.mkdir @gems_dir
 

data/test/rubygems/test_gem_commands_query_command.rb

@@ -9,8 +9,8 @@ class TestGemCommandsQueryCommand < Gem::TestCase
     @cmd = Gem::Commands::QueryCommand.new
 
     util_setup_fake_fetcher
-
-    @si = util_setup_spec_fetcher @a1, @a2, @pl1, @a3a
+    util_clear_gems
+    util_setup_spec_fetcher @a1, @a2, @pl1, @a3a
 
     @fetcher.data["#{@gem_repo}Marshal.#{Gem.marshal_version}"] = proc do
       raise Gem::RemoteFetcher::FetchError
@@ -42,7 +42,8 @@ pl (1 i386-linux)
     @a1.platform = 'x86-linux'
     @a2.platform = 'universal-darwin'
 
-    @si = util_setup_spec_fetcher @a1, @a1r, @a2, @b2, @pl1
+    util_clear_gems
+    util_setup_spec_fetcher @a1, @a1r, @a2, @b2, @pl1
 
     @cmd.handle_options %w[-r -a]
 
@@ -107,7 +108,8 @@ pl (1 i386-linux)
     @a2.homepage = 'http://a.example.com/'
     @a2.rubyforge_project = 'rubygems'
 
-    @si = util_setup_spec_fetcher @a1, @a2, @pl1
+    util_clear_gems
+    util_setup_spec_fetcher @a1, @a2, @pl1
 
     @cmd.handle_options %w[-r -d]
 
@@ -148,7 +150,8 @@ pl (1)
     @a2.rubyforge_project = 'rubygems'
     @a2.platform = 'universal-darwin'
 
-    @si = util_setup_spec_fetcher @a1, @a2, @pl1
+    util_clear_gems
+    util_setup_spec_fetcher @a1, @a2, @pl1
 
     @cmd.handle_options %w[-r -d]
 
@@ -184,25 +187,22 @@ pl (1)
   end
 
   def test_execute_installed
-    @cmd.handle_options %w[-n c --installed]
+    @cmd.handle_options %w[-n a --installed]
 
-    e = assert_raises Gem::SystemExitException do
+    assert_raises Gem::MockGemUi::SystemExitException do
       use_ui @ui do
         @cmd.execute
       end
     end
 
-    assert_equal 0, e.exit_code
-
     assert_equal "true\n", @ui.output
-
     assert_equal '', @ui.error
   end
 
   def test_execute_installed_no_name
     @cmd.handle_options %w[--installed]
 
-    e = assert_raises Gem::SystemExitException do
+    e = assert_raises Gem::MockGemUi::TermError do
       use_ui @ui do
         @cmd.execute
       end
@@ -217,7 +217,7 @@ pl (1)
   def test_execute_installed_not_installed
     @cmd.handle_options %w[-n not_installed --installed]
 
-    e = assert_raises Gem::SystemExitException do
+    e = assert_raises Gem::MockGemUi::TermError do
       use_ui @ui do
         @cmd.execute
       end
@@ -230,9 +230,9 @@ pl (1)
   end
 
   def test_execute_installed_version
-    @cmd.handle_options %w[-n c --installed --version 1.2]
+    @cmd.handle_options %w[-n a --installed --version 2]
 
-    e = assert_raises Gem::SystemExitException do
+    assert_raises Gem::MockGemUi::SystemExitException do
       use_ui @ui do
         @cmd.execute
       end
@@ -240,14 +240,12 @@ pl (1)
 
     assert_equal "true\n", @ui.output
     assert_equal '', @ui.error
-
-    assert_equal 0, e.exit_code
   end
 
   def test_execute_installed_version_not_installed
     @cmd.handle_options %w[-n c --installed --version 2]
 
-    e = assert_raises Gem::SystemExitException do
+    e = assert_raises Gem::MockGemUi::TermError do
       use_ui @ui do
         @cmd.execute
       end
@@ -259,65 +257,6 @@ pl (1)
     assert_equal 1, e.exit_code
   end
 
-  def test_execute_local_details
-    @a3a.summary = 'This is a lot of text. ' * 4
-    @a3a.authors = ['Abraham Lincoln', 'Hirohito']
-    @a3a.homepage = 'http://a.example.com/'
-    @a3a.rubyforge_project = 'rubygems'
-
-    @cmd.handle_options %w[--local --details]
-
-    use_ui @ui do
-      @cmd.execute
-    end
-
-    expected = <<-EOF
-
-*** LOCAL GEMS ***
-
-a (3.a, 2, 1)
-    Author: A User
-    Homepage: http://example.com
-    Installed at (3.a): #{@gemhome}
-                 (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)
-    Platform: i386-linux
-    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_local_notty
     @cmd.handle_options %w[]
 
@@ -329,9 +268,6 @@ pl (1)
 
     expected = <<-EOF
 a (3.a, 2, 1)
-a_evil (9)
-b (2)
-c (1.2)
 pl (1 i386-linux)
     EOF
 
@@ -406,9 +342,6 @@ a (3.a)
 *** LOCAL GEMS ***
 
 a (3.a, 2, 1)
-a_evil (9)
-b (2)
-c (1.2)
 pl (1 i386-linux)
     EOF
 

data/test/rubygems/test_gem_commands_sources_command.rb

@@ -36,12 +36,11 @@ class TestGemCommandsSourcesCommand < Gem::TestCase
   def test_execute_add
     util_setup_fake_fetcher
 
-    si = Gem::SourceIndex.new
-    si.add_spec @a1
+    install_specs @a1
 
-    specs = si.map do |_, spec|
+    specs = Gem::Specification.map { |spec|
       [spec.name, spec.version, spec.original_platform]
-    end
+    }
 
     specs_dump_gz = StringIO.new
     Zlib::GzipWriter.wrap specs_dump_gz do |io|
@@ -181,18 +180,18 @@ beta-gems.example.com is not a URI
     @cmd.handle_options %w[--update]
 
     util_setup_fake_fetcher
-    source_index = util_setup_spec_fetcher @a1
+    util_setup_spec_fetcher @a1
 
-    specs = source_index.map do |name, spec|
+    specs = Gem::Specification.map { |spec|
       [spec.name, spec.version, spec.original_platform]
-    end
+    }
 
     @fetcher.data["#{@gem_repo}specs.#{Gem.marshal_version}.gz"] =
       util_gzip Marshal.dump(specs)
 
-    latest_specs = source_index.latest_specs.map do |spec|
+    latest_specs = Gem::Specification.latest_specs.map { |spec|
       [spec.name, spec.version, spec.original_platform]
-    end
+    }
 
     @fetcher.data["#{@gem_repo}latest_specs.#{Gem.marshal_version}.gz"] =
       util_gzip Marshal.dump(latest_specs)

data/test/rubygems/test_gem_commands_specification_command.rb

@@ -11,7 +11,8 @@ class TestGemCommandsSpecificationCommand < Gem::TestCase
 
   def test_execute
     foo = quick_spec 'foo'
-    Gem.source_index.add_spec foo
+
+    install_specs foo
 
     @cmd.options[:args] = %w[foo]
 
@@ -71,8 +72,9 @@ class TestGemCommandsSpecificationCommand < Gem::TestCase
   end
 
   def test_execute_field
-    foo = quick_spec 'foo'
-    Gem.source_index.add_spec foo
+    foo = new_spec 'foo', '2'
+
+    install_specs foo
 
     @cmd.options[:args] = %w[foo name]
 
@@ -84,8 +86,9 @@ class TestGemCommandsSpecificationCommand < Gem::TestCase
   end
 
   def test_execute_marshal
-    foo = quick_spec 'foo'
-    Gem.source_index.add_spec foo
+    foo = new_spec 'foo', '2'
+
+    install_specs foo
 
     @cmd.options[:args] = %w[foo]
     @cmd.options[:format] = :marshal
@@ -121,7 +124,8 @@ class TestGemCommandsSpecificationCommand < Gem::TestCase
 
   def test_execute_ruby
     foo = quick_spec 'foo'
-    Gem.source_index.add_spec foo
+
+    install_specs foo
 
     @cmd.options[:args] = %w[foo]
     @cmd.options[:format] = :ruby