Merge RubyGems/Bundler 4.0.5

Author: hsbt

lib/bundler/definition.rb

@@ -1077,7 +1077,7 @@ def converge_specs(specs)
             end
           end
 
-          if parent_dep
+          if parent_dep && parent_dep.source.is_a?(Source::Path)
             replacement_source = parent_dep.source
           else
             replacement_source = sources.get(lockfile_source)

lib/bundler/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: false
 
 module Bundler
-  VERSION = "4.0.4".freeze
+  VERSION = "4.0.5".freeze
 
   def self.bundler_major_version
     @bundler_major_version ||= gem_version.segments.first

lib/rubygems.rb

@@ -9,7 +9,7 @@
 require "rbconfig"
 
 module Gem
-  VERSION = "4.0.4"
+  VERSION = "4.0.5"
 end
 
 require_relative "rubygems/defaults"
@@ -192,11 +192,12 @@ def self.try_activate(path)
     begin
       spec.activate
     rescue Gem::LoadError => e # this could fail due to gem dep collisions, go lax
-      spec_by_name = Gem::Specification.find_by_name(spec.name)
-      if spec_by_name.nil?
+      spec = Gem::Specification.find_unloaded_by_path(path)
+      spec ||= Gem::Specification.find_by_name(spec.name)
+      if spec.nil?
         raise e
       else
-        spec_by_name.activate
+        spec.activate
       end
     end
 

lib/rubygems/bundler_version_finder.rb

@@ -10,6 +10,8 @@ def self.bundler_version
     v ||= bundle_update_bundler_version
     return if v == true
 
+    v ||= bundle_config_version
+
     v ||= lockfile_version
     return unless v
 
@@ -49,21 +51,7 @@ def self.lockfile_version
   private_class_method :lockfile_version
 
   def self.lockfile_contents
-    gemfile = ENV["BUNDLE_GEMFILE"]
-    gemfile = nil if gemfile&.empty?
-
-    unless gemfile
-      begin
-        Gem::Util.traverse_parents(Dir.pwd) do |directory|
-          next unless gemfile = Gem::GEM_DEP_FILES.find {|f| File.file?(f) }
-
-          gemfile = File.join directory, gemfile
-          break
-        end
-      rescue Errno::ENOENT
-        return
-      end
-    end
+    gemfile = gemfile_path
 
     return unless gemfile
 
@@ -82,19 +70,24 @@ def self.lockfile_contents
   private_class_method :lockfile_contents
 
   def self.bundle_config_version
-    config_file = bundler_config_file
-    return unless config_file && File.file?(config_file)
+    version = nil
 
-    contents = File.read(config_file)
-    contents =~ /^BUNDLE_VERSION:\s*["']?([^"'\s]+)["']?\s*$/
+    [bundler_local_config_file, bundler_global_config_file].each do |config_file|
+      next unless config_file && File.file?(config_file)
 
-    $1
+      contents = File.read(config_file)
+      contents =~ /^BUNDLE_VERSION:\s*["']?([^"'\s]+)["']?\s*$/
+
+      version = $1
+      break if version
+    end
+
+    version
   end
   private_class_method :bundle_config_version
 
-  def self.bundler_config_file
-    # see Bundler::Settings#global_config_file and local_config_file
-    # global
+  def self.bundler_global_config_file
+    # see Bundler::Settings#global_config_file
     if ENV["BUNDLE_CONFIG"] && !ENV["BUNDLE_CONFIG"].empty?
       ENV["BUNDLE_CONFIG"]
     elsif ENV["BUNDLE_USER_CONFIG"] && !ENV["BUNDLE_USER_CONFIG"].empty?
@@ -103,10 +96,36 @@ def self.bundler_config_file
       ENV["BUNDLE_USER_HOME"] + "config"
     elsif Gem.user_home && !Gem.user_home.empty?
       Gem.user_home + ".bundle/config"
-    else
-      # local
-      "config"
     end
   end
-  private_class_method :bundler_config_file
+  private_class_method :bundler_global_config_file
+
+  def self.bundler_local_config_file
+    gemfile = gemfile_path
+    return unless gemfile
+
+    File.join(File.dirname(gemfile), ".bundle", "config")
+  end
+  private_class_method :bundler_local_config_file
+
+  def self.gemfile_path
+    gemfile = ENV["BUNDLE_GEMFILE"]
+    gemfile = nil if gemfile&.empty?
+
+    unless gemfile
+      begin
+        Gem::Util.traverse_parents(Dir.pwd) do |directory|
+          next unless gemfile = Gem::GEM_DEP_FILES.find {|f| File.file?(f) }
+
+          gemfile = File.join directory, gemfile
+          break
+        end
+      rescue Errno::ENOENT
+        return
+      end
+    end
+
+    gemfile
+  end
+  private_class_method :gemfile_path
 end

lib/rubygems/commands/pristine_command.rb

@@ -88,6 +88,10 @@ def description # :nodoc:
 will revert them.  All extensions are rebuilt and all bin stubs for the gem
 are regenerated after checking for modifications.
 
+Rebuilding extensions also refreshes C-extension gems against updated system
+libraries (for example after OS or package upgrades) to avoid mismatches like
+outdated library version warnings.
+
 If the cached gem cannot be found it will be downloaded.
 
 If --no-extensions is provided pristine will not attempt to restore a gem

lib/rubygems/ext/builder.rb

@@ -163,8 +163,6 @@ def initialize(spec, build_args = spec.build_args, target_rbconfig = Gem.target_
     @gem_dir    = spec.full_gem_path
     @target_rbconfig = target_rbconfig
     @build_jobs = build_jobs
-
-    @ran_rake = false
   end
 
   ##
@@ -177,7 +175,6 @@ def builder_for(extension) # :nodoc:
     when /configure/ then
       Gem::Ext::ConfigureBuilder
     when /rakefile/i, /mkrf_conf/i then
-      @ran_rake = true
       Gem::Ext::RakeBuilder
     when /CMakeLists.txt/ then
       Gem::Ext::CmakeBuilder.new
@@ -250,8 +247,6 @@ def build_extensions
     FileUtils.rm_f @spec.gem_build_complete_path
 
     @spec.extensions.each do |extension|
-      break if @ran_rake
-
       build_extension extension, dest_path
     end
 

lib/rubygems/specification.rb

@@ -959,6 +959,15 @@ def self.find_by_path(path)
     specification_record.find_by_path(path)
   end
 
+  ##
+  # Return the best specification that contains the file matching +path+
+  # amongst the specs that are not loaded. This method is different than
+  # +find_inactive_by_path+ as it will filter out loaded specs by their name.
+
+  def self.find_unloaded_by_path(path)
+    specification_record.find_unloaded_by_path(path)
+  end
+
   ##
   # Return the best specification that contains the file matching +path+
   # amongst the specs that are not activated.

lib/rubygems/specification_policy.rb

@@ -436,6 +436,7 @@ def validate_values
     warning "deprecated autorequire specified" if @specification.autorequire
 
     @specification.executables.each do |executable|
+      validate_executable(executable)
       validate_shebang_line_in(executable)
     end
 
@@ -449,6 +450,13 @@ def validate_attribute_present(attribute)
     warning("no #{attribute} specified") if value.nil? || value.empty?
   end
 
+  def validate_executable(executable)
+    separators = [File::SEPARATOR, File::ALT_SEPARATOR, File::PATH_SEPARATOR].compact.map {|sep| Regexp.escape(sep) }.join
+    return unless executable.match?(/[\s#{separators}]/)
+
+    error "executable \"#{executable}\" contains invalid characters"
+  end
+
   def validate_shebang_line_in(executable)
     executable_path = File.join(@specification.bindir, executable)
     return if File.read(executable_path, 2) == "#!"

lib/rubygems/specification_record.rb

@@ -154,6 +154,19 @@ def find_by_path(path)
       spec.to_spec
     end
 
+    ##
+    # Return the best specification that contains the file matching +path+
+    # amongst the specs that are not loaded. This method is different than
+    # +find_inactive_by_path+ as it will filter out loaded specs by their name.
+
+    def find_unloaded_by_path(path)
+      stub = stubs.find do |s|
+        next if Gem.loaded_specs[s.name]
+        s.contains_requirable_file? path
+      end
+      stub&.to_spec
+    end
+
     ##
     # Return the best specification in the record that contains the file
     # matching +path+ amongst the specs that are not activated.

lib/rubygems/version.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "deprecate"
-
 ##
 # The Version class processes string versions into comparable
 # values. A version string should normally be a series of numbers
@@ -152,6 +150,9 @@
 # For the last example, single-digit versions are automatically extended with
 # a zero to give a sensible result.
 
+# Workaround for directly loading Gem::Version in some cases
+module Gem; end
+
 class Gem::Version
   include Comparable