bundler 1.15.4 → 1.16.0.pre.1

data/lib/bundler/resolver/spec_group.rb

@@ -0,0 +1,111 @@
+# frozen_string_literal: true
+
+module Bundler
+  class Resolver
+    class SpecGroup
+      include GemHelpers
+
+      attr_accessor :name, :version, :source
+      attr_accessor :ignores_bundler_dependencies
+
+      def initialize(all_specs)
+        raise ArgumentError, "cannot initialize with an empty value" unless exemplary_spec = all_specs.first
+        @name = exemplary_spec.name
+        @version = exemplary_spec.version
+        @source = exemplary_spec.source
+
+        @required_by = []
+        @activated_platforms = []
+        @dependencies = nil
+        @specs        = Hash.new do |specs, platform|
+          specs[platform] = select_best_platform_match(all_specs, platform)
+        end
+        @ignores_bundler_dependencies = true
+      end
+
+      def to_specs
+        @activated_platforms.map do |p|
+          next unless s = @specs[p]
+          lazy_spec = LazySpecification.new(name, version, s.platform, source)
+          lazy_spec.dependencies.replace s.dependencies
+          lazy_spec
+        end.compact
+      end
+
+      def activate_platform!(platform)
+        return unless for?(platform)
+        return if @activated_platforms.include?(platform)
+        @activated_platforms << platform
+      end
+
+      def for?(platform)
+        spec = @specs[platform]
+        !spec.nil?
+      end
+
+      def to_s
+        @to_s ||= "#{name} (#{version})"
+      end
+
+      def dependencies_for_activated_platforms
+        dependencies = @activated_platforms.map {|p| __dependencies[p] }
+        metadata_dependencies = @activated_platforms.map do |platform|
+          metadata_dependencies(@specs[platform], platform)
+        end
+        dependencies.concat(metadata_dependencies).flatten
+      end
+
+      def platforms_for_dependency_named(dependency)
+        __dependencies.select {|_, deps| deps.map(&:name).include? dependency }.keys
+      end
+
+      def ==(other)
+        return unless other.is_a?(SpecGroup)
+        name == other.name &&
+          version == other.version &&
+          source == other.source
+      end
+
+      def eql?(other)
+        name.eql?(other.name) &&
+          version.eql?(other.version) &&
+          source.eql?(other.source)
+      end
+
+      def hash
+        to_s.hash ^ source.hash
+      end
+
+    private
+
+      def __dependencies
+        @dependencies = Hash.new do |dependencies, platform|
+          dependencies[platform] = []
+          if spec = @specs[platform]
+            spec.dependencies.each do |dep|
+              next if dep.type == :development
+              next if @ignores_bundler_dependencies && dep.name == "bundler".freeze
+              dependencies[platform] << DepProxy.new(dep, platform)
+            end
+          end
+          dependencies[platform]
+        end
+      end
+
+      def metadata_dependencies(spec, platform)
+        return [] unless spec
+        # Only allow endpoint specifications since they won't hit the network to
+        # fetch the full gemspec when calling required_ruby_version
+        return [] if !spec.is_a?(EndpointSpecification) && !spec.is_a?(Gem::Specification)
+        dependencies = []
+        if !spec.required_ruby_version.nil? && !spec.required_ruby_version.none?
+          dependencies << DepProxy.new(Gem::Dependency.new("ruby\0", spec.required_ruby_version), platform)
+        end
+        if !spec.required_rubygems_version.nil? && !spec.required_rubygems_version.none?
+          dependencies << DepProxy.new(Gem::Dependency.new("rubygems\0", spec.required_rubygems_version), platform)
+        end
+        dependencies
+      end
+    end
+  end
+end

data/lib/bundler/retry.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Bundler
   # General purpose class for retrying code that may fail
   class Retry

data/lib/bundler/ruby_dsl.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Bundler
   module RubyDsl
     def ruby(*ruby_version)

data/lib/bundler/ruby_version.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Bundler
   class RubyVersion
     attr_reader :versions,

data/lib/bundler/rubygems_ext.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "pathname"
 
 if defined?(Gem::QuickLoader)
@@ -14,7 +15,7 @@ begin
   # shouldn't be deferred.
   require "rubygems/source"
 rescue LoadError
-  # Not available before Rubygems 2.0.0, ignore
+  # Not available before RubyGems 2.0.0, ignore
   nil
 end
 
@@ -135,7 +136,7 @@ module Gem
   end
 
   class Dependency
-    attr_accessor :source, :groups
+    attr_accessor :source, :groups, :all_sources
 
     alias_method :eql?, :==
 
@@ -146,7 +147,7 @@ module Gem
     end
 
     def to_yaml_properties
-      instance_variables.reject {|p| ["@source", "@groups"].include?(p.to_s) }
+      instance_variables.reject {|p| ["@source", "@groups", "@all_sources"].include?(p.to_s) }
     end
 
     def to_lock
@@ -158,7 +159,7 @@ module Gem
       out
     end
 
-    # Backport of performance enhancement added to Rubygems 1.4
+    # Backport of performance enhancement added to RubyGems 1.4
     def matches_spec?(spec)
       # name can be a Regexp, so use ===
       return false unless name === spec.name

data/lib/bundler/rubygems_gem_installer.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "rubygems/installer"
 
 module Bundler
@@ -17,6 +18,28 @@ module Bundler
       super && validate_bundler_checksum(options[:bundler_expected_checksum])
     end
 
+    def build_extensions
+      extension_cache_path = options[:bundler_extension_cache_path]
+      return super unless extension_cache_path && extension_dir = Bundler.rubygems.spec_extension_dir(spec)
+
+      extension_dir = Pathname.new(extension_dir)
+      build_complete = SharedHelpers.filesystem_access(extension_cache_path.join("gem.build_complete"), :read, &:file?)
+      if build_complete && !options[:force]
+        SharedHelpers.filesystem_access(extension_dir.parent, &:mkpath)
+        SharedHelpers.filesystem_access(extension_cache_path) do
+          FileUtils.cp_r extension_cache_path, spec.extension_dir
+        end
+      else
+        super
+        if extension_dir.directory? # not made for gems without extensions
+          SharedHelpers.filesystem_access(extension_cache_path.parent, &:mkpath)
+          SharedHelpers.filesystem_access(extension_cache_path) do
+            FileUtils.cp_r extension_dir, extension_cache_path
+          end
+        end
+      end
+    end
+
   private
 
     def validate_bundler_checksum(checksum)

data/lib/bundler/rubygems_integration.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "monitor"
 require "rubygems"
 require "rubygems/config_file"
@@ -84,6 +85,19 @@ module Bundler
       spec.respond_to?(:default_gem?) && spec.default_gem?
     end
 
+    def spec_matches_for_glob(spec, glob)
+      return spec.matches_for_glob(glob) if spec.respond_to?(:matches_for_glob)
+
+      spec.load_paths.map do |lp|
+        Dir["#{lp}/#{glob}#{suffix_pattern}"]
+      end.flatten(1)
+    end
+
+    def spec_extension_dir(spec)
+      return unless spec.respond_to?(:extension_dir)
+      spec.extension_dir
+    end
+
     def stub_set_spec(stub, spec)
       stub.instance_variable_set(:@spec, spec)
     end
@@ -158,6 +172,10 @@ module Bundler
       Gem.post_reset_hooks
     end
 
+    def suffix_pattern
+      Gem.suffix_pattern
+    end
+
     def gem_cache
       gem_path.map {|p| File.expand_path("cache", p) }
     end
@@ -165,7 +183,7 @@ module Bundler
     def spec_cache_dirs
       @spec_cache_dirs ||= begin
         dirs = gem_path.map {|dir| File.join(dir, "specifications") }
-        dirs << Gem.spec_cache_dir if Gem.respond_to?(:spec_cache_dir) # Not in Rubygems 2.0.3 or earlier
+        dirs << Gem.spec_cache_dir if Gem.respond_to?(:spec_cache_dir) # Not in RubyGems 2.0.3 or earlier
         dirs.uniq.select {|dir| File.directory? dir }
       end
     end
@@ -179,7 +197,7 @@ module Bundler
     end
 
     def repository_subdirectories
-      %w(cache doc gems specifications)
+      %w[cache doc gems specifications]
     end
 
     def clear_paths
@@ -190,8 +208,12 @@ module Bundler
       Gem.bin_path(gem, bin, ver)
     end
 
+    def path_separator
+      File::PATH_SEPARATOR
+    end
+
     def preserve_paths
-      # this is a no-op outside of Rubygems 1.8
+      # this is a no-op outside of RubyGems 1.8
       yield
     end
 
@@ -212,6 +234,10 @@ module Bundler
       Gem.load_plugins if Gem.respond_to?(:load_plugins)
     end
 
+    def load_plugin_files(files)
+      Gem.load_plugin_files(files) if Gem.respond_to?(:load_plugin_files)
+    end
+
     def ui=(obj)
       Gem::DefaultUserInteraction.ui = obj
     end
@@ -233,9 +259,9 @@ module Bundler
       {} # if we can't download them, there aren't any
     end
 
-    # TODO: This is for older versions of Rubygems... should we support the
+    # TODO: This is for older versions of RubyGems... should we support the
     # X-Gemfile-Source header on these old versions?
-    # Maybe the newer implementation will work on older Rubygems?
+    # Maybe the newer implementation will work on older RubyGems?
     # It seems difficult to keep this implementation and still send the header.
     def fetch_all_remote_specs(remote)
       old_sources = Bundler.rubygems.sources
@@ -306,7 +332,7 @@ module Bundler
     end
 
     def security_policy_keys
-      %w(High Medium Low AlmostNo No).map {|level| "#{level}Security" }
+      %w[High Medium Low AlmostNo No].map {|level| "#{level}Security" }
     end
 
     def security_policies
@@ -377,9 +403,8 @@ module Bundler
           raise e
         end
 
-        # TODO: delete this in 2.0, it's a backwards compatibility shim
-        # see https://github.com/bundler/bundler/issues/5102
-        kernel_class.send(:public, :gem)
+        # backwards compatibility shim, see https://github.com/bundler/bundler/issues/5102
+        kernel_class.send(:public, :gem) if Bundler.feature_flag.setup_makes_kernel_gem_public?
       end
     end
 
@@ -434,9 +459,9 @@ module Bundler
 
         raise Gem::Exception, "no default executable for #{spec.full_name}" unless exec_name ||= spec.default_executable
 
-        unless spec.name == name
-          Bundler::SharedHelpers.major_deprecation \
-            "Bundler is using a binstub that was created for a different gem.\n" \
+        unless spec.name == gem_name
+          Bundler::SharedHelpers.major_deprecation 2,
+            "Bundler is using a binstub that was created for a different gem (#{spec.name}).\n" \
             "You should run `bundle binstub #{gem_name}` " \
             "to work around a system/bundle conflict."
         end
@@ -476,7 +501,7 @@ module Bundler
       redefine_method(gem_class, :refresh) {}
     end
 
-    # Replace or hook into Rubygems to provide a bundlerized view
+    # Replace or hook into RubyGems to provide a bundlerized view
     # of the world.
     def replace_entrypoints(specs)
       specs_by_name = specs.reduce({}) do |h, s|
@@ -492,8 +517,8 @@ module Bundler
       Gem.clear_paths
     end
 
-    # This backports the correct segment generation code from Rubygems 1.4+
-    # by monkeypatching it into the method in Rubygems 1.3.6 and 1.3.7.
+    # This backports the correct segment generation code from RubyGems 1.4+
+    # by monkeypatching it into the method in RubyGems 1.3.6 and 1.3.7.
     def backport_segment_generation
       redefine_method(Gem::Version, :segments) do
         @segments ||= @version.scan(/[0-9]+|[a-z]+/i).map do |s|
@@ -512,7 +537,7 @@ module Bundler
     end
 
     # This backports base_dir which replaces installation path
-    # Rubygems 1.8+
+    # RubyGems 1.8+
     def backport_base_dir
       redefine_method(Gem::Specification, :base_dir) do
         return Gem.dir unless loaded_from
@@ -581,7 +606,7 @@ module Bundler
       end
     end
 
-    # Rubygems 1.4 through 1.6
+    # RubyGems 1.4 through 1.6
     class Legacy < RubygemsIntegration
       def initialize
         super
@@ -592,7 +617,7 @@ module Bundler
       end
 
       def stub_rubygems(specs)
-        # Rubygems versions lower than 1.7 use SourceIndex#from_gems_in
+        # RubyGems versions lower than 1.7 use SourceIndex#from_gems_in
         source_index_class = (class << Gem::SourceIndex; self; end)
         redefine_method(source_index_class, :from_gems_in) do |*args|
           Gem::SourceIndex.new.tap do |source_index|
@@ -624,7 +649,7 @@ module Bundler
       end
     end
 
-    # Rubygems versions 1.3.6 and 1.3.7
+    # RubyGems versions 1.3.6 and 1.3.7
     class Ancient < Legacy
       def initialize
         super
@@ -632,7 +657,7 @@ module Bundler
       end
     end
 
-    # Rubygems 1.7
+    # RubyGems 1.7
     class Transitional < Legacy
       def stub_rubygems(specs)
         stub_source_index(specs)
@@ -646,7 +671,7 @@ module Bundler
       end
     end
 
-    # Rubygems 1.8.5-1.8.19
+    # RubyGems 1.8.5-1.8.19
     class Modern < RubygemsIntegration
       def stub_rubygems(specs)
         Gem::Specification.all = specs
@@ -667,9 +692,9 @@ module Bundler
       end
     end
 
-    # Rubygems 1.8.0 to 1.8.4
+    # RubyGems 1.8.0 to 1.8.4
     class AlmostModern < Modern
-      # Rubygems [>= 1.8.0, < 1.8.5] has a bug that changes Gem.dir whenever
+      # RubyGems [>= 1.8.0, < 1.8.5] has a bug that changes Gem.dir whenever
       # you call Gem::Installer#install with an :install_dir set. We have to
       # change it back for our sudo mode to work.
       def preserve_paths
@@ -680,9 +705,9 @@ module Bundler
       end
     end
 
-    # Rubygems 1.8.20+
+    # RubyGems 1.8.20+
     class MoreModern < Modern
-      # Rubygems 1.8.20 and adds the skip_validation parameter, so that's
+      # RubyGems 1.8.20 and adds the skip_validation parameter, so that's
       # when we start passing it through.
       def build(spec, skip_validation = false)
         require "rubygems/builder"
@@ -690,7 +715,7 @@ module Bundler
       end
     end
 
-    # Rubygems 2.0
+    # RubyGems 2.0
     class Future < RubygemsIntegration
       def stub_rubygems(specs)
         Gem::Specification.all = specs
@@ -767,6 +792,10 @@ module Bundler
       def install_with_build_args(args)
         yield
       end
+
+      def path_separator
+        Gem.path_separator
+      end
     end
 
     # RubyGems 2.1.0
@@ -855,7 +884,7 @@ module Bundler
       RubygemsIntegration::Transitional.new
     elsif RubygemsIntegration.provides?(">= 1.4.0")
       RubygemsIntegration::Legacy.new
-    else # Rubygems 1.3.6 and 1.3.7
+    else # RubyGems 1.3.6 and 1.3.7
       RubygemsIntegration::Ancient.new
     end
   end