rubygems-update 3.0.3 → 3.4.7

data/test/rubygems/test_gem_commands_query_command.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
-require 'rubygems/test_case'
-require 'rubygems/commands/query_command'
+require_relative "helper"
+require "rubygems/commands/query_command"
 
 module TestGemCommandsQueryCommandSetup
   def setup
@@ -41,7 +41,7 @@ pl (1 i386-linux)
     EOF
 
     assert_equal expected, @stub_ui.output
-    assert_equal '', @stub_ui.error
+    assert_equal "", @stub_ui.error
   end
 
   def test_execute_all
@@ -64,7 +64,7 @@ pl (1 i386-linux)
     EOF
 
     assert_equal expected, @stub_ui.output
-    assert_equal '', @stub_ui.error
+    assert_equal "", @stub_ui.error
   end
 
   def test_execute_all_prerelease
@@ -87,15 +87,15 @@ pl (1 i386-linux)
     EOF
 
     assert_equal expected, @stub_ui.output
-    assert_equal '', @stub_ui.error
+    assert_equal "", @stub_ui.error
   end
 
   def test_execute_details
     spec_fetcher do |fetcher|
-      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/'
+      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/"
       end
 
       fetcher.legacy_platform
@@ -127,13 +127,13 @@ pl (1)
     EOF
 
     assert_equal expected, @stub_ui.output
-    assert_equal '', @stub_ui.error
+    assert_equal "", @stub_ui.error
   end
 
   def test_execute_details_cleans_text
     spec_fetcher do |fetcher|
-      fetcher.spec 'a', 2 do |s|
-        s.summary = 'This is a lot of text. ' * 4
+      fetcher.spec "a", 2 do |s|
+        s.summary = "This is a lot of text. " * 4
         s.authors = ["Abraham Lincoln \x01", "\x02 Hirohito"]
         s.homepage = "http://a.example.com/\x03"
       end
@@ -167,13 +167,13 @@ pl (1)
     EOF
 
     assert_equal expected, @stub_ui.output
-    assert_equal '', @stub_ui.error
+    assert_equal "", @stub_ui.error
   end
 
   def test_execute_details_truncates_summary
     spec_fetcher do |fetcher|
-      fetcher.spec 'a', 2 do |s|
-        s.summary = 'This is a lot of text. ' * 10_000
+      fetcher.spec "a", 2 do |s|
+        s.summary = "This is a lot of text. " * 10_000
         s.authors = ["Abraham Lincoln \x01", "\x02 Hirohito"]
         s.homepage = "http://a.example.com/\x03"
       end
@@ -207,33 +207,33 @@ pl (1)
     EOF
 
     assert_equal expected, @stub_ui.output
-    assert_equal '', @stub_ui.error
+    assert_equal "", @stub_ui.error
   end
 
   def test_execute_installed
     @cmd.handle_options %w[-n a --installed]
 
-    assert_raises Gem::MockGemUi::SystemExitException do
+    assert_raise Gem::MockGemUi::SystemExitException do
       use_ui @stub_ui do
         @cmd.execute
       end
     end
 
     assert_equal "true\n", @stub_ui.output
-    assert_equal '', @stub_ui.error
+    assert_equal "", @stub_ui.error
   end
 
   def test_execute_installed_inverse
     @cmd.handle_options %w[-n a --no-installed]
 
-    e = assert_raises Gem::MockGemUi::TermError do
+    e = assert_raise Gem::MockGemUi::TermError do
       use_ui @stub_ui do
         @cmd.execute
       end
     end
 
     assert_equal "false\n", @stub_ui.output
-    assert_equal '', @stub_ui.error
+    assert_equal "", @stub_ui.error
 
     assert_equal 1, e.exit_code
   end
@@ -241,26 +241,26 @@ pl (1)
   def test_execute_installed_inverse_not_installed
     @cmd.handle_options %w[-n not_installed --no-installed]
 
-    assert_raises Gem::MockGemUi::SystemExitException do
+    assert_raise Gem::MockGemUi::SystemExitException do
       use_ui @stub_ui do
         @cmd.execute
       end
     end
 
     assert_equal "true\n", @stub_ui.output
-    assert_equal '', @stub_ui.error
+    assert_equal "", @stub_ui.error
   end
 
   def test_execute_installed_no_name
     @cmd.handle_options %w[--installed]
 
-    e = assert_raises Gem::MockGemUi::TermError do
+    e = assert_raise Gem::MockGemUi::TermError do
       use_ui @stub_ui do
         @cmd.execute
       end
     end
 
-    assert_equal '', @stub_ui.output
+    assert_equal "", @stub_ui.output
     assert_equal "ERROR:  You must specify a gem name\n", @stub_ui.error
 
     assert_equal 4, e.exit_code
@@ -269,14 +269,14 @@ pl (1)
   def test_execute_installed_not_installed
     @cmd.handle_options %w[-n not_installed --installed]
 
-    e = assert_raises Gem::MockGemUi::TermError do
+    e = assert_raise Gem::MockGemUi::TermError do
       use_ui @stub_ui do
         @cmd.execute
       end
     end
 
     assert_equal "false\n", @stub_ui.output
-    assert_equal '', @stub_ui.error
+    assert_equal "", @stub_ui.error
 
     assert_equal 1, e.exit_code
   end
@@ -284,27 +284,27 @@ pl (1)
   def test_execute_installed_version
     @cmd.handle_options %w[-n a --installed --version 2]
 
-    assert_raises Gem::MockGemUi::SystemExitException do
+    assert_raise Gem::MockGemUi::SystemExitException do
       use_ui @stub_ui do
         @cmd.execute
       end
     end
 
     assert_equal "true\n", @stub_ui.output
-    assert_equal '', @stub_ui.error
+    assert_equal "", @stub_ui.error
   end
 
   def test_execute_installed_version_not_installed
     @cmd.handle_options %w[-n c --installed --version 2]
 
-    e = assert_raises Gem::MockGemUi::TermError do
+    e = assert_raise Gem::MockGemUi::TermError do
       use_ui @stub_ui do
         @cmd.execute
       end
     end
 
     assert_equal "false\n", @stub_ui.output
-    assert_equal '', @stub_ui.error
+    assert_equal "", @stub_ui.error
 
     assert_equal 1, e.exit_code
   end
@@ -329,7 +329,7 @@ pl (1 i386-linux)
     EOF
 
     assert_equal expected, @stub_ui.output
-    assert_equal '', @stub_ui.error
+    assert_equal "", @stub_ui.error
   end
 
   def test_execute_local_notty
@@ -351,7 +351,7 @@ pl (1 i386-linux)
     EOF
 
     assert_equal expected, @stub_ui.output
-    assert_equal '', @stub_ui.error
+    assert_equal "", @stub_ui.error
   end
 
   def test_execute_local_quiet
@@ -372,7 +372,7 @@ pl (1 i386-linux)
     EOF
 
     assert_equal expected, @stub_ui.output
-    assert_equal '', @stub_ui.error
+    assert_equal "", @stub_ui.error
   end
 
   def test_execute_no_versions
@@ -395,7 +395,7 @@ pl
     EOF
 
     assert_equal expected, @stub_ui.output
-    assert_equal '', @stub_ui.error
+    assert_equal "", @stub_ui.error
   end
 
   def test_execute_notty
@@ -417,7 +417,7 @@ pl (1 i386-linux)
     EOF
 
     assert_equal expected, @stub_ui.output
-    assert_equal '', @stub_ui.error
+    assert_equal "", @stub_ui.error
   end
 
   def test_execute_prerelease
@@ -435,7 +435,7 @@ a (3.a)
     EOF
 
     assert_equal expected, @stub_ui.output
-    assert_equal '', @stub_ui.error
+    assert_equal "", @stub_ui.error
   end
 
   def test_execute_prerelease_local
@@ -458,7 +458,28 @@ pl (1 i386-linux)
     EOF
 
     assert_equal expected, @stub_ui.output
-    assert_equal "WARNING:  prereleases are always shown locally\n", @stub_ui.error
+  end
+
+  def test_execute_no_prerelease_local
+    spec_fetcher do |fetcher|
+      fetcher.legacy_platform
+    end
+
+    @cmd.handle_options %w[-l --no-prerelease]
+
+    use_ui @stub_ui do
+      @cmd.execute
+    end
+
+    expected = <<-EOF
+
+*** LOCAL GEMS ***
+
+a (2, 1)
+pl (1 i386-linux)
+    EOF
+
+    assert_equal expected, @stub_ui.output
   end
 
   def test_execute_remote
@@ -481,7 +502,7 @@ pl (1 i386-linux)
     EOF
 
     assert_equal expected, @stub_ui.output
-    assert_equal '', @stub_ui.error
+    assert_equal "", @stub_ui.error
   end
 
   def test_execute_remote_notty
@@ -503,7 +524,7 @@ pl (1 i386-linux)
     EOF
 
     assert_equal expected, @stub_ui.output
-    assert_equal '', @stub_ui.error
+    assert_equal "", @stub_ui.error
   end
 
   def test_execute_remote_quiet
@@ -524,16 +545,16 @@ pl (1 i386-linux)
     EOF
 
     assert_equal expected, @stub_ui.output
-    assert_equal '', @stub_ui.error
+    assert_equal "", @stub_ui.error
   end
 
   def test_make_entry
-    a_2_name = @specs['a-2'].original_name
+    a_2_name = @specs["a-2"].original_name
 
     @stub_fetcher.data.delete \
       "#{@gem_repo}quick/Marshal.#{Gem.marshal_version}/#{a_2_name}.gemspec.rz"
 
-    a2 = @specs['a-2']
+    a2 = @specs["a-2"]
     entry_tuples = [
       [Gem::NameTuple.new(a2.name, a2.version, a2.platform),
        Gem.sources.first],
@@ -543,7 +564,7 @@ pl (1 i386-linux)
 
     entry = @cmd.send :make_entry, entry_tuples, platforms
 
-    assert_equal 'a (2)', entry
+    assert_equal "a (2)", entry
   end
 
   # Test for multiple args handling!
@@ -558,9 +579,9 @@ pl (1 i386-linux)
       @cmd.execute
     end
 
-    assert_match %r%^a %, @stub_ui.output
-    assert_match %r%^pl %, @stub_ui.output
-    assert_equal '', @stub_ui.error
+    assert_match %r{^a }, @stub_ui.output
+    assert_match %r{^pl }, @stub_ui.output
+    assert_equal "", @stub_ui.error
   end
 
   def test_show_gems
@@ -568,11 +589,11 @@ pl (1 i386-linux)
     @cmd.options[:domain] = :remote
 
     use_ui @stub_ui do
-      @cmd.send :show_gems, /a/i, false
+      @cmd.send :show_gems, /a/i
     end
 
-    assert_match %r%^a %,  @stub_ui.output
-    refute_match %r%^pl %, @stub_ui.output
+    assert_match %r{^a },  @stub_ui.output
+    refute_match %r{^pl }, @stub_ui.output
     assert_empty @stub_ui.error
   end
 
@@ -580,9 +601,9 @@ pl (1 i386-linux)
 
   def add_gems_to_fetcher
     spec_fetcher do |fetcher|
-      fetcher.spec 'a', 1
-      fetcher.spec 'a', 2
-      fetcher.spec 'a', '3.a'
+      fetcher.spec "a", 1
+      fetcher.spec "a", 2
+      fetcher.spec "a", "3.a"
     end
   end
 end
@@ -592,13 +613,13 @@ class TestGemCommandsQueryCommandWithoutInstalledGems < Gem::TestCase
 
   def test_execute_platform
     spec_fetcher do |fetcher|
-      fetcher.spec 'a', 1
-      fetcher.spec 'a', 1 do |s|
-        s.platform = 'x86-linux'
+      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'
+      fetcher.spec "a", 2 do |s|
+        s.platform = "universal-darwin"
       end
     end
 
@@ -616,14 +637,14 @@ a (2 universal-darwin, 1 ruby x86-linux)
     EOF
 
     assert_equal expected, @stub_ui.output
-    assert_equal '', @stub_ui.error
+    assert_equal "", @stub_ui.error
   end
 
   def test_execute_show_default_gems
-    spec_fetcher { |fetcher| fetcher.spec 'a', 2 }
+    spec_fetcher {|fetcher| fetcher.spec "a", 2 }
 
-    a1 = new_default_spec 'a', 1
-    install_default_specs a1
+    a1 = new_default_spec "a", 1
+    install_default_gems a1
 
     use_ui @stub_ui do
       @cmd.execute
@@ -640,9 +661,9 @@ EOF
   end
 
   def test_execute_show_default_gems_with_platform
-    a1 = new_default_spec 'a', 1
-    a1.platform = 'java'
-    install_default_specs a1
+    a1 = new_default_spec "a", 1
+    a1.platform = "java"
+    install_default_gems a1
 
     use_ui @stub_ui do
       @cmd.execute
@@ -660,11 +681,11 @@ EOF
 
   def test_execute_default_details
     spec_fetcher do |fetcher|
-      fetcher.spec 'a', 2
+      fetcher.spec "a", 2
     end
 
-    a1 = new_default_spec 'a', 1
-    install_default_specs a1
+    a1 = new_default_spec "a", 1
+    install_default_gems a1
 
     @cmd.handle_options %w[-l -d]
 
@@ -690,15 +711,15 @@ a (2, 1)
 
   def test_execute_local_details
     spec_fetcher do |fetcher|
-      fetcher.spec 'a', 1 do |s|
-        s.platform = 'x86-linux'
+      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'
+      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
@@ -745,9 +766,9 @@ pl (1)
 
   def test_execute_exact_remote
     spec_fetcher do |fetcher|
-      fetcher.spec 'coolgem-omg', 3
-      fetcher.spec 'coolgem', '4.2.1'
-      fetcher.spec 'wow_coolgem', 1
+      fetcher.spec "coolgem-omg", 3
+      fetcher.spec "coolgem", "4.2.1"
+      fetcher.spec "wow_coolgem", 1
     end
 
     @cmd.handle_options %w[--remote --exact coolgem]
@@ -768,9 +789,9 @@ coolgem (4.2.1)
 
   def test_execute_exact_local
     spec_fetcher do |fetcher|
-      fetcher.spec 'coolgem-omg', 3
-      fetcher.spec 'coolgem', '4.2.1'
-      fetcher.spec 'wow_coolgem', 1
+      fetcher.spec "coolgem-omg", 3
+      fetcher.spec "coolgem", "4.2.1"
+      fetcher.spec "wow_coolgem", 1
     end
 
     @cmd.handle_options %w[--exact coolgem]
@@ -791,13 +812,13 @@ coolgem (4.2.1)
 
   def test_execute_exact_multiple
     spec_fetcher do |fetcher|
-      fetcher.spec 'coolgem-omg', 3
-      fetcher.spec 'coolgem', '4.2.1'
-      fetcher.spec 'wow_coolgem', 1
+      fetcher.spec "coolgem-omg", 3
+      fetcher.spec "coolgem", "4.2.1"
+      fetcher.spec "wow_coolgem", 1
 
-      fetcher.spec 'othergem-omg', 3
-      fetcher.spec 'othergem', '1.2.3'
-      fetcher.spec 'wow_othergem', 1
+      fetcher.spec "othergem-omg", 3
+      fetcher.spec "othergem", "1.2.3"
+      fetcher.spec "wow_othergem", 1
     end
 
     @cmd.handle_options %w[--exact coolgem othergem]
@@ -820,13 +841,17 @@ othergem (1.2.3)
     assert_equal expected, @stub_ui.output
   end
 
+  def test_depprecated
+    assert @cmd.deprecated?
+  end
+
   private
 
   def add_gems_to_fetcher
     spec_fetcher do |fetcher|
-      fetcher.download 'a', 1
-      fetcher.download 'a', 2
-      fetcher.download 'a', '3.a'
+      fetcher.download "a", 1
+      fetcher.download "a", 2
+      fetcher.download "a", "3.a"
     end
   end
 end

data/test/rubygems/test_gem_commands_search_command.rb

@@ -1,9 +1,8 @@
 # frozen_string_literal: true
-require 'rubygems/test_case'
-require 'rubygems/commands/search_command'
+require_relative "helper"
+require "rubygems/commands/search_command"
 
 class TestGemCommandsSearchCommand < Gem::TestCase
-
   def setup
     super
 
@@ -13,5 +12,4 @@ class TestGemCommandsSearchCommand < Gem::TestCase
   def test_initialize
     assert_equal :remote, @cmd.defaults[:domain]
   end
-
 end

data/test/rubygems/test_gem_commands_server_command.rb

@@ -1,59 +1,19 @@
 # frozen_string_literal: true
-require 'rubygems/test_case'
-require 'rubygems/commands/server_command'
+require_relative "helper"
+require "rubygems/commands/server_command"
 
 class TestGemCommandsServerCommand < Gem::TestCase
-
   def setup
     super
 
     @cmd = Gem::Commands::ServerCommand.new
   end
 
-  def test_handle_options
-    @cmd.send :handle_options, %w[-p 8808 --no-daemon]
-
-    assert_equal false, @cmd.options[:daemon]
-    assert_equal [], @cmd.options[:gemdir]
-    assert_equal 8808, @cmd.options[:port]
-
-    @cmd.send :handle_options, %w[-p 9999 -d /nonexistent --daemon]
-
-    assert_equal true, @cmd.options[:daemon]
-    assert_equal [File.expand_path('/nonexistent')], @cmd.options[:gemdir]
-    assert_equal 9999, @cmd.options[:port]
-  end
-
-  def test_handle_options_gemdir
-    @cmd.send :handle_options, %w[--dir a --dir b]
-
-    assert_equal [File.expand_path('a'), File.expand_path('b')],
-                 @cmd.options[:gemdir]
-  end
-
-  def test_handle_options_port
-    @cmd.send :handle_options, %w[-p 0]
-    assert_equal 0, @cmd.options[:port]
-
-    @cmd.send :handle_options, %w[-p 65535]
-    assert_equal 65535, @cmd.options[:port]
-
-    @cmd.send :handle_options, %w[-p discard]
-    assert_equal 9, @cmd.options[:port]
-
-    e = assert_raises OptionParser::InvalidArgument do
-      @cmd.send :handle_options, %w[-p nonexistent]
+  def test_execute
+    use_ui @ui do
+      @cmd.execute
     end
 
-    assert_equal 'invalid argument: -p nonexistent: no such named service',
-                 e.message
-
-    e = assert_raises OptionParser::InvalidArgument do
-      @cmd.send :handle_options, %w[-p 65536]
-    end
-
-    assert_equal 'invalid argument: -p 65536: not a port number',
-                 e.message
+    assert_match %r{Install the rubygems-server}i, @ui.error
   end
-
 end