rubygems-update 2.7.11 → 3.0.9

data/test/rubygems/test_gem_installer.rb

@@ -53,11 +53,11 @@ require 'rubygems'
 
 version = \">= 0.a\"
 
-if ARGV.first
-  str = ARGV.first
-  str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
-  if str =~ /\\A_(.*)_\\z/ and Gem::Version.correct?($1) then
-    version = $1
+str = ARGV.first
+if str
+  str = str.b[/\\A_(.*)_\\z/, 1]
+  if str and Gem::Version.correct?(str)
+    version = str
     ARGV.shift
   end
 end
@@ -121,7 +121,7 @@ end
   ensure
     Object.const_set :RUBY_FRAMEWORK_VERSION, orig_RUBY_FRAMEWORK_VERSION if
       orig_RUBY_FRAMEWORK_VERSION
-    if orig_bindir then
+    if orig_bindir
       RbConfig::CONFIG['bindir'] = orig_bindir
     else
       RbConfig::CONFIG.delete 'bindir'
@@ -141,7 +141,7 @@ end
     end
 
     File.open File.join(util_inst_bindir, 'executable'), 'w' do |io|
-     io.write <<-EXEC
+      io.write <<-EXEC
 #!/usr/local/bin/ruby
 #
 # This file was generated by RubyGems
@@ -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
@@ -250,7 +252,7 @@ gem 'other', version
 
     expected = @installer.bin_dir
 
-    if Gem.win_platform? then
+    if Gem.win_platform?
       expected = expected.downcase.gsub(File::SEPARATOR, File::ALT_SEPARATOR)
     end
 
@@ -311,7 +313,7 @@ gem 'other', version
     @installer.wrappers = true
 
     @spec.executables = %w[executable]
-    @spec.bindir = '.'
+    @spec.bindir = 'bin'
 
     exec_file = @installer.formatted_program_filename 'executable'
     exec_path = File.join @spec.gem_dir, exec_file
@@ -323,7 +325,7 @@ gem 'other', version
 
     @installer.generate_bin
 
-    assert_equal true, File.directory?(util_inst_bindir)
+    assert_directory_exists (util_inst_bindir)
     installed_exec = File.join(util_inst_bindir, 'executable')
     assert_path_exists installed_exec
     assert_equal mask, File.stat(installed_exec).mode unless win_platform?
@@ -336,6 +338,9 @@ gem 'other', version
     bin_dir = Gem.win_platform? ? File.expand_path(ENV["WINDIR"]).upcase :
                                   "/usr/bin"
 
+    old_path = ENV["PATH"]
+    ENV["PATH"] = [ENV["PATH"], bin_dir].compact.join(File::PATH_SEPARATOR)
+
     options = {
       :bin_dir => bin_dir,
       :install_dir => "/non/existent"
@@ -350,6 +355,9 @@ gem 'other', version
     end
 
     assert_equal "", @ui.error
+
+  ensure
+    ENV["PATH"] = old_path
   end
 
   def test_generate_bin_script
@@ -358,7 +366,7 @@ gem 'other', version
     @installer.gem_dir = @spec.gem_dir
 
     @installer.generate_bin
-    assert File.directory? util_inst_bindir
+    assert_directory_exists util_inst_bindir
     installed_exec = File.join util_inst_bindir, 'executable'
     assert_path_exists installed_exec
     assert_equal mask, File.stat(installed_exec).mode unless win_platform?
@@ -375,7 +383,7 @@ gem 'other', version
 
     Gem::Installer.exec_format = 'foo-%s-bar'
     @installer.generate_bin
-    assert_equal true, File.directory?(util_inst_bindir)
+    assert_directory_exists util_inst_bindir
     installed_exec = File.join util_inst_bindir, 'foo-executable-bar'
     assert_path_exists installed_exec
   ensure
@@ -389,7 +397,7 @@ gem 'other', version
 
     Gem::Installer.exec_format = 'foo-%s-bar'
     @installer.generate_bin
-    assert_equal true, File.directory?(util_inst_bindir)
+    assert_directory_exists util_inst_bindir
     installed_exec = File.join util_inst_bindir, 'executable'
     assert_path_exists installed_exec
   ensure
@@ -482,13 +490,13 @@ gem 'other', version
     real_exec = File.join @spec.gem_dir, 'bin', 'executable'
 
     # fake --no-wrappers for previous install
-    unless Gem.win_platform? then
+    unless Gem.win_platform?
       FileUtils.mkdir_p File.dirname(installed_exec)
       FileUtils.ln_s real_exec, installed_exec
     end
 
     @installer.generate_bin
-    assert_equal true, File.directory?(util_inst_bindir)
+    assert_directory_exists util_inst_bindir
     assert_path_exists installed_exec
     assert_equal mask, File.stat(installed_exec).mode unless win_platform?
 
@@ -506,7 +514,7 @@ gem 'other', version
     @installer.gem_dir = @spec.gem_dir
 
     @installer.generate_bin
-    assert_equal true, File.directory?(util_inst_bindir)
+    assert_directory_exists util_inst_bindir
     installed_exec = File.join util_inst_bindir, 'executable'
     assert_equal true, File.symlink?(installed_exec)
     assert_equal(File.join(@spec.gem_dir, 'bin', 'executable'),
@@ -658,7 +666,7 @@ gem 'other', version
       @installer.generate_bin
     end
 
-    assert_equal true, File.directory?(util_inst_bindir)
+    assert_directory_exists util_inst_bindir
     installed_exec = File.join(util_inst_bindir, 'executable')
     assert_path_exists installed_exec
 
@@ -734,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'
@@ -748,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
@@ -890,8 +898,6 @@ gem 'other', version
   end
 
   def test_install_creates_binstub_that_dont_trust_encoding
-    skip unless "".respond_to?(:force_encoding)
-
     Dir.mkdir util_inst_bindir
     util_setup_gem
     util_clear_gems
@@ -961,7 +967,7 @@ gem 'other', version
 
   def test_install_force
     use_ui @ui do
-      installer = Gem::Installer.at old_ruby_required, :force => true
+      installer = Gem::Installer.at old_ruby_required('= 1.4.6'), :force => true
       installer.install
     end
 
@@ -971,16 +977,16 @@ gem 'other', version
 
   def test_install_missing_dirs
     FileUtils.rm_f File.join(Gem.dir, 'cache')
-    FileUtils.rm_f File.join(Gem.dir, 'docs')
+    FileUtils.rm_f File.join(Gem.dir, 'doc')
     FileUtils.rm_f File.join(Gem.dir, 'specifications')
 
     use_ui @ui do
       @installer.install
     end
 
-    File.directory? File.join(Gem.dir, 'cache')
-    File.directory? File.join(Gem.dir, 'docs')
-    File.directory? File.join(Gem.dir, 'specifications')
+    assert_directory_exists File.join(Gem.dir, 'cache')
+    assert_directory_exists File.join(Gem.dir, 'doc')
+    assert_directory_exists File.join(Gem.dir, 'specifications')
 
     assert_path_exists File.join @gemhome, 'cache', @spec.file_name
     assert_path_exists File.join @gemhome, 'specifications', @spec.spec_name
@@ -1179,88 +1185,47 @@ gem 'other', version
     refute_path_exists File.join expected_extension_dir, 'gem_make.out'
   end
 
-  # ruby core repository needs to `depend` file for extension build.
-  # but 1.9.2 and earlier mkmf.rb does not create TOUCH file like depend.
-  if RUBY_VERSION < '1.9.3'
-    def test_find_lib_file_after_install
-
-      @spec.extensions << "extconf.rb"
-      write_file File.join(@tempdir, "extconf.rb") do |io|
-        io.write <<-RUBY
-          require "mkmf"
-          create_makefile("#{@spec.name}")
-        RUBY
-      end
-
-      write_file File.join(@tempdir, "a.c") do |io|
-        io.write <<-C
-          #include <ruby.h>
-          void Init_a() { }
-        C
-      end
-
-      Dir.mkdir File.join(@tempdir, "lib")
-      write_file File.join(@tempdir, 'lib', "b.rb") do |io|
-        io.write "# b.rb"
-      end
-
-      @spec.files += %w[extconf.rb lib/b.rb a.c]
-
-      use_ui @ui do
-        path = Gem::Package.build @spec
+  def test_find_lib_file_after_install
+    @spec.extensions << "extconf.rb"
+    write_file File.join(@tempdir, "extconf.rb") do |io|
+      io.write <<-RUBY
+        require "mkmf"
 
-        installer = Gem::Installer.at path
-        installer.install
-      end
+        CONFIG['CC'] = '$(TOUCH) $@ ||'
+        CONFIG['LDSHARED'] = '$(TOUCH) $@ ||'
+        $ruby = '#{Gem.ruby}'
 
-      expected = File.join @spec.full_require_paths.find { |path|
-        File.exist? File.join path, 'b.rb'
-      }, 'b.rb'
-      assert_equal expected, @spec.matches_for_glob('b.rb').first
+        create_makefile("#{@spec.name}")
+      RUBY
     end
-  else
-    def test_find_lib_file_after_install
-      @spec.extensions << "extconf.rb"
-      write_file File.join(@tempdir, "extconf.rb") do |io|
-        io.write <<-RUBY
-          require "mkmf"
 
-          CONFIG['CC'] = '$(TOUCH) $@ ||'
-          CONFIG['LDSHARED'] = '$(TOUCH) $@ ||'
-          $ruby = '#{Gem.ruby}'
+    write_file File.join(@tempdir, "depend")
 
-          create_makefile("#{@spec.name}")
-        RUBY
-      end
-
-      write_file File.join(@tempdir, "depend")
-
-      write_file File.join(@tempdir, "a.c") do |io|
-        io.write <<-C
-          #include <ruby.h>
-          void Init_a() { }
-        C
-      end
-
-      Dir.mkdir File.join(@tempdir, "lib")
-      write_file File.join(@tempdir, 'lib', "b.rb") do |io|
-        io.write "# b.rb"
-      end
+    write_file File.join(@tempdir, "a.c") do |io|
+      io.write <<-C
+        #include <ruby.h>
+        void Init_a() { }
+      C
+    end
 
-      @spec.files += %w[extconf.rb lib/b.rb depend a.c]
+    Dir.mkdir File.join(@tempdir, "lib")
+    write_file File.join(@tempdir, 'lib', "b.rb") do |io|
+      io.write "# b.rb"
+    end
 
-      use_ui @ui do
-        path = Gem::Package.build @spec
+    @spec.files += %w[extconf.rb lib/b.rb depend a.c]
 
-        installer = Gem::Installer.at path
-        installer.install
-      end
+    use_ui @ui do
+      path = Gem::Package.build @spec
 
-      expected = File.join @spec.full_require_paths.find { |path|
-        File.exist? File.join path, 'b.rb'
-      }, 'b.rb'
-      assert_equal expected, @spec.matches_for_glob('b.rb').first
+      installer = Gem::Installer.at path
+      installer.install
     end
+
+    expected = File.join @spec.full_require_paths.find { |path|
+      File.exist? File.join path, 'b.rb'
+    }, 'b.rb'
+    assert_equal expected, @spec.matches_for_glob('b.rb').first
   end
 
   def test_install_extension_and_script
@@ -1302,13 +1267,6 @@ gem 'other', version
   end
 
   def test_install_extension_flat
-    skip '1.9.2 and earlier mkmf.rb does not create TOUCH' if
-      RUBY_VERSION < '1.9.3'
-
-    if RUBY_VERSION == "1.9.3" and RUBY_PATCHLEVEL <= 194
-      skip "TOUCH was introduced into 1.9.3 after p194"
-    end
-
     @spec.require_paths = ["."]
 
     @spec.extensions << "extconf.rb"
@@ -1424,16 +1382,32 @@ gem 'other', version
 
   def test_pre_install_checks_ruby_version
     use_ui @ui do
-      installer = Gem::Installer.at old_ruby_required
+      installer = Gem::Installer.at old_ruby_required('= 1.4.6')
       e = assert_raises Gem::RuntimeRequirementNotMetError do
         installer.pre_install_checks
       end
-      rv = Gem.ruby_api_version
+      rv = Gem.ruby_version
       assert_equal "old_ruby_required requires Ruby version = 1.4.6. The current ruby version is #{rv}.",
                    e.message
     end
   end
 
+  def test_pre_install_checks_ruby_version_with_prereleases
+    util_set_RUBY_VERSION '2.6.0', -1, '63539', 'ruby 2.6.0preview2 (2018-05-31 trunk 63539) [x86_64-linux]'
+
+    installer = Gem::Installer.at old_ruby_required('>= 2.6.0.preview2')
+    assert installer.pre_install_checks
+
+    installer = Gem::Installer.at old_ruby_required('> 2.6.0.preview2')
+    e = assert_raises Gem::RuntimeRequirementNotMetError do
+      assert installer.pre_install_checks
+    end
+    assert_equal "old_ruby_required requires Ruby version > 2.6.0.preview2. The current ruby version is 2.6.0.preview2.",
+                 e.message
+  ensure
+    util_restore_RUBY_VERSION
+  end
+
   def test_pre_install_checks_wrong_rubygems_version
     spec = util_spec 'old_rubygems_required', '1' do |s|
       s.required_rubygems_version = '< 0'
@@ -1459,7 +1433,7 @@ gem 'other', version
     def spec.full_name # so the spec is buildable
       "malicious-1"
     end
-    def spec.validate; end
+    def spec.validate(packaging, strict); end
 
     util_build_gem spec
 
@@ -1517,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"
@@ -1846,33 +1822,92 @@ gem 'other', version
     assert_predicate spec, :default_gem?
   end
 
-  def test_default_gem
+  def test_default_gem_without_wrappers
     FileUtils.rm_f File.join(Gem.dir, 'specifications')
 
-    @installer.wrappers = true
+    @installer.wrappers = false
     @installer.options[:install_as_default] = true
     @installer.gem_dir = @spec.gem_dir
-    @installer.generate_bin
 
     use_ui @ui do
       @installer.install
     end
 
-    assert File.directory? util_inst_bindir
-    installed_exec = File.join util_inst_bindir, 'executable'
+    assert_directory_exists File.join(@spec.gem_dir, 'bin')
+    installed_exec = File.join @spec.gem_dir, 'bin', 'executable'
     assert_path_exists installed_exec
 
-    assert File.directory? File.join(Gem.default_dir, 'specifications')
-    assert File.directory? File.join(Gem.default_dir, 'specifications', 'default')
+    assert_directory_exists File.join(Gem.default_dir, 'specifications')
+    assert_directory_exists File.join(Gem.default_dir, 'specifications', 'default')
 
     default_spec = eval File.read File.join(Gem.default_dir, 'specifications', 'default', 'a-2.gemspec')
     assert_equal Gem::Version.new("2"), default_spec.version
     assert_equal ['bin/executable'], default_spec.files
+
+    assert_directory_exists util_inst_bindir
+
+    installed_exec = File.join util_inst_bindir, 'executable'
+    assert_path_exists installed_exec
+
+    wrapper = File.read installed_exec
+    refute_match %r|generated by RubyGems|, wrapper
+  end
+
+  def test_default_gem_with_wrappers
+    FileUtils.rm_f File.join(Gem.dir, 'specifications')
+
+    @installer.wrappers = true
+    @installer.options[:install_as_default] = true
+    @installer.gem_dir = @spec.gem_dir
+
+    use_ui @ui do
+      @installer.install
+    end
+
+    assert_directory_exists util_inst_bindir
+
+    installed_exec = File.join util_inst_bindir, 'executable'
+    assert_path_exists installed_exec
+
+    wrapper = File.read installed_exec
+    assert_match %r|generated by RubyGems|, wrapper
+  end
+
+  def test_default_gem_with_exe_as_bindir
+    FileUtils.rm_f File.join(Gem.dir, 'specifications')
+
+    @spec = quick_gem 'c' do |spec|
+      util_make_exec spec, '#!/usr/bin/ruby', 'exe'
+    end
+
+    util_build_gem @spec
+
+    @spec.cache_file
+
+    installer = util_installer @spec, @gemhome
+
+    installer.options[:install_as_default] = true
+    installer.gem_dir = @spec.gem_dir
+
+    use_ui @ui do
+      installer.install
+    end
+
+    assert_directory_exists File.join(@spec.gem_dir, 'exe')
+    installed_exec = File.join @spec.gem_dir, 'exe', 'executable'
+    assert_path_exists installed_exec
+
+    assert_directory_exists File.join(Gem.default_dir, 'specifications')
+    assert_directory_exists File.join(Gem.default_dir, 'specifications', 'default')
+
+    default_spec = eval File.read File.join(Gem.default_dir, 'specifications', 'default', 'c-2.gemspec')
+    assert_equal Gem::Version.new("2"), default_spec.version
+    assert_equal ['exe/executable'], default_spec.files
   end
 
-  def old_ruby_required
+  def old_ruby_required(requirement)
     spec = util_spec 'old_ruby_required', '1' do |s|
-      s.required_ruby_version = '= 1.4.6'
+      s.required_ruby_version = requirement
     end
 
     util_build_gem spec
@@ -1887,7 +1922,7 @@ gem 'other', version
     @installer = util_installer @spec, @gemhome
   end
 
-  def util_conflict_executable wrappers
+  def util_conflict_executable(wrappers)
     conflict = quick_gem 'conflict' do |spec|
       util_make_exec spec
     end

data/test/rubygems/test_gem_local_remote_options.rb

@@ -44,8 +44,9 @@ class TestGemLocalRemoteOptions < Gem::TestCase
     spec_fetcher
 
     @cmd.add_local_remote_options
+    Gem.configuration.sources = nil
     @cmd.handle_options %W[--clear-sources]
-    assert_equal Gem.default_sources, Gem.sources
+    assert_equal Gem.default_sources, Gem.sources.to_a
   end
 
   def test_local_eh
@@ -123,7 +124,7 @@ class TestGemLocalRemoteOptions < Gem::TestCase
 
     s1 = 'htp://more-gems.example.com'
 
-    assert_raises OptionParser::InvalidArgument do
+    assert_raises ArgumentError do
       @cmd.handle_options %W[--source #{s1}]
     end
 
@@ -131,4 +132,3 @@ class TestGemLocalRemoteOptions < Gem::TestCase
   end
 
 end
-

data/test/rubygems/test_gem_name_tuple.rb

@@ -42,4 +42,3 @@ class TestGemNameTuple < Gem::TestCase
   end
 
 end
-