rubygems-update 2.7.11 → 3.0.0

data/test/rubygems/test_gem_commands_check_command.rb

@@ -10,7 +10,7 @@ class TestGemCommandsCheckCommand < Gem::TestCase
     @cmd = Gem::Commands::CheckCommand.new
   end
 
-  def gem name
+  def gem(name)
     spec = quick_gem name do |gem|
       gem.files = %W[lib/#{name}.rb Rakefile]
     end

data/test/rubygems/test_gem_commands_cleanup_command.rb

@@ -236,5 +236,31 @@ class TestGemCommandsCleanupCommand < Gem::TestCase
     refute_path_exists d_1.gem_dir
     refute_path_exists e_1.gem_dir
   end
-end
 
+  def test_execute_user_install
+    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'
+
+    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
+
+    d_1 = install_gem d_1
+    d_2 = install_gem d_2
+
+    Gem::Specification.dirs = [Gem.dir, Gem.user_dir]
+
+    @cmd.handle_options %w[--user-install]
+    @cmd.options[:args] = []
+
+    @cmd.execute
+
+    refute_path_exists c_1.gem_dir
+    assert_path_exists c_2.gem_dir
+
+    assert_path_exists d_1.gem_dir
+    assert_path_exists d_2.gem_dir
+  end
+end

data/test/rubygems/test_gem_commands_contents_command.rb

@@ -10,7 +10,7 @@ class TestGemCommandsContentsCommand < Gem::TestCase
     @cmd = Gem::Commands::ContentsCommand.new
   end
 
-  def gem name, version = 2
+  def gem(name, version = 2)
     spec = quick_gem name, version do |gem|
       gem.files = %W[lib/#{name}.rb Rakefile]
     end
@@ -237,4 +237,3 @@ lib/foo.rb
   end
 
 end
-

data/test/rubygems/test_gem_commands_dependency_command.rb

@@ -6,7 +6,7 @@ class TestGemCommandsDependencyCommand < Gem::TestCase
 
   def setup
     super
-
+    @stub_ui = Gem::MockGemUi.new
     @cmd = Gem::Commands::DependencyCommand.new
     @cmd.options[:domain] = :local
   end
@@ -19,17 +19,17 @@ class TestGemCommandsDependencyCommand < Gem::TestCase
 
     @cmd.options[:args] = %w[foo]
 
-    use_ui @ui do
+    use_ui @stub_ui do
       @cmd.execute
     end
 
     assert_equal "Gem foo-2\n  bar (> 1)\n  baz (> 1)\n\n",
-                 @ui.output
-    assert_equal '', @ui.error
+                 @stub_ui.output
+    assert_equal '', @stub_ui.error
   end
 
   def test_execute_no_args
-    install_specs new_spec 'x', '2'
+    install_specs util_spec 'x', '2'
 
     spec_fetcher do |fetcher|
       fetcher.spec 'a', 1
@@ -40,7 +40,7 @@ class TestGemCommandsDependencyCommand < Gem::TestCase
 
     @cmd.options[:args] = []
 
-    use_ui @ui do
+    use_ui @stub_ui do
       @cmd.execute
     end
 
@@ -58,21 +58,21 @@ Gem x-2
 
     EOF
 
-    assert_equal expected, @ui.output
-    assert_equal '', @ui.error
+    assert_equal expected, @stub_ui.output
+    assert_equal '', @stub_ui.error
   end
 
   def test_execute_no_match
     @cmd.options[:args] = %w[foo]
 
     assert_raises Gem::MockGemUi::TermError do
-      use_ui @ui do
+      use_ui @stub_ui do
         @cmd.execute
       end
     end
 
-    assert_equal "No gems found matching foo (>= 0)\n", @ui.output
-    assert_equal '', @ui.error
+    assert_equal "No gems found matching foo (>= 0)\n", @stub_ui.output
+    assert_equal '', @stub_ui.error
   end
 
   def test_execute_pipe_format
@@ -85,12 +85,12 @@ Gem x-2
     @cmd.options[:args] = %w[foo]
     @cmd.options[:pipe_format] = true
 
-    use_ui @ui do
+    use_ui @stub_ui do
       @cmd.execute
     end
 
-    assert_equal "bar --version '> 1'\n", @ui.output
-    assert_equal '', @ui.error
+    assert_equal "bar --version '> 1'\n", @stub_ui.output
+    assert_equal '', @stub_ui.error
   end
 
   def test_execute_regexp
@@ -103,7 +103,7 @@ Gem x-2
 
     @cmd.options[:args] = %w[/[ab]/]
 
-    use_ui @ui do
+    use_ui @stub_ui do
       @cmd.execute
     end
 
@@ -118,8 +118,8 @@ Gem b-2
 
     EOF
 
-    assert_equal expected, @ui.output
-    assert_equal '', @ui.error
+    assert_equal expected, @stub_ui.output
+    assert_equal '', @stub_ui.error
   end
 
   def test_execute_reverse
@@ -135,7 +135,7 @@ Gem b-2
     @cmd.options[:args] = %w[foo]
     @cmd.options[:reverse_dependencies] = true
 
-    use_ui @ui do
+    use_ui @stub_ui do
       @cmd.execute
     end
 
@@ -147,8 +147,8 @@ Gem foo-2
 
     EOF
 
-    assert_equal expected, @ui.output
-    assert_equal '', @ui.error
+    assert_equal expected, @stub_ui.output
+    assert_equal '', @stub_ui.error
   end
 
   def test_execute_reverse_remote
@@ -157,7 +157,7 @@ Gem foo-2
     @cmd.options[:domain] = :remote
 
     assert_raises Gem::MockGemUi::TermError do
-      use_ui @ui do
+      use_ui @stub_ui do
         @cmd.execute
       end
     end
@@ -166,12 +166,12 @@ Gem foo-2
 ERROR:  Only reverse dependencies for local gems are supported.
     EOF
 
-    assert_equal '', @ui.output
-    assert_equal expected, @ui.error
+    assert_equal '', @stub_ui.output
+    assert_equal expected, @stub_ui.error
   end
 
   def test_execute_remote
-    install_specs new_spec 'bar', '2'
+    install_specs util_spec 'bar', '2'
 
     spec_fetcher do |fetcher|
       fetcher.spec 'foo', 2, 'bar' => '> 1'
@@ -180,12 +180,12 @@ ERROR:  Only reverse dependencies for local gems are supported.
     @cmd.options[:args] = %w[foo]
     @cmd.options[:domain] = :remote
 
-    use_ui @ui do
+    use_ui @stub_ui do
       @cmd.execute
     end
 
-    assert_equal "Gem foo-2\n  bar (> 1)\n\n", @ui.output
-    assert_equal '', @ui.error
+    assert_equal "Gem foo-2\n  bar (> 1)\n\n", @stub_ui.output
+    assert_equal '', @stub_ui.error
   end
 
   def test_execute_remote_version
@@ -201,12 +201,12 @@ ERROR:  Only reverse dependencies for local gems are supported.
     @cmd.options[:domain] = :remote
     @cmd.options[:version] = req '= 1'
 
-    use_ui @ui do
+    use_ui @stub_ui do
       @cmd.execute
     end
 
-    assert_equal "Gem a-1\n\n", @ui.output
-    assert_equal '', @ui.error
+    assert_equal "Gem a-1\n\n", @stub_ui.output
+    assert_equal '', @stub_ui.error
   end
 
   def test_execute_prerelease
@@ -218,13 +218,12 @@ ERROR:  Only reverse dependencies for local gems are supported.
     @cmd.options[:domain] = :remote
     @cmd.options[:prerelease] = true
 
-    use_ui @ui do
+    use_ui @stub_ui do
       @cmd.execute
     end
 
-    assert_equal "Gem a-2.a\n\n", @ui.output
-    assert_equal '', @ui.error
+    assert_equal "Gem a-2.a\n\n", @stub_ui.output
+    assert_equal '', @stub_ui.error
   end
 
 end
-

data/test/rubygems/test_gem_commands_environment_command.rb

@@ -29,6 +29,7 @@ class TestGemCommandsEnvironmentCommand < Gem::TestCase
     assert_match %r|RUBYGEMS PREFIX: |, @ui.output
     assert_match %r|RUBY EXECUTABLE:.*#{RbConfig::CONFIG['ruby_install_name']}|,
                  @ui.output
+    assert_match %r|GIT EXECUTABLE: #{@cmd.send(:git_path)}|, @ui.output
     assert_match %r|SYSTEM CONFIGURATION DIRECTORY:|, @ui.output
     assert_match %r|EXECUTABLE DIRECTORY:|, @ui.output
     assert_match %r|RUBYGEMS PLATFORMS:|, @ui.output

data/test/rubygems/test_gem_commands_fetch_command.rb

@@ -124,4 +124,3 @@ class TestGemCommandsFetchCommand < Gem::TestCase
   end
 
 end
-

data/test/rubygems/test_gem_commands_generate_index_command.rb

@@ -48,4 +48,3 @@ class TestGemCommandsGenerateIndexCommand < Gem::TestCase
   end
 
 end if ''.respond_to? :to_xs
-

data/test/rubygems/test_gem_commands_help_command.rb

@@ -7,13 +7,16 @@ require "rubygems/command_manager"
 require File.expand_path('../rubygems_plugin', __FILE__)
 
 class TestGemCommandsHelpCommand < Gem::TestCase
+  # previously this was calc'd in setup, but 1.8.7 had
+  # intermittent failures, but no issues with above require
+  PLUGIN = File.expand_path('../rubygems_plugin.rb', __FILE__)
+
   def setup
     super
 
     @cmd = Gem::Commands::HelpCommand.new
 
-    load File.expand_path('../rubygems_plugin.rb', __FILE__) unless
-      Gem::Commands.const_defined? :InterruptCommand
+    load PLUGIN unless Gem::Commands.const_defined? :InterruptCommand
   end
 
   def test_gem_help_bad
@@ -45,7 +48,7 @@ class TestGemCommandsHelpCommand < Gem::TestCase
         assert_match(/\s+#{cmd}\s+\S+/, out)
       end
 
-      if defined?(OpenSSL::SSL) then
+      if defined?(OpenSSL::SSL)
         assert_empty err
 
         refute_match 'No command found for ', out
@@ -61,7 +64,7 @@ class TestGemCommandsHelpCommand < Gem::TestCase
     end
   end
 
-  def util_gem *args
+  def util_gem(*args)
     @cmd.options[:args] = args
 
     use_ui @ui do

data/test/rubygems/test_gem_commands_info_command.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+require 'rubygems/test_case'
+require 'rubygems/commands/info_command'
+
+class TestGemCommandsInfoCommand < Gem::TestCase
+
+  def setup
+    super
+
+    @cmd = Gem::Commands::InfoCommand.new
+  end
+
+  def gem(name, version = "1.0")
+    spec = quick_gem name do |gem|
+      gem.summary = "test gem"
+      gem.homepage = "https://github.com/rubygems/rubygems"
+      gem.files = %W[lib/#{name}.rb Rakefile]
+      gem.authors = ["Colby", "Jack"]
+      gem.license = "MIT"
+      gem.version = version
+    end
+    write_file File.join(*%W[gems #{spec.full_name} lib #{name}.rb])
+    write_file File.join(*%W[gems #{spec.full_name} Rakefile])
+    spec
+  end
+
+  def test_execute
+    @gem = gem "foo", "1.0.0"
+
+    @cmd.handle_options %w[foo]
+
+    use_ui @ui do
+      @cmd.execute
+    end
+
+    assert_match %r%#{@gem.name} \(#{@gem.version}\)\n%, @ui.output
+    assert_match %r%Authors: #{@gem.authors.join(', ')}\n%, @ui.output
+    assert_match %r%Homepage: #{@gem.homepage}\n%, @ui.output
+    assert_match %r%License: #{@gem.license}\n%, @ui.output
+    assert_match %r%Installed at: #{@gem.base_dir}\n%, @ui.output
+    assert_match %r%#{@gem.summary}\n%, @ui.output
+    assert_match "", @ui.error
+  end
+end

data/test/rubygems/test_gem_commands_install_command.rb

@@ -55,7 +55,7 @@ class TestGemCommandsInstallCommand < Gem::TestCase
     a2_pre = specs['a-2.a']
 
     @cmd.handle_options [a2_pre.name, '--version', a2_pre.version.to_s,
-                         "--no-ri", "--no-rdoc"]
+                         "--no-document"]
     assert @cmd.options[:prerelease]
     assert @cmd.options[:version].satisfied_by?(a2_pre.version)
 
@@ -201,6 +201,38 @@ class TestGemCommandsInstallCommand < Gem::TestCase
     assert_match(/ould not find a valid gem 'nonexistent'/, @ui.error)
   end
 
+  def test_execute_dependency_nonexistent
+    spec_fetcher do |fetcher|
+      fetcher.spec 'foo', 2, 'bar' => '0.5'
+    end
+
+    @cmd.options[:args] = ['foo']
+
+    use_ui @ui do
+      e = assert_raises Gem::MockGemUi::TermError do
+        @cmd.execute
+      end
+
+      assert_equal 2, e.exit_code
+    end
+
+    expected = <<-EXPECTED
+ERROR:  Could not find a valid gem 'bar' (= 0.5) (required by 'foo' (>= 0)) in any repository
+    EXPECTED
+
+    assert_equal expected, @ui.error
+  end
+
+  def test_execute_http_proxy
+    use_ui @ui do
+      e = assert_raises ArgumentError, @ui.error do
+        @cmd.handle_options %w[-p=foo.bar.com]
+      end
+
+      assert_match "Invalid uri scheme for =foo.bar.com\nPreface URLs with one of [\"http://\", \"https://\", \"file://\", \"s3://\"]", e.message
+    end
+  end
+
   def test_execute_bad_source
     spec_fetcher
 
@@ -361,6 +393,23 @@ ERROR:  Possible alternatives: non_existent_with_hint
     assert_equal %w[a-2.a], @cmd.installed_specs.map { |spec| spec.full_name }
   end
 
+  def test_execute_with_version_specified_by_colon
+    spec_fetcher do |fetcher|
+      fetcher.download 'a', 1
+      fetcher.download 'a', 2
+    end
+
+    @cmd.options[:args] = %w[a:1]
+
+    use_ui @ui do
+      assert_raises Gem::MockGemUi::SystemExitException, @ui.error do
+        @cmd.execute
+      end
+    end
+
+    assert_equal %w[a-1], @cmd.installed_specs.map { |spec| spec.full_name }
+  end
+
   def test_execute_prerelease_skipped_when_non_pre_available
     spec_fetcher do |fetcher|
       fetcher.gem 'a', '2.pre'
@@ -380,7 +429,6 @@ ERROR:  Possible alternatives: non_existent_with_hint
   end
 
   def test_execute_rdoc
-    skip if RUBY_VERSION <= "1.8.7"
     specs = spec_fetcher do |fetcher|
       fetcher.gem 'a', 2
     end
@@ -417,27 +465,26 @@ ERROR:  Possible alternatives: non_existent_with_hint
   end
 
   def test_execute_rdoc_with_path
-    skip if RUBY_VERSION <= "1.8.7"
     specs = spec_fetcher do |fetcher|
       fetcher.gem 'a', 2
     end
-  
+
     Gem.done_installing(&Gem::RDoc.method(:generation_hook))
-  
+
     @cmd.options[:document] = %w[rdoc ri]
     @cmd.options[:domain] = :local
     @cmd.options[:install_dir] = 'whatever'
-  
+
     a2 = specs['a-2']
     FileUtils.mv a2.cache_file, @tempdir
-  
+
     @cmd.options[:args] = %w[a]
-  
+
     use_ui @ui do
       # Don't use Dir.chdir with a block, it warnings a lot because
       # of a downstream Dir.chdir with a block
       old = Dir.getwd
-  
+
       begin
         Dir.chdir @tempdir
         assert_raises Gem::MockGemUi::SystemExitException, @ui.error do
@@ -447,9 +494,9 @@ ERROR:  Possible alternatives: non_existent_with_hint
         Dir.chdir old
       end
     end
-  
+
     wait_for_child_process_to_exit
-  
+
     assert_path_exists 'whatever/doc/a-2', 'documentation not installed'
   end
 
@@ -618,12 +665,32 @@ ERROR:  Possible alternatives: non_existent_with_hint
 
     assert_empty @cmd.installed_specs
 
-    msg = "ERROR:  Can't use --version w/ multiple gems. Use name:ver instead."
+    msg = "ERROR:  Can't use --version with multiple gems. You can specify multiple gems with" \
+      " version requirements using `gem install 'my_gem:1.0.0' 'my_other_gem:~>2.0.0'`"
 
     assert_empty @ui.output
     assert_equal msg, @ui.error.chomp
   end
 
+  def test_execute_two_version_specified_by_colon
+    spec_fetcher do |fetcher|
+      fetcher.gem 'a', 1
+      fetcher.gem 'a', 2
+      fetcher.gem 'b', 1
+      fetcher.gem 'b', 2
+    end
+
+    @cmd.options[:args] = %w[a:1 b:1]
+
+    use_ui @ui do
+      assert_raises Gem::MockGemUi::SystemExitException, @ui.error do
+        @cmd.execute
+      end
+    end
+
+    assert_equal %w[a-1 b-1], @cmd.installed_specs.map { |spec| spec.full_name }
+  end
+
   def test_execute_conservative
     spec_fetcher do |fetcher|
       fetcher.download 'b', 2