rubygems-update 3.0.9 → 3.1.0.pre1

data/test/rubygems/test_gem_source.rb

@@ -199,16 +199,16 @@ class TestGemSource < Gem::TestCase
     installed = Gem::Source::Installed.new
     local     = Gem::Source::Local.new
 
-    assert_equal( 0, remote.   <=>(remote),    'remote    <=> remote')
+    assert_equal(0, remote.   <=>(remote),    'remote    <=> remote')
 
     assert_equal(-1, remote.   <=>(specific),  'remote    <=> specific')
-    assert_equal( 1, specific. <=>(remote),    'specific  <=> remote')
+    assert_equal(1, specific. <=>(remote),    'specific  <=> remote')
 
     assert_equal(-1, remote.   <=>(local),     'remote    <=> local')
-    assert_equal( 1, local.    <=>(remote),    'local     <=> remote')
+    assert_equal(1, local.    <=>(remote),    'local     <=> remote')
 
     assert_equal(-1, remote.   <=>(installed), 'remote    <=> installed')
-    assert_equal( 1, installed.<=>(remote),    'installed <=> remote')
+    assert_equal(1, installed.<=>(remote),    'installed <=> remote')
 
     no_uri = @source.dup
     no_uri.instance_variable_set :@uri, nil
@@ -220,9 +220,9 @@ class TestGemSource < Gem::TestCase
     sourceA = Gem::Source.new "http://example.com/a"
     sourceB = Gem::Source.new "http://example.com/b"
 
-    assert_equal( 0, sourceA. <=>(sourceA), 'sourceA <=> sourceA')
-    assert_equal( 1, sourceA. <=>(sourceB), 'sourceA <=> sourceB')
-    assert_equal( 1, sourceB. <=>(sourceA), 'sourceB <=> sourceA')
+    assert_equal(0, sourceA. <=>(sourceA), 'sourceA <=> sourceA')
+    assert_equal(1, sourceA. <=>(sourceB), 'sourceA <=> sourceB')
+    assert_equal(1, sourceB. <=>(sourceA), 'sourceB <=> sourceA')
   end
 
   def test_update_cache_eh

data/test/rubygems/test_gem_source_fetch_problem.rb

@@ -24,4 +24,5 @@ class TestGemSourceFetchProblem < Gem::TestCase
 
     refute_match sf.wordy, 'secret'
   end
+
 end

data/test/rubygems/test_gem_source_git.rb

@@ -208,16 +208,16 @@ class TestGemSourceGit < Gem::TestCase
     installed = Gem::Source::Installed.new
     vendor    = Gem::Source::Vendor.new 'vendor/foo'
 
-    assert_equal( 0, git.      <=>(git),       'git    <=> git')
+    assert_equal(0, git.      <=>(git),       'git    <=> git')
 
-    assert_equal( 1, git.      <=>(remote),    'git    <=> remote')
+    assert_equal(1, git.      <=>(remote),    'git    <=> remote')
     assert_equal(-1, remote.   <=>(git),       'remote <=> git')
 
-    assert_equal( 1, git.      <=>(installed), 'git       <=> installed')
+    assert_equal(1, git.      <=>(installed), 'git       <=> installed')
     assert_equal(-1, installed.<=>(git),       'installed <=> git')
 
     assert_equal(-1, git.      <=>(vendor),    'git       <=> vendor')
-    assert_equal( 1, vendor.   <=>(git),       'vendor    <=> git')
+    assert_equal(1, vendor.   <=>(git),       'vendor    <=> git')
   end
 
   def test_specs
@@ -236,11 +236,6 @@ class TestGemSourceGit < Gem::TestCase
         system @git, 'add', 'b.gemspec'
         system @git, 'commit', '--quiet', '-m', 'add b/b.gemspec'
       end
-
-      FileUtils.touch 'c.gemspec'
-
-      system @git, 'add', 'c.gemspec'
-      system @git, 'commit', '--quiet', '-m', 'add c.gemspec'
     end
 
     specs = nil

data/test/rubygems/test_gem_source_installed.rb

@@ -15,21 +15,21 @@ class TestGemSourceInstalled < Gem::TestCase
     git       = Gem::Source::Git.new 'a', 'a', 'master'
     vendor    = Gem::Source::Vendor.new 'a'
 
-    assert_equal( 0, installed.<=>(installed), 'installed <=> installed')
+    assert_equal(0, installed.<=>(installed), 'installed <=> installed')
 
     assert_equal(-1, remote.   <=>(installed), 'remote    <=> installed')
-    assert_equal( 1, installed.<=>(remote),    'installed <=> remote')
+    assert_equal(1, installed.<=>(remote),    'installed <=> remote')
 
-    assert_equal( 1, installed.<=>(local),     'installed <=> local')
+    assert_equal(1, installed.<=>(local),     'installed <=> local')
     assert_equal(-1, local.    <=>(installed), 'local     <=> installed')
 
     assert_equal(-1, specific. <=>(installed), 'specific  <=> installed')
-    assert_equal( 1, installed.<=>(specific),  'installed <=> specific')
+    assert_equal(1, installed.<=>(specific),  'installed <=> specific')
 
-    assert_equal( 1, git.      <=>(installed), 'git       <=> installed')
+    assert_equal(1, git.      <=>(installed), 'git       <=> installed')
     assert_equal(-1, installed.<=>(git),       'installed <=> git')
 
-    assert_equal( 1, vendor.   <=>(installed), 'vendor    <=> installed')
+    assert_equal(1, vendor.   <=>(installed), 'vendor    <=> installed')
     assert_equal(-1, installed.<=>(vendor),    'installed <=> vendor')
   end
 

data/test/rubygems/test_gem_source_list.rb

@@ -3,6 +3,7 @@ require 'rubygems/source_list'
 require 'rubygems/test_case'
 
 class TestGemSourceList < Gem::TestCase
+
   def setup
     super
 

data/test/rubygems/test_gem_source_local.rb

@@ -5,6 +5,7 @@ require 'rubygems/source'
 require 'fileutils'
 
 class TestGemSourceLocal < Gem::TestCase
+
   def setup
     super
 
@@ -92,16 +93,16 @@ class TestGemSourceLocal < Gem::TestCase
     installed = Gem::Source::Installed.new
     local     = Gem::Source::Local.new
 
-    assert_equal( 0, local.    <=>(local),     'local     <=> local')
+    assert_equal(0, local.    <=>(local),     'local     <=> local')
 
     assert_equal(-1, remote.   <=>(local),     'remote    <=> local')
-    assert_equal( 1, local.    <=>(remote),    'local     <=> remote')
+    assert_equal(1, local.    <=>(remote),    'local     <=> remote')
 
-    assert_equal( 1, installed.<=>(local),     'installed <=> local')
+    assert_equal(1, installed.<=>(local),     'installed <=> local')
     assert_equal(-1, local.    <=>(installed), 'local     <=> installed')
 
     assert_equal(-1, specific. <=>(local),     'specific  <=> local')
-    assert_equal( 1, local.    <=>(specific),  'local     <=> specific')
+    assert_equal(1, local.    <=>(specific),  'local     <=> specific')
   end
 
 end

data/test/rubygems/test_gem_source_lock.rb

@@ -40,25 +40,25 @@ class TestGemSourceLock < Gem::TestCase
     vendor = Gem::Source::Vendor.new 'vendor/a'
     v_lock = Gem::Source::Lock.new vendor
 
-    assert_equal( 0, g_lock.<=>(g_lock), 'g_lock <=> g_lock')
-    assert_equal( 0, i_lock.<=>(i_lock), 'i_lock <=> i_lock')
-    assert_equal( 0, v_lock.<=>(v_lock), 'v_lock <=> v_lock')
+    assert_equal(0, g_lock.<=>(g_lock), 'g_lock <=> g_lock')
+    assert_equal(0, i_lock.<=>(i_lock), 'i_lock <=> i_lock')
+    assert_equal(0, v_lock.<=>(v_lock), 'v_lock <=> v_lock')
 
-    assert_equal( 1, g_lock.<=>(i_lock), 'g_lock <=> i_lock')
+    assert_equal(1, g_lock.<=>(i_lock), 'g_lock <=> i_lock')
     assert_equal(-1, i_lock.<=>(g_lock), 'i_lock <=> g_lock')
 
     assert_equal(-1, g_lock.<=>(v_lock), 'g_lock <=> v_lock')
-    assert_equal( 1, v_lock.<=>(g_lock), 'v_lock <=> g_lock')
+    assert_equal(1, v_lock.<=>(g_lock), 'v_lock <=> g_lock')
 
     assert_equal(-1, i_lock.<=>(v_lock), 'i_lock <=> v_lock')
-    assert_equal( 1, v_lock.<=>(i_lock), 'i_lock <=> v_lock')
+    assert_equal(1, v_lock.<=>(i_lock), 'i_lock <=> v_lock')
   end
 
   def test_spaceship_git
     git  = Gem::Source::Git.new 'a', 'git/a', 'master', false
     lock = Gem::Source::Lock.new git
 
-    assert_equal( 1, lock.<=>(git),  'lock <=> git')
+    assert_equal(1, lock.<=>(git),  'lock <=> git')
     assert_equal(-1, git .<=>(lock), 'git  <=> lock')
   end
 
@@ -66,7 +66,7 @@ class TestGemSourceLock < Gem::TestCase
     installed = Gem::Source::Installed.new
     lock      = Gem::Source::Lock.new installed
 
-    assert_equal( 1, lock.     <=>(installed),  'lock      <=> installed')
+    assert_equal(1, lock.     <=>(installed),  'lock      <=> installed')
     assert_equal(-1, installed.<=>(lock),       'installed <=> lock')
   end
 
@@ -74,7 +74,7 @@ class TestGemSourceLock < Gem::TestCase
     local = Gem::Source::Local.new
     lock  = Gem::Source::Lock.new local # nonsense
 
-    assert_equal( 1, lock. <=>(local), 'lock  <=> local')
+    assert_equal(1, lock. <=>(local), 'lock  <=> local')
     assert_equal(-1, local.<=>(lock),  'local <=> lock')
   end
 
@@ -82,7 +82,7 @@ class TestGemSourceLock < Gem::TestCase
     remote = Gem::Source.new @gem_repo
     lock   = Gem::Source::Lock.new remote
 
-    assert_equal( 1, lock.  <=>(remote), 'lock   <=> remote')
+    assert_equal(1, lock.  <=>(remote), 'lock   <=> remote')
     assert_equal(-1, remote.<=>(lock),   'remote <=> lock')
   end
 
@@ -92,7 +92,7 @@ class TestGemSourceLock < Gem::TestCase
     specific = Gem::Source::SpecificFile.new gem
     lock     = Gem::Source::Lock.new specific # nonsense
 
-    assert_equal( 1, lock    .<=>(specific),  'lock     <=> specific')
+    assert_equal(1, lock    .<=>(specific),  'lock     <=> specific')
     assert_equal(-1, specific.<=>(lock),      'specific <=> lock')
   end
 
@@ -100,7 +100,7 @@ class TestGemSourceLock < Gem::TestCase
     vendor = Gem::Source::Vendor.new 'vendor/a'
     lock   = Gem::Source::Lock.new vendor
 
-    assert_equal( 1, lock.  <=>(vendor), 'lock   <=>    vendor')
+    assert_equal(1, lock.  <=>(vendor), 'lock   <=>    vendor')
     assert_equal(-1, vendor.<=>(lock),   'vendor <=> lock')
   end
 

data/test/rubygems/test_gem_source_specific_file.rb

@@ -3,6 +3,7 @@ require 'rubygems/test_case'
 require 'rubygems/source'
 
 class TestGemSourceSpecificFile < Gem::TestCase
+
   def setup
     super
 
@@ -45,16 +46,16 @@ class TestGemSourceSpecificFile < Gem::TestCase
     installed = Gem::Source::Installed.new
     local     = Gem::Source::Local.new
 
-    assert_equal( 0, specific. <=>(specific),  'specific  <=> specific')
+    assert_equal(0, specific. <=>(specific),  'specific  <=> specific')
 
     assert_equal(-1, remote.   <=>(specific),  'remote    <=> specific')
-    assert_equal( 1, specific. <=>(remote),    'specific  <=> remote')
+    assert_equal(1, specific. <=>(remote),    'specific  <=> remote')
 
     assert_equal(-1, specific. <=>(local),     'specific  <=> local')
-    assert_equal( 1, local.    <=>(specific),  'local     <=> specific')
+    assert_equal(1, local.    <=>(specific),  'local     <=> specific')
 
     assert_equal(-1, specific. <=>(installed), 'specific  <=> installed')
-    assert_equal( 1, installed.<=>(specific),  'installed <=> specific')
+    assert_equal(1, installed.<=>(specific),  'installed <=> specific')
 
     a2 = quick_gem 'a', '2'
     util_build_gem a2
@@ -69,8 +70,8 @@ class TestGemSourceSpecificFile < Gem::TestCase
     assert_nil       a1_source.<=>(b1_source), 'a1_source <=> b1_source'
 
     assert_equal(-1, a1_source.<=>(a2_source), 'a1_source <=> a2_source')
-    assert_equal( 0, a1_source.<=>(a1_source), 'a1_source <=> a1_source')
-    assert_equal( 1, a2_source.<=>(a1_source), 'a2_source <=> a1_source')
+    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_vendor.rb

@@ -16,15 +16,15 @@ class TestGemSourceVendor < Gem::TestCase
     git       = Gem::Source::Git.new 'a', 'a', 'master'
     installed = Gem::Source::Installed.new
 
-    assert_equal( 0, vendor.   <=>(vendor),    'vendor    <=> vendor')
+    assert_equal(0, vendor.   <=>(vendor),    'vendor    <=> vendor')
 
-    assert_equal( 1, vendor.   <=>(remote),    'vendor    <=> remote')
+    assert_equal(1, vendor.   <=>(remote),    'vendor    <=> remote')
     assert_equal(-1, remote.   <=>(vendor),    'remote    <=> vendor')
 
-    assert_equal( 1, vendor.   <=>(git),       'vendor    <=> git')
+    assert_equal(1, vendor.   <=>(git),       'vendor    <=> git')
     assert_equal(-1, git.      <=>(vendor),    'git       <=> vendor')
 
-    assert_equal( 1, vendor.   <=>(installed), 'vendor    <=> installed')
+    assert_equal(1, vendor.   <=>(installed), 'vendor    <=> installed')
     assert_equal(-1, installed.<=>(vendor),    'installed <=> vendor')
   end
 

data/test/rubygems/test_gem_specification.rb

@@ -6,6 +6,7 @@ require 'stringio'
 require 'rubygems/ext'
 require 'rubygems/specification'
 require 'rubygems/installer'
+require 'rubygems/platform'
 
 class TestGemSpecification < Gem::TestCase
 
@@ -59,12 +60,13 @@ end
     end
   end
 
-  def ext_spec
+  def ext_spec(platform: Gem::Platform::RUBY)
     @ext = util_spec 'ext', '1' do |s|
       s.executable = 'exec'
       s.test_file = 'test/suite.rb'
       s.extensions = %w[ext/extconf.rb]
       s.license = 'MIT'
+      s.platform = platform
 
       s.mark_version
       s.files = %w[lib/code.rb]
@@ -143,9 +145,9 @@ end
       num_of_version_per_pkg = 3
       packages = (0..num_of_pkg).map do |pkgi|
         (0..num_of_version_per_pkg).map do |pkg_version|
-          deps = Hash[((pkgi + 1)..num_of_pkg).map { |deppkgi|
+          deps = Hash[((pkgi + 1)..num_of_pkg).map do |deppkgi|
             ["pkg#{deppkgi}", ">= 0"]
-          }]
+          end]
           util_spec "pkg#{pkgi}", pkg_version.to_s, deps
         end
       end
@@ -156,9 +158,9 @@ end
       install_specs base
       base.activate
 
-      tms = Benchmark.measure {
+      tms = Benchmark.measure do
         assert_raises(LoadError) { require 'no_such_file_foo' }
-      }
+      end
       assert_operator tms.total, :<=, 10
     end
   end
@@ -384,7 +386,7 @@ end
   #     [B] ~> 1.0 (satisfied by 1.0)
 
   def test_self_activate_checks_dependencies
-    a  = util_spec 'a', '1.0'
+    a = util_spec 'a', '1.0'
     a.add_dependency 'c', '= 1.0'
     a.add_dependency 'b', '~> 1.0'
 
@@ -1127,7 +1129,7 @@ dependencies: []
     Gem::Specification.class_variable_set(:@@stubs, nil)
 
     dir_standard_specs = File.join Gem.dir, 'specifications'
-    dir_default_specs = Gem::BasicSpecification.default_specifications_dir
+    dir_default_specs = Gem.default_specifications_dir
 
     # Create gemspecs in three locations used in stubs
     loaded_spec = Gem::Specification.new 'a', '3'
@@ -1147,7 +1149,7 @@ dependencies: []
     Gem::Specification.class_variable_set(:@@stubs, nil)
 
     dir_standard_specs = File.join Gem.dir, 'specifications'
-    dir_default_specs = Gem::BasicSpecification.default_specifications_dir
+    dir_default_specs = Gem.default_specifications_dir
 
     # Create gemspecs in three locations used in stubs
     loaded_spec = Gem::Specification.new 'a', '3'
@@ -1439,6 +1441,7 @@ dependencies: []
   end
 
   def test_build_args
+    skip "extensions don't quite work on jruby" if Gem.java_platform?
     ext_spec
 
     assert_empty @ext.build_args
@@ -1457,6 +1460,7 @@ dependencies: []
   end
 
   def test_build_extensions
+    skip "extensions don't quite work on jruby" if Gem.java_platform?
     ext_spec
 
     refute_path_exists @ext.extension_dir, 'sanity check'
@@ -1492,6 +1496,7 @@ dependencies: []
   end
 
   def test_build_extensions_built
+    skip "extensions don't quite work on jruby" if Gem.java_platform?
     ext_spec
 
     refute_empty @ext.extensions, 'sanity check'
@@ -1530,6 +1535,7 @@ dependencies: []
   end
 
   def test_build_extensions_error
+    skip "extensions don't quite work on jruby" if Gem.java_platform?
     ext_spec
 
     refute_empty @ext.extensions, 'sanity check'
@@ -1543,6 +1549,7 @@ dependencies: []
     skip 'chmod not supported' if Gem.win_platform?
     skip 'skipped in root privilege' if Process.uid.zero?
 
+    skip "extensions don't quite work on jruby" if Gem.java_platform?
     ext_spec
 
     refute_empty @ext.extensions, 'sanity check'
@@ -1567,7 +1574,7 @@ dependencies: []
     @ext.build_extensions
     refute_path_exists @ext.extension_dir
   ensure
-    unless ($DEBUG or win_platform? or Process.uid.zero?)
+    unless ($DEBUG or win_platform? or Process.uid.zero? or Gem.java_platform?)
       FileUtils.chmod 0755, File.join(@ext.base_dir, 'extensions')
       FileUtils.chmod 0755, @ext.base_dir
     end
@@ -1575,7 +1582,7 @@ dependencies: []
 
   def test_build_extensions_no_extensions_dir_unwritable
     skip 'chmod not supported' if Gem.win_platform?
-
+    skip "extensions don't quite work on jruby" if Gem.java_platform?
     ext_spec
 
     refute_empty @ext.extensions, 'sanity check'
@@ -1614,6 +1621,7 @@ dependencies: []
   end
 
   def test_build_extensions_old
+    skip "extensions don't quite work on jruby" if Gem.java_platform?
     ext_spec
 
     refute_empty @ext.extensions, 'sanity check'
@@ -1627,6 +1635,7 @@ dependencies: []
   end
 
   def test_build_extensions_preview
+    skip "extensions don't quite work on jruby" if Gem.java_platform?
     ext_spec
 
     extconf_rb = File.join @ext.gem_dir, @ext.extensions.first
@@ -1661,6 +1670,7 @@ dependencies: []
   end
 
   def test_contains_requirable_file_eh_extension
+    skip "extensions don't quite work on jruby" if Gem.java_platform?
     ext_spec
 
     _, err = capture_io do
@@ -1673,8 +1683,20 @@ dependencies: []
     assert_equal expected, err
   end
 
+  def test_contains_requirable_file_eh_extension_java_platform
+    ext_spec(platform: Gem::Platform.new("java"))
+
+    _, err = capture_io do
+      refute @ext.contains_requirable_file? 'nonexistent'
+    end
+
+    assert_empty err
+  end
+
   def test_date
-    assert_equal Gem::Specification::TODAY, @a1.date
+    today = Gem::Specification::TODAY
+    tomorrow = today + 86401    # +1 for leap second
+    assert_operator (today..tomorrow), :cover?, @a1.date
   end
 
   def test_date_equals_date
@@ -1823,6 +1845,7 @@ dependencies: []
       RbConfig::CONFIG['ENABLE_SHARED'], 'no'
 
     class << Gem
+
       alias orig_default_ext_dir_for default_ext_dir_for
 
       remove_method :default_ext_dir_for
@@ -1830,6 +1853,7 @@ dependencies: []
       def Gem.default_ext_dir_for(base_dir)
         'elsewhere'
       end
+
     end
 
     ext_spec
@@ -1843,9 +1867,11 @@ 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
 
@@ -2028,7 +2054,7 @@ dependencies: []
 
   def test_base_dir_default
     default_dir =
-      File.join Gem::Specification.default_specifications_dir, @a1.spec_name
+      File.join Gem.default_specifications_dir, @a1.spec_name
 
     @a1.instance_variable_set :@loaded_from, default_dir
 
@@ -2135,9 +2161,11 @@ 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)
@@ -2153,9 +2181,11 @@ 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
 
@@ -2316,8 +2346,8 @@ dependencies: []
     s2 = util_spec 'b', '1'
 
     assert_equal(-1, (s1 <=> s2))
-    assert_equal( 0, (s1 <=> s1))
-    assert_equal( 1, (s2 <=> s1))
+    assert_equal(0, (s1 <=> s1))
+    assert_equal(1, (s2 <=> s1))
   end
 
   def test_spaceship_platform
@@ -2326,18 +2356,18 @@ dependencies: []
       s.platform = Gem::Platform.new 'x86-my_platform1'
     end
 
-    assert_equal( -1, (s1 <=> s2))
-    assert_equal(  0, (s1 <=> s1))
-    assert_equal(  1, (s2 <=> s1))
+    assert_equal(-1, (s1 <=> s2))
+    assert_equal(0, (s1 <=> s1))
+    assert_equal(1, (s2 <=> s1))
   end
 
   def test_spaceship_version
     s1 = util_spec 'a', '1'
     s2 = util_spec 'a', '2'
 
-    assert_equal( -1, (s1 <=> s2))
-    assert_equal(  0, (s1 <=> s1))
-    assert_equal(  1, (s2 <=> s1))
+    assert_equal(-1, (s1 <=> s2))
+    assert_equal(0, (s1 <=> s1))
+    assert_equal(1, (s2 <=> s1))
   end
 
   def test_spec_file
@@ -2400,12 +2430,10 @@ Gem::Specification.new do |s|
 
   if s.respond_to? :specification_version then
     s.specification_version = #{Gem::Specification::CURRENT_SPECIFICATION_VERSION}
+  end
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<b>.freeze, [\"= 1\"])
-    else
-      s.add_dependency(%q<b>.freeze, [\"= 1\"])
-    end
+  if s.respond_to? :add_runtime_dependency then
+    s.add_runtime_dependency(%q<b>.freeze, [\"= 1\"])
   else
     s.add_dependency(%q<b>.freeze, [\"= 1\"])
   end
@@ -2440,7 +2468,7 @@ Gem::Specification.new do |s|
   s.email = "example@example.com".freeze
   s.files = ["lib/code.rb".freeze]
   s.homepage = "http://example.com".freeze
-  s.rubygems_version = "#{Gem::VERSION}".freeze
+  s.rubygems_version = "3.1.0.pre1".freeze
   s.summary = "this is a summary".freeze
 end
     SPEC
@@ -2479,12 +2507,10 @@ Gem::Specification.new do |s|
 
   if s.respond_to? :specification_version then
     s.specification_version = #{Gem::Specification::CURRENT_SPECIFICATION_VERSION}
+  end
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<b>.freeze, [\"= 1\"])
-    else
-      s.add_dependency(%q<b>.freeze, [\"= 1\"])
-    end
+  if s.respond_to? :add_runtime_dependency then
+    s.add_runtime_dependency(%q<b>.freeze, [\"= 1\"])
   else
     s.add_dependency(%q<b>.freeze, [\"= 1\"])
   end
@@ -2540,16 +2566,12 @@ Gem::Specification.new do |s|
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
+  end
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rake>.freeze, [\"> 0.4\"])
-      s.add_runtime_dependency(%q<jabber4r>.freeze, [\"> 0.0.0\"])
-      s.add_runtime_dependency(%q<pqa>.freeze, [\"> 0.4\", \"<= 0.6\"])
-    else
-      s.add_dependency(%q<rake>.freeze, [\"> 0.4\"])
-      s.add_dependency(%q<jabber4r>.freeze, [\"> 0.0.0\"])
-      s.add_dependency(%q<pqa>.freeze, [\"> 0.4\", \"<= 0.6\"])
-    end
+  if s.respond_to? :add_runtime_dependency then
+    s.add_runtime_dependency(%q<rake>.freeze, [\"> 0.4\"])
+    s.add_runtime_dependency(%q<jabber4r>.freeze, [\"> 0.0.0\"])
+    s.add_runtime_dependency(%q<pqa>.freeze, [\"> 0.4\", \"<= 0.6\"])
   else
     s.add_dependency(%q<rake>.freeze, [\"> 0.4\"])
     s.add_dependency(%q<jabber4r>.freeze, [\"> 0.0.0\"])
@@ -2565,6 +2587,14 @@ end
     assert_equal @c1, same_spec
   end
 
+  def test_to_ruby_keeps_requirements_as_originally_specified
+    spec = util_spec 'a', '1' do |s|
+      s.add_dependency 'b', ['~> 1.0', '>= 1.0.0']
+    end
+
+    assert_includes spec.to_ruby, '"~> 1.0", ">= 1.0.0"'
+  end
+
   def test_to_ruby_legacy
     gemspec1 = Gem::Deprecate.skip_during do
       eval LEGACY_RUBY_SPEC
@@ -2899,7 +2929,7 @@ duplicate dependency on c (>= 1.2.3, development), (~> 1.2) use:
     util_setup_validate
 
     FileUtils.mkdir_p File.join(@tempdir, 'bin')
-    File.open File.join(@tempdir, 'bin', 'exec'), 'w' do end
+    File.write File.join(@tempdir, 'bin', 'exec'), ''
     FileUtils.mkdir_p File.join(@tempdir, 'exec')
 
     use_ui @ui do
@@ -2965,7 +2995,7 @@ duplicate dependency on c (>= 1.2.3, development), (~> 1.2) use:
     end
 
     expected = <<-EXPECTED
-WARN: Unresolved or ambigious specs during Gem::Specification.reset:
+WARN: Unresolved or ambiguous specs during Gem::Specification.reset:
       x (= 1)
 WARN: Clearing out unresolved specs. Try 'gem cleanup <gem>'
 Please report a bug if this causes problems.
@@ -2993,7 +3023,7 @@ Please report a bug if this causes problems.
     end
 
     expected = <<-EXPECTED
-WARN: Unresolved or ambigious specs during Gem::Specification.reset:
+WARN: Unresolved or ambiguous specs during Gem::Specification.reset:
       x (= 1)
       Available/installed versions of this gem:
       - 1
@@ -3624,6 +3654,7 @@ end
   end
 
   def test_missing_extensions_eh
+    skip "extensions don't quite work on jruby" if Gem.java_platform?
     ext_spec
 
     assert @ext.missing_extensions?
@@ -3840,4 +3871,5 @@ end
   ensure
     $VERBOSE = old_verbose
   end
+
 end