rubygems-update 3.2.0.rc.1 → 3.2.3

data/lib/rubygems/dependency_list.rb

@@ -17,7 +17,6 @@ require 'rubygems/deprecate'
 # this class necessary anymore?  Especially #ok?, #why_not_ok?
 
 class Gem::DependencyList
-
   attr_reader :specs
 
   include Enumerable
@@ -240,5 +239,4 @@ class Gem::DependencyList
   def active_count(specs, ignored)
     specs.count {|spec| ignored[spec.full_name].nil? }
   end
-
 end

data/lib/rubygems/doctor.rb

@@ -12,7 +12,6 @@ require 'rubygems/user_interaction'
 # removing the bogus specification.
 
 class Gem::Doctor
-
   include Gem::UserInteraction
 
   ##
@@ -129,5 +128,4 @@ class Gem::Doctor
   rescue Errno::ENOENT
     # ignore
   end
-
 end

data/lib/rubygems/errors.rb

@@ -13,13 +13,11 @@ module Gem
   # already activated gems or that RubyGems is otherwise unable to activate.
 
   class LoadError < ::LoadError
-
     # Name of gem
     attr_accessor :name
 
     # Version requirement of gem
     attr_accessor :requirement
-
   end
 
   ##
@@ -27,7 +25,6 @@ module Gem
   # system.  Instead of rescuing from this class, make sure to rescue from the
   # superclass Gem::LoadError to catch all types of load errors.
   class MissingSpecError < Gem::LoadError
-
     def initialize(name, requirement, extra_message=nil)
       @name        = name
       @requirement = requirement
@@ -45,7 +42,6 @@ module Gem
       total = Gem::Specification.stubs.size
       "Could not find '#{name}' (#{requirement}) among #{total} total gem(s)\n"
     end
-
   end
 
   ##
@@ -53,7 +49,6 @@ module Gem
   # not the requested version. Instead of rescuing from this class, make sure to
   # rescue from the superclass Gem::LoadError to catch all types of load errors.
   class MissingSpecVersionError < MissingSpecError
-
     attr_reader :specs
 
     def initialize(name, requirement, specs)
@@ -70,13 +65,11 @@ module Gem
       names = specs.map(&:full_name)
       "Could not find '#{name}' (#{requirement}) - did find: [#{names.join ','}]\n"
     end
-
   end
 
   # Raised when there are conflicting gem specs loaded
 
   class ConflictError < LoadError
-
     ##
     # A Hash mapping conflicting specifications to the dependencies that
     # caused the conflict
@@ -101,7 +94,6 @@ module Gem
 
       super("Unable to activate #{target.full_name}, because #{reason}")
     end
-
   end
 
   class ErrorReason; end
@@ -113,7 +105,6 @@ module Gem
   # in figuring out why a gem couldn't be installed.
   #
   class PlatformMismatch < ErrorReason
-
     ##
     # the name of the gem
     attr_reader :name
@@ -151,7 +142,6 @@ module Gem
          @platforms.size == 1 ? '' : 's',
          @platforms.join(' ,')]
     end
-
   end
 
   ##
@@ -159,7 +149,6 @@ module Gem
   # data from a source
 
   class SourceFetchProblem < ErrorReason
-
     ##
     # Creates a new SourceFetchProblem for the given +source+ and +error+.
 
@@ -190,6 +179,5 @@ module Gem
     # The "exception" alias allows you to call raise on a SourceFetchProblem.
 
     alias exception error
-
   end
 end

data/lib/rubygems/exceptions.rb

@@ -19,7 +19,6 @@ class Gem::DependencyRemovalException < Gem::Exception; end
 # and #conflicting_dependencies
 
 class Gem::DependencyResolutionError < Gem::DependencyError
-
   attr_reader :conflict
 
   def initialize(conflict)
@@ -32,25 +31,20 @@ class Gem::DependencyResolutionError < Gem::DependencyError
   def conflicting_dependencies
     @conflict.conflicting_dependencies
   end
-
 end
 
 ##
 # Raised when attempting to uninstall a gem that isn't in GEM_HOME.
 
 class Gem::GemNotInHomeException < Gem::Exception
-
   attr_accessor :spec
-
 end
 
 ###
 # Raised when removing a gem with the uninstall command fails
 
 class Gem::UninstallError < Gem::Exception
-
   attr_accessor :spec
-
 end
 
 class Gem::DocumentError < Gem::Exception; end
@@ -64,7 +58,6 @@ class Gem::EndOfYAMLException < Gem::Exception; end
 # operating on the given directory.
 
 class Gem::FilePermissionError < Gem::Exception
-
   attr_reader :directory
 
   def initialize(directory)
@@ -72,15 +65,12 @@ class Gem::FilePermissionError < Gem::Exception
 
     super "You don't have write permissions for the #{directory} directory."
   end
-
 end
 
 ##
 # Used to raise parsing and loading errors
 class Gem::FormatException < Gem::Exception
-
   attr_accessor :file_path
-
 end
 
 class Gem::GemNotFoundException < Gem::Exception; end
@@ -89,7 +79,6 @@ class Gem::GemNotFoundException < Gem::Exception; end
 # Raised by the DependencyInstaller when a specific gem cannot be found
 
 class Gem::SpecificGemNotFoundException < Gem::GemNotFoundException
-
   ##
   # Creates a new SpecificGemNotFoundException for a gem with the given +name+
   # and +version+.  Any +errors+ encountered when attempting to find the gem
@@ -117,7 +106,6 @@ class Gem::SpecificGemNotFoundException < Gem::GemNotFoundException
   # Errors encountered attempting to find the gem.
 
   attr_reader :errors
-
 end
 
 ##
@@ -125,7 +113,6 @@ end
 # inability to find a valid possible spec for a request.
 
 class Gem::ImpossibleDependenciesError < Gem::Exception
-
   attr_reader :conflicts
   attr_reader :request
 
@@ -153,17 +140,14 @@ class Gem::ImpossibleDependenciesError < Gem::Exception
   def dependency
     @request.dependency
   end
-
 end
 
 class Gem::InstallError < Gem::Exception; end
 class Gem::RuntimeRequirementNotMetError < Gem::InstallError
-
   attr_accessor :suggestion
   def message
     [suggestion, super].compact.join("\n\t")
   end
-
 end
 
 ##
@@ -205,7 +189,6 @@ class Gem::VerificationError < Gem::Exception; end
 # exit_code
 
 class Gem::SystemExitException < SystemExit
-
   ##
   # The exit code for the process
 
@@ -219,7 +202,6 @@ class Gem::SystemExitException < SystemExit
 
     super "Exiting RubyGems with exit_code #{exit_code}"
   end
-
 end
 
 ##
@@ -227,7 +209,6 @@ end
 # there is no spec.
 
 class Gem::UnsatisfiableDependencyError < Gem::DependencyError
-
   ##
   # The unsatisfiable dependency.  This is a
   # Gem::Resolver::DependencyRequest, not a Gem::Dependency
@@ -272,7 +253,6 @@ class Gem::UnsatisfiableDependencyError < Gem::DependencyError
   def version
     @dependency.requirement
   end
-
 end
 
 ##

data/lib/rubygems/ext/builder.rb

@@ -8,17 +8,8 @@
 require_relative '../user_interaction'
 
 class Gem::Ext::Builder
-
   include Gem::UserInteraction
 
-  ##
-  # The builder shells-out to run various commands after changing the
-  # directory.  This means multiple installations cannot be allowed to build
-  # extensions in parallel as they may change each other's directories leading
-  # to broken extensions or failed installations.
-
-  CHDIR_MUTEX = Mutex.new # :nodoc:
-
   attr_accessor :build_args # :nodoc:
 
   def self.class_name
@@ -26,8 +17,8 @@ class Gem::Ext::Builder
     $1.downcase
   end
 
-  def self.make(dest_path, results)
-    unless File.exist? 'Makefile'
+  def self.make(dest_path, results, make_dir = Dir.pwd)
+    unless File.exist? File.join(make_dir, 'Makefile')
       raise Gem::InstallError, 'Makefile not found'
     end
 
@@ -45,32 +36,32 @@ class Gem::Ext::Builder
       cmd = [
         make_program,
         destdir,
-        target
+        target,
       ].join(' ').rstrip
       begin
-        run(cmd, results, "make #{target}".rstrip)
+        run(cmd, results, "make #{target}".rstrip, make_dir)
       rescue Gem::InstallError
         raise unless target == 'clean' # ignore clean failure
       end
     end
   end
 
-  def self.run(command, results, command_name = nil)
+  def self.run(command, results, command_name = nil, dir = Dir.pwd)
     verbose = Gem.configuration.really_verbose
 
     begin
       rubygems_gemdeps, ENV['RUBYGEMS_GEMDEPS'] = ENV['RUBYGEMS_GEMDEPS'], nil
       if verbose
-        puts("current directory: #{Dir.pwd}")
+        puts("current directory: #{dir}")
         p(command)
       end
-      results << "current directory: #{Dir.pwd}"
+      results << "current directory: #{dir}"
       results << (command.respond_to?(:shelljoin) ? command.shelljoin : command)
 
       require "open3"
       # Set $SOURCE_DATE_EPOCH for the subprocess.
       env = {'SOURCE_DATE_EPOCH' => Gem.source_date_epoch_string}
-      output, status = Open3.capture2e(env, *command)
+      output, status = Open3.capture2e(env, *command, :chdir => dir)
       if verbose
         puts output
       else
@@ -162,22 +153,10 @@ EOF
     begin
       FileUtils.mkdir_p dest_path
 
-      CHDIR_MUTEX.synchronize do
-        pwd = Dir.getwd
-        Dir.chdir extension_dir
-        begin
-          results = builder.build(extension, dest_path,
-                                  results, @build_args, lib_dir)
-
-          verbose { results.join("\n") }
-        ensure
-          begin
-            Dir.chdir pwd
-          rescue SystemCallError
-            Dir.chdir dest_path
-          end
-        end
-      end
+      results = builder.build(extension, dest_path,
+                              results, @build_args, lib_dir, extension_dir)
+
+      verbose { results.join("\n") }
 
       write_gem_make_out results.join "\n"
     rescue => e
@@ -202,6 +181,7 @@ EOF
 
     dest_path = @spec.extension_dir
 
+    require "fileutils"
     FileUtils.rm_f @spec.gem_build_complete_path
 
     @spec.extensions.each do |extension|
@@ -227,5 +207,4 @@ EOF
 
     destination
   end
-
 end

data/lib/rubygems/ext/cmake_builder.rb

@@ -2,18 +2,16 @@
 require_relative '../command'
 
 class Gem::Ext::CmakeBuilder < Gem::Ext::Builder
-
-  def self.build(extension, dest_path, results, args=[], lib_dir=nil)
-    unless File.exist?('Makefile')
+  def self.build(extension, dest_path, results, args=[], lib_dir=nil, cmake_dir=Dir.pwd)
+    unless File.exist?(File.join(cmake_dir, 'Makefile'))
       cmd = "cmake . -DCMAKE_INSTALL_PREFIX=#{dest_path}"
       cmd << " #{Gem::Command.build_args.join ' '}" unless Gem::Command.build_args.empty?
 
-      run cmd, results
+      run cmd, results, class_name, cmake_dir
     end
 
-    make dest_path, results
+    make dest_path, results, cmake_dir
 
     results
   end
-
 end

data/lib/rubygems/ext/configure_builder.rb

@@ -6,18 +6,16 @@
 #++
 
 class Gem::Ext::ConfigureBuilder < Gem::Ext::Builder
-
-  def self.build(extension, dest_path, results, args=[], lib_dir=nil)
-    unless File.exist?('Makefile')
+  def self.build(extension, dest_path, results, args=[], lib_dir=nil, configure_dir=Dir.pwd)
+    unless File.exist?(File.join(configure_dir, 'Makefile'))
       cmd = "sh ./configure --prefix=#{dest_path}"
       cmd << " #{args.join ' '}" unless args.empty?
 
-      run cmd, results
+      run cmd, results, class_name, configure_dir
     end
 
-    make dest_path, results
+    make dest_path, results, configure_dir
 
     results
   end
-
 end

data/lib/rubygems/ext/ext_conf_builder.rb

@@ -8,12 +8,11 @@
 require 'shellwords'
 
 class Gem::Ext::ExtConfBuilder < Gem::Ext::Builder
-
-  def self.build(extension, dest_path, results, args=[], lib_dir=nil)
+  def self.build(extension, dest_path, results, args=[], lib_dir=nil, extension_dir=Dir.pwd)
     require 'fileutils'
     require 'tempfile'
 
-    tmp_dest = Dir.mktmpdir(".gem.", ".")
+    tmp_dest = Dir.mktmpdir(".gem.", extension_dir)
 
     # Some versions of `mktmpdir` return absolute paths, which will break make
     # if the paths contain spaces. However, on Ruby 1.9.x on Windows, relative
@@ -24,9 +23,9 @@ class Gem::Ext::ExtConfBuilder < Gem::Ext::Builder
     # spaces do not work.
     #
     # Details: https://github.com/rubygems/rubygems/issues/977#issuecomment-171544940
-    tmp_dest = get_relative_path(tmp_dest)
+    tmp_dest = get_relative_path(tmp_dest, extension_dir)
 
-    Tempfile.open %w[siteconf .rb], "." do |siteconf|
+    Tempfile.open %w[siteconf .rb], extension_dir do |siteconf|
       siteconf.puts "require 'rbconfig'"
       siteconf.puts "dest_path = #{tmp_dest.dump}"
       %w[sitearchdir sitelibdir].each do |dir|
@@ -39,19 +38,22 @@ class Gem::Ext::ExtConfBuilder < Gem::Ext::Builder
       destdir = ENV["DESTDIR"]
 
       begin
+        # workaround for https://github.com/oracle/truffleruby/issues/2115
+        siteconf_path = RUBY_ENGINE == "truffleruby" ? siteconf.path.dup : siteconf.path
         cmd = Gem.ruby.shellsplit << "-I" << File.expand_path("../../..", __FILE__) <<
-              "-r" << get_relative_path(siteconf.path) << File.basename(extension)
+              "-r" << get_relative_path(siteconf_path, extension_dir) << File.basename(extension)
         cmd.push(*args)
 
         begin
-          run(cmd, results) do |s, r|
-            if File.exist? 'mkmf.log'
+          run(cmd, results, class_name, extension_dir) do |s, r|
+            mkmf_log = File.join(extension_dir, 'mkmf.log')
+            if File.exist? mkmf_log
               unless s.success?
                 r << "To see why this extension failed to compile, please check" \
                   " the mkmf.log which can be found here:\n"
                 r << "  " + File.join(dest_path, 'mkmf.log') + "\n"
               end
-              FileUtils.mv 'mkmf.log', dest_path
+              FileUtils.mv mkmf_log, dest_path
             end
           end
           siteconf.unlink
@@ -59,18 +61,20 @@ class Gem::Ext::ExtConfBuilder < Gem::Ext::Builder
 
         ENV["DESTDIR"] = nil
 
-        make dest_path, results
+        make dest_path, results, extension_dir
 
         if tmp_dest
+          full_tmp_dest = File.join(extension_dir, tmp_dest)
+
           # TODO remove in RubyGems 3
           if Gem.install_extension_in_lib and lib_dir
             FileUtils.mkdir_p lib_dir
-            entries = Dir.entries(tmp_dest) - %w[. ..]
-            entries = entries.map {|entry| File.join tmp_dest, entry }
+            entries = Dir.entries(full_tmp_dest) - %w[. ..]
+            entries = entries.map {|entry| File.join full_tmp_dest, entry }
             FileUtils.cp_r entries, lib_dir, :remove_destination => true
           end
 
-          FileUtils::Entry_.new(tmp_dest).traverse do |ent|
+          FileUtils::Entry_.new(full_tmp_dest).traverse do |ent|
             destent = ent.class.new(dest_path, ent.rel)
             destent.exist? or FileUtils.mv(ent.path, destent.path)
           end
@@ -88,9 +92,8 @@ class Gem::Ext::ExtConfBuilder < Gem::Ext::Builder
 
   private
 
-  def self.get_relative_path(path)
-    path[0..Dir.pwd.length - 1] = '.' if path.start_with?(Dir.pwd)
+  def self.get_relative_path(path, base)
+    path[0..base.length - 1] = '.' if path.start_with?(base)
     path
   end
-
 end