rubygems-update 3.0.3 → 3.0.4

data/test/rubygems/ssl_key.pem

@@ -1,15 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----

data/test/rubygems/test_bundled_ca.rb

@@ -37,7 +37,7 @@ if ENV["CI"] || ENV["TEST_SSL"]
       http.verify_mode = OpenSSL::SSL::VERIFY_PEER
       http.cert_store = bundled_certificate_store
       http.get('/')
-    rescue Errno::ENOENT, Errno::ETIMEDOUT
+    rescue Errno::ENOENT, Errno::ETIMEDOUT, SocketError
       skip "#{host} seems offline, I can't tell whether ssl would work."
     rescue OpenSSL::SSL::SSLError => e
       # Only fail for certificate verification errors

data/test/rubygems/test_gem.rb

@@ -166,15 +166,12 @@ class TestGem < Gem::TestCase
     }
     Dir.chdir @tempdir do
       Dir.mkdir 'bin'
-      File.open 'bin/foo.cmd', 'w' do |fp|
-        fp.chmod(0755)
-        fp.puts 'p'
-      end
-
       Dir.mkdir 'data'
-      File.open 'data/foo.txt', 'w' do |fp|
-        fp.puts 'blah'
-      end
+
+      File.write 'bin/foo.cmd', "p\n"
+      File.chmod 0755, 'bin/foo.cmd'
+
+      File.write 'data/foo.txt', "blah\n"
 
       spec_fetcher do |f|
         f.gem 'foo', 1 do |s|

data/test/rubygems/test_gem_bundler_version_finder.rb

@@ -3,6 +3,8 @@ require 'rubygems/test_case'
 
 class TestGemBundlerVersionFinder < Gem::TestCase
   def setup
+    super
+
     @argv = ARGV.dup
     @env = ENV.to_hash.clone
     ENV.delete("BUNDLER_VERSION")
@@ -13,6 +15,8 @@ class TestGemBundlerVersionFinder < Gem::TestCase
     ARGV.replace @argv
     ENV.replace @env
     $0 = @dollar_0
+
+    super
   end
 
   def bvf

data/test/rubygems/test_gem_command_manager.rb

@@ -103,6 +103,16 @@ class TestGemCommandManager < Gem::TestCase
     assert_match(/invalid option: --bad-arg/i, @ui.error)
   end
 
+  def test_process_args_bad_no_ri
+    use_ui @ui do
+      assert_raises Gem::MockGemUi::TermError do
+        @command_manager.process_args %w[--no-ri]
+      end
+    end
+
+    assert_match(/invalid option: --no-ri. Use --no-document instead./i, @ui.error)
+  end
+
   # HACK move to install command test
   def test_process_args_install
     #capture all install options

data/test/rubygems/test_gem_commands_build_command.rb

@@ -207,6 +207,7 @@ class TestGemCommandsBuildCommand < Gem::TestCase
       gs.write @gem.to_ruby
     end
 
+    @cmd.options[:build_path] = gemspec_dir
     @cmd.options[:args] = [gemspec_file]
 
     use_ui @ui do

data/test/rubygems/test_gem_ext_cmake_builder.rb

@@ -25,7 +25,7 @@ class TestGemExtCmakeBuilder < Gem::TestCase
     File.open File.join(@ext, 'CMakeLists.txt'), 'w' do |cmakelists|
       cmakelists.write <<-eo_cmake
 cmake_minimum_required(VERSION 2.6)
-project(self_build LANGUAGES NONE)
+project(self_build NONE)
 install (FILES test.txt DESTINATION bin)
       eo_cmake
     end

data/test/rubygems/test_gem_indexer.rb

@@ -37,6 +37,13 @@ class TestGemIndexer < Gem::TestCase
     @indexer = Gem::Indexer.new(@tempdir)
   end
 
+  def teardown
+    super
+
+    util_clear_gems
+    util_clear_default_gems
+  end
+
   def test_initialize
     assert_equal @tempdir, @indexer.dest_directory
     assert_match %r{#{Dir.mktmpdir('gem_generate_index').match(/.*-/)}}, @indexer.directory

data/test/rubygems/test_gem_installer.rb

@@ -163,6 +163,8 @@ gem 'other', version
 
     wrapper = File.read installed_exec
     assert_match %r|generated by RubyGems|, wrapper
+  ensure
+    Gem::Installer.exec_format = nil
   end
 
   def test_check_executable_overwrite_other_gem
@@ -740,13 +742,13 @@ gem 'other', version
     rakefile   = File.join gemdir, 'ext', 'a', 'Rakefile'
     spec_file  = File.join @gemhome, 'specifications', @spec.spec_name
 
-    Gem.pre_install do |installer|
+    Gem.pre_install do
       refute_path_exists cache_file, 'cache file must not exist yet'
       refute_path_exists spec_file,  'spec file must not exist yet'
       true
     end
 
-    Gem.post_build do |installer|
+    Gem.post_build do
       assert_path_exists gemdir, 'gem install dir must exist'
       assert_path_exists rakefile, 'gem executable must exist'
       refute_path_exists stub_exe, 'gem executable must not exist'
@@ -754,7 +756,7 @@ gem 'other', version
       true
     end
 
-    Gem.post_install do |installer|
+    Gem.post_install do
       assert_path_exists cache_file, 'cache file must exist'
       assert_path_exists spec_file,  'spec file must exist'
     end
@@ -1489,6 +1491,8 @@ gem 'other', version
   end
 
   def test_pre_install_checks_malicious_extensions_before_eval
+    skip "mswin environment disallow to create file contained the carriage return code." if Gem.win_platform?
+
     spec = util_spec "malicious", '1'
     def spec.full_name # so the spec is buildable
       "malicious-1"

data/test/rubygems/test_gem_rdoc.rb

@@ -5,7 +5,6 @@ require 'rubygems/rdoc'
 
 class TestGemRDoc < Gem::TestCase
   Gem::RDoc.load_rdoc
-  rdoc_4 = Gem::Requirement.new('> 3').satisfied_by?(Gem::RDoc.rdoc_version)
 
   def setup
     super
@@ -31,29 +30,8 @@ class TestGemRDoc < Gem::TestCase
     Gem.configuration[:rdoc] = nil
   end
 
-  ##
-  # RDoc 4 ships with its own Gem::RDoc which overrides this one which is
-  # shipped for backwards compatibility.
-
-  def rdoc_4?
-    Gem::Requirement.new('>= 4.0.0.preview2').satisfied_by? \
-      @hook.class.rdoc_version
-  end
-
-  def rdoc_3?
-    Gem::Requirement.new('~> 3.0').satisfied_by? @hook.class.rdoc_version
-  end
-
-  def rdoc_3_8_or_better?
-    Gem::Requirement.new('>= 3.8').satisfied_by? @hook.class.rdoc_version
-  end
-
   def test_initialize
-    if rdoc_4?
-      refute @hook.generate_rdoc
-    else
-      assert @hook.generate_rdoc
-    end
+    refute @hook.generate_rdoc
     assert @hook.generate_ri
 
     rdoc = Gem::RDoc.new @a, false, false
@@ -75,67 +53,6 @@ class TestGemRDoc < Gem::TestCase
     assert_empty args
   end
 
-  def test_document
-    skip 'RDoc 3 required' unless rdoc_3?
-
-    options = RDoc::Options.new
-    options.files = []
-
-    rdoc = @hook.new_rdoc
-    @hook.instance_variable_set :@rdoc, rdoc
-    @hook.instance_variable_set :@file_info, []
-
-    @hook.document 'darkfish', options, @a.doc_dir('rdoc')
-
-    assert @hook.rdoc_installed?
-  end unless rdoc_4
-
-  def test_generate
-    skip 'RDoc 3 required' unless rdoc_3?
-
-    FileUtils.mkdir_p @a.doc_dir
-    FileUtils.mkdir_p File.join(@a.gem_dir, 'lib')
-
-    @hook.generate
-
-    assert @hook.rdoc_installed?
-    assert @hook.ri_installed?
-
-    rdoc = @hook.instance_variable_get :@rdoc
-
-    refute rdoc.options.hyperlink_all
-  end unless rdoc_4
-
-  def test_generate_configuration_rdoc_array
-    skip 'RDoc 3 required' unless rdoc_3?
-
-    Gem.configuration[:rdoc] = %w[-A]
-
-    FileUtils.mkdir_p @a.doc_dir
-    FileUtils.mkdir_p File.join(@a.gem_dir, 'lib')
-
-    @hook.generate
-
-    rdoc = @hook.instance_variable_get :@rdoc
-
-    assert rdoc.options.hyperlink_all
-  end unless rdoc_4
-
-  def test_generate_configuration_rdoc_string
-    skip 'RDoc 3 required' unless rdoc_3?
-
-    Gem.configuration[:rdoc] = '-A'
-
-    FileUtils.mkdir_p @a.doc_dir
-    FileUtils.mkdir_p File.join(@a.gem_dir, 'lib')
-
-    @hook.generate
-
-    rdoc = @hook.instance_variable_get :@rdoc
-
-    assert rdoc.options.hyperlink_all
-  end unless rdoc_4
-
   def test_generate_disabled
     @hook.generate_rdoc = false
     @hook.generate_ri   = false
@@ -146,57 +63,6 @@ class TestGemRDoc < Gem::TestCase
     refute @hook.ri_installed?
   end
 
-  def test_generate_force
-    skip 'RDoc 3 required' unless rdoc_3?
-
-    FileUtils.mkdir_p @a.doc_dir 'ri'
-    FileUtils.mkdir_p @a.doc_dir 'rdoc'
-    FileUtils.mkdir_p File.join(@a.gem_dir, 'lib')
-
-    @hook.force = true
-
-    @hook.generate
-
-    assert_path_exists File.join(@a.doc_dir('rdoc'), 'index.html')
-    assert_path_exists File.join(@a.doc_dir('ri'),   'cache.ri')
-  end unless rdoc_4
-
-  def test_generate_no_overwrite
-    skip 'RDoc 3 required' unless rdoc_3?
-
-    FileUtils.mkdir_p @a.doc_dir 'ri'
-    FileUtils.mkdir_p @a.doc_dir 'rdoc'
-    FileUtils.mkdir_p File.join(@a.gem_dir, 'lib')
-
-    @hook.generate
-
-    refute_path_exists File.join(@a.doc_dir('rdoc'), 'index.html')
-    refute_path_exists File.join(@a.doc_dir('ri'),   'cache.ri')
-  end unless rdoc_4
-
-  def test_generate_legacy
-    skip 'RDoc < 3.8 required' if rdoc_3_8_or_better?
-
-    FileUtils.mkdir_p @a.doc_dir
-    FileUtils.mkdir_p File.join(@a.gem_dir, 'lib')
-
-    @hook.generate_legacy
-
-    assert @hook.rdoc_installed?
-    assert @hook.ri_installed?
-  end unless rdoc_4
-
-  def test_legacy_rdoc
-    skip 'RDoc < 3.8 required' if rdoc_3_8_or_better?
-
-    FileUtils.mkdir_p @a.doc_dir
-    FileUtils.mkdir_p File.join(@a.gem_dir, 'lib')
-
-    @hook.legacy_rdoc '--op', @a.doc_dir('rdoc')
-
-    assert @hook.rdoc_installed?
-  end unless rdoc_4
-
   def test_new_rdoc
     assert_kind_of RDoc::RDoc, @hook.new_rdoc
   end

data/test/rubygems/test_gem_request_set_gem_dependency_api.rb

@@ -283,6 +283,14 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase
       refute_empty set.dependencies
     end
 
+    with_engine_version 'truffleruby', '2.0.0' do
+      set = Gem::RequestSet.new
+      gda = @GDA.new set, 'gem.deps.rb'
+      gda.gem 'a', :platforms => :ruby
+
+      refute_empty set.dependencies
+    end
+
     with_engine_version 'jruby', '1.7.6' do
       set = Gem::RequestSet.new
       gda = @GDA.new set, 'gem.deps.rb'
@@ -310,6 +318,12 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase
 
       assert_empty @set.dependencies
     end
+
+    with_engine_version 'truffleruby', '1.2.3' do
+      @gda.gem 'a', :platforms => :mri
+
+      assert_empty @set.dependencies
+    end
   end
 
   def test_gem_platforms_maglev
@@ -332,6 +346,22 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase
     Gem.win_platform = win_platform
   end
 
+  def test_gem_platforms_truffleruby
+    with_engine_version 'truffleruby', '1.0.0' do
+      set = Gem::RequestSet.new
+      gda = @GDA.new set, 'gem.deps.rb'
+      gda.gem 'a', :platforms => :truffleruby
+
+      refute_empty set.dependencies
+
+      set = Gem::RequestSet.new
+      gda = @GDA.new set, 'gem.deps.rb'
+      gda.gem 'a', :platforms => :maglev
+
+      assert_empty set.dependencies
+    end
+  end
+
   def test_gem_platforms_multiple
     win_platform, Gem.win_platform = Gem.win_platform?, false
 
@@ -652,20 +682,23 @@ end
   end
 
   def test_platform_mswin
-    util_set_arch 'i686-darwin8.10.1' do
-      @gda.platform :mswin do
-        @gda.gem 'a'
+    if win_platform?
+      util_set_arch 'x86-mswin32-60' do
+        @gda.platform :mswin do
+          @gda.gem 'a'
+        end
+
+        assert_equal [dep('a')], @set.dependencies
+        refute_empty @set.dependencies
       end
+    else
+      util_set_arch 'i686-darwin8.10.1' do
+        @gda.platform :mswin do
+          @gda.gem 'a'
+        end
 
-      assert_empty @set.dependencies
-    end
-
-    util_set_arch 'x86-mswin32-60' do
-      @gda.platform :mswin do
-        @gda.gem 'a'
+        assert_empty @set.dependencies
       end
-
-      refute_empty @set.dependencies
     end
   end
 
@@ -708,26 +741,20 @@ end
   end
 
   def test_platforms
-    util_set_arch 'i686-darwin8.10.1' do
-      @gda.platforms :ruby do
-        @gda.gem 'a'
-      end
+    unless win_platform?
+      util_set_arch 'i686-darwin8.10.1' do
+        @gda.platforms :ruby do
+          @gda.gem 'a'
+        end
 
-      assert_equal [dep('a')], @set.dependencies
+        assert_equal [dep('a')], @set.dependencies
 
-      @gda.platforms :mswin do
-        @gda.gem 'b'
-      end
+        @gda.platforms :mswin do
+          @gda.gem 'b'
+        end
 
-      assert_equal [dep('a')], @set.dependencies
-    end
-
-    util_set_arch 'x86-mswin32-60' do
-      @gda.platforms :mswin do
-        @gda.gem 'c'
+        assert_equal [dep('a')], @set.dependencies
       end
-
-      assert_equal [dep('a'), dep('c')], @set.dependencies
     end
   end
 
@@ -741,6 +768,12 @@ end
                :engine => 'jruby', :engine_version => '1.7.6'
 
     end
+
+    with_engine_version 'truffleruby', '1.0.0-rc11' do
+      assert @gda.ruby RUBY_VERSION,
+               :engine => 'truffleruby', :engine_version => '1.0.0-rc11'
+
+    end
   end
 
   def test_ruby_engine_mismatch_engine