rubygems-update 2.6.7 → 2.6.8

data/bundler/lib/bundler/setup.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-require "bundler/postit_trampoline" unless ENV["BUNDLE_DISABLE_POSTIT"]
+require "bundler/postit_trampoline"
 require "bundler/shared_helpers"
 
 if Bundler::SharedHelpers.in_bundle?
@@ -20,9 +20,12 @@ if Bundler::SharedHelpers.in_bundle?
     Bundler.setup
   end
 
-  # Add bundler to the load path after disabling system gems
-  bundler_lib = File.expand_path("../..", __FILE__)
-  $LOAD_PATH.unshift(bundler_lib) unless $LOAD_PATH.include?(bundler_lib)
+  unless ENV["BUNDLE_POSTIT_TRAMPOLINING_VERSION"]
+    # Add bundler to the load path after disabling system gems
+    # This is guarenteed to be done already if we've trampolined
+    bundler_lib = File.expand_path("../..", __FILE__)
+    $LOAD_PATH.unshift(bundler_lib) unless $LOAD_PATH.include?(bundler_lib)
+  end
 
   Bundler.ui = nil
 end

data/bundler/lib/bundler/shared_helpers.rb

@@ -23,7 +23,7 @@ module Bundler
     def default_gemfile
       gemfile = find_gemfile
       raise GemfileNotFound, "Could not locate Gemfile" unless gemfile
-      Pathname.new(gemfile)
+      Pathname.new(gemfile).untaint
     end
 
     def default_lockfile
@@ -32,17 +32,19 @@ module Bundler
       case gemfile.basename.to_s
       when "gems.rb" then Pathname.new(gemfile.sub(/.rb$/, ".locked"))
       else Pathname.new("#{gemfile}.lock")
-      end
+      end.untaint
     end
 
     def default_bundle_dir
       bundle_dir = find_directory(".bundle")
       return nil unless bundle_dir
 
-      global_bundle_dir = File.join(Bundler.rubygems.user_home, ".bundle")
+      bundle_dir = Pathname.new(bundle_dir)
+
+      global_bundle_dir = Bundler.user_home.join(".bundle")
       return nil if bundle_dir == global_bundle_dir
 
-      Pathname.new(bundle_dir)
+      bundle_dir
     end
 
     def in_bundle?
@@ -102,7 +104,7 @@ module Bundler
     #
     # @see {Bundler::PermissionError}
     def filesystem_access(path, action = :write)
-      yield path
+      yield path.dup.untaint
     rescue Errno::EACCES
       raise PermissionError.new(path, action)
     rescue Errno::EAGAIN
@@ -120,12 +122,27 @@ module Bundler
       namespace.const_get(constant_name)
     end
 
+    def major_deprecation(message)
+      return unless prints_major_deprecations?
+      @major_deprecation_ui ||= Bundler::UI::Shell.new("no-color" => true)
+      ui = Bundler.ui.is_a?(@major_deprecation_ui.class) ? Bundler.ui : @major_deprecation_ui
+      ui.warn("[DEPRECATED FOR #{Bundler::VERSION.split(".").first.to_i + 1}.0] #{message}")
+    end
+
+    def print_major_deprecations!
+      deprecate_gemfile(find_gemfile) if find_gemfile == find_file("Gemfile")
+      if RUBY_VERSION < "2"
+        major_deprecation("Bundler will only support ruby >= 2.0, you are running #{RUBY_VERSION}")
+      end
+      return if Bundler.rubygems.provides?(">= 2")
+      major_deprecation("Bundler will only support rubygems >= 2.0, you are running #{Bundler.rubygems.version}")
+    end
+
   private
 
     def find_gemfile
       given = ENV["BUNDLE_GEMFILE"]
       return given if given && !given.empty?
-
       find_file("Gemfile", "gems.rb")
     end
 
@@ -143,7 +160,7 @@ module Bundler
 
     def search_up(*names)
       previous = nil
-      current  = File.expand_path(SharedHelpers.pwd)
+      current  = File.expand_path(SharedHelpers.pwd).untaint
 
       until !File.directory?(current) || current == previous
         if ENV["BUNDLE_SPEC_RUN"]
@@ -187,10 +204,15 @@ module Bundler
 
     def set_rubylib
       rubylib = (ENV["RUBYLIB"] || "").split(File::PATH_SEPARATOR)
-      rubylib.unshift File.expand_path("../..", __FILE__)
+      rubylib.unshift bundler_ruby_lib
       ENV["RUBYLIB"] = rubylib.uniq.join(File::PATH_SEPARATOR)
     end
 
+    def bundler_ruby_lib
+      File.expand_path("../..", __FILE__)
+    end
+    private :bundler_ruby_lib
+
     def clean_load_path
       # handle 1.9 where system gems are always on the load path
       if defined?(::Gem)
@@ -207,6 +229,21 @@ module Bundler
       end
     end
 
+    def prints_major_deprecations?
+      require "bundler"
+      deprecation_release = Bundler::VERSION.split(".").drop(1).include?("99")
+      return false if !deprecation_release && !Bundler.settings[:major_deprecations]
+      require "bundler/deprecate"
+      return false if Bundler::Deprecate.skip
+      true
+    end
+
+    def deprecate_gemfile(gemfile)
+      return unless gemfile && File.basename(gemfile) == "Gemfile"
+      Bundler::SharedHelpers.major_deprecation \
+        "gems.rb and gems.locked will be prefered to Gemfile and Gemfile.lock."
+    end
+
     extend self
   end
 end

data/bundler/lib/bundler/source.rb

@@ -14,12 +14,13 @@ module Bundler
 
     def version_message(spec)
       message = "#{spec.name} #{spec.version}"
+      message += " (#{spec.platform})" if spec.platform != Gem::Platform::RUBY && !spec.platform.nil?
 
       if Bundler.locked_gems
         locked_spec = Bundler.locked_gems.specs.find {|s| s.name == spec.name }
         locked_spec_version = locked_spec.version if locked_spec
         if locked_spec_version && spec.version != locked_spec_version
-          message += " (#{Bundler.ui.add_color("was #{locked_spec_version}", :green)})"
+          message += Bundler.ui.add_color(" (was #{locked_spec_version})", :green)
         end
       end
 

data/bundler/lib/bundler/source/gemspec.rb

@@ -8,6 +8,10 @@ module Bundler
         super
         @gemspec = options["gemspec"]
       end
+
+      def as_path_source
+        Path.new(options)
+      end
     end
   end
 end

data/bundler/lib/bundler/source/git.rb

@@ -152,7 +152,7 @@ module Bundler
         set_local!(app_cache_path) if has_app_cache? && !local?
 
         if requires_checkout? && !@copied
-          git_proxy.checkout
+          fetch
           git_proxy.copy_to(install_path, submodules)
           serialize_gemspecs_in(install_path)
           @copied = true
@@ -170,7 +170,7 @@ module Bundler
           serialize_gemspecs_in(install_path)
           @copied = true
         end
-        generate_bin(spec)
+        generate_bin(spec, !Bundler.rubygems.spec_missing_extensions?(spec))
 
         requires_checkout? ? spec.post_install_message : nil
       end
@@ -223,10 +223,6 @@ module Bundler
 
     private
 
-      def build_extensions(installer)
-        super if Bundler.rubygems.spec_missing_extensions?(installer.spec)
-      end
-
       def serialize_gemspecs_in(destination)
         destination = destination.expand_path(Bundler.root) if destination.relative?
         Dir["#{destination}/#{@glob}"].each do |spec_path|
@@ -292,6 +288,13 @@ module Bundler
       def git_proxy
         @git_proxy ||= GitProxy.new(cache_path, uri, ref, cached_revision, self)
       end
+
+      def fetch
+        git_proxy.checkout
+      rescue GitError
+        raise unless Bundler.feature_flag.allow_offline_install?
+        Bundler.ui.warn "Using cached git data because of network errors"
+      end
     end
   end
 end

data/bundler/lib/bundler/source/git/git_proxy.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+require "tempfile"
 module Bundler
   class Source
     class Git < Path
@@ -80,6 +81,10 @@ module Bundler
         end
 
         def version
+          git("--version").match(/(git version\s*)?((\.?\d+)+).*/)[2]
+        end
+
+        def full_version
           git("--version").sub("git version", "").strip
         end
 
@@ -110,7 +115,7 @@ module Bundler
                 FileUtils.rm_rf(p)
               end
               git_retry %(clone --no-checkout --quiet "#{path}" "#{destination}")
-              File.chmod(((File.stat(destination).mode | 0777) & ~File.umask), destination)
+              File.chmod(((File.stat(destination).mode | 0o777) & ~File.umask), destination)
             rescue Errno::EEXIST => e
               file_path = e.message[%r{.*?(/.*)}, 1]
               raise GitError, "Bundler could not install a gem because it needs to " \
@@ -123,7 +128,11 @@ module Bundler
             git_retry %(fetch --force --quiet --tags "#{path}")
             git "reset --hard #{@revision}"
 
-            git_retry "submodule update --init --recursive" if submodules
+            if submodules
+              git_retry "submodule update --init --recursive"
+            elsif Gem::Version.create(version) >= Gem::Version.create("2.9.0")
+              git_retry "submodule deinit --all"
+            end
           end
         end
 
@@ -139,7 +148,7 @@ module Bundler
         end
 
         def git_retry(command)
-          Bundler::Retry.new("git #{command}", GitNotAllowedError).attempts do
+          Bundler::Retry.new("`git #{command}`", GitNotAllowedError).attempts do
             git(command)
           end
         end
@@ -148,7 +157,9 @@ module Bundler
           command_with_no_credentials = URICredentialsFilter.credential_filtered_string(command, uri)
           raise GitNotAllowedError.new(command_with_no_credentials) unless allow?
 
-          out = SharedHelpers.with_clean_git_env { `git #{command}` }
+          out = SharedHelpers.with_clean_git_env do
+            capture_and_filter_stderr(uri) { `git #{command}` }
+          end
 
           stdout_with_no_credentials = URICredentialsFilter.credential_filtered_string(out, uri)
           raise GitCommandError.new(command_with_no_credentials, path, error_msg) if check_errors && !$?.success?
@@ -212,6 +223,28 @@ module Bundler
           return in_path { yield } if allow?
           raise GitError, "The git source #{uri} is not yet checked out. Please run `bundle install` before trying to start your application"
         end
+
+        # TODO: Replace this with Open3 when upgrading to bundler 2
+        # Similar to #git_null, as Open3 is not cross-platform,
+        # a temporary way is to use Tempfile to capture the stderr.
+        # When replacing this using Open3, make sure git_null is
+        # also replaced by Open3, so stdout and stderr all got handled properly.
+        def capture_and_filter_stderr(uri)
+          return_value, captured_err = ""
+          backup_stderr = STDERR.dup
+          begin
+            Tempfile.open("captured_stderr") do |f|
+              STDERR.reopen(f)
+              return_value = yield
+              f.rewind
+              captured_err = f.read
+            end
+          ensure
+            STDERR.reopen backup_stderr
+          end
+          $stderr.puts URICredentialsFilter.credential_filtered_string(captured_err, uri) if uri && !captured_err.empty?
+          return_value
+        end
       end
     end
   end

data/bundler/lib/bundler/source/path.rb

@@ -11,7 +11,7 @@ module Bundler
       DEFAULT_GLOB = "{,*,*/*}.gemspec".freeze
 
       def initialize(options)
-        @options = options
+        @options = options.dup
         @glob = options["glob"] || DEFAULT_GLOB
 
         @allow_cached = false
@@ -46,7 +46,7 @@ module Bundler
 
       def to_lock
         out = String.new("PATH\n")
-        out << "  remote: #{relative_path}\n"
+        out << "  remote: #{lockfile_path}\n"
         out << "  glob: #{@glob}\n" unless @glob == DEFAULT_GLOB
         out << "  specs:\n"
       end
@@ -60,7 +60,7 @@ module Bundler
       end
 
       def eql?(other)
-        return unless other.class == Path || other.class == Gemspec
+        return unless other.class == self.class
         expanded_path == expand(other.path) &&
           version == other.version
       end
@@ -129,6 +129,11 @@ module Bundler
           "`#{somepath}`.\nThe error message was: #{e.message}."
       end
 
+      def lockfile_path
+        return relative_path if path.absolute?
+        expand(path).relative_path_from(Bundler.root)
+      end
+
       def app_cache_path(custom_path = nil)
         @app_cache_path ||= Bundler.app_cache(custom_path).join(app_cache_dirname)
       end
@@ -203,13 +208,8 @@ module Bundler
           end
         end.compact
 
-        SharedHelpers.chdir(gem_dir) do
-          installer = Path::Installer.new(spec, :env_shebang => false)
-          run_hooks(:pre_install, installer)
-          build_extensions(installer) unless disable_extensions
-          installer.generate_bin
-          run_hooks(:post_install, installer)
-        end
+        installer = Path::Installer.new(spec, :env_shebang => false, :disable_extensions => disable_extensions)
+        installer.post_install
       rescue Gem::InvalidSpecificationException => e
         Bundler.ui.warn "\n#{spec.name} at #{spec.full_gem_path} did not have a valid gemspec.\n" \
                         "This prevents bundler from installing bins or native extensions, but " \
@@ -223,23 +223,6 @@ module Bundler
 
         Bundler.ui.warn "The validation message from Rubygems was:\n  #{e.message}"
       end
-
-      def build_extensions(installer)
-        installer.build_extensions
-        run_hooks(:post_build, installer)
-      end
-
-      def run_hooks(type, installer)
-        hooks_meth = "#{type}_hooks"
-        return unless Gem.respond_to?(hooks_meth)
-        Gem.send(hooks_meth).each do |hook|
-          result = hook.call(installer)
-          next unless result == false
-          location = " at #{$1}" if hook.inspect =~ /@(.*:\d+)/
-          message = "#{type} hook#{location} failed for #{installer.spec.full_name}"
-          raise InstallHookError, message
-        end
-      end
     end
   end
 end

data/bundler/lib/bundler/source/path/installer.rb

@@ -6,13 +6,14 @@ module Bundler
         attr_reader :spec
 
         def initialize(spec, options = {})
-          @spec              = spec
-          @gem_dir           = Bundler.rubygems.path(spec.full_gem_path)
-          @wrappers          = true
-          @env_shebang       = true
-          @format_executable = options[:format_executable] || false
-          @build_args        = options[:build_args] || Bundler.rubygems.build_args
-          @gem_bin_dir       = "#{Bundler.rubygems.gem_dir}/bin"
+          @spec               = spec
+          @gem_dir            = Bundler.rubygems.path(spec.full_gem_path)
+          @wrappers           = true
+          @env_shebang        = true
+          @format_executable  = options[:format_executable] || false
+          @build_args         = options[:build_args] || Bundler.rubygems.build_args
+          @gem_bin_dir        = "#{Bundler.rubygems.gem_dir}/bin"
+          @disable_extentions = options[:disable_extensions]
 
           if Bundler.requires_sudo?
             @tmp_dir = Bundler.tmp(spec.full_name).to_s
@@ -22,9 +23,26 @@ module Bundler
           end
         end
 
-        def generate_bin
-          return if spec.executables.nil? || spec.executables.empty?
+        def post_install
+          SharedHelpers.chdir(@gem_dir) do
+            run_hooks(:pre_install)
+
+            unless @disable_extentions
+              build_extensions
+              run_hooks(:post_build)
+            end
+
+            generate_bin unless spec.executables.nil? || spec.executables.empty?
+
+            run_hooks(:post_install)
+          end
+        ensure
+          Bundler.rm_rf(@tmp_dir) if Bundler.requires_sudo?
+        end
+
+      private
 
+        def generate_bin
           super
 
           if Bundler.requires_sudo?
@@ -35,8 +53,18 @@ module Bundler
               Bundler.sudo "cp -R #{@bin_dir}/#{exe} #{@gem_bin_dir}"
             end
           end
-        ensure
-          Bundler.rm_rf(@tmp_dir) if Bundler.requires_sudo?
+        end
+
+        def run_hooks(type)
+          hooks_meth = "#{type}_hooks"
+          return unless Gem.respond_to?(hooks_meth)
+          Gem.send(hooks_meth).each do |hook|
+            result = hook.call(self)
+            next unless result == false
+            location = " at #{$1}" if hook.inspect =~ /@(.*:\d+)/
+            message = "#{type} hook#{location} failed for #{spec.full_name}"
+            raise InstallHookError, message
+          end
         end
       end
     end

data/bundler/lib/bundler/source/rubygems.rb

@@ -134,13 +134,14 @@ module Bundler
 
           installed_spec = nil
           Bundler.rubygems.preserve_paths do
-            installed_spec = Bundler::RubyGemsGemInstaller.new(
+            installed_spec = Bundler::RubyGemsGemInstaller.at(
               path,
               :install_dir         => install_path.to_s,
               :bin_dir             => bin_path.to_s,
               :ignore_dependencies => true,
               :wrappers            => true,
-              :env_shebang         => true
+              :env_shebang         => true,
+              :bundler_expected_checksum => spec.respond_to?(:checksum) && spec.checksum
             ).install
           end
           spec.full_gem_path = installed_spec.full_gem_path