rubygems-update 3.3.7 → 3.4.8

data/test/rubygems/test_gem_commands_cleanup_command.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
-require_relative 'helper'
-require 'rubygems/commands/cleanup_command'
-require 'rubygems/installer'
+require_relative "helper"
+require "rubygems/commands/cleanup_command"
+require "rubygems/installer"
 
 class TestGemCommandsCleanupCommand < Gem::TestCase
   def setup
@@ -9,8 +9,8 @@ class TestGemCommandsCleanupCommand < Gem::TestCase
 
     @cmd = Gem::Commands::CleanupCommand.new
 
-    @a_1 = util_spec 'a', 1
-    @a_2 = util_spec 'a', 2
+    @a_1 = util_spec "a", 1
+    @a_2 = util_spec "a", 2
 
     install_gem @a_1
     install_gem @a_2
@@ -66,12 +66,12 @@ class TestGemCommandsCleanupCommand < Gem::TestCase
   end
 
   def test_execute_all_dependencies
-    @b_1 = util_spec 'b', 1 do |s|
-      s.add_dependency 'a', '1'
+    @b_1 = util_spec "b", 1 do |s|
+      s.add_dependency "a", "1"
     end
 
-    @b_2 = util_spec 'b', 2 do |s|
-      s.add_dependency 'a', '2'
+    @b_2 = util_spec "b", 2 do |s|
+      s.add_dependency "a", "2"
     end
 
     install_gem @b_1
@@ -86,12 +86,12 @@ class TestGemCommandsCleanupCommand < Gem::TestCase
   end
 
   def test_execute_dev_dependencies
-    @b_1 = util_spec 'b', 1 do |s|
-      s.add_development_dependency 'a', '1'
+    @b_1 = util_spec "b", 1 do |s|
+      s.add_development_dependency "a", "1"
     end
 
-    @c_1 = util_spec 'c', 1 do |s|
-      s.add_development_dependency 'a', '2'
+    @c_1 = util_spec "c", 1 do |s|
+      s.add_development_dependency "a", "2"
     end
 
     install_gem @b_1
@@ -105,12 +105,12 @@ class TestGemCommandsCleanupCommand < Gem::TestCase
   end
 
   def test_execute_without_dev_dependencies
-    @b_1 = util_spec 'b', 1 do |s|
-      s.add_development_dependency 'a', '1'
+    @b_1 = util_spec "b", 1 do |s|
+      s.add_development_dependency "a", "1"
     end
 
-    @c_1 = util_spec 'c', 1 do |s|
-      s.add_development_dependency 'a', '2'
+    @c_1 = util_spec "c", 1 do |s|
+      s.add_development_dependency "a", "2"
     end
 
     install_gem @b_1
@@ -124,14 +124,14 @@ class TestGemCommandsCleanupCommand < Gem::TestCase
   end
 
   def test_execute_all
-    gemhome2 = File.join @tempdir, 'gemhome2'
+    gemhome2 = File.join @tempdir, "gemhome2"
 
     Gem.ensure_gem_subdirectories gemhome2
 
     Gem.use_paths @gemhome, gemhome2
 
-    @b_1 = util_spec 'b', 1
-    @b_2 = util_spec 'b', 2
+    @b_1 = util_spec "b", 1
+    @b_2 = util_spec "b", 2
 
     install_gem @b_1
     install_gem @b_2
@@ -140,15 +140,15 @@ class TestGemCommandsCleanupCommand < Gem::TestCase
 
     @cmd.execute
 
-    assert_equal @gemhome, Gem.dir, 'GEM_HOME'
-    assert_equal [@gemhome, gemhome2], Gem.path.sort, 'GEM_PATH'
+    assert_equal @gemhome, Gem.dir, "GEM_HOME"
+    assert_equal [@gemhome, gemhome2], Gem.path.sort, "GEM_PATH"
 
     assert_path_not_exist @a_1.gem_dir
     assert_path_not_exist @b_1.gem_dir
   end
 
   def test_execute_all_user
-    @a_1_1, = util_gem 'a', '1.1'
+    @a_1_1, = util_gem "a", "1.1"
     @a_1_1 = install_gem @a_1_1 # pick up user install path
 
     Gem::Specification.dirs = [Gem.dir, Gem.user_dir]
@@ -167,7 +167,7 @@ class TestGemCommandsCleanupCommand < Gem::TestCase
   def test_execute_all_user_no_sudo
     FileUtils.chmod 0555, @gemhome
 
-    @a_1_1, = util_gem 'a', '1.1'
+    @a_1_1, = util_gem "a", "1.1"
     @a_1_1 = install_gem @a_1_1, :user_install => true # pick up user install path
 
     Gem::Specification.dirs = [Gem.dir, Gem.user_dir]
@@ -195,11 +195,11 @@ class TestGemCommandsCleanupCommand < Gem::TestCase
   end
 
   def test_execute_keeps_older_versions_with_deps
-    @b_1 = util_spec 'b', 1
-    @b_2 = util_spec 'b', 2
+    @b_1 = util_spec "b", 1
+    @b_2 = util_spec "b", 2
 
-    @c = util_spec 'c', 1 do |s|
-      s.add_dependency 'b', '1'
+    @c = util_spec "c", 1 do |s|
+      s.add_dependency "b", "1"
     end
 
     install_gem @b_1
@@ -216,9 +216,9 @@ class TestGemCommandsCleanupCommand < Gem::TestCase
   def test_execute_ignore_default_gem_verbose
     Gem.configuration.verbose = :really
 
-    @b_1 = util_spec 'b', 1
+    @b_1 = util_spec "b", 1
     @b_default = new_default_spec "b", "2"
-    @b_2 = util_spec 'b', 3
+    @b_2 = util_spec "b", 3
 
     install_gem @b_1
     install_default_gems @b_default
@@ -235,12 +235,12 @@ class TestGemCommandsCleanupCommand < Gem::TestCase
   end
 
   def test_execute_remove_gem_home_only
-    c_1, = util_gem 'c', '1'
-    c_2, = util_gem 'c', '2'
-    d_1, = util_gem 'd', '1'
-    d_2, = util_gem 'd', '2'
-    e_1, = util_gem 'e', '1'
-    e_2, = util_gem 'e', '2'
+    c_1, = util_gem "c", "1"
+    c_2, = util_gem "c", "2"
+    d_1, = util_gem "d", "1"
+    d_2, = util_gem "d", "2"
+    e_1, = util_gem "e", "1"
+    e_2, = util_gem "e", "2"
 
     c_1 = install_gem c_1, :user_install => true # pick up user install path
     c_2 = install_gem c_2
@@ -263,11 +263,11 @@ class TestGemCommandsCleanupCommand < Gem::TestCase
   end
 
   def test_execute_user_install
-    c_1, = util_gem 'c', '1.0'
-    c_2, = util_gem 'c', '1.1'
+    c_1, = util_gem "c", "1.0"
+    c_2, = util_gem "c", "1.1"
 
-    d_1, = util_gem 'd', '1.0'
-    d_2, = util_gem 'd', '1.1'
+    d_1, = util_gem "d", "1.0"
+    d_2, = util_gem "d", "1.1"
 
     c_1 = install_gem c_1, :user_install => true # pick up user install path
     c_2 = install_gem c_2, :user_install => true # pick up user install path

data/test/rubygems/test_gem_commands_contents_command.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
-require_relative 'helper'
-require 'rubygems/commands/contents_command'
+require_relative "helper"
+require "rubygems/commands/contents_command"
 
 class TestGemCommandsContentsCommand < Gem::TestCase
   def setup
@@ -20,7 +20,7 @@ class TestGemCommandsContentsCommand < Gem::TestCase
   def test_execute
     @cmd.options[:args] = %w[foo]
 
-    gem 'foo'
+    gem "foo"
 
     use_ui @ui do
       @cmd.execute
@@ -34,8 +34,8 @@ class TestGemCommandsContentsCommand < Gem::TestCase
   def test_execute_all
     @cmd.options[:all] = true
 
-    gem 'foo'
-    gem 'bar'
+    gem "foo"
+    gem "bar"
 
     use_ui @ui do
       @cmd.execute
@@ -63,8 +63,8 @@ class TestGemCommandsContentsCommand < Gem::TestCase
 
   def test_execute_exact_match
     @cmd.options[:args] = %w[foo]
-    gem 'foo'
-    gem 'bar'
+    gem "foo"
+    gem "bar"
 
     use_ui @ui do
       @cmd.execute
@@ -79,7 +79,7 @@ class TestGemCommandsContentsCommand < Gem::TestCase
     @cmd.options[:args] = %w[foo]
     @cmd.options[:lib_only] = true
 
-    gem 'foo'
+    gem "foo"
 
     use_ui @ui do
       @cmd.execute
@@ -106,9 +106,9 @@ class TestGemCommandsContentsCommand < Gem::TestCase
 
   def test_execute_missing_version
     @cmd.options[:args] = %w[foo]
-    @cmd.options[:version] = Gem::Requirement.new '= 2'
+    @cmd.options[:version] = Gem::Requirement.new "= 2"
 
-    gem 'foo', 1
+    gem "foo", 1
 
     assert_raise Gem::MockGemUi::TermError do
       use_ui @ui do
@@ -123,7 +123,7 @@ class TestGemCommandsContentsCommand < Gem::TestCase
   def test_execute_missing_multiple
     @cmd.options[:args] = %w[foo bar]
 
-    gem 'foo'
+    gem "foo"
 
     use_ui @ui do
       @cmd.execute
@@ -138,8 +138,8 @@ class TestGemCommandsContentsCommand < Gem::TestCase
   def test_execute_multiple
     @cmd.options[:args] = %w[foo bar]
 
-    gem 'foo'
-    gem 'bar'
+    gem "foo"
+    gem "bar"
 
     use_ui @ui do
       @cmd.execute
@@ -155,13 +155,13 @@ class TestGemCommandsContentsCommand < Gem::TestCase
     @cmd.options[:args] = %w[foo]
     @cmd.options[:show_install_dir] = true
 
-    gem 'foo'
+    gem "foo"
 
     use_ui @ui do
       @cmd.execute
     end
 
-    expected = File.join @gemhome, 'gems', 'foo-2'
+    expected = File.join @gemhome, "gems", "foo-2"
 
     assert_equal "#{expected}\n", @ui.output
     assert_equal "", @ui.error
@@ -171,14 +171,14 @@ class TestGemCommandsContentsCommand < Gem::TestCase
     @cmd.options[:args] = %w[foo]
     @cmd.options[:show_install_dir] = true
 
-    gem 'foo', 1
-    gem 'foo', 2
+    gem "foo", 1
+    gem "foo", 2
 
     use_ui @ui do
       @cmd.execute
     end
 
-    expected = File.join @gemhome, 'gems', 'foo-2'
+    expected = File.join @gemhome, "gems", "foo-2"
 
     assert_equal "#{expected}\n", @ui.output
     assert_equal "", @ui.error
@@ -187,16 +187,16 @@ class TestGemCommandsContentsCommand < Gem::TestCase
   def test_execute_show_install_dir_version
     @cmd.options[:args] = %w[foo]
     @cmd.options[:show_install_dir] = true
-    @cmd.options[:version] = Gem::Requirement.new '= 1'
+    @cmd.options[:version] = Gem::Requirement.new "= 1"
 
-    gem 'foo', 1
-    gem 'foo', 2
+    gem "foo", 1
+    gem "foo", 2
 
     use_ui @ui do
       @cmd.execute
     end
 
-    expected = File.join @gemhome, 'gems', 'foo-1'
+    expected = File.join @gemhome, "gems", "foo-1"
 
     assert_equal "#{expected}\n", @ui.output
     assert_equal "", @ui.error
@@ -206,7 +206,7 @@ class TestGemCommandsContentsCommand < Gem::TestCase
     @cmd.options[:args] = %w[foo]
     @cmd.options[:prefix] = false
 
-    gem 'foo'
+    gem "foo"
 
     use_ui @ui do
       @cmd.execute
@@ -236,10 +236,10 @@ lib/foo.rb
     end
 
     expected = [
-      [RbConfig::CONFIG['bindir'], 'default_command'],
-      [RbConfig::CONFIG['rubylibdir'], 'default/gem.rb'],
-      [RbConfig::CONFIG['archdir'], 'default_gem.so'],
-    ].sort.map{|a|File.join a }.join "\n"
+      [RbConfig::CONFIG["bindir"], "default_command"],
+      [RbConfig::CONFIG["rubylibdir"], "default/gem.rb"],
+      [RbConfig::CONFIG["archdir"], "default_gem.so"],
+    ].sort.map {|a|File.join a }.join "\n"
 
     assert_equal expected, @ui.output.chomp
     assert_equal "", @ui.error
@@ -264,7 +264,7 @@ lib/foo.rb
     assert @cmd.options[:lib_only]
     refute @cmd.options[:prefix]
     assert_equal %w[foo], @cmd.options[:specdirs]
-    assert_equal Gem::Requirement.new('0.0.2'), @cmd.options[:version]
+    assert_equal Gem::Requirement.new("0.0.2"), @cmd.options[:version]
     assert @cmd.options[:show_install_dir]
   end
 end

data/test/rubygems/test_gem_commands_dependency_command.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
-require_relative 'helper'
-require 'rubygems/commands/dependency_command'
+require_relative "helper"
+require "rubygems/commands/dependency_command"
 
 class TestGemCommandsDependencyCommand < Gem::TestCase
   def setup
@@ -11,9 +11,9 @@ class TestGemCommandsDependencyCommand < Gem::TestCase
   end
 
   def test_execute
-    quick_gem 'foo' do |gem|
-      gem.add_dependency 'bar', '> 1'
-      gem.add_dependency 'baz', '> 1'
+    quick_gem "foo" do |gem|
+      gem.add_dependency "bar", "> 1"
+      gem.add_dependency "baz", "> 1"
     end
 
     @cmd.options[:args] = %w[foo]
@@ -24,16 +24,16 @@ class TestGemCommandsDependencyCommand < Gem::TestCase
 
     assert_equal "Gem foo-2\n  bar (> 1)\n  baz (> 1)\n\n",
                  @stub_ui.output
-    assert_equal '', @stub_ui.error
+    assert_equal "", @stub_ui.error
   end
 
   def test_execute_no_args
-    install_specs util_spec 'x', '2'
+    install_specs util_spec "x", "2"
 
     spec_fetcher do |fetcher|
-      fetcher.spec 'a', 1
-      fetcher.spec 'a', '2.a'
-      fetcher.spec 'dep_x', 1, 'x' => '>= 1'
+      fetcher.spec "a", 1
+      fetcher.spec "a", "2.a"
+      fetcher.spec "dep_x", 1, "x" => ">= 1"
       fetcher.legacy_platform
     end
 
@@ -58,7 +58,7 @@ Gem x-2
     EOF
 
     assert_equal expected, @stub_ui.output
-    assert_equal '', @stub_ui.error
+    assert_equal "", @stub_ui.error
   end
 
   def test_execute_no_match
@@ -71,14 +71,14 @@ Gem x-2
     end
 
     assert_equal "No gems found matching foo (>= 0)\n", @stub_ui.output
-    assert_equal '', @stub_ui.error
+    assert_equal "", @stub_ui.error
   end
 
   def test_execute_pipe_format
-    spec = util_spec 'foo' do |gem|
-      gem.add_dependency 'bar', '> 1'
+    spec = util_spec "foo" do |gem|
+      gem.add_dependency "bar", "> 1"
     end
-    install_specs util_spec 'bar', 2
+    install_specs util_spec "bar", 2
     install_specs spec
 
     @cmd.options[:args] = %w[foo]
@@ -89,15 +89,15 @@ Gem x-2
     end
 
     assert_equal "bar --version '> 1'\n", @stub_ui.output
-    assert_equal '', @stub_ui.error
+    assert_equal "", @stub_ui.error
   end
 
   def test_execute_regexp
     spec_fetcher do |fetcher|
-      fetcher.spec 'a',      1
-      fetcher.spec 'a',      '2.a'
-      fetcher.spec 'a_evil', 9
-      fetcher.spec 'b',      2
+      fetcher.spec "a",      1
+      fetcher.spec "a",      "2.a"
+      fetcher.spec "a_evil", 9
+      fetcher.spec "b",      2
     end
 
     @cmd.options[:args] = %w[[ab]]
@@ -118,17 +118,17 @@ Gem b-2
     EOF
 
     assert_equal expected, @stub_ui.output
-    assert_equal '', @stub_ui.error
+    assert_equal "", @stub_ui.error
   end
 
   def test_execute_reverse
     # FIX: this shouldn't need to write out, but fails if you switch it
-    quick_gem 'foo' do |gem|
-      gem.add_dependency 'bar', '> 1'
+    quick_gem "foo" do |gem|
+      gem.add_dependency "bar", "> 1"
     end
 
-    quick_gem 'baz' do |gem|
-      gem.add_dependency 'foo'
+    quick_gem "baz" do |gem|
+      gem.add_dependency "foo"
     end
 
     @cmd.options[:args] = %w[foo]
@@ -147,7 +147,7 @@ Gem foo-2
     EOF
 
     assert_equal expected, @stub_ui.output
-    assert_equal '', @stub_ui.error
+    assert_equal "", @stub_ui.error
   end
 
   def test_execute_reverse_remote
@@ -165,15 +165,15 @@ Gem foo-2
 ERROR:  Only reverse dependencies for local gems are supported.
     EOF
 
-    assert_equal '', @stub_ui.output
+    assert_equal "", @stub_ui.output
     assert_equal expected, @stub_ui.error
   end
 
   def test_execute_remote
-    install_specs util_spec 'bar', '2'
+    install_specs util_spec "bar", "2"
 
     spec_fetcher do |fetcher|
-      fetcher.spec 'foo', 2, 'bar' => '> 1'
+      fetcher.spec "foo", 2, "bar" => "> 1"
     end
 
     @cmd.options[:args] = %w[foo]
@@ -184,7 +184,7 @@ ERROR:  Only reverse dependencies for local gems are supported.
     end
 
     assert_equal "Gem foo-2\n  bar (> 1)\n\n", @stub_ui.output
-    assert_equal '', @stub_ui.error
+    assert_equal "", @stub_ui.error
   end
 
   def test_execute_remote_version
@@ -192,25 +192,25 @@ ERROR:  Only reverse dependencies for local gems are supported.
     Gem::RemoteFetcher.fetcher = @fetcher
 
     spec_fetcher do |fetcher|
-      fetcher.spec 'a', 1
-      fetcher.spec 'a', 2
+      fetcher.spec "a", 1
+      fetcher.spec "a", 2
     end
 
     @cmd.options[:args] = %w[a]
     @cmd.options[:domain] = :remote
-    @cmd.options[:version] = req '= 1'
+    @cmd.options[:version] = req "= 1"
 
     use_ui @stub_ui do
       @cmd.execute
     end
 
     assert_equal "Gem a-1\n\n", @stub_ui.output
-    assert_equal '', @stub_ui.error
+    assert_equal "", @stub_ui.error
   end
 
   def test_execute_prerelease
     spec_fetcher do |fetcher|
-      fetcher.spec 'a', '2.a'
+      fetcher.spec "a", "2.a"
     end
 
     @cmd.options[:args] = %w[a]
@@ -222,6 +222,6 @@ ERROR:  Only reverse dependencies for local gems are supported.
     end
 
     assert_equal "Gem a-2.a\n\n", @stub_ui.output
-    assert_equal '', @stub_ui.error
+    assert_equal "", @stub_ui.error
   end
 end

data/test/rubygems/test_gem_commands_environment_command.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
-require_relative 'helper'
-require 'rubygems/commands/environment_command'
+require_relative "helper"
+require "rubygems/commands/environment_command"
 
 class TestGemCommandsEnvironmentCommand < Gem::TestCase
   def setup
@@ -11,9 +11,9 @@ class TestGemCommandsEnvironmentCommand < Gem::TestCase
 
   def test_execute
     orig_sources = Gem.sources.dup
-    orig_path, ENV['PATH'] = ENV['PATH'], %w[/usr/local/bin /usr/bin /bin].join(File::PATH_SEPARATOR)
+    orig_path, ENV["PATH"] = ENV["PATH"], %w[/usr/local/bin /usr/bin /bin].join(File::PATH_SEPARATOR)
     Gem.sources.replace %w[http://gems.example.com]
-    Gem.configuration['gemcutter_key'] = 'blah'
+    Gem.configuration["gemcutter_key"] = "blah"
 
     @cmd.send :handle_options, %w[]
 
@@ -25,6 +25,8 @@ class TestGemCommandsEnvironmentCommand < Gem::TestCase
     assert_match %r{RUBY VERSION: \d+\.\d+\.\d+ \(.*\) \[.*\]}, @ui.output
     assert_match %r{INSTALLATION DIRECTORY: #{Regexp.escape @gemhome}},
                  @ui.output
+    assert_match %r{USER INSTALLATION DIRECTORY: #{Regexp.escape Gem.user_dir}},
+                 @ui.output
     assert_match %r{RUBYGEMS PREFIX: }, @ui.output
     assert_match %r{RUBY EXECUTABLE:.*#{RbConfig::CONFIG['ruby_install_name']}},
                  @ui.output
@@ -49,7 +51,7 @@ class TestGemCommandsEnvironmentCommand < Gem::TestCase
 
   ensure
     Gem.sources.replace orig_sources
-    ENV['PATH'] = orig_path
+    ENV["PATH"] = orig_path
   end
 
   def test_execute_gemdir
@@ -60,7 +62,29 @@ class TestGemCommandsEnvironmentCommand < Gem::TestCase
     end
 
     assert_equal "#{@gemhome}\n", @ui.output
-    assert_equal '', @ui.error
+    assert_equal "", @ui.error
+  end
+
+  def test_execute_user_gemdir
+    @cmd.send :handle_options, %w[user_gemdir]
+
+    use_ui @ui do
+      @cmd.execute
+    end
+
+    assert_equal "#{Gem.user_dir}\n", @ui.output
+    assert_equal "", @ui.error
+  end
+
+  def test_execute_user_gemhome
+    @cmd.send :handle_options, %w[user_gemhome]
+
+    use_ui @ui do
+      @cmd.execute
+    end
+
+    assert_equal "#{Gem.user_dir}\n", @ui.output
+    assert_equal "", @ui.error
   end
 
   def test_execute_gempath
@@ -71,13 +95,13 @@ class TestGemCommandsEnvironmentCommand < Gem::TestCase
     end
 
     assert_equal "#{@gemhome}\n", @ui.output
-    assert_equal '', @ui.error
+    assert_equal "", @ui.error
   end
 
   def test_execute_gempath_multiple
     Gem.clear_paths
     path = [@gemhome, "#{@gemhome}2"].join File::PATH_SEPARATOR
-    ENV['GEM_PATH'] = path
+    ENV["GEM_PATH"] = path
 
     @cmd.send :handle_options, %w[gempath]
 
@@ -86,7 +110,7 @@ class TestGemCommandsEnvironmentCommand < Gem::TestCase
     end
 
     assert_equal "#{Gem.path.join File::PATH_SEPARATOR}\n", @ui.output
-    assert_equal '', @ui.error
+    assert_equal "", @ui.error
   end
 
   def test_execute_remotesources
@@ -100,7 +124,7 @@ class TestGemCommandsEnvironmentCommand < Gem::TestCase
     end
 
     assert_equal "http://gems.example.com\n", @ui.output
-    assert_equal '', @ui.error
+    assert_equal "", @ui.error
 
   ensure
     Gem.sources.replace orig_sources
@@ -115,8 +139,8 @@ class TestGemCommandsEnvironmentCommand < Gem::TestCase
       end
     end
 
-    assert_equal '', @ui.output
-    assert_equal '', @ui.error
+    assert_equal "", @ui.output
+    assert_equal "", @ui.error
   end
 
   def test_execute_version
@@ -127,7 +151,7 @@ class TestGemCommandsEnvironmentCommand < Gem::TestCase
     end
 
     assert_equal "#{Gem::VERSION}\n", @ui.output
-    assert_equal '', @ui.error
+    assert_equal "", @ui.error
   end
 
   def test_execute_platform
@@ -138,6 +162,6 @@ class TestGemCommandsEnvironmentCommand < Gem::TestCase
     end
 
     assert_equal "#{Gem.platforms.join File::PATH_SEPARATOR}\n", @ui.output
-    assert_equal '', @ui.error
+    assert_equal "", @ui.error
   end
 end