rubygems-update 2.5.1 → 2.5.2

data/test/rubygems/test_gem_local_remote_options.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems/local_remote_options'
 require 'rubygems/command'

data/test/rubygems/test_gem_name_tuple.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems/name_tuple'
 

data/test/rubygems/test_gem_package.rb

@@ -1,4 +1,5 @@
 # coding: UTF-8
+# frozen_string_literal: true
 
 require 'rubygems/package/tar_test_case'
 require 'rubygems/simple_gem'
@@ -427,19 +428,25 @@ class TestGemPackage < Gem::Package::TarTestCase
                  "#{@destination} is not allowed", e.message)
   end
 
-  def test_extract_tar_gz_symlink_absolute
+  def test_extract_tar_gz_symlink_relative_path
+    skip 'symlink not supported' if Gem.win_platform?
+
     package = Gem::Package.new @gem
 
     tgz_io = util_tar_gz do |tar|
-      tar.add_symlink 'code.rb', '/absolute.rb', 0644
+      tar.add_file    'relative.rb', 0644 do |io| io.write 'hi' end
+      tar.mkdir       'lib',         0755
+      tar.add_symlink 'lib/foo.rb', '../relative.rb', 0644
     end
 
-    e = assert_raises Gem::Package::PathError do
-      package.extract_tar_gz tgz_io, @destination
-    end
+    package.extract_tar_gz tgz_io, @destination
 
-    assert_equal("installing into parent path /absolute.rb of " +
-                 "#{@destination} is not allowed", e.message)
+    extracted = File.join @destination, 'lib/foo.rb'
+    assert_path_exists extracted
+    assert_equal '../relative.rb',
+                 File.readlink(extracted)
+    assert_equal 'hi',
+                 File.read(extracted)
   end
 
   def test_extract_tar_gz_directory
@@ -489,7 +496,7 @@ class TestGemPackage < Gem::Package::TarTestCase
   def test_install_location
     package = Gem::Package.new @gem
 
-    file = 'file.rb'
+    file = 'file.rb'.dup
     file.taint
 
     destination = package.install_location file, @destination
@@ -529,7 +536,7 @@ class TestGemPackage < Gem::Package::TarTestCase
     skip 'no File.realpath on 1.8' if RUBY_VERSION < '1.9'
     package = Gem::Package.new @gem
 
-    file = 'foo//file.rb'
+    file = 'foo//file.rb'.dup
     file.taint
 
     destination = @destination.sub '/', '//'

data/test/rubygems/test_gem_package_old.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems/simple_gem'
 

data/test/rubygems/test_gem_package_tar_header.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'rubygems/package/tar_test_case'
 require 'rubygems/package'
 

data/test/rubygems/test_gem_package_tar_reader.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'rubygems/package/tar_test_case'
 require 'rubygems/package'
 

data/test/rubygems/test_gem_package_tar_reader_entry.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'rubygems/package/tar_test_case'
 require 'rubygems/package'
 
@@ -8,7 +9,7 @@ class TestGemPackageTarReaderEntry < Gem::Package::TarTestCase
 
     @contents = ('a'..'z').to_a.join * 100
 
-    @tar = ''
+    @tar = String.new
     @tar << tar_file_header("lib/foo", "", 0, @contents.size, Time.now)
     @tar << @contents
     @tar << "\0" * (512 - (@tar.size % 512))

data/test/rubygems/test_gem_package_tar_writer.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'rubygems/package/tar_test_case'
 require 'rubygems/package/tar_writer'
 require 'minitest/mock'

data/test/rubygems/test_gem_package_task.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems'
 begin

data/test/rubygems/test_gem_path_support.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems'
 require 'fileutils'

data/test/rubygems/test_gem_platform.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems/platform'
 require 'rbconfig'

data/test/rubygems/test_gem_rdoc.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'rubygems'
 require 'rubygems/test_case'
 require 'rubygems/rdoc'

data/test/rubygems/test_gem_remote_fetcher.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'rubygems/test_case'
 
 require 'webrick'

data/test/rubygems/test_gem_request.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems/request'
 require 'ostruct'

data/test/rubygems/test_gem_request_connection_pools.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems/request'
 require 'timeout'

data/test/rubygems/test_gem_request_set.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems/request_set'
 
@@ -354,7 +355,7 @@ ruby "0"
 
     assert_equal %w[a-1], names
 
-    assert_equal [@DR::BestSet, @DR::GitSet, @DR::VendorSet],
+    assert_equal [@DR::BestSet, @DR::GitSet, @DR::VendorSet, @DR::SourceSet],
                  rs.sets.map { |set| set.class }
   end
 
@@ -418,7 +419,7 @@ ruby "0"
 
     assert_equal ["a-1", "b-2"], names
 
-    assert_equal [@DR::BestSet, @DR::GitSet, @DR::VendorSet],
+    assert_equal [@DR::BestSet, @DR::GitSet, @DR::VendorSet, @DR::SourceSet],
                  rs.sets.map { |set| set.class }
   end
 

data/test/rubygems/test_gem_request_set_gem_dependency_api.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems/request_set'
 
@@ -51,22 +52,14 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase
   end
 
   def test_gempspec_with_multiple_runtime_deps
-    gda = Class.new(@GDA) do
-      # implement find_gemspec so we don't need one on the FS
-      def find_gemspec name, path
-        Gem::Specification.new do |s|
-          s.name = 'foo'
-          s.version = '1.0'
-          s.add_runtime_dependency 'bar', '>= 1.6.0', '< 1.6.4'
-        end
-      end
+    save_gemspec 'foo', '1.0' do |s|
+      s.add_runtime_dependency 'bar', '>= 1.6.0', '< 1.6.4'
     end
-    instance = gda.new @set, __FILE__
-    instance.gemspec
+    @gda.gemspec
     assert_equal %w{ foo bar }.sort, @set.dependencies.map(&:name).sort
     bar = @set.dependencies.find { |d| d.name == 'bar' }
-    assert_equal [[">=", Gem::Version.create('1.6.0')],
-                  ["<", Gem::Version.create('1.6.4')]], bar.requirement.requirements
+    assert_equal [["<", Gem::Version.create('1.6.4')],
+                  [">=", Gem::Version.create('1.6.0')]], bar.requirement.requirements.sort
   end
 
   def test_gemspec_without_group
@@ -144,7 +137,11 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase
   end
 
   def test_gem_git_branch
-    @gda.gem 'a', :git => 'git/a', :branch => 'other', :tag => 'v1'
+    _, err = capture_io do
+      @gda.gem 'a', :git => 'git/a', :branch => 'other', :tag => 'v1'
+    end
+    expected = "Gem dependencies file gem.deps.rb includes git reference for both ref/branch and tag but only ref/branch is used."
+    assert_match expected, err
 
     assert_equal [dep('a')], @set.dependencies
 
@@ -161,7 +158,11 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase
   end
 
   def test_gem_git_ref
-    @gda.gem 'a', :git => 'git/a', :ref => 'abcd123', :branch => 'other'
+    _, err = capture_io do
+      @gda.gem 'a', :git => 'git/a', :ref => 'abcd123', :branch => 'other'
+    end
+    expected = "Gem dependencies file gem.deps.rb includes git reference for both ref and branch but only ref is used."
+    assert_match expected, err
 
     assert_equal [dep('a')], @set.dependencies
 
@@ -470,11 +471,9 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase
   end
 
   def test_gemspec
-    spec = util_spec 'a', 1, 'b' => 2
-    spec.add_development_dependency 'c', 3
-
-    open 'a.gemspec', 'w' do |io|
-      io.write spec.to_ruby_for_cache
+    save_gemspec 'a', 1 do |s|
+      s.add_dependency 'b', 2
+      s.add_development_dependency 'c', 3
     end
 
     @gda.gemspec
@@ -506,11 +505,9 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase
   end
 
   def test_gemspec_development_group
-    spec = util_spec 'a', 1, 'b' => 2
-    spec.add_development_dependency 'c', 3
-
-    open 'a.gemspec', 'w' do |io|
-      io.write spec.to_ruby_for_cache
+    save_gemspec 'a', 1 do |s|
+      s.add_dependency 'b', 2
+      s.add_development_dependency 'c', 3
     end
 
     @gda.without_groups << :other
@@ -523,14 +520,12 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase
   end
 
   def test_gemspec_multiple
-    open 'a.gemspec', 'w' do |io|
-      spec = util_spec 'a', 1, 'b' => 2
-      io.write spec.to_ruby_for_cache
+    save_gemspec 'a', 1 do |s|
+      s.add_dependency 'b', 2
     end
 
-    open 'b.gemspec', 'w' do |io|
-      spec = util_spec 'b', 2, 'c' => 3
-      io.write spec.to_ruby_for_cache
+    save_gemspec 'b', 2 do |s|
+      s.add_dependency 'c', 3
     end
 
     e = assert_raises ArgumentError do
@@ -541,14 +536,12 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase
   end
 
   def test_gemspec_name
-    open 'a.gemspec', 'w' do |io|
-      spec = util_spec 'a', 1, 'b' => 2
-      io.write spec.to_ruby_for_cache
+    save_gemspec 'a', 1 do |s|
+      s.add_dependency 'b', 2
     end
 
-    open 'b.gemspec', 'w' do |io|
-      spec = util_spec 'b', 2, 'c' => 3
-      io.write spec.to_ruby_for_cache
+    save_gemspec 'b', 2 do |s|
+      s.add_dependency 'c', 3
     end
 
     @gda.gemspec :name => 'b'
@@ -557,10 +550,8 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase
   end
 
   def test_gemspec_named
-    spec = util_spec 'a', 1, 'b' => 2
-
-    open 'other.gemspec', 'w' do |io|
-      io.write spec.to_ruby_for_cache
+    save_gemspec 'a', 1 do |s|
+      s.add_dependency 'b', 2
     end
 
     @gda.gemspec
@@ -577,12 +568,10 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase
   end
 
   def test_gemspec_path
-    spec = util_spec 'a', 1, 'b' => 2
-
     FileUtils.mkdir 'other'
 
-    open 'other/a.gemspec', 'w' do |io|
-      io.write spec.to_ruby_for_cache
+    save_gemspec 'a', 1, 'other' do |s|
+      s.add_dependency 'b', 2
     end
 
     @gda.gemspec :path => 'other'

data/test/rubygems/test_gem_request_set_lockfile.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems/request_set'
 require 'rubygems/request_set/lockfile'

data/test/rubygems/test_gem_request_set_lockfile_parser.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems/request_set'
 require 'rubygems/request_set/lockfile'
@@ -245,10 +246,15 @@ DEPENDENCIES
 
     assert lockfile_set, 'found a LockSet'
 
-    assert_equal %w[a-2 a-2], lockfile_set.specs.map { |s| s.full_name }
+    assert_equal %w[a-2], lockfile_set.specs.map { |s| s.full_name }
 
-    assert_equal %w[https://gems.example/ https://other.example/],
-                 lockfile_set.specs.map { |s| s.source.uri.to_s }
+    if [].respond_to? :flat_map
+      assert_equal %w[https://gems.example/ https://other.example/],
+                   lockfile_set.specs.flat_map { |s| s.sources.map{ |src| src.uri.to_s } }
+    else # FIXME: remove when 1.8 is dropped
+      assert_equal %w[https://gems.example/ https://other.example/],
+                   lockfile_set.specs.map { |s| s.sources.map{ |src| src.uri.to_s } }.flatten(1)
+    end
   end
 
   def test_parse_GIT

data/test/rubygems/test_gem_request_set_lockfile_tokenizer.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems/request_set'
 require 'rubygems/request_set/lockfile'

data/test/rubygems/test_gem_requirement.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require "rubygems/requirement"
 

data/test/rubygems/test_gem_resolver.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'rubygems/test_case'
 
 class TestGemResolver < Gem::TestCase

data/test/rubygems/test_gem_resolver_activation_request.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'rubygems/test_case'
 
 class TestGemResolverActivationRequest < Gem::TestCase

data/test/rubygems/test_gem_resolver_api_set.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'rubygems/test_case'
 
 class TestGemResolverAPISet < Gem::TestCase

data/test/rubygems/test_gem_resolver_api_specification.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'rubygems/test_case'
 
 class TestGemResolverAPISpecification < Gem::TestCase

data/test/rubygems/test_gem_resolver_best_set.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'rubygems/test_case'
 
 class TestGemResolverBestSet < Gem::TestCase

data/test/rubygems/test_gem_resolver_composed_set.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'rubygems/test_case'
 
 class TestGemResolverComposedSet < Gem::TestCase

data/test/rubygems/test_gem_resolver_conflict.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'rubygems/test_case'
 
 class TestGemResolverConflict < Gem::TestCase

data/test/rubygems/test_gem_resolver_dependency_request.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'rubygems/test_case'
 
 class TestGemResolverDependencyRequest < Gem::TestCase

data/test/rubygems/test_gem_resolver_git_set.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'rubygems/test_case'
 
 class TestGemResolverGitSet < Gem::TestCase

data/test/rubygems/test_gem_resolver_git_specification.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems/installer'
 

data/test/rubygems/test_gem_resolver_index_set.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'rubygems/test_case'
 
 class TestGemResolverIndexSet < Gem::TestCase

data/test/rubygems/test_gem_resolver_index_specification.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems/available_set'
 

data/test/rubygems/test_gem_resolver_installed_specification.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'rubygems/test_case'
 
 class TestGemResolverInstalledSpecification < Gem::TestCase

data/test/rubygems/test_gem_resolver_installer_set.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'rubygems/test_case'
 
 class TestGemResolverInstallerSet < Gem::TestCase

data/test/rubygems/test_gem_resolver_local_specification.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems/available_set'