rubygems-update 3.1.0.pre3 → 3.1.4

data/test/rubygems/test_gem_package_tar_writer.rb

@@ -8,6 +8,11 @@ class TestGemPackageTarWriter < Gem::Package::TarTestCase
   def setup
     super
 
+    # Setting `@default_source_date_epoch` to `nil` effectively resets the
+    # value used for `Gem.source_date_epoch` whenever `$SOURCE_DATE_EPOCH`
+    # is not set.
+    Gem.instance_variable_set(:'@default_source_date_epoch', nil)
+
     @data = 'abcde12345'
     @io = TempIO.new
     @tar_writer = Gem::Package::TarWriter.new @io

data/test/rubygems/test_gem_request_set.rb

@@ -183,6 +183,58 @@ DEPENDENCIES
     assert_path_exists File.join @gemhome, 'specifications', 'b-1.gemspec'
   end
 
+  def test_install_from_gemdeps_complex_dependencies
+    quick_gem("z", 1)
+    quick_gem("z", "1.0.1")
+    quick_gem("z", "1.0.2")
+    quick_gem("z", "1.0.3")
+    quick_gem("z", 2)
+
+    spec_fetcher do |fetcher|
+      fetcher.download "z", 1
+    end
+
+    rs = Gem::RequestSet.new
+    installed = []
+
+    File.open 'Gemfile.lock', 'w' do |io|
+      io.puts <<-LOCKFILE
+GEM
+  remote: #{@gem_repo}
+  specs:
+    z (1)
+
+PLATFORMS
+  #{Gem::Platform::RUBY}
+
+DEPENDENCIES
+  z (~> 1.0, >= 1.0.1)
+      LOCKFILE
+    end
+
+    File.open 'testo.gemspec', 'w' do |io|
+      io.puts <<-LOCKFILE
+Gem::Specification.new do |spec|
+  spec.name = 'testo'
+  spec.version = '1.0.0'
+  spec.add_dependency('z', '~> 1.0', '>= 1.0.1')
+end
+      LOCKFILE
+    end
+
+    File.open 'Gemfile', 'w' do |io|
+      io.puts("gemspec")
+    end
+
+    rs.install_from_gemdeps :gemdeps => 'Gemfile' do |req, installer|
+      installed << req.full_name
+    end
+
+    assert_includes installed, 'z-1.0.3'
+
+    assert_path_exists File.join @gemhome, 'specifications', 'z-1.0.3.gemspec'
+  end
+
   def test_install_from_gemdeps_version_mismatch
     spec_fetcher do |fetcher|
       fetcher.gem 'a', 2

data/test/rubygems/test_gem_source.rb

@@ -235,4 +235,18 @@ class TestGemSource < Gem::TestCase
     refute @source.update_cache?
   end
 
+  def test_typo_squatting
+    rubygems_source = Gem::Source.new("https://rubgems.org")
+    assert rubygems_source.typo_squatting?("rubygems.org")
+    assert rubygems_source.typo_squatting?("rubyagems.org")
+    assert rubygems_source.typo_squatting?("rubyasgems.org")
+    refute rubygems_source.typo_squatting?("rubysertgems.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_specification.rb

@@ -83,6 +83,11 @@ end
   def setup
     super
 
+    # Setting `@default_source_date_epoch` to `nil` effectively resets the
+    # value used for `Gem.source_date_epoch` whenever `$SOURCE_DATE_EPOCH`
+    # is not set.
+    Gem.instance_variable_set(:'@default_source_date_epoch', nil)
+
     @a1 = util_spec 'a', '1' do |s|
       s.executable = 'exec'
       s.test_file = 'test/suite.rb'
@@ -126,8 +131,8 @@ end
   def test_self_activate_ambiguous_direct
     save_loaded_features do
       a1 = util_spec "a", "1", "b" => "> 0"
-      b1 = util_spec("b", "1", { "c" => ">= 1" }, "lib/d.rb")
-      b2 = util_spec("b", "2", { "c" => ">= 2" }, "lib/d.rb")
+      b1 = util_spec("b", "1", { "c" => ">= 1" }, "lib/d#{$$}.rb")
+      b2 = util_spec("b", "2", { "c" => ">= 2" }, "lib/d#{$$}.rb")
       c1 = util_spec "c", "1"
       c2 = util_spec "c", "2"
 
@@ -138,7 +143,7 @@ end
       assert_equal %w(a-1), loaded_spec_names
       assert_equal ["b (> 0)"], unresolved_names
 
-      require "d"
+      require "d#{$$}"
 
       assert_equal %w(a-1 b-2 c-2), loaded_spec_names
       assert_equal [], unresolved_names
@@ -176,8 +181,8 @@ end
       a1 = util_spec "a", "1", "b" => "> 0"
       b1 = util_spec "b", "1", "c" => ">= 1"
       b2 = util_spec "b", "2", "c" => ">= 2"
-      c1 = util_spec "c", "1", nil, "lib/d.rb"
-      c2 = util_spec "c", "2", nil, "lib/d.rb"
+      c1 = util_spec "c", "1", nil, "lib/d#{$$}.rb"
+      c2 = util_spec "c", "2", nil, "lib/d#{$$}.rb"
 
       install_specs c1, c2, b1, b2, a1
 
@@ -185,7 +190,7 @@ end
       assert_equal %w(a-1), loaded_spec_names
       assert_equal ["b (> 0)"], unresolved_names
 
-      require "d"
+      require "d#{$$}"
 
       assert_equal %w(a-1 b-2 c-2), loaded_spec_names
       assert_equal [], unresolved_names
@@ -198,8 +203,8 @@ end
       a2 = util_spec "a", "2", "b" => "> 0"
       b1 = util_spec "b", "1", "c" => ">= 1"
       b2 = util_spec "b", "2", "c" => ">= 2"
-      c1 = util_spec "c", "1", nil, "lib/d.rb"
-      c2 = util_spec("c", "2", { "a" => "1" }, "lib/d.rb") # conflicts with a-2
+      c1 = util_spec "c", "1", nil, "lib/d#{$$}.rb"
+      c2 = util_spec("c", "2", { "a" => "1" }, "lib/d#{$$}.rb") # conflicts with a-2
 
       install_specs c1, b1, a1, a2, c2, b2
 
@@ -207,7 +212,7 @@ end
       assert_equal %w(a-2), loaded_spec_names
       assert_equal ["b (> 0)"], unresolved_names
 
-      require "d"
+      require "d#{$$}"
 
       assert_equal %w(a-2 b-1 c-1), loaded_spec_names
       assert_equal [], unresolved_names
@@ -221,7 +226,7 @@ end
       b2 = util_spec "b", "2", "c" => ">= 2"
       c1 = util_spec "c", "1"
       c2 = util_spec "c", "2"
-      d1 = util_spec "d", "1", nil, "lib/d.rb"
+      d1 = util_spec "d", "1", nil, "lib/d#{$$}.rb"
 
       install_specs d1, c1, c2, b1, b2, a1
 
@@ -229,7 +234,7 @@ end
       assert_equal %w(a-1), loaded_spec_names
       assert_equal ["b (> 0)"], unresolved_names
 
-      require "d"
+      require "d#{$$}"
 
       assert_equal %w(a-1 d-1), loaded_spec_names
       assert_equal ["b (> 0)"], unresolved_names
@@ -241,14 +246,14 @@ end
       a1 = util_spec "a", "1", "b" => "> 0"
       b1 = util_spec "b", "1", "c" => ">= 0" # unresolved
       b2 = util_spec "b", "2", "c" => ">= 0"
-      c1 = util_spec "c", "1", nil, "lib/c.rb"  # 1st level
-      c2 = util_spec "c", "2", nil, "lib/c.rb"
+      c1 = util_spec "c", "1", nil, "lib/c#{$$}.rb"  # 1st level
+      c2 = util_spec "c", "2", nil, "lib/c#{$$}.rb"
 
       install_specs c1, c2, b1, b2, a1
 
       a1.activate
 
-      require "c"
+      require "c#{$$}"
 
       assert_equal %w(a-1 b-2 c-2), loaded_spec_names
     end
@@ -261,14 +266,14 @@ end
       b2 = util_spec "b", "2", "c" => ">= 0"
       c1 = util_spec "c", "1", "d" => ">= 0"  # 1st level
       c2 = util_spec "c", "2", "d" => ">= 0"
-      d1 = util_spec "d", "1", nil, "lib/d.rb" # 2nd level
-      d2 = util_spec "d", "2", nil, "lib/d.rb"
+      d1 = util_spec "d", "1", nil, "lib/d#{$$}.rb" # 2nd level
+      d2 = util_spec "d", "2", nil, "lib/d#{$$}.rb"
 
       install_specs d1, d2, c1, c2, b1, b2, a1
 
       a1.activate
 
-      require "d"
+      require "d#{$$}"
 
       assert_equal %w(a-1 b-2 c-2 d-2), loaded_spec_names
     end
@@ -281,15 +286,15 @@ end
       b2 = util_spec "b", "2", "c" => ">= 0"
       c1 = util_spec "c", "1", "d" => "<= 2" # 1st level
       c2 = util_spec "c", "2", "d" => "<= 2"
-      d1 = util_spec "d", "1", nil, "lib/d.rb" # 2nd level
-      d2 = util_spec "d", "2", nil, "lib/d.rb"
-      d3 = util_spec "d", "3", nil, "lib/d.rb"
+      d1 = util_spec "d", "1", nil, "lib/d#{$$}.rb" # 2nd level
+      d2 = util_spec "d", "2", nil, "lib/d#{$$}.rb"
+      d3 = util_spec "d", "3", nil, "lib/d#{$$}.rb"
 
       install_specs d1, d2, d3, c1, c2, b1, b2, a1
 
       a1.activate
 
-      require "d"
+      require "d#{$$}"
 
       assert_equal %w(a-1 b-2 c-2 d-2), loaded_spec_names
     end
@@ -302,16 +307,16 @@ end
       b2 = util_spec "b", "2", "c" => ">= 0"
       c1 = util_spec "c", "1", "d" => "<= 2" # 1st level
       c2 = util_spec "c", "2", "d" => "<= 2"
-      d1 = util_spec "d", "1", nil, "lib/d.rb" # 2nd level
-      d2 = util_spec "d", "2", nil, "lib/d.rb"
-      d3 = util_spec "d", "3", nil, "lib/d.rb"
-      e  = util_spec "anti_d", "1", nil, "lib/d.rb"
+      d1 = util_spec "d", "1", nil, "lib/d#{$$}.rb" # 2nd level
+      d2 = util_spec "d", "2", nil, "lib/d#{$$}.rb"
+      d3 = util_spec "d", "3", nil, "lib/d#{$$}.rb"
+      e  = util_spec "anti_d", "1", nil, "lib/d#{$$}.rb"
 
       install_specs d1, d2, d3, e, c1, c2, b1, b2, a1
 
       a1.activate
 
-      require "d"
+      require "d#{$$}"
 
       assert_equal %w(a-1 b-2 c-2 d-2), loaded_spec_names
     end
@@ -322,8 +327,8 @@ end
       base = util_spec "0", "1", "A" => ">= 1"
       a1 = util_spec "A", "1", {"c" => ">= 2", "b" => "> 0"}, "lib/a.rb"
       a2 = util_spec "A", "2", {"c" => ">= 2", "b" => "> 0"}, "lib/a.rb"
-      b1 = util_spec "b", "1", {"c" => "= 1"}, "lib/d.rb"
-      b2 = util_spec "b", "2", {"c" => "= 2"}, "lib/d.rb"
+      b1 = util_spec "b", "1", {"c" => "= 1"}, "lib/d#{$$}.rb"
+      b2 = util_spec "b", "2", {"c" => "= 2"}, "lib/d#{$$}.rb"
       c1 = util_spec "c", "1", {}, "lib/c.rb"
       c2 = util_spec "c", "2", {}, "lib/c.rb"
       c3 = util_spec "c", "3", {}, "lib/c.rb"
@@ -334,7 +339,7 @@ end
       assert_equal %w(0-1), loaded_spec_names
       assert_equal ["A (>= 1)"], unresolved_names
 
-      require "d"
+      require "d#{$$}"
 
       assert_equal %w(0-1 A-2 b-2 c-2), loaded_spec_names
       assert_equal [], unresolved_names
@@ -349,15 +354,15 @@ end
       c1 = util_spec "c", "1", "d" => "<= 2" # 1st level
       c2 = util_spec "c", "2", "d" => "<= 2"
       c3 = util_spec "c", "3", "d" => "<= 3"
-      d1 = util_spec "d", "1", nil, "lib/d.rb" # 2nd level
-      d2 = util_spec "d", "2", nil, "lib/d.rb"
-      d3 = util_spec "d", "3", nil, "lib/d.rb"
+      d1 = util_spec "d", "1", nil, "lib/d#{$$}.rb" # 2nd level
+      d2 = util_spec "d", "2", nil, "lib/d#{$$}.rb"
+      d3 = util_spec "d", "3", nil, "lib/d#{$$}.rb"
 
       install_specs d1, d2, d3, c1, c2, c3, b1, b2, a1
 
       a1.activate
 
-      require "d"
+      require "d#{$$}"
 
       assert_includes [%w(a-1 b-2 c-3 d-2),%w(a-1 b-2 d-2)], loaded_spec_names
     end
@@ -371,15 +376,15 @@ end
       c1 = util_spec "xc", "1", "d" => "<= 3" # 1st level
       c2 = util_spec "xc", "2", "d" => "<= 2"
       c3 = util_spec "xc", "3", "d" => "<= 3"
-      d1 = util_spec "d", "1", nil, "lib/d.rb" # 2nd level
-      d2 = util_spec "d", "2", nil, "lib/d.rb"
-      d3 = util_spec "d", "3", nil, "lib/d.rb"
+      d1 = util_spec "d", "1", nil, "lib/d#{$$}.rb" # 2nd level
+      d2 = util_spec "d", "2", nil, "lib/d#{$$}.rb"
+      d3 = util_spec "d", "3", nil, "lib/d#{$$}.rb"
 
       install_specs d1, d2, d3, c1, c2, c3, b1, b2, a1
 
       a1.activate
 
-      require "d"
+      require "d#{$$}"
 
       assert_includes [%w(a-1 b-2 d-2 xc-3), %w(a-1 b-2 d-2)], loaded_spec_names
     end
@@ -516,12 +521,12 @@ end
   def test_self_activate_via_require_wtf
     save_loaded_features do
       a1 = util_spec "a", "1", "b" => "> 0", "d" => "> 0"    # this
-      b1 = util_spec "b", "1", { "c" => ">= 1" }, "lib/b.rb"
-      b2 = util_spec "b", "2", { "c" => ">= 2" }, "lib/b.rb" # this
+      b1 = util_spec "b", "1", { "c" => ">= 1" }, "lib/b#{$$}.rb"
+      b2 = util_spec "b", "2", { "c" => ">= 2" }, "lib/b#{$$}.rb" # this
       c1 = util_spec "c", "1"
       c2 = util_spec "c", "2"                                # this
-      d1 = util_spec "d", "1", { "c" => "< 2" },  "lib/d.rb"
-      d2 = util_spec "d", "2", { "c" => "< 2" },  "lib/d.rb" # this
+      d1 = util_spec "d", "1", { "c" => "< 2" },  "lib/d#{$$}.rb"
+      d2 = util_spec "d", "2", { "c" => "< 2" },  "lib/d#{$$}.rb" # this
 
       install_specs c1, c2, b1, b2, d1, d2, a1
 
@@ -530,10 +535,10 @@ end
       assert_equal %w(a-1), loaded_spec_names
       assert_equal ["b (> 0)", "d (> 0)"], unresolved_names
 
-      require "b"
+      require "b#{$$}"
 
       e = assert_raises Gem::LoadError do
-        require "d"
+        require "d#{$$}"
       end
 
       assert_equal "unable to find a version of 'd' to activate", e.message
@@ -939,7 +944,7 @@ dependencies: []
     assert_equal File.join(@tempdir, 'a-2.gemspec'), spec.loaded_from
   end
 
-  if RUBY_VERSION < '2.7'
+  if RUBY_ENGINE == 'ruby' and RUBY_VERSION < '2.7'
     def test_self_load_tainted
       full_path = @a2.spec_file
       write_file full_path do |io|
@@ -2287,7 +2292,7 @@ dependencies: []
 
   def test_require_already_activated
     save_loaded_features do
-      a1 = util_spec "a", "1", nil, "lib/d.rb"
+      a1 = util_spec "a", "1", nil, "lib/d#{$$}.rb"
 
       install_specs a1 # , a2, b1, b2, c1, c2
 
@@ -2295,7 +2300,7 @@ dependencies: []
       assert_equal %w(a-1), loaded_spec_names
       assert_equal [], unresolved_names
 
-      assert require "d"
+      assert require "d#{$$}"
 
       assert_equal %w(a-1), loaded_spec_names
       assert_equal [], unresolved_names
@@ -2308,8 +2313,8 @@ dependencies: []
       a2 = util_spec "a", "2", "b" => "> 0"
       b1 = util_spec "b", "1", "c" => ">= 1"
       b2 = util_spec "b", "2", "c" => ">= 2"
-      c1 = util_spec "c", "1", nil, "lib/d.rb"
-      c2 = util_spec("c", "2", { "a" => "1" }, "lib/d.rb") # conflicts with a-2
+      c1 = util_spec "c", "1", nil, "lib/d#{$$}.rb"
+      c2 = util_spec("c", "2", { "a" => "1" }, "lib/d#{$$}.rb") # conflicts with a-2
 
       install_specs c1, b1, a1, a2, c2, b2
 
@@ -2318,7 +2323,7 @@ dependencies: []
       assert_equal %w(a-1 c-1), loaded_spec_names
       assert_equal ["b (> 0)"], unresolved_names
 
-      assert require "d"
+      assert require "d#{$$}"
 
       assert_equal %w(a-1 c-1), loaded_spec_names
       assert_equal ["b (> 0)"], unresolved_names
@@ -2784,7 +2789,7 @@ end
     add_runtime_dependency 'l', '~> 1.2', '> 1.2.3'
 #{w}:  open-ended dependency on o (>= 0) is not recommended
   use a bounded requirement, such as '~> x.y'
-#{w}:  See http://guides.rubygems.org/specification-reference/ for help
+#{w}:  See https://guides.rubygems.org/specification-reference/ for help
       EXPECTED
 
       assert_equal expected, @ui.error, 'warning'
@@ -2816,7 +2821,7 @@ duplicate dependency on c (>= 1.2.3, development), (~> 1.2) use:
       end
 
       assert_equal <<-EXPECTED, @ui.error
-#{w}:  See http://guides.rubygems.org/specification-reference/ for help
+#{w}:  See https://guides.rubygems.org/specification-reference/ for help
       EXPECTED
     end
   end
@@ -2927,7 +2932,7 @@ duplicate dependency on c (>= 1.2.3, development), (~> 1.2) use:
       end
     end
 
-    assert_match 'See http://guides.rubygems.org/specification-reference/ for help', @ui.error
+    assert_match 'See https://guides.rubygems.org/specification-reference/ for help', @ui.error
   end
 
   def test_validate_executables
@@ -3100,7 +3105,7 @@ Please report a bug if this causes problems.
 
       assert_equal '"ftp://rubygems.org" is not a valid HTTP URI', e.message
 
-      @a1.homepage = 'http://rubygems.org'
+      @a1.homepage = 'https://rubygems.org/'
       assert_equal true, @a1.validate
 
       @a1.homepage = 'https://rubygems.org'
@@ -3123,6 +3128,21 @@ http://spdx.org/licenses or 'Nonstandard' for a nonstandard license.
     warning
   end
 
+  def test_removed_methods
+    assert_equal Gem::Specification::REMOVED_METHODS, [:rubyforge_project=]
+  end
+
+  def test_validate_removed_rubyforge_project
+    util_setup_validate
+
+    use_ui @ui do
+      @a1.rubyforge_project = 'invalid-attribute'
+      @a1.validate
+    end
+
+    assert_match "rubyforge_project= is deprecated", @ui.error
+  end
+
   def test_validate_license_values
     util_setup_validate
 
@@ -3430,7 +3450,7 @@ Did you mean 'Ruby'?
       @a1.validate
     end
 
-    assert_match 'See http://guides.rubygems.org/specification-reference/ for help', @ui.error
+    assert_match 'See https://guides.rubygems.org/specification-reference/ for help', @ui.error
   end
 
   def test_version

data/test/rubygems/test_gem_stub_specification.rb

@@ -4,7 +4,6 @@ require "rubygems/stub_specification"
 
 class TestStubSpecification < Gem::TestCase
 
-  SPECIFICATIONS = File.expand_path(File.join("..", "specifications"), __FILE__)
   FOO = File.join SPECIFICATIONS, "foo-0.0.1-x86-mswin32.gemspec"
   BAR = File.join SPECIFICATIONS, "bar-0.0.2.gemspec"