bundler 1.15.4 → 1.16.0.pre.1

data/lib/bundler/environment_preserver.rb

@@ -1,12 +1,28 @@
 # frozen_string_literal: true
+
 module Bundler
   class EnvironmentPreserver
+    INTENTIONALLY_NIL = "BUNDLER_ENVIRONMENT_PRESERVER_INTENTIONALLY_NIL".freeze
+    BUNDLER_KEYS = %w[
+      BUNDLE_BIN_PATH
+      BUNDLE_GEMFILE
+      BUNDLER_ORIG_MANPATH
+      BUNDLER_VERSION
+      GEM_HOME
+      GEM_PATH
+      MANPATH
+      PATH
+      RUBYLIB
+      RUBYOPT
+    ].map(&:freeze).freeze
+    BUNDLER_PREFIX = "BUNDLER_ORIG_".freeze
+
     # @param env [ENV]
     # @param keys [Array<String>]
     def initialize(env, keys)
       @original = env.to_hash
       @keys = keys
-      @prefix = "BUNDLER_ORIG_"
+      @prefix = BUNDLER_PREFIX
     end
 
     # @return [Hash]
@@ -14,9 +30,10 @@ module Bundler
       env = @original.clone
       @keys.each do |key|
         value = env[key]
-        original_value = env[@prefix + key]
-        if !value.nil? && !value.empty? && original_value.nil?
-          env[@prefix + key] = value
+        if !value.nil? && !value.empty?
+          env[@prefix + key] ||= value
+        elsif value.nil?
+          env[@prefix + key] ||= INTENTIONALLY_NIL
         end
       end
       env
@@ -27,10 +44,13 @@ module Bundler
       env = @original.clone
       @keys.each do |key|
         value_original = env[@prefix + key]
-        unless value_original.nil? || value_original.empty?
+        next if value_original.nil? || value_original.empty?
+        if value_original == INTENTIONALLY_NIL
+          env.delete(key)
+        else
           env[key] = value_original
-          env.delete(@prefix + key)
         end
+        env.delete(@prefix + key)
       end
       env
     end

data/lib/bundler/errors.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Bundler
   class BundlerError < StandardError
     def self.status_code(code)

data/lib/bundler/feature_flag.rb

@@ -1,22 +1,59 @@
 # frozen_string_literal: true
+
 module Bundler
   class FeatureFlag
     def self.settings_flag(flag, &default)
       unless Bundler::Settings::BOOL_KEYS.include?(flag.to_s)
         raise "Cannot use `#{flag}` as a settings feature flag since it isn't a bool key"
       end
-      define_method("#{flag}?") do
-        value = Bundler.settings[flag]
+
+      settings_method("#{flag}?", flag, &default)
+    end
+    private_class_method :settings_flag
+
+    def self.settings_option(key, &default)
+      settings_method(key, key, &default)
+    end
+    private_class_method :settings_option
+
+    def self.settings_method(name, key, &default)
+      define_method(name) do
+        value = Bundler.settings[key]
         value = instance_eval(&default) if value.nil? && !default.nil?
         value
       end
     end
+    private_class_method :settings_method
 
     (1..10).each {|v| define_method("bundler_#{v}_mode?") { major_version >= v } }
 
+    settings_flag(:allow_bundler_dependency_conflicts) { bundler_2_mode? }
     settings_flag(:allow_offline_install) { bundler_2_mode? }
+    settings_flag(:auto_clean_without_path) { bundler_2_mode? }
+    settings_flag(:cache_all) { bundler_2_mode? }
+    settings_flag(:cache_command_is_package) { bundler_2_mode? }
+    settings_flag(:console_command) { !bundler_2_mode? }
+    settings_flag(:default_install_uses_path) { bundler_2_mode? }
+    settings_flag(:deployment_means_frozen) { bundler_2_mode? }
+    settings_flag(:disable_multisource) { bundler_2_mode? }
+    settings_flag(:error_on_stderr) { bundler_2_mode? }
+    settings_flag(:forget_cli_options) { bundler_2_mode? }
+    settings_flag(:global_gem_cache) { bundler_2_mode? }
+    settings_flag(:init_gems_rb) { bundler_2_mode? }
+    settings_flag(:list_command) { bundler_2_mode? }
+    settings_flag(:lockfile_uses_separate_rubygems_sources) { bundler_2_mode? }
     settings_flag(:only_update_to_newer_versions) { bundler_2_mode? }
     settings_flag(:plugins) { @bundler_version >= Gem::Version.new("1.14") }
+    settings_flag(:prefer_gems_rb) { bundler_2_mode? }
+    settings_flag(:print_only_version_number) { bundler_2_mode? }
+    settings_flag(:setup_makes_kernel_gem_public) { !bundler_2_mode? }
+    settings_flag(:skip_default_git_sources) { bundler_2_mode? }
+    settings_flag(:specific_platform) { bundler_2_mode? }
+    settings_flag(:suppress_install_using_messages) { bundler_2_mode? }
+    settings_flag(:unlock_source_unlocks_spec) { !bundler_2_mode? }
+    settings_flag(:update_requires_all_flag) { bundler_2_mode? }
+
+    settings_option(:default_cli_command) { bundler_2_mode? ? :cli_help : :install }
 
     def initialize(bundler_version)
       @bundler_version = Gem::Version.create(bundler_version)
@@ -26,7 +63,5 @@ module Bundler
       @bundler_version.segments.first
     end
     private :major_version
-
-    class << self; private :settings_flag; end
   end
 end

data/lib/bundler/fetcher.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "bundler/vendored_persistent"
 require "cgi"
 require "securerandom"
@@ -237,7 +238,7 @@ module Bundler
           Bundler.settings[:ssl_client_cert]
         raise SSLError if needs_ssl && !defined?(OpenSSL::SSL)
 
-        con = Bundler::Persistent::Net::HTTP::Persistent.new "bundler", :ENV
+        con = PersistentHTTP.new "bundler", :ENV
         if gem_proxy = Bundler.rubygems.configuration[:http_proxy]
           con.proxy = URI.parse(gem_proxy) if gem_proxy != :no_proxy
         end
@@ -248,8 +249,11 @@ module Bundler
           con.cert_store = bundler_cert_store
         end
 
-        if Bundler.settings[:ssl_client_cert]
-          pem = File.read(Bundler.settings[:ssl_client_cert])
+        ssl_client_cert = Bundler.settings[:ssl_client_cert] ||
+          (Bundler.rubygems.configuration.ssl_client_cert if
+            Bundler.rubygems.configuration.respond_to?(:ssl_client_cert))
+        if ssl_client_cert
+          pem = File.read(ssl_client_cert)
           con.cert = OpenSSL::X509::Certificate.new(pem)
           con.key  = OpenSSL::PKey::RSA.new(pem)
         end
@@ -273,16 +277,19 @@ module Bundler
       Timeout::Error, EOFError, SocketError, Errno::ENETDOWN, Errno::ENETUNREACH,
       Errno::EINVAL, Errno::ECONNRESET, Errno::ETIMEDOUT, Errno::EAGAIN,
       Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError,
-      Bundler::Persistent::Net::HTTP::Persistent::Error, Zlib::BufError, Errno::EHOSTUNREACH
+      PersistentHTTP::Error, Zlib::BufError, Errno::EHOSTUNREACH
     ].freeze
 
     def bundler_cert_store
       store = OpenSSL::X509::Store.new
-      if Bundler.settings[:ssl_ca_cert]
-        if File.directory? Bundler.settings[:ssl_ca_cert]
-          store.add_path Bundler.settings[:ssl_ca_cert]
+      ssl_ca_cert = Bundler.settings[:ssl_ca_cert] ||
+        (Bundler.rubygems.configuration.ssl_ca_cert if
+          Bundler.rubygems.configuration.respond_to?(:ssl_ca_cert))
+      if ssl_ca_cert
+        if File.directory? ssl_ca_cert
+          store.add_path ssl_ca_cert
         else
-          store.add_file Bundler.settings[:ssl_ca_cert]
+          store.add_file ssl_ca_cert
         end
       else
         store.set_default_paths

data/lib/bundler/fetcher/base.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Bundler
   class Fetcher
     class Base

data/lib/bundler/fetcher/compact_index.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "bundler/fetcher/base"
 require "bundler/worker"
 
@@ -61,7 +62,7 @@ module Bundler
       compact_index_request :fetch_spec
 
       def available?
-        return nil unless md5_available?
+        return nil unless SharedHelpers.md5_available?
         user_home = Bundler.user_home
         return nil unless user_home.directory? && user_home.writable?
         # Read info file checksums out of /versions, so we can know if gems are up to date
@@ -120,16 +121,6 @@ module Bundler
           Net::HTTPNotModified.new(nil, nil, nil)
         end
       end
-
-      def md5_available?
-        require "openssl"
-        OpenSSL::Digest::MD5.digest("")
-        true
-      rescue LoadError
-        true
-      rescue OpenSSL::Digest::DigestError
-        false
-      end
     end
   end
 end

data/lib/bundler/fetcher/dependency.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "bundler/fetcher/base"
 require "cgi"
 

data/lib/bundler/fetcher/downloader.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Bundler
   class Fetcher
     class Downloader

data/lib/bundler/fetcher/index.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "bundler/fetcher/base"
 require "rubygems/remote_fetcher"
 

data/lib/bundler/friendly_errors.rb

@@ -1,5 +1,6 @@
 # encoding: utf-8
 # frozen_string_literal: true
+
 require "cgi"
 require "bundler/vendored_thor"
 
@@ -92,7 +93,7 @@ module Bundler
           #{e.backtrace && e.backtrace.join("\n          ").chomp}
         ```
 
-        #{Bundler::Env.new.report}
+        #{Bundler::Env.report}
         --- TEMPLATE END ----------------------------------------------------------------
 
       EOS

data/lib/bundler/gem_helper.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "bundler/vendored_thor" unless defined?(Thor)
 require "bundler"
 
@@ -50,8 +51,8 @@ module Bundler
         install_gem(built_gem_path, :local)
       end
 
-      desc "Create tag #{version_tag} and build and push #{name}-#{version}.gem to Rubygems\n" \
-           "To prevent publishing in Rubygems use `gem_push=no rake release`"
+      desc "Create tag #{version_tag} and build and push #{name}-#{version}.gem to #{gem_push_host}\n" \
+           "To prevent publishing in RubyGems use `gem_push=no rake release`"
       task "release", [:remote] => ["build", "release:guard_clean",
                                     "release:source_control_push", "release:rubygem_push"] do
       end
@@ -92,18 +93,14 @@ module Bundler
   protected
 
     def rubygem_push(path)
-      allowed_push_host = nil
       gem_command = "gem push '#{path}'"
       gem_command += " --key #{gem_key}" if gem_key
-      if @gemspec.respond_to?(:metadata)
-        allowed_push_host = @gemspec.metadata["allowed_push_host"]
-        gem_command += " --host #{allowed_push_host}" if allowed_push_host
-      end
+      gem_command += " --host #{allowed_push_host}" if allowed_push_host
       unless allowed_push_host || Bundler.user_home.join(".gem/credentials").file?
         raise "Your rubygems.org credentials aren't set. Run `gem push` to set them."
       end
       sh(gem_command)
-      Bundler.ui.confirm "Pushed #{name} #{version} to #{allowed_push_host ? allowed_push_host : "rubygems.org."}"
+      Bundler.ui.confirm "Pushed #{name} #{version} to #{gem_push_host}"
     end
 
     def built_gem_path
@@ -116,6 +113,14 @@ module Bundler
       Bundler.ui.confirm "Pushed git commits and tags."
     end
 
+    def allowed_push_host
+      @gemspec.metadata["allowed_push_host"] if @gemspec.respond_to?(:metadata)
+    end
+
+    def gem_push_host
+      allowed_push_host || "rubygems.org"
+    end
+
     def perform_git_push(options = "")
       cmd = "git push #{options}"
       out, code = sh_with_code(cmd)
@@ -187,7 +192,7 @@ module Bundler
     end
 
     def gem_push?
-      !%w(n no nil false off 0).include?(ENV["gem_push"].to_s.downcase)
+      !%w[n no nil false off 0].include?(ENV["gem_push"].to_s.downcase)
     end
   end
 end

data/lib/bundler/gem_helpers.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Bundler
   module GemHelpers
     GENERIC_CACHE = {} # rubocop:disable MutableConstant

data/lib/bundler/gem_remote_fetcher.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "rubygems/remote_fetcher"
 
 module Bundler

data/lib/bundler/gem_tasks.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "rake/clean"
 CLOBBER.include "pkg"
 

data/lib/bundler/gem_version_promoter.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Bundler
   # This class contains all of the logic for determining the next version of a
   # Gem to update to based on the requested level (patch, minor, major).

data/lib/bundler/gemdeps.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Bundler
   class Gemdeps
     def initialize(runtime)

data/lib/bundler/graph.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "set"
 module Bundler
   class Graph

data/lib/bundler/index.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "set"
 
 module Bundler
@@ -111,6 +112,7 @@ module Bundler
         spec_sets.values.each(&blk)
       end
       sources.each {|s| s.each(&blk) }
+      self
     end
 
     # returns a list of the dependencies
@@ -131,6 +133,19 @@ module Bundler
       names.uniq
     end
 
+    def dependency_names_if_available
+      reduce([]) do |names, spec|
+        case spec
+        when EndpointSpecification, Gem::Specification, LazySpecification, StubSpecification
+          names.concat(spec.dependencies)
+        when RemoteSpecification # from the full index
+          return nil
+        else
+          raise "unhandled spec type in #dependency_names_if_available (#{spec.inspect})"
+        end
+      end.tap {|n| n && n.map!(&:name) }
+    end
+
     def use(other, override_dupes = false)
       return unless other
       other.each do |s|
@@ -191,14 +206,6 @@ module Bundler
           end
         end
 
-        wants_prerelease = dependency.requirement.prerelease?
-        wants_prerelease ||= base && base.any? {|base_spec| base_spec.version.prerelease? }
-        only_prerelease = specs.all? {|spec| spec.version.prerelease? }
-
-        unless wants_prerelease || only_prerelease
-          found.reject! {|spec| spec.version.prerelease? }
-        end
-
         found
       end
     end

data/lib/bundler/injector.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Bundler
   class Injector
     def self.inject(new_deps, options = {})
@@ -12,38 +13,40 @@ module Bundler
     end
 
     def inject(gemfile_path, lockfile_path)
-      if Bundler.settings[:frozen]
+      if Bundler.frozen?
         # ensure the lock and Gemfile are synced
         Bundler.definition.ensure_equivalent_gemfile_and_lockfile(true)
-        # temporarily remove frozen while we inject
-        frozen = Bundler.settings.delete(:frozen)
       end
 
-      # evaluate the Gemfile we have now
-      builder = Dsl.new
-      builder.eval_gemfile(gemfile_path)
+      # temporarily unfreeze
+      Bundler.settings.temporary(:deployment => false, :frozen => false) do
+        # evaluate the Gemfile we have now
+        builder = Dsl.new
+        builder.eval_gemfile(gemfile_path)
+
+        # don't inject any gems that are already in the Gemfile
+        @new_deps -= builder.dependencies
 
-      # don't inject any gems that are already in the Gemfile
-      @new_deps -= builder.dependencies
+        # add new deps to the end of the in-memory Gemfile
+        # Set conservative versioning to false because we want to let the resolver resolve the version first
+        builder.eval_gemfile("injected gems", build_gem_lines(false)) if @new_deps.any?
 
-      # add new deps to the end of the in-memory Gemfile
-      # Set conservative versioining to false because we want to let the resolver resolve the version first
-      builder.eval_gemfile("injected gems", build_gem_lines(false)) if @new_deps.any?
+        # resolve to see if the new deps broke anything
+        @definition = builder.to_definition(lockfile_path, {})
+        @definition.resolve_remotely!
 
-      # resolve to see if the new deps broke anything
-      @definition = builder.to_definition(lockfile_path, {})
-      @definition.resolve_remotely!
+        # since nothing broke, we can add those gems to the gemfile
+        append_to(gemfile_path, build_gem_lines(@options[:conservative_versioning])) if @new_deps.any?
 
-      # since nothing broke, we can add those gems to the gemfile
-      append_to(gemfile_path, build_gem_lines(@options[:conservative_versioning])) if @new_deps.any?
+        # since we resolved successfully, write out the lockfile
+        @definition.lock(Bundler.default_lockfile)
 
-      # since we resolved successfully, write out the lockfile
-      @definition.lock(Bundler.default_lockfile)
+        # invalidate the cached Bundler.definition
+        Bundler.reset_paths!
 
-      # return an array of the deps that we added
-      return @new_deps
-    ensure
-      Bundler.settings[:frozen] = "1" if frozen
+        # return an array of the deps that we added
+        @new_deps
+      end
     end
 
   private