rubygems-update 3.2.0.rc.1 → 3.2.3

data/test/rubygems/test_gem_source.rb

@@ -4,7 +4,6 @@ require 'rubygems/source'
 require 'rubygems/indexer'
 
 class TestGemSource < Gem::TestCase
-
   def tuple(*args)
     Gem::NameTuple.new(*args)
   end
@@ -45,9 +44,9 @@ class TestGemSource < Gem::TestCase
 
   def test_dependency_resolver_set_bundler_api
     response = Net::HTTPResponse.new '1.1', 200, 'OK'
-    response.uri = URI('http://example') if response.respond_to? :uri
+    response.uri = URI('http://example')
 
-    @fetcher.data["#{@gem_repo}api/v1/dependencies"] = response
+    @fetcher.data[@gem_repo] = response
 
     set = @source.dependency_resolver_set
 
@@ -241,10 +240,14 @@ class TestGemSource < Gem::TestCase
     refute rubygems_source.typo_squatting?("rubysertgems.org")
   end
 
+  def test_typo_squatting_false_positive
+    rubygems_source = Gem::Source.new("https://rubygems.org")
+    refute rubygems_source.typo_squatting?("rubygems.org")
+  end
+
   def test_typo_squatting_custom_distance_threshold
     rubygems_source = Gem::Source.new("https://rubgems.org")
     distance_threshold = 5
     assert rubygems_source.typo_squatting?("rubysertgems.org", distance_threshold)
   end
-
 end

data/test/rubygems/test_gem_source_fetch_problem.rb

@@ -2,7 +2,6 @@
 require 'rubygems/test_case'
 
 class TestGemSourceFetchProblem < Gem::TestCase
-
   def test_exception
     source = Gem::Source.new @gem_repo
     error  = RuntimeError.new 'test'
@@ -24,5 +23,4 @@ class TestGemSourceFetchProblem < Gem::TestCase
 
     refute_match sf.wordy, 'secret'
   end
-
 end

data/test/rubygems/test_gem_source_git.rb

@@ -3,7 +3,6 @@ require 'rubygems/test_case'
 require 'rubygems/source'
 
 class TestGemSourceGit < Gem::TestCase
-
   def setup
     super
 
@@ -300,5 +299,4 @@ class TestGemSourceGit < Gem::TestCase
     assert_equal '291c4caac7feba8bb64c297987028acb3dde6cfe',
                  source.uri_hash
   end
-
 end

data/test/rubygems/test_gem_source_installed.rb

@@ -3,7 +3,6 @@ require 'rubygems/test_case'
 require 'rubygems/source'
 
 class TestGemSourceInstalled < Gem::TestCase
-
   def test_spaceship
     a1 = quick_gem 'a', '1'
     util_build_gem a1
@@ -32,5 +31,4 @@ class TestGemSourceInstalled < Gem::TestCase
     assert_equal(1, vendor.<=>(installed), 'vendor <=> installed')
     assert_equal(-1, installed.<=>(vendor), 'installed <=> vendor')
   end
-
 end

data/test/rubygems/test_gem_source_list.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
+require 'rubygems'
 require 'rubygems/source_list'
 require 'rubygems/test_case'
 
 class TestGemSourceList < Gem::TestCase
-
   def setup
     super
 
@@ -115,5 +115,4 @@ class TestGemSourceList < Gem::TestCase
     @sl.delete Gem::Source.new(@uri)
     assert_equal @sl.sources, []
   end
-
 end

data/test/rubygems/test_gem_source_local.rb

@@ -5,7 +5,6 @@ require 'rubygems/source'
 require 'fileutils'
 
 class TestGemSourceLocal < Gem::TestCase
-
   def setup
     super
 
@@ -104,5 +103,4 @@ class TestGemSourceLocal < Gem::TestCase
     assert_equal(-1, specific.<=>(local), 'specific <=> local')
     assert_equal(1, local.<=>(specific), 'local <=> specific')
   end
-
 end

data/test/rubygems/test_gem_source_lock.rb

@@ -2,7 +2,6 @@
 require 'rubygems/test_case'
 
 class TestGemSourceLock < Gem::TestCase
-
   def test_fetch_spec
     spec_fetcher do |fetcher|
       fetcher.spec 'a', 1
@@ -110,5 +109,4 @@ class TestGemSourceLock < Gem::TestCase
 
     assert_equal URI(@gem_repo), lock.uri
   end
-
 end

data/test/rubygems/test_gem_source_specific_file.rb

@@ -3,7 +3,6 @@ require 'rubygems/test_case'
 require 'rubygems/source'
 
 class TestGemSourceSpecificFile < Gem::TestCase
-
   def setup
     super
 
@@ -73,5 +72,4 @@ class TestGemSourceSpecificFile < Gem::TestCase
     assert_equal(0, a1_source.<=>(a1_source), 'a1_source <=> a1_source')
     assert_equal(1, a2_source.<=>(a1_source), 'a2_source <=> a1_source')
   end
-
 end

data/test/rubygems/test_gem_source_subpath_problem.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+require 'rubygems/test_case'
+require 'rubygems/source'
+
+class TestGemSourceSubpathProblem < Gem::TestCase
+  def tuple(*args)
+    Gem::NameTuple.new(*args)
+  end
+
+  def setup
+    super
+
+    @gem_repo = "http://gems.example.com/private"
+
+    spec_fetcher
+
+    @source = Gem::Source.new(@gem_repo)
+
+    util_make_gems
+  end
+
+  def test_dependency_resolver_set
+    response = Net::HTTPResponse.new '1.1', 200, 'OK'
+    response.uri = URI('http://example')
+
+    @fetcher.data["#{@gem_repo}/"] = response
+
+    set = @source.dependency_resolver_set
+
+    assert_kind_of Gem::Resolver::APISet, set
+  end
+
+  def test_fetch_spec
+    @fetcher.data["#{@gem_repo}/#{Gem::MARSHAL_SPEC_DIR}#{@a1.spec_name}.rz"] = Zlib::Deflate.deflate(Marshal.dump(@a1))
+
+    spec = @source.fetch_spec tuple('a', Gem::Version.new(1), 'ruby')
+    assert_equal @a1.full_name, spec.full_name
+  end
+
+  def test_load_specs
+    @fetcher.data["#{@gem_repo}/latest_specs.#{Gem.marshal_version}.gz"] = util_gzip(Marshal.dump([
+      Gem::NameTuple.new(@a1.name, @a1.version, 'ruby'),
+      Gem::NameTuple.new(@b2.name, @b2.version, 'ruby'),
+    ]))
+
+    released = @source.load_specs(:latest).map {|spec| spec.full_name }
+    assert_equal %W[a-1 b-2], released
+  end
+end

data/test/rubygems/test_gem_source_vendor.rb

@@ -3,7 +3,6 @@ require 'rubygems/test_case'
 require 'rubygems/source'
 
 class TestGemSourceVendor < Gem::TestCase
-
   def test_initialize
     source = Gem::Source::Vendor.new 'vendor/foo'
 
@@ -27,5 +26,4 @@ class TestGemSourceVendor < Gem::TestCase
     assert_equal(1, vendor.<=>(installed), 'vendor <=> installed')
     assert_equal(-1, installed.<=>(vendor), 'installed <=> vendor')
   end
-
 end

data/test/rubygems/test_gem_spec_fetcher.rb

@@ -3,7 +3,6 @@ require 'rubygems/test_case'
 require 'rubygems/spec_fetcher'
 
 class TestGemSpecFetcher < Gem::TestCase
-
   def tuple(*args)
     Gem::NameTuple.new(*args)
   end
@@ -335,5 +334,4 @@ class TestGemSpecFetcher < Gem::TestCase
     assert_equal({}, specs)
     assert_kind_of Gem::SourceFetchProblem, errors.first
   end
-
 end

data/test/rubygems/test_gem_specification.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 require 'benchmark'
 require 'rubygems/test_case'
+require 'date'
 require 'pathname'
 require 'stringio'
 require 'rubygems/ext'
@@ -9,7 +10,6 @@ require 'rubygems/installer'
 require 'rubygems/platform'
 
 class TestGemSpecification < Gem::TestCase
-
   LEGACY_YAML_SPEC = <<-EOF.freeze
 --- !ruby/object:Gem::Specification
 rubygems_version: "1.0"
@@ -1837,7 +1837,6 @@ dependencies: []
       RbConfig::CONFIG['ENABLE_SHARED'], 'no'
 
     class << Gem
-
       alias orig_default_ext_dir_for default_ext_dir_for
 
       remove_method :default_ext_dir_for
@@ -1845,7 +1844,6 @@ dependencies: []
       def Gem.default_ext_dir_for(base_dir)
         'elsewhere'
       end
-
     end
 
     ext_spec
@@ -1859,11 +1857,9 @@ dependencies: []
     RbConfig::CONFIG['ENABLE_SHARED'] = enable_shared
 
     class << Gem
-
       remove_method :default_ext_dir_for
 
       alias default_ext_dir_for orig_default_ext_dir_for
-
     end
   end
 
@@ -2004,7 +2000,7 @@ dependencies: []
     test_cases = {
       'i386-mswin32'      => 'a-1-x86-mswin32-60',
       'i386-mswin32_80'   => 'a-1-x86-mswin32-80',
-      'i386-mingw32'      => 'a-1-x86-mingw32'
+      'i386-mingw32'      => 'a-1-x86-mingw32',
     }
 
     test_cases.each do |arch, expected|
@@ -2153,11 +2149,9 @@ dependencies: []
 
   def test_require_paths_default_ext_dir_for
     class << Gem
-
       send :alias_method, :orig_default_ext_dir_for, :default_ext_dir_for
 
       remove_method :default_ext_dir_for
-
     end
 
     def Gem.default_ext_dir_for(base_dir)
@@ -2173,11 +2167,9 @@ dependencies: []
     end
   ensure
     class << Gem
-
       send :remove_method, :default_ext_dir_for
       send :alias_method,  :default_ext_dir_for, :orig_default_ext_dir_for
       send :remove_method, :orig_default_ext_dir_for
-
     end
   end
 
@@ -2440,6 +2432,9 @@ end
   end
 
   def test_to_ruby_with_rsa_key
+    require 'rubygems/openssl'
+    skip 'openssl is missing' unless defined?(OpenSSL::PKey::RSA)
+
     rsa_key = OpenSSL::PKey::RSA.new(2048)
     @a2.signing_key = rsa_key
     ruby_code = @a2.to_ruby
@@ -3041,7 +3036,7 @@ Please report a bug if this causes problems.
     specification.define_singleton_method(:find_all_by_name) do |dep_name|
       [
         specification.new {|s| s.name = "z", s.version = Gem::Version.new("1") },
-        specification.new {|s| s.name = "z", s.version = Gem::Version.new("2") }
+        specification.new {|s| s.name = "z", s.version = Gem::Version.new("2") },
       ]
     end
 
@@ -3060,6 +3055,13 @@ Please report a bug if this causes problems.
     end
   end
 
+  def test_duplicate_runtime_dependency
+    expected = "WARNING: duplicated b dependency [\"~> 3.0\", \"~> 3.0\"]\n"
+    assert_output nil, expected do
+      @a1.add_runtime_dependency "b", "~> 3.0", "~> 3.0"
+    end
+  end
+
   def set_orig(cls)
     s_cls = cls.singleton_class
     s_cls.send :alias_method, :orig_unresolved_deps , :unresolved_deps
@@ -3577,7 +3579,7 @@ Did you mean 'Ruby'?
           "one"          => "two",
           "home"         => "three",
           "homepage_uri" => "https://example.com/user/repo",
-          "funding_uri"  => "https://example.com/donate"
+          "funding_uri"  => "https://example.com/donate",
         }
       end
 
@@ -3837,7 +3839,7 @@ end
 
     default_gem_spec = new_default_spec("default", "2.0.0.0",
                                         nil, "default/gem.rb")
-    spec_path = File.join(@default_spec_dir, default_gem_spec.spec_name)
+    spec_path = File.join(@gemhome, "specifications", "default", default_gem_spec.spec_name)
     write_file(spec_path) do |file|
       file.print(default_gem_spec.to_ruby)
     end
@@ -3926,5 +3928,4 @@ end
   ensure
     $VERBOSE = old_verbose
   end
-
 end

data/test/rubygems/test_gem_stream_ui.rb

@@ -4,7 +4,6 @@ require 'rubygems/user_interaction'
 require 'timeout'
 
 class TestGemStreamUI < Gem::TestCase
-
   # increase timeout with MJIT for --jit-wait testing
   mjit_enabled = defined?(RubyVM::MJIT) && RubyVM::MJIT.enabled?
   SHORT_TIMEOUT = (RUBY_ENGINE == "ruby" && !mjit_enabled) ? 0.1 : 1.0
@@ -222,5 +221,4 @@ class TestGemStreamUI < Gem::TestCase
     reporter.fetch 'a.gem', 1024
     assert_equal "", @out.string
   end
-
 end

data/test/rubygems/test_gem_stub_specification.rb

@@ -3,15 +3,14 @@ require "rubygems/test_case"
 require "rubygems/stub_specification"
 
 class TestStubSpecification < Gem::TestCase
-
-  FOO = File.join SPECIFICATIONS, "foo-0.0.1-x86-mswin32.gemspec"
-  BAR = File.join SPECIFICATIONS, "bar-0.0.2.gemspec"
+  FOO = File.expand_path File.join("specifications", "foo-0.0.1-x86-mswin32.gemspec"), __dir__
+  BAR = File.expand_path File.join("specifications", "bar-0.0.2.gemspec"), __dir__
 
   def setup
     super
 
-    @base_dir = File.dirname(SPECIFICATIONS)
-    @gems_dir = File.join File.dirname(SPECIFICATIONS), 'gem'
+    @base_dir = __dir__
+    @gems_dir = File.join __dir__, 'gem'
     @foo = Gem::StubSpecification.gemspec_stub FOO, @base_dir, @gems_dir
   end
 
@@ -291,5 +290,4 @@ end
       return stub
     end
   end
-
 end

data/test/rubygems/test_gem_text.rb

@@ -3,7 +3,6 @@ require 'rubygems/test_case'
 require "rubygems/text"
 
 class TestGemText < Gem::TestCase
-
   include Gem::Text
 
   def test_format_text
@@ -94,5 +93,4 @@ Without the wrapping, the text might not look good in the RSS feed.
   def test_clean_text
     assert_equal ".]2;nyan.", clean_text("\e]2;nyan\a")
   end
-
 end

data/test/rubygems/test_gem_uninstaller.rb

@@ -3,7 +3,6 @@ require 'rubygems/installer_test_case'
 require 'rubygems/uninstaller'
 
 class TestGemUninstaller < Gem::InstallerTestCase
-
   def setup
     super
     @installer = setup_base_installer
@@ -178,7 +177,7 @@ class TestGemUninstaller < Gem::InstallerTestCase
 
     @spec.files += %w[lib/rubygems_plugin.rb]
 
-    Gem::Installer.at(Gem::Package.build(@spec)).install
+    Gem::Installer.at(Gem::Package.build(@spec), :force => true).install
 
     plugin_path = File.join Gem.plugindir, 'a_plugin.rb'
     assert File.exist?(plugin_path), 'plugin not written'
@@ -195,7 +194,7 @@ class TestGemUninstaller < Gem::InstallerTestCase
 
     @spec.files += %w[lib/rubygems_plugin.rb]
 
-    Gem::Installer.at(Gem::Package.build(@spec)).install
+    Gem::Installer.at(Gem::Package.build(@spec), :force => true).install
 
     plugin_path = File.join Gem.plugindir, 'a_plugin.rb'
     assert File.exist?(plugin_path), 'plugin not written'
@@ -213,7 +212,7 @@ class TestGemUninstaller < Gem::InstallerTestCase
 
     @spec.files += %w[lib/rubygems_plugin.rb]
 
-    Gem::Installer.at(Gem::Package.build(@spec)).install
+    Gem::Installer.at(Gem::Package.build(@spec), :force => true).install
 
     plugin_path = File.join Gem.plugindir, 'a_plugin.rb'
     assert File.exist?(plugin_path), 'plugin not written'
@@ -315,7 +314,7 @@ create_makefile '#{@spec.name}'
     use_ui @ui do
       path = Gem::Package.build @spec
 
-      installer = Gem::Installer.at path
+      installer = Gem::Installer.at path, :force => true
       installer.install
     end
 
@@ -634,19 +633,19 @@ create_makefile '#{@spec.name}'
     plugin_path = File.join Gem.plugindir, 'a_plugin.rb'
 
     @spec.version = '1'
-    Gem::Installer.at(Gem::Package.build(@spec)).install
+    Gem::Installer.at(Gem::Package.build(@spec), :force => true).install
 
     refute File.exist?(plugin_path), 'version without plugin installed, but plugin written'
 
     @spec.files += %w[lib/rubygems_plugin.rb]
     @spec.version = '2'
-    Gem::Installer.at(Gem::Package.build(@spec)).install
+    Gem::Installer.at(Gem::Package.build(@spec), :force => true).install
 
     assert File.exist?(plugin_path), 'version with plugin installed, but plugin not written'
     assert_match %r{\Arequire.*a-2/lib/rubygems_plugin\.rb}, File.read(plugin_path), 'written plugin has incorrect content'
 
     @spec.version = '3'
-    Gem::Installer.at(Gem::Package.build(@spec)).install
+    Gem::Installer.at(Gem::Package.build(@spec), :force => true).install
 
     assert File.exist?(plugin_path), 'version with plugin installed, but plugin removed'
     assert_match %r{\Arequire.*a-3/lib/rubygems_plugin\.rb}, File.read(plugin_path), 'old version installed, but plugin updated'
@@ -665,5 +664,4 @@ create_makefile '#{@spec.name}'
 
     refute File.exist?(plugin_path), 'last version uninstalled, but plugin still present'
   end
-
 end