rubygems-update 3.2.0.rc.1 → 3.2.0.rc.2

data/test/rubygems/test_gem_commands_push_command.rb

@@ -3,7 +3,6 @@ require 'rubygems/test_case'
 require 'rubygems/commands/push_command'
 
 class TestGemCommandsPushCommand < Gem::TestCase
-
   def setup
     super
 
@@ -410,5 +409,4 @@ class TestGemCommandsPushCommand < Gem::TestCase
   def singleton_gem_class
     class << Gem; self; end
   end
-
 end

data/test/rubygems/test_gem_commands_query_command.rb

@@ -19,7 +19,6 @@ module TestGemCommandsQueryCommandSetup
 end
 
 class TestGemCommandsQueryCommandWithInstalledGems < Gem::TestCase
-
   include TestGemCommandsQueryCommandSetup
 
   def test_execute
@@ -607,11 +606,9 @@ pl (1 i386-linux)
       fetcher.spec 'a', '3.a'
     end
   end
-
 end
 
 class TestGemCommandsQueryCommandWithoutInstalledGems < Gem::TestCase
-
   include TestGemCommandsQueryCommandSetup
 
   def test_execute_platform
@@ -857,5 +854,4 @@ othergem (1.2.3)
       fetcher.download 'a', '3.a'
     end
   end
-
 end

data/test/rubygems/test_gem_commands_search_command.rb

@@ -3,7 +3,6 @@ require 'rubygems/test_case'
 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

@@ -3,7 +3,6 @@ require 'rubygems/test_case'
 require 'rubygems/commands/server_command'
 
 class TestGemCommandsServerCommand < Gem::TestCase
-
   def setup
     super
 
@@ -59,5 +58,4 @@ class TestGemCommandsServerCommand < Gem::TestCase
     assert_equal 'invalid argument: -p 65536: not a port number',
                  e.message
   end
-
 end

data/test/rubygems/test_gem_commands_setup_command.rb

@@ -4,7 +4,6 @@ require 'rubygems/test_case'
 require 'rubygems/commands/setup_command'
 
 class TestGemCommandsSetupCommand < Gem::TestCase
-
   bundler_gemspec = File.expand_path("../../../bundler/lib/bundler/version.rb", __FILE__)
   if File.exist?(bundler_gemspec)
     BUNDLER_VERS = File.read(bundler_gemspec).match(/VERSION = "(#{Gem::Version::VERSION_PATTERN})"/)[1]
@@ -30,9 +29,9 @@ class TestGemCommandsSetupCommand < Gem::TestCase
       bundler/lib/bundler/templates/.circleci/config.yml
       bundler/lib/bundler/templates/.travis.yml
       bundler/man/bundle-b.1
-      bundler/man/bundle-b.1.txt
+      bundler/man/bundle-b.1.ronn
       bundler/man/gemfile.5
-      bundler/man/gemfile.5.txt
+      bundler/man/gemfile.5.ronn
     ]
 
     create_dummy_files(filelist)
@@ -167,12 +166,12 @@ class TestGemCommandsSetupCommand < Gem::TestCase
   end
 
   def test_bundler_man1_files_in
-    assert_equal %w[bundle-b.1 bundle-b.1.txt],
+    assert_equal %w[bundle-b.1 bundle-b.1.ronn],
                  @cmd.bundler_man1_files_in('bundler/man').sort
   end
 
   def test_bundler_man5_files_in
-    assert_equal %w[gemfile.5 gemfile.5.txt],
+    assert_equal %w[gemfile.5 gemfile.5.ronn],
                  @cmd.bundler_man5_files_in('bundler/man').sort
   end
 
@@ -200,9 +199,9 @@ class TestGemCommandsSetupCommand < Gem::TestCase
       @cmd.install_man dir
 
       assert_path_exists File.join("#{dir}/man1", 'bundle-b.1')
-      assert_path_exists File.join("#{dir}/man1", 'bundle-b.1.txt')
+      assert_path_exists File.join("#{dir}/man1", 'bundle-b.1.ronn')
       assert_path_exists File.join("#{dir}/man5", 'gemfile.5')
-      assert_path_exists File.join("#{dir}/man5", 'gemfile.5.txt')
+      assert_path_exists File.join("#{dir}/man5", 'gemfile.5.ronn')
     end
   end
 
@@ -221,7 +220,7 @@ class TestGemCommandsSetupCommand < Gem::TestCase
         assert_path_exists File.join(bin_dir, "#{e}.bat")
       end
 
-      assert_path_exists File.join bin_dir, Gem.default_exec_format % e
+      assert_path_exists File.join bin_dir, e
     end
 
     default_dir = Gem.default_specifications_dir
@@ -267,7 +266,7 @@ class TestGemCommandsSetupCommand < Gem::TestCase
           assert_path_exists File.join(bin_dir, "#{e}.bat")
         end
 
-        assert_path_exists File.join bin_dir, Gem.default_exec_format % e
+        assert_path_exists File.join bin_dir, e
       end
     end
   end
@@ -308,14 +307,14 @@ class TestGemCommandsSetupCommand < Gem::TestCase
 
     ruby_1             = File.join man, 'man1', 'ruby.1'
     bundle_b_1         = File.join man, 'man1', 'bundle-b.1'
+    bundle_b_1_ronn    = File.join man, 'man1', 'bundle-b.1.ronn'
     bundle_b_1_txt     = File.join man, 'man1', 'bundle-b.1.txt'
-    bundle_old_b_1     = File.join man, 'man1', 'bundle-old_b.1'
-    bundle_old_b_1_txt = File.join man, 'man1', 'bundle-old_b.1.txt'
     gemfile_5          = File.join man, 'man5', 'gemfile.5'
+    gemfile_5_ronn     = File.join man, 'man5', 'gemfile.5.ronn'
     gemfile_5_txt      = File.join man, 'man5', 'gemfile.5.txt'
 
-    files_that_go   = [bundle_old_b_1, bundle_old_b_1_txt]
-    files_that_stay = [ruby_1, bundle_b_1, bundle_b_1_txt, gemfile_5, gemfile_5_txt]
+    files_that_go   = [bundle_b_1_txt, gemfile_5_txt]
+    files_that_stay = [ruby_1, bundle_b_1, bundle_b_1_ronn, gemfile_5, gemfile_5_ronn]
 
     create_dummy_files(files_that_go + files_that_stay)
 
@@ -334,8 +333,6 @@ class TestGemCommandsSetupCommand < Gem::TestCase
 
     File.open 'History.txt', 'w' do |io|
       io.puts <<-HISTORY_TXT
-# coding: UTF-8
-
 === #{Gem::VERSION} / 2013-03-26
 
 * Bug fixes:
@@ -412,13 +409,10 @@ class TestGemCommandsSetupCommand < Gem::TestCase
   end
 
   def default_gem_bin_path
-    gem_exec = sprintf Gem.default_exec_format, 'gem'
-    File.join @install_dir, 'bin', gem_exec
+    File.join @install_dir, 'bin', 'gem'
   end
 
   def default_bundle_bin_path
-    bundle_exec = sprintf Gem.default_exec_format, 'bundle'
-    File.join @install_dir, 'bin', bundle_exec
+    File.join @install_dir, 'bin', 'bundle'
   end
-
 end unless Gem.java_platform?

data/test/rubygems/test_gem_commands_signin_command.rb

@@ -4,7 +4,6 @@ require 'rubygems/commands/signin_command'
 require 'rubygems/installer'
 
 class TestGemCommandsSigninCommand < Gem::TestCase
-
   def setup
     super
 
@@ -97,5 +96,4 @@ class TestGemCommandsSigninCommand < Gem::TestCase
 
     sign_in_ui
   end
-
 end

data/test/rubygems/test_gem_commands_signout_command.rb

@@ -5,7 +5,6 @@ require 'rubygems/commands/signout_command'
 require 'rubygems/installer'
 
 class TestGemCommandsSignoutCommand < Gem::TestCase
-
   def setup
     super
     @cmd = Gem::Commands::SignoutCommand.new
@@ -28,5 +27,4 @@ class TestGemCommandsSignoutCommand < Gem::TestCase
 
     assert_match %r{You are not currently signed in}, @sign_out_ui.error
   end
-
 end

data/test/rubygems/test_gem_commands_sources_command.rb

@@ -3,7 +3,6 @@ require 'rubygems/test_case'
 require 'rubygems/commands/sources_command'
 
 class TestGemCommandsSourcesCommand < Gem::TestCase
-
   def setup
     super
 
@@ -422,5 +421,4 @@ beta-gems.example.com is not a URI
     assert_equal "source cache successfully updated\n", @ui.output
     assert_equal '', @ui.error
   end
-
 end

data/test/rubygems/test_gem_commands_specification_command.rb

@@ -3,7 +3,6 @@ require 'rubygems/test_case'
 require 'rubygems/commands/specification_command'
 
 class TestGemCommandsSpecificationCommand < Gem::TestCase
-
   def setup
     super
 
@@ -246,5 +245,4 @@ class TestGemCommandsSpecificationCommand < Gem::TestCase
     assert_match %r{s.name = "foo"}, @ui.output
     assert_equal '', @ui.error
   end
-
 end

data/test/rubygems/test_gem_commands_stale_command.rb

@@ -3,7 +3,6 @@ require 'rubygems/test_case'
 require 'rubygems/commands/stale_command'
 
 class TestGemCommandsStaleCommand < Gem::TestCase
-
   def setup
     super
     @stub_ui = Gem::MockGemUi.new
@@ -40,5 +39,4 @@ class TestGemCommandsStaleCommand < Gem::TestCase
     assert_equal("#{foo_bar.name}-#{foo_bar.version}", lines[0].split.first)
     assert_equal("#{bar_baz.name}-#{bar_baz.version}", lines[1].split.first)
   end
-
 end

data/test/rubygems/test_gem_commands_uninstall_command.rb

@@ -3,7 +3,6 @@ require 'rubygems/installer_test_case'
 require 'rubygems/commands/uninstall_command'
 
 class TestGemCommandsUninstallCommand < Gem::InstallerTestCase
-
   def setup
     super
     @cmd = Gem::Commands::UninstallCommand.new
@@ -502,5 +501,4 @@ WARNING:  Use your OS package manager to uninstall vendor gems
       end
     end
   end
-
 end

data/test/rubygems/test_gem_commands_unpack_command.rb

@@ -3,7 +3,6 @@ require 'rubygems/test_case'
 require 'rubygems/commands/unpack_command'
 
 class TestGemCommandsUnpackCommand < Gem::TestCase
-
   def setup
     super
 
@@ -221,5 +220,4 @@ class TestGemCommandsUnpackCommand < Gem::TestCase
 
     assert @cmd.options[:spec]
   end
-
 end

data/test/rubygems/test_gem_commands_update_command.rb

@@ -3,7 +3,6 @@ require 'rubygems/test_case'
 require 'rubygems/commands/update_command'
 
 class TestGemCommandsUpdateCommand < Gem::TestCase
-
   def setup
     super
     common_installer_setup
@@ -159,6 +158,26 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
     assert_empty out
   end
 
+  def test_execute_system_specific_older_than_minimum_supported_rubygems
+    spec_fetcher do |fetcher|
+      fetcher.download 'rubygems-update', "2.5.1" do |s|
+        s.files = %w[setup.rb]
+      end
+    end
+
+    @cmd.options[:args]          = []
+    @cmd.options[:system]        = "2.5.1"
+
+    assert_raises Gem::MockGemUi::TermError do
+      use_ui @ui do
+        @cmd.execute
+      end
+    end
+
+    assert_empty @ui.output
+    assert_equal "ERROR:  rubygems 2.5.1 is not supported. The oldest supported version is 2.5.2\n", @ui.error
+  end
+
   def test_execute_system_specific_older_than_3_2_removes_plugins_dir
     spec_fetcher do |fetcher|
       fetcher.download 'rubygems-update', 3.1 do |s|
@@ -257,6 +276,34 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
     Gem.disable_system_update_message = old_disable_system_update_message
   end
 
+  # The other style of `gem update --system` tests don't actually run
+  # setup.rb, so we just check that setup.rb gets the `--silent` flag.
+  def test_execute_system_silent_passed_to_setuprb
+    @cmd.options[:args] = []
+    @cmd.options[:system] = true
+    @cmd.options[:silent] = true
+
+    assert_equal true, @cmd.update_rubygems_arguments.include?('--silent')
+  end
+
+  def test_execute_system_silent
+    spec_fetcher do |fetcher|
+      fetcher.download 'rubygems-update', 9 do |s|
+        s.files = %w[setup.rb]
+      end
+    end
+
+    @cmd.options[:args]          = []
+    @cmd.options[:system]        = true
+    @cmd.options[:silent]        = true
+
+    use_ui @ui do
+      @cmd.execute
+    end
+
+    assert_empty @ui.output
+  end
+
   # before:
   #   a1 -> c1.2
   # after:
@@ -647,5 +694,4 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
     assert_equal "  a-2", out.shift
     assert_empty out
   end
-
 end

data/test/rubygems/test_gem_commands_which_command.rb

@@ -3,7 +3,6 @@ require 'rubygems/test_case'
 require 'rubygems/commands/which_command'
 
 class TestGemCommandsWhichCommand < Gem::TestCase
-
   def setup
     super
     Gem::Specification.reset
@@ -82,5 +81,4 @@ class TestGemCommandsWhichCommand < Gem::TestCase
       FileUtils.touch filename
     end
   end
-
 end

data/test/rubygems/test_gem_commands_yank_command.rb

@@ -3,7 +3,6 @@ require 'rubygems/test_case'
 require 'rubygems/commands/yank_command'
 
 class TestGemCommandsYankCommand < Gem::TestCase
-
   def setup
     super
 
@@ -148,5 +147,4 @@ class TestGemCommandsYankCommand < Gem::TestCase
     assert_equal 'key', @fetcher.last_request['Authorization']
     assert_equal [yank_uri], @fetcher.paths
   end
-
 end

data/test/rubygems/test_gem_config_file.rb

@@ -3,7 +3,6 @@ require 'rubygems/test_case'
 require 'rubygems/config_file'
 
 class TestGemConfigFile < Gem::TestCase
-
   def setup
     super
 
@@ -492,5 +491,4 @@ if you believe they were disclosed to a third party.
     util_config_file
     assert_equal(true, @cfg.disable_default_gem_server)
   end
-
 end

data/test/rubygems/test_gem_dependency.rb

@@ -3,7 +3,6 @@ require 'rubygems/test_case'
 require 'rubygems/dependency'
 
 class TestGemDependency < Gem::TestCase
-
   def test_initialize
     d = dep "pkg", "> 1.0"
 
@@ -391,5 +390,4 @@ class TestGemDependency < Gem::TestCase
     assert_equal dep("a", " >= 1.a").identity, :abs_latest
     assert_equal dep("a").identity, :latest
   end
-
 end

data/test/rubygems/test_gem_dependency_installer.rb

@@ -4,7 +4,6 @@ require 'rubygems/dependency_installer'
 require 'rubygems/security'
 
 class TestGemDependencyInstaller < Gem::TestCase
-
   def setup
     super
     common_installer_setup
@@ -841,6 +840,8 @@ class TestGemDependencyInstaller < Gem::TestCase
     assert_equal %w[a-1-cpu-other_platform-1], inst.installed_gems.map {|s| s.full_name }
   end
 
+  require 'rubygems/openssl'
+
   if defined? OpenSSL
     def test_install_security_policy
       util_setup_gems
@@ -1128,5 +1129,4 @@ class TestGemDependencyInstaller < Gem::TestCase
                               @d1, @d2, @x1_m, @x1_o, @w1, @y1,
                               @y1_1_p, @z1].compact)
   end
-
 end

data/test/rubygems/test_gem_dependency_list.rb

@@ -3,7 +3,6 @@ require 'rubygems/test_case'
 require 'rubygems/dependency_list'
 
 class TestGemDependencyList < Gem::TestCase
-
   def setup
     super
 
@@ -262,5 +261,4 @@ class TestGemDependencyList < Gem::TestCase
 
     @deplist.add @a1, @a2, @b1, @c2, @d1
   end
-
 end

data/test/rubygems/test_gem_dependency_resolution_error.rb

@@ -2,7 +2,6 @@
 require 'rubygems/test_case'
 
 class TestGemDependencyResolutionError < Gem::TestCase
-
   def setup
     super
 
@@ -24,5 +23,4 @@ class TestGemDependencyResolutionError < Gem::TestCase
     assert_match %r{^conflicting dependencies a \(= 1\) and a \(= 2\)$},
                  @error.message
   end
-
 end