rubygems-update 3.1.0 → 3.2.0.rc.1

data/test/rubygems/test_gem_available_set.rb

@@ -37,12 +37,12 @@ class TestGemAvailableSet < Gem::TestCase
 
     dep = Gem::Resolver::DependencyRequest.new dep('a'), nil
 
-    assert_equal %w[a-1], set.find_all(dep).map { |spec| spec.full_name }
+    assert_equal %w[a-1], set.find_all(dep).map {|spec| spec.full_name }
 
     dep = Gem::Resolver::DependencyRequest.new dep('a', '>= 0.a'), nil
 
     assert_equal %w[a-1 a-1.a],
-                 set.find_all(dep).map { |spec| spec.full_name }.sort
+                 set.find_all(dep).map {|spec| spec.full_name }.sort
   end
 
   def test_match_platform
@@ -123,7 +123,7 @@ class TestGemAvailableSet < Gem::TestCase
     set.add a2a, @source
     set.add a2, @source
 
-    g = set.sorted.map { |t| t.spec }
+    g = set.sorted.map {|t| t.spec }
 
     assert_equal [a3a, a2, a2a, a1, a1a], g
   end

data/test/rubygems/test_gem_bundler_version_finder.rb

@@ -78,6 +78,24 @@ class TestGemBundlerVersionFinder < Gem::TestCase
     end
   end
 
+  def test_deleted_directory
+    skip "Cannot perform this test on windows" if win_platform?
+    skip "Cannot perform this test on Solaris" if /solaris/ =~ RUBY_PLATFORM
+    require "tmpdir"
+
+    orig_dir = Dir.pwd
+
+    begin
+      Dir.mktmpdir("some_dir") do |dir|
+        Dir.chdir(dir)
+      end
+    ensure
+      Dir.chdir(orig_dir)
+    end
+
+    assert_nil bvf.bundler_version_with_reason
+  end
+
   def test_compatible
     assert bvf.compatible?(util_spec("foo"))
     assert bvf.compatible?(util_spec("bundler", 1.1))
@@ -102,7 +120,7 @@ class TestGemBundlerVersionFinder < Gem::TestCase
 
   def test_filter
     versions = %w[1 1.0 1.0.1.1 2 2.a 2.0 2.1.1 3 3.a 3.0 3.1.1]
-    specs = versions.map { |v| util_spec("bundler", v) }
+    specs = versions.map {|v| util_spec("bundler", v) }
 
     assert_equal %w[1 1.0 1.0.1.1 2 2.a 2.0 2.1.1 3 3.a 3.0 3.1.1], util_filter_specs(specs).map(&:version).map(&:to_s)
 

data/test/rubygems/test_gem_command.rb

@@ -34,7 +34,7 @@ class TestGemCommand < Gem::TestCase
 
   def test_self_add_specific_extra_args
     added_args = %w[--all]
-    @cmd.add_option('--all') { |v,o| }
+    @cmd.add_option('--all') {|v,o| }
 
     Gem::Command.add_specific_extra_args @cmd_name, added_args
 
@@ -57,6 +57,27 @@ class TestGemCommand < Gem::TestCase
     assert_equal [], h
   end
 
+  def test_self_extra_args
+    verbose, $VERBOSE, separator = $VERBOSE, nil, $;
+    extra_args = Gem::Command.extra_args
+
+    Gem::Command.extra_args = %w[--all]
+    assert_equal %w[--all], Gem::Command.extra_args
+
+    Gem::Command.extra_args = "--file --help"
+    assert_equal %w[--file --help], Gem::Command.extra_args
+
+    $; = "="
+
+    Gem::Command.extra_args = "--awesome=true --verbose"
+    assert_equal %w[--awesome=true --verbose], Gem::Command.extra_args
+
+  ensure
+    Gem::Command.extra_args = extra_args
+    $; = separator
+    $VERBOSE = verbose
+  end
+
   def test_basic_accessors
     assert_equal "doit", @cmd.command
     assert_equal "gem doit", @cmd.program_name
@@ -82,7 +103,7 @@ class TestGemCommand < Gem::TestCase
       @cmd.invoke
     end
 
-    assert_match %r|Usage: gem doit|, @ui.output
+    assert_match %r{Usage: gem doit}, @ui.output
   end
 
   def test_invoke
@@ -168,7 +189,7 @@ class TestGemCommand < Gem::TestCase
       @cmd.invoke '-h'
     end
 
-    assert_match %r|Usage: gem doit|, @ui.output
+    assert_match %r{Usage: gem doit}, @ui.output
   end
 
   def test_option_recognition

data/test/rubygems/test_gem_command_manager.rb

@@ -224,26 +224,34 @@ class TestGemCommandManager < Gem::TestCase
     end
 
     #check defaults
-    @command_manager.process_args %w[query]
+    Gem::Deprecate.skip_during do
+      @command_manager.process_args %w[query]
+    end
     assert_equal(//, check_options[:name])
     assert_equal :local, check_options[:domain]
     assert_equal false, check_options[:details]
 
     #check settings
     check_options = nil
-    @command_manager.process_args %w[query --name foobar --local --details]
+    Gem::Deprecate.skip_during do
+      @command_manager.process_args %w[query --name foobar --local --details]
+    end
     assert_equal(/foobar/i, check_options[:name])
     assert_equal :local, check_options[:domain]
     assert_equal true, check_options[:details]
 
     #remote domain
     check_options = nil
-    @command_manager.process_args %w[query --remote]
+    Gem::Deprecate.skip_during do
+      @command_manager.process_args %w[query --remote]
+    end
     assert_equal :remote, check_options[:domain]
 
     #both (local/remote) domains
     check_options = nil
-    @command_manager.process_args %w[query --both]
+    Gem::Deprecate.skip_during do
+      @command_manager.process_args %w[query --both]
+    end
     assert_equal :both, check_options[:domain]
   end
 
@@ -268,4 +276,29 @@ class TestGemCommandManager < Gem::TestCase
     assert_equal Dir.pwd, check_options[:install_dir]
   end
 
+  def test_deprecated_command
+    require 'rubygems/command'
+    foo_command = Class.new(Gem::Command) do
+      extend Gem::Deprecate
+
+      rubygems_deprecate_command
+
+      def execute
+        say "pew pew!"
+      end
+    end
+
+    Gem::Commands.send(:const_set, :FooCommand, foo_command)
+    @command_manager.register_command(:foo, foo_command.new("foo"))
+
+    use_ui @ui do
+      @command_manager.process_args(%w[foo])
+    end
+
+    assert_equal "pew pew!\n", @ui.output
+    assert_match(/WARNING:  foo command is deprecated. It will be removed in Rubygems [0-9]+/, @ui.error)
+  ensure
+    Gem::Commands.send(:remove_const, :FooCommand)
+  end
+
 end

data/test/rubygems/test_gem_commands_build_command.rb

@@ -17,8 +17,13 @@ class TestGemCommandsBuildCommand < Gem::TestCase
 
     readme_file = File.join(@tempdir, 'README.md')
 
-    File.open readme_file, 'w' do |f|
-      f.write 'My awesome gem'
+    begin
+      umask_orig = File.umask(2)
+      File.open readme_file, 'w' do |f|
+        f.write 'My awesome gem'
+      end
+    ensure
+      File.umask(umask_orig)
     end
 
     @gem = util_spec 'some_gem' do |s|
@@ -122,6 +127,23 @@ class TestGemCommandsBuildCommand < Gem::TestCase
     util_test_build_gem @gem
   end
 
+  def test_execute_rubyforge_project_warning
+    rubyforge_gemspec = File.join SPECIFICATIONS, "rubyforge-0.0.1.gemspec"
+
+    @cmd.options[:args] = [rubyforge_gemspec]
+
+    use_ui @ui do
+      Dir.chdir @tempdir do
+        @cmd.execute
+      end
+    end
+
+    error = @ui.error.split("\n")
+    assert_equal "WARNING:  rubyforge_project= is deprecated and ignored. Please remove this from your gemspec to ensure that your gem continues to build in the future.", error.shift
+    assert_equal "WARNING:  See https://guides.rubygems.org/specification-reference/ for help", error.shift
+    assert_equal [], error
+  end
+
   def test_execute_strict_with_warnings
     bad_gem = util_spec 'some_bad_gem' do |s|
       s.files = ['README.md']
@@ -147,7 +169,7 @@ class TestGemCommandsBuildCommand < Gem::TestCase
     error = @ui.error.split "\n"
     assert_equal "WARNING:  licenses is empty, but is recommended.  Use a license identifier from", error.shift
     assert_equal "http://spdx.org/licenses or 'Nonstandard' for a nonstandard license.", error.shift
-    assert_equal "WARNING:  See http://guides.rubygems.org/specification-reference/ for help", error.shift
+    assert_equal "WARNING:  See https://guides.rubygems.org/specification-reference/ for help", error.shift
     assert_equal [], error
 
     gem_file = File.join @tempdir, File.basename(@gem.cache_file)

data/test/rubygems/test_gem_commands_cert_command.rb

@@ -675,12 +675,12 @@ ERROR:  --private-key not specified and ~/.gem/gem-private_key.pem does not exis
     ]
 
     assert_equal [PUBLIC_CERT.to_pem, ALTERNATE_CERT.to_pem],
-                 @cmd.options[:add].map { |cert| cert.to_pem }
+                 @cmd.options[:add].map {|cert| cert.to_pem }
 
     assert_equal %w[nobody example], @cmd.options[:remove]
 
     assert_equal %w[nobody@example other@example],
-                 @cmd.options[:build].map { |name| name.to_s }
+                 @cmd.options[:build].map {|name| name.to_s }
 
     assert_equal ['', 'example'], @cmd.options[:list]
   end

data/test/rubygems/test_gem_commands_cleanup_command.rb

@@ -220,7 +220,7 @@ class TestGemCommandsCleanupCommand < Gem::TestCase
       @cmd.execute
     end
 
-    assert_match %r%^Skipped default gems: b-2%, @ui.output
+    assert_match %r{^Skipped default gems: b-2}, @ui.output
     assert_empty @ui.error
   end
 

data/test/rubygems/test_gem_commands_contents_command.rb

@@ -27,8 +27,8 @@ class TestGemCommandsContentsCommand < Gem::TestCase
       @cmd.execute
     end
 
-    assert_match %r|lib/foo\.rb|, @ui.output
-    assert_match %r|Rakefile|, @ui.output
+    assert_match %r{lib/foo\.rb}, @ui.output
+    assert_match %r{Rakefile}, @ui.output
     assert_equal "", @ui.error
   end
 
@@ -42,9 +42,9 @@ class TestGemCommandsContentsCommand < Gem::TestCase
       @cmd.execute
     end
 
-    assert_match %r|lib/foo\.rb|, @ui.output
-    assert_match %r|lib/bar\.rb|, @ui.output
-    assert_match %r|Rakefile|, @ui.output
+    assert_match %r{lib/foo\.rb}, @ui.output
+    assert_match %r{lib/bar\.rb}, @ui.output
+    assert_match %r{Rakefile}, @ui.output
     assert_equal "", @ui.error
   end
 
@@ -57,8 +57,8 @@ class TestGemCommandsContentsCommand < Gem::TestCase
       end
     end
 
-    assert_match %r|Unable to find gem 'foo' in default gem paths|, @ui.output
-    assert_match %r|Directories searched:|, @ui.output
+    assert_match %r{Unable to find gem 'foo' in default gem paths}, @ui.output
+    assert_match %r{Directories searched:}, @ui.output
     assert_equal "", @ui.error
   end
 
@@ -71,8 +71,8 @@ class TestGemCommandsContentsCommand < Gem::TestCase
       @cmd.execute
     end
 
-    assert_match %r|lib/foo\.rb|, @ui.output
-    assert_match %r|Rakefile|, @ui.output
+    assert_match %r{lib/foo\.rb}, @ui.output
+    assert_match %r{Rakefile}, @ui.output
     assert_equal "", @ui.error
   end
 
@@ -86,8 +86,8 @@ class TestGemCommandsContentsCommand < Gem::TestCase
       @cmd.execute
     end
 
-    assert_match %r|lib/foo\.rb|, @ui.output
-    refute_match %r|Rakefile|, @ui.output
+    assert_match %r{lib/foo\.rb}, @ui.output
+    refute_match %r{Rakefile}, @ui.output
 
     assert_equal "", @ui.error
   end
@@ -105,6 +105,22 @@ class TestGemCommandsContentsCommand < Gem::TestCase
     assert_empty @ui.error
   end
 
+  def test_execute_missing_version
+    @cmd.options[:args] = %w[foo]
+    @cmd.options[:version] = Gem::Requirement.new '= 2'
+
+    gem 'foo', 1
+
+    assert_raises Gem::MockGemUi::TermError do
+      use_ui @ui do
+        @cmd.execute
+      end
+    end
+
+    assert_match "Unable to find gem 'foo'", @ui.output
+    assert_empty @ui.error
+  end
+
   def test_execute_missing_multiple
     @cmd.options[:args] = %w[foo bar]
 
@@ -130,9 +146,9 @@ class TestGemCommandsContentsCommand < Gem::TestCase
       @cmd.execute
     end
 
-    assert_match %r|lib/foo\.rb|, @ui.output
-    assert_match %r|lib/bar\.rb|, @ui.output
-    assert_match %r|Rakefile|, @ui.output
+    assert_match %r{lib/foo\.rb}, @ui.output
+    assert_match %r{lib/bar\.rb}, @ui.output
+    assert_match %r{Rakefile}, @ui.output
     assert_equal "", @ui.error
   end
 
@@ -152,6 +168,23 @@ class TestGemCommandsContentsCommand < Gem::TestCase
     assert_equal "", @ui.error
   end
 
+  def test_execute_show_install_dir_latest_version
+    @cmd.options[:args] = %w[foo]
+    @cmd.options[:show_install_dir] = true
+
+    gem 'foo', 1
+    gem 'foo', 2
+
+    use_ui @ui do
+      @cmd.execute
+    end
+
+    expected = File.join @gemhome, 'gems', 'foo-2'
+
+    assert_equal "#{expected}\n", @ui.output
+    assert_equal "", @ui.error
+  end
+
   def test_execute_show_install_dir_version
     @cmd.options[:args] = %w[foo]
     @cmd.options[:show_install_dir] = true
@@ -207,7 +240,7 @@ lib/foo.rb
       [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"
+    ].sort.map{|a|File.join a }.join "\n"
 
     assert_equal expected, @ui.output.chomp
     assert_equal "", @ui.error

data/test/rubygems/test_gem_commands_environment_command.rb

@@ -22,29 +22,29 @@ class TestGemCommandsEnvironmentCommand < Gem::TestCase
       @cmd.execute
     end
 
-    assert_match %r|RUBYGEMS VERSION: (\d\.)+\d|, @ui.output
-    assert_match %r|RUBY VERSION: \d+\.\d+\.\d+ \(.*\) \[.*\]|, @ui.output
-    assert_match %r|INSTALLATION DIRECTORY: #{Regexp.escape @gemhome}|,
+    assert_match %r{RUBYGEMS VERSION: (\d\.)+\d}, @ui.output
+    assert_match %r{RUBY VERSION: \d+\.\d+\.\d+ \(.*\) \[.*\]}, @ui.output
+    assert_match %r{INSTALLATION DIRECTORY: #{Regexp.escape @gemhome}},
                  @ui.output
-    assert_match %r|RUBYGEMS PREFIX: |, @ui.output
-    assert_match %r|RUBY EXECUTABLE:.*#{RbConfig::CONFIG['ruby_install_name']}|,
+    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
-    assert_match %r|- #{Gem::Platform.local}|, @ui.output
-    assert_match %r|GEM PATHS:|, @ui.output
-    assert_match %r|- #{Regexp.escape @gemhome}|, @ui.output
-    assert_match %r|GEM CONFIGURATION:|, @ui.output
-    assert_match %r|"gemcutter_key" => "\*\*\*\*"|, @ui.output
-    assert_match %r|:verbose => |, @ui.output
-    assert_match %r|REMOTE SOURCES:|, @ui.output
-
-    assert_match %r|- SHELL PATH:|,     @ui.output
-    assert_match %r|- /usr/local/bin$|, @ui.output
-    assert_match %r|- /usr/bin$|,       @ui.output
-    assert_match %r|- /bin$|,           @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
+    assert_match %r{- #{Gem::Platform.local}}, @ui.output
+    assert_match %r{GEM PATHS:}, @ui.output
+    assert_match %r{- #{Regexp.escape @gemhome}}, @ui.output
+    assert_match %r{GEM CONFIGURATION:}, @ui.output
+    assert_match %r{"gemcutter_key" => "\*\*\*\*"}, @ui.output
+    assert_match %r{:verbose => }, @ui.output
+    assert_match %r{REMOTE SOURCES:}, @ui.output
+
+    assert_match %r{- SHELL PATH:},     @ui.output
+    assert_match %r{- /usr/local/bin$}, @ui.output
+    assert_match %r{- /usr/bin$},       @ui.output
+    assert_match %r{- /bin$},           @ui.output
 
     assert_empty @ui.error
 

data/test/rubygems/test_gem_commands_generate_index_command.rb

@@ -3,10 +3,6 @@ require 'rubygems/test_case'
 require 'rubygems/indexer'
 require 'rubygems/commands/generate_index_command'
 
-unless defined?(Builder::XChar)
-  warn "generate_index tests are being skipped.  Install builder gem."
-end
-
 class TestGemCommandsGenerateIndexCommand < Gem::TestCase
 
   def setup
@@ -83,4 +79,4 @@ class TestGemCommandsGenerateIndexCommand < Gem::TestCase
       @ui.error
   end
 
-end if defined?(Builder::XChar)
+end

data/test/rubygems/test_gem_commands_info_command.rb

@@ -33,12 +33,12 @@ class TestGemCommandsInfoCommand < Gem::TestCase
       @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 %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