rubygems-update 2.4.8 → 2.5.0

data/test/rubygems/test_gem_commands_outdated_command.rb

@@ -15,9 +15,8 @@ class TestGemCommandsOutdatedCommand < Gem::TestCase
 
   def test_execute
     spec_fetcher do |fetcher|
-      fetcher.spec 'foo', '1.0'
-      fetcher.spec 'foo', '2.0'
-      fetcher.clear
+      fetcher.download 'foo', '1.0'
+      fetcher.download 'foo', '2.0'
       fetcher.gem 'foo', '0.1'
       fetcher.gem 'foo', '0.2'
     end

data/test/rubygems/test_gem_commands_pristine_command.rb

@@ -5,6 +5,8 @@ class TestGemCommandsPristineCommand < Gem::TestCase
 
   def setup
     super
+    common_installer_setup
+
     @cmd = Gem::Commands::PristineCommand.new
   end
 
@@ -103,10 +105,12 @@ class TestGemCommandsPristineCommand < Gem::TestCase
 
     assert_path_exists gem_exec
 
+    ruby_exec = sprintf Gem.default_exec_format, 'ruby'
+
     if win_platform?
-      assert_match %r%\A#!\s*ruby%, File.read(gem_exec)
+      assert_match %r%\A#!\s*#{ruby_exec}%, File.read(gem_exec)
     else
-      assert_match %r%\A#!\s*/usr/bin/env ruby%, File.read(gem_exec)
+      assert_match %r%\A#!\s*/usr/bin/env #{ruby_exec}%, File.read(gem_exec)
     end
   end
 
@@ -151,10 +155,11 @@ class TestGemCommandsPristineCommand < Gem::TestCase
 
     ext_path = File.join @tempdir, 'ext', 'a', 'extconf.rb'
     write_file ext_path do |io|
-      io.write '# extconf.rb'
+      io.write "# extconf.rb\nrequire 'mkmf'; create_makefile 'a'"
     end
 
     util_build_gem a
+    install_gem a
 
     @cmd.options[:args] = %w[a]
     @cmd.options[:extensions] = false
@@ -225,6 +230,28 @@ class TestGemCommandsPristineCommand < Gem::TestCase
     assert_empty out, out.inspect
   end
 
+  def test_skip
+    a = util_spec 'a'
+    b = util_spec 'b'
+
+    install_gem a
+    install_gem b
+
+    @cmd.options[:args] = %w[a b]
+    @cmd.options[:skip] = 'a'
+
+    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 was given through options", out.shift
+    assert_equal "Restored #{b.full_name}", out.shift
+    assert_empty out, out.inspect
+  end
+
   def test_execute_many_multi_repo
     a = util_spec 'a'
     install_gem a
@@ -381,7 +408,7 @@ class TestGemCommandsPristineCommand < Gem::TestCase
   end
 
   def test_execute_unknown_gem_at_remote_source
-    util_spec 'a'
+    install_specs util_spec 'a'
 
     @cmd.options[:args] = %w[a]
 
@@ -420,9 +447,10 @@ class TestGemCommandsPristineCommand < Gem::TestCase
   def test_execute_bundled_gem_on_old_rubies
     util_set_RUBY_VERSION '1.9.3', 551
 
-    util_spec 'bigdecimal', '1.1.0' do |s|
+    spec = util_spec 'bigdecimal', '1.1.0' do |s|
       s.summary = "This bigdecimal is bundled with Ruby"
     end
+    install_specs spec
 
     @cmd.options[:args] = %w[bigdecimal]
 

data/test/rubygems/test_gem_commands_query_command.rb

@@ -1,23 +1,22 @@
 require 'rubygems/test_case'
 require 'rubygems/commands/query_command'
 
-class TestGemCommandsQueryCommand < Gem::TestCase
-
+module TestGemCommandsQueryCommandSetup
   def setup
     super
 
     @cmd = Gem::Commands::QueryCommand.new
 
-    @specs = spec_fetcher do |fetcher|
-      fetcher.spec 'a', 1
-      fetcher.spec 'a', 2
-      fetcher.spec 'a', '3.a'
-    end
+    @specs = add_gems_to_fetcher
 
     @fetcher.data["#{@gem_repo}Marshal.#{Gem.marshal_version}"] = proc do
       raise Gem::RemoteFetcher::FetchError
     end
   end
+end
+
+class TestGemCommandsQueryCommandWithInstalledGems < Gem::TestCase
+  include TestGemCommandsQueryCommandSetup
 
   def test_execute
     spec_fetcher do |fetcher|
@@ -42,37 +41,6 @@ pl (1 i386-linux)
     assert_equal '', @ui.error
   end
 
-  def test_execute_platform
-    spec_fetcher do |fetcher|
-      fetcher.clear
-
-      fetcher.spec 'a', 1
-      fetcher.spec 'a', 1 do |s|
-        s.platform = 'x86-linux'
-      end
-
-      fetcher.spec 'a', 2 do |s|
-        s.platform = 'universal-darwin'
-      end
-    end
-
-    @cmd.handle_options %w[-r -a]
-
-    use_ui @ui do
-      @cmd.execute
-    end
-
-    expected = <<-EOF
-
-*** REMOTE GEMS ***
-
-a (2 universal-darwin, 1 ruby x86-linux)
-    EOF
-
-    assert_equal expected, @ui.output
-    assert_equal '', @ui.error
-  end
-
   def test_execute_all
     spec_fetcher do |fetcher|
       fetcher.legacy_platform
@@ -147,56 +115,6 @@ a (2)
     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)
-    Platform: i386-linux
-    Author: A User
-    Homepage: http://example.com
-
-    this is a summary
-    EOF
-
-    assert_equal expected, @ui.output
-    assert_equal '', @ui.error
-  end
-
-  def test_execute_details_platform
-    spec_fetcher do |fetcher|
-      fetcher.clear
-
-      fetcher.spec 'a', 1 do |s|
-        s.platform = 'x86-linux'
-      end
-
-      fetcher.spec 'a', 2 do |s|
-        s.summary = 'This is a lot of text. ' * 4
-        s.authors = ['Abraham Lincoln', 'Hirohito']
-        s.homepage = 'http://a.example.com/'
-        s.platform = 'universal-darwin'
-      end
-
-      fetcher.legacy_platform
-    end
-
-    @cmd.handle_options %w[-r -d]
-
-    use_ui @ui do
-      @cmd.execute
-    end
-
-    expected = <<-EOF
-
-*** REMOTE GEMS ***
-
-a (2, 1)
-    Platforms:
-        1: x86-linux
-        2: universal-darwin
-    Authors: Abraham Lincoln, Hirohito
-    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)
     Platform: i386-linux
     Author: A User
@@ -526,67 +444,100 @@ pl (1 i386-linux)
     assert_equal '', @ui.error
   end
 
-  def test_execute_local_details
+  def test_make_entry
+    a_2_name = @specs['a-2'].original_name
+
+    @fetcher.data.delete \
+      "#{@gem_repo}quick/Marshal.#{Gem.marshal_version}/#{a_2_name}.gemspec.rz"
+
+    a2 = @specs['a-2']
+    entry_tuples = [
+      [Gem::NameTuple.new(a2.name, a2.version, a2.platform),
+       Gem.sources.first],
+    ]
+
+    platforms = { a2.version => [a2.platform] }
+
+    entry = @cmd.send :make_entry, entry_tuples, platforms
+
+    assert_equal 'a (2)', entry
+  end
+
+  # Test for multiple args handling!
+  def test_execute_multiple_args
     spec_fetcher do |fetcher|
-      fetcher.clear
+      fetcher.legacy_platform
+    end
+
+    @cmd.handle_options %w[a pl]
+
+    use_ui @ui do
+      @cmd.execute
+    end
 
+    assert_match %r%^a %, @ui.output
+    assert_match %r%^pl %, @ui.output
+    assert_equal '', @ui.error
+  end
+
+  def test_show_gems
+    @cmd.options[:name] = //
+    @cmd.options[:domain] = :remote
+
+    use_ui @ui do
+      @cmd.send :show_gems, /a/i, false
+    end
+
+    assert_match %r%^a %,  @ui.output
+    refute_match %r%^pl %, @ui.output
+    assert_empty @ui.error
+  end
+
+  private
+
+  def add_gems_to_fetcher
+    spec_fetcher do |fetcher|
+      fetcher.spec 'a', 1
+      fetcher.spec 'a', 2
+      fetcher.spec 'a', '3.a'
+    end
+  end
+end
+
+class TestGemCommandsQueryCommandWithoutInstalledGems < Gem::TestCase
+  include TestGemCommandsQueryCommandSetup
+
+  def test_execute_platform
+    spec_fetcher do |fetcher|
+      fetcher.spec 'a', 1
       fetcher.spec 'a', 1 do |s|
         s.platform = 'x86-linux'
       end
 
       fetcher.spec 'a', 2 do |s|
-        s.summary = 'This is a lot of text. ' * 4
-        s.authors = ['Abraham Lincoln', 'Hirohito']
-        s.homepage = 'http://a.example.com/'
         s.platform = 'universal-darwin'
       end
-
-      fetcher.legacy_platform
     end
 
-    @cmd.handle_options %w[-l -d]
+    @cmd.handle_options %w[-r -a]
 
     use_ui @ui do
       @cmd.execute
     end
 
-    str = @ui.output
-
-    str.gsub!(/\(\d\): [^\n]*/, "-")
-    str.gsub!(/at: [^\n]*/, "at: -")
-
     expected = <<-EOF
 
-*** LOCAL GEMS ***
-
-a (2, 1)
-    Platforms:
-        1: x86-linux
-        2: universal-darwin
-    Authors: Abraham Lincoln, Hirohito
-    Homepage: http://a.example.com/
-    Installed at -
-                 -
-
-    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)
-    Platform: i386-linux
-    Author: A User
-    Homepage: http://example.com
-    Installed at: -
+*** REMOTE GEMS ***
 
-    this is a summary
+a (2 universal-darwin, 1 ruby x86-linux)
     EOF
 
     assert_equal expected, @ui.output
+    assert_equal '', @ui.error
   end
 
   def test_execute_default_details
     spec_fetcher do |fetcher|
-      fetcher.clear
-
       fetcher.spec 'a', 2
     end
 
@@ -615,54 +566,68 @@ a (2, 1)
     assert_equal expected, @ui.output
   end
 
-  def test_make_entry
-    a_2_name = @specs['a-2'].original_name
-
-    @fetcher.data.delete \
-      "#{@gem_repo}quick/Marshal.#{Gem.marshal_version}/#{a_2_name}.gemspec.rz"
-
-    a2 = @specs['a-2']
-    entry_tuples = [
-      [Gem::NameTuple.new(a2.name, a2.version, a2.platform),
-       Gem.sources.first],
-    ]
-
-    platforms = { a2.version => [a2.platform] }
-
-    entry = @cmd.send :make_entry, entry_tuples, platforms
+  def test_execute_local_details
+    spec_fetcher do |fetcher|
+      fetcher.spec 'a', 1 do |s|
+        s.platform = 'x86-linux'
+      end
 
-    assert_equal 'a (2)', entry
-  end
+      fetcher.spec 'a', 2 do |s|
+        s.summary = 'This is a lot of text. ' * 4
+        s.authors = ['Abraham Lincoln', 'Hirohito']
+        s.homepage = 'http://a.example.com/'
+        s.platform = 'universal-darwin'
+      end
 
-  # Test for multiple args handling!
-  def test_execute_multiple_args
-    spec_fetcher do |fetcher|
       fetcher.legacy_platform
     end
 
-    @cmd.handle_options %w[a pl]
+    @cmd.handle_options %w[-l -d]
 
     use_ui @ui do
       @cmd.execute
     end
 
-    assert_match %r%^a %, @ui.output
-    assert_match %r%^pl %, @ui.output
-    assert_equal '', @ui.error
-  end
+    str = @ui.output
 
-  def test_show_gems
-    @cmd.options[:name] = //
-    @cmd.options[:domain] = :remote
+    str.gsub!(/\(\d\): [^\n]*/, "-")
+    str.gsub!(/at: [^\n]*/, "at: -")
 
-    use_ui @ui do
-      @cmd.send :show_gems, /a/i, false
-    end
+    expected = <<-EOF
 
-    assert_match %r%^a %,  @ui.output
-    refute_match %r%^pl %, @ui.output
-    assert_empty @ui.error
+*** LOCAL GEMS ***
+
+a (2, 1)
+    Platforms:
+        1: x86-linux
+        2: universal-darwin
+    Authors: Abraham Lincoln, Hirohito
+    Homepage: http://a.example.com/
+    Installed at -
+                 -
+
+    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)
+    Platform: i386-linux
+    Author: A User
+    Homepage: http://example.com
+    Installed at: -
+
+    this is a summary
+    EOF
+
+    assert_equal expected, @ui.output
   end
 
-end
+  private
 
+  def add_gems_to_fetcher
+    spec_fetcher do |fetcher|
+      fetcher.download 'a', 1
+      fetcher.download 'a', 2
+      fetcher.download 'a', '3.a'
+    end
+  end
+end