bundler 2.2.3 → 2.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6d1efe11ee2c513b90baf20e54b599a1cec72355056997c53b1d62a064c4237
-  data.tar.gz: ac82de915bc8c58b391a19e61f3abcad69dc279a531e09cadcc59083653fc7f9
+  metadata.gz: cb5e62df5ac6ec81289223672d91b6b7a1229fc348a7d7d3dba5a200e87293af
+  data.tar.gz: 8ef6f15e230d10fd4fce8918ffd0bbeff4df1d65e9921d46e0d246cc316fe79d
 SHA512:
-  metadata.gz: 835e64c01ad6e8c66e0c2e7199457f0b6ce5ecb2ff8c8e4af557e40c9186bd734cbff607a45ec9a751f6ad0e6790e81a78b206b1082a7b2a7a22526b6422b280
-  data.tar.gz: 07ed7766695917265535b4a5803ff799d201aaa910d73ba4b185f5f18836e1d1ec3967535b7b68c4c55d3af05c038ec6bcde8f66e8068db5576e16929ead145d
+  metadata.gz: 4da8e14312ce09705a4c23999a27d0cf268809ce6dbb01da190a3f93218fb68c98c21f5ef13ead345e2a46be89dacdc3c87c91e2369bc4b69e0f2a36efa8c6b4
+  data.tar.gz: f48e22dabd54c2a4e3b87b2644ace759777a2f949fcd47322534804272314b655435dbda1aadfcbb4f7a96e2b52b0ee3666595d8a56384e51720feb17ba28a53

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 2.2.4 (December 31, 2020)
+
+## Bug fixes:
+
+  - Fix bundle man pages display on truffleruby [#4209](https://github.com/rubygems/rubygems/pull/4209)
+  - Fix Windows + JRuby no longer being able to install git sources [#4196](https://github.com/rubygems/rubygems/pull/4196)
+
 # 2.2.3 (December 22, 2020)
 
 ## Bug fixes:

data/bundler.gemspec

@@ -34,7 +34,7 @@ Gem::Specification.new do |s|
   s.required_ruby_version     = ">= 2.3.0"
   s.required_rubygems_version = ">= 2.5.2"
 
-  s.files = Dir.glob("{lib,man,exe}/**/*", File::FNM_DOTMATCH).reject {|f| File.directory?(f) }
+  s.files = Dir.glob("{lib,exe}/**/*", File::FNM_DOTMATCH).reject {|f| File.directory?(f) }
 
   # Include the CHANGELOG.md, LICENSE.md, README.md manually
   s.files += %w[CHANGELOG.md LICENSE.md README.md]

data/lib/bundler/build_metadata.rb

@@ -4,8 +4,8 @@ module Bundler
   # Represents metadata from when the Bundler gem was built.
   module BuildMetadata
     # begin ivars
-    @built_at = "2020-12-22".freeze
-    @git_commit_sha = "29dc3c8398".freeze
+    @built_at = "2020-12-31".freeze
+    @git_commit_sha = "529e536f28".freeze
     @release = true
     # end ivars
 

data/lib/bundler/cli.rb

@@ -122,9 +122,7 @@ module Bundler
       else command = "bundle-#{cli}"
       end
 
-      man_path = File.expand_path("../../../man", __FILE__)
-      # man files are located under ruby's mandir with the default gems of bundler
-      man_path = RbConfig::CONFIG["mandir"] unless File.directory?(man_path)
+      man_path = File.expand_path("man", __dir__)
       man_pages = Hash[Dir.glob(File.join(man_path, "**", "*")).grep(/.*\.\d*\Z/).collect do |f|
         [File.basename(f, ".*"), f]
       end]
@@ -134,8 +132,7 @@ module Bundler
         if Bundler.which("man") && man_path !~ %r{^file:/.+!/META-INF/jruby.home/.+}
           Kernel.exec "man #{man_page}"
         else
-          fallback_man_path = File.expand_path("../man", __FILE__)
-          puts File.read("#{fallback_man_path}/#{File.basename(man_page)}.ronn")
+          puts File.read("#{man_path}/#{File.basename(man_page)}.ronn")
         end
       elsif command_path = Bundler.which("bundler-#{cli}")
         Kernel.exec(command_path, "--help")

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

@@ -67,13 +67,13 @@ module Bundler
 
         def branch
           @branch ||= allowed_with_path do
-            git("rev-parse --abbrev-ref HEAD", :dir => path).strip
+            git("rev-parse", "--abbrev-ref", "HEAD", :dir => path).strip
           end
         end
 
         def contains?(commit)
           allowed_with_path do
-            result, status = git_null("branch --contains #{commit}", :dir => path)
+            result, status = git_null("branch", "--contains", commit, :dir => path)
             status.success? && result =~ /^\* (.*)$/
           end
         end
@@ -88,20 +88,22 @@ module Bundler
 
         def checkout
           return if path.exist? && has_revision_cached?
-          extra_ref = "#{Shellwords.shellescape(ref)}:#{Shellwords.shellescape(ref)}" if ref && ref.start_with?("refs/")
+          extra_ref = "#{ref}:#{ref}" if ref && ref.start_with?("refs/")
 
           Bundler.ui.info "Fetching #{URICredentialsFilter.credential_filtered_uri(uri)}"
 
+          configured_uri = configured_uri_for(uri).to_s
+
           unless path.exist?
             SharedHelpers.filesystem_access(path.dirname) do |p|
               FileUtils.mkdir_p(p)
             end
-            git_retry %(clone #{uri_escaped_with_configured_credentials} "#{path}" --bare --no-hardlinks --quiet)
+            git_retry "clone", configured_uri, path.to_s, "--bare", "--no-hardlinks", "--quiet"
             return unless extra_ref
           end
 
           with_path do
-            git_retry %(fetch --force --quiet --tags #{uri_escaped_with_configured_credentials} "refs/heads/*:refs/heads/*" #{extra_ref}), :dir => path
+            git_retry(*["fetch", "--force", "--quiet", "--tags", configured_uri, "refs/heads/*:refs/heads/*", extra_ref].compact, :dir => path)
           end
         end
 
@@ -115,7 +117,7 @@ module Bundler
               SharedHelpers.filesystem_access(destination) do |p|
                 FileUtils.rm_rf(p)
               end
-              git_retry %(clone --no-checkout --quiet "#{path}" "#{destination}")
+              git_retry "clone", "--no-checkout", "--quiet", path.to_s, destination.to_s
               File.chmod(((File.stat(destination).mode | 0o777) & ~File.umask), destination)
             rescue Errno::EEXIST => e
               file_path = e.message[%r{.*?((?:[a-zA-Z]:)?/.*)}, 1]
@@ -125,46 +127,45 @@ module Bundler
             end
           end
           # method 2
-          git_retry %(fetch --force --quiet --tags "#{path}"), :dir => destination
+          git_retry "fetch", "--force", "--quiet", "--tags", path.to_s, :dir => destination
 
           begin
-            git "reset --hard #{@revision}", :dir => destination
+            git "reset", "--hard", @revision, :dir => destination
           rescue GitCommandError => e
             raise MissingGitRevisionError.new(e.command, path, destination, @revision, URICredentialsFilter.credential_filtered_uri(uri))
           end
 
           if submodules
-            git_retry "submodule update --init --recursive", :dir => destination
+            git_retry "submodule", "update", "--init", "--recursive", :dir => destination
           elsif Gem::Version.create(version) >= Gem::Version.create("2.9.0")
             inner_command = "git -C $toplevel submodule deinit --force $sm_path"
-            inner_command = inner_command.gsub("$") { '\$' } unless Bundler::WINDOWS
-            git_retry "submodule foreach --quiet \"#{inner_command}\"", :dir => destination
+            git_retry "submodule", "foreach", "--quiet", inner_command, :dir => destination
           end
         end
 
         private
 
-        def git_null(command, dir: SharedHelpers.pwd)
+        def git_null(*command, dir: SharedHelpers.pwd)
           check_allowed(command)
 
           out, status = SharedHelpers.with_clean_git_env do
-            capture_and_ignore_stderr("git #{command}", :chdir => dir.to_s)
+            capture_and_ignore_stderr("git", "-C", dir.to_s, *command)
           end
 
           [URICredentialsFilter.credential_filtered_string(out, uri), status]
         end
 
-        def git_retry(command, dir: SharedHelpers.pwd)
-          Bundler::Retry.new("`git #{URICredentialsFilter.credential_filtered_string(command, uri)}`", GitNotAllowedError).attempts do
-            git(command, :dir => dir)
+        def git_retry(*command, dir: SharedHelpers.pwd)
+          Bundler::Retry.new("`git -C #{dir} #{URICredentialsFilter.credential_filtered_string(command.shelljoin, uri)}`", GitNotAllowedError).attempts do
+            git(*command, :dir => dir)
           end
         end
 
-        def git(command, dir: SharedHelpers.pwd)
+        def git(*command, dir: SharedHelpers.pwd)
           command_with_no_credentials = check_allowed(command)
 
           out, status = SharedHelpers.with_clean_git_env do
-            capture_and_filter_stderr(uri, "git #{command}", :chdir => dir.to_s)
+            capture_and_filter_stderr("git", "-C", dir.to_s, *command)
           end
 
           raise GitCommandError.new(command_with_no_credentials, path, dir) unless status.success?
@@ -174,7 +175,7 @@ module Bundler
 
         def has_revision_cached?
           return unless @revision
-          with_path { git("cat-file -e #{@revision}", :dir => path) }
+          with_path { git("cat-file", "-e", @revision, :dir => path) }
           true
         rescue GitError
           false
@@ -186,26 +187,12 @@ module Bundler
 
         def find_local_revision
           allowed_with_path do
-            git("rev-parse --verify #{Shellwords.shellescape(ref)}", :dir => path).strip
+            git("rev-parse", "--verify", ref, :dir => path).strip
           end
         rescue GitCommandError => e
           raise MissingGitRevisionError.new(e.command, path, path, ref, URICredentialsFilter.credential_filtered_uri(uri))
         end
 
-        # Escape the URI for git commands
-        def uri_escaped_with_configured_credentials
-          remote = configured_uri_for(uri)
-          if Bundler::WINDOWS
-            # Windows quoting requires double quotes only, with double quotes
-            # inside the string escaped by being doubled.
-            '"' + remote.gsub('"') { '""' } + '"'
-          else
-            # Bash requires single quoted strings, with the single quotes escaped
-            # by ending the string, escaping the quote, and restarting the string.
-            "'" + remote.gsub("'") { "'\\''" } + "'"
-          end
-        end
-
         # Adds credentials to the URI as Fetcher#configured_uri_for does
         def configured_uri_for(uri)
           if /https?:/ =~ uri
@@ -233,21 +220,21 @@ module Bundler
         end
 
         def check_allowed(command)
-          command_with_no_credentials = URICredentialsFilter.credential_filtered_string(command, uri)
+          command_with_no_credentials = URICredentialsFilter.credential_filtered_string(command.shelljoin, uri)
           raise GitNotAllowedError.new(command_with_no_credentials) unless allow?
           command_with_no_credentials
         end
 
-        def capture_and_filter_stderr(uri, cmd, chdir: SharedHelpers.pwd)
+        def capture_and_filter_stderr(*cmd)
           require "open3"
-          return_value, captured_err, status = Open3.capture3(cmd, :chdir => chdir)
-          Bundler.ui.warn URICredentialsFilter.credential_filtered_string(captured_err, uri) if uri && !captured_err.empty?
+          return_value, captured_err, status = Open3.capture3(*cmd)
+          Bundler.ui.warn URICredentialsFilter.credential_filtered_string(captured_err, uri) unless captured_err.empty?
           [return_value, status]
         end
 
-        def capture_and_ignore_stderr(cmd, chdir: SharedHelpers.pwd)
+        def capture_and_ignore_stderr(*cmd)
           require "open3"
-          return_value, _, status = Open3.capture3(cmd, :chdir => chdir)
+          return_value, _, status = Open3.capture3(*cmd)
           [return_value, status]
         end
       end

data/lib/bundler/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: false
 
 module Bundler
-  VERSION = "2.2.3".freeze
+  VERSION = "2.2.4".freeze
 
   def self.bundler_major_version
     @bundler_major_version ||= VERSION.split(".").first.to_i

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bundler
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 2.2.4
 platform: ruby
 authors:
 - André Arko
@@ -22,7 +22,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-12-22 00:00:00.000000000 Z
+date: 2020-12-31 00:00:00.000000000 Z
 dependencies: []
 description: Bundler manages an application's dependencies through its entire life,
   across many machines, systematically and repeatably
@@ -113,31 +113,57 @@ files:
 - lib/bundler/lockfile_generator.rb
 - lib/bundler/lockfile_parser.rb
 - lib/bundler/man/.document
+- lib/bundler/man/bundle-add.1
 - lib/bundler/man/bundle-add.1.ronn
+- lib/bundler/man/bundle-binstubs.1
 - lib/bundler/man/bundle-binstubs.1.ronn
+- lib/bundler/man/bundle-cache.1
 - lib/bundler/man/bundle-cache.1.ronn
+- lib/bundler/man/bundle-check.1
 - lib/bundler/man/bundle-check.1.ronn
+- lib/bundler/man/bundle-clean.1
 - lib/bundler/man/bundle-clean.1.ronn
+- lib/bundler/man/bundle-config.1
 - lib/bundler/man/bundle-config.1.ronn
+- lib/bundler/man/bundle-doctor.1
 - lib/bundler/man/bundle-doctor.1.ronn
+- lib/bundler/man/bundle-exec.1
 - lib/bundler/man/bundle-exec.1.ronn
+- lib/bundler/man/bundle-gem.1
 - lib/bundler/man/bundle-gem.1.ronn
+- lib/bundler/man/bundle-info.1
 - lib/bundler/man/bundle-info.1.ronn
+- lib/bundler/man/bundle-init.1
 - lib/bundler/man/bundle-init.1.ronn
+- lib/bundler/man/bundle-inject.1
 - lib/bundler/man/bundle-inject.1.ronn
+- lib/bundler/man/bundle-install.1
 - lib/bundler/man/bundle-install.1.ronn
+- lib/bundler/man/bundle-list.1
 - lib/bundler/man/bundle-list.1.ronn
+- lib/bundler/man/bundle-lock.1
 - lib/bundler/man/bundle-lock.1.ronn
+- lib/bundler/man/bundle-open.1
 - lib/bundler/man/bundle-open.1.ronn
+- lib/bundler/man/bundle-outdated.1
 - lib/bundler/man/bundle-outdated.1.ronn
+- lib/bundler/man/bundle-platform.1
 - lib/bundler/man/bundle-platform.1.ronn
+- lib/bundler/man/bundle-pristine.1
 - lib/bundler/man/bundle-pristine.1.ronn
+- lib/bundler/man/bundle-remove.1
 - lib/bundler/man/bundle-remove.1.ronn
+- lib/bundler/man/bundle-show.1
 - lib/bundler/man/bundle-show.1.ronn
+- lib/bundler/man/bundle-update.1
 - lib/bundler/man/bundle-update.1.ronn
+- lib/bundler/man/bundle-viz.1
 - lib/bundler/man/bundle-viz.1.ronn
+- lib/bundler/man/bundle.1
 - lib/bundler/man/bundle.1.ronn
+- lib/bundler/man/gemfile.5
 - lib/bundler/man/gemfile.5.ronn
+- lib/bundler/man/index.txt
 - lib/bundler/match_platform.rb
 - lib/bundler/mirror.rb
 - lib/bundler/plugin.rb
@@ -302,32 +328,6 @@ files:
 - lib/bundler/vlad.rb
 - lib/bundler/worker.rb
 - lib/bundler/yaml_serializer.rb
-- man/bundle-add.1
-- man/bundle-binstubs.1
-- man/bundle-cache.1
-- man/bundle-check.1
-- man/bundle-clean.1
-- man/bundle-config.1
-- man/bundle-doctor.1
-- man/bundle-exec.1
-- man/bundle-gem.1
-- man/bundle-info.1
-- man/bundle-init.1
-- man/bundle-inject.1
-- man/bundle-install.1
-- man/bundle-list.1
-- man/bundle-lock.1
-- man/bundle-open.1
-- man/bundle-outdated.1
-- man/bundle-platform.1
-- man/bundle-pristine.1
-- man/bundle-remove.1
-- man/bundle-show.1
-- man/bundle-update.1
-- man/bundle-viz.1
-- man/bundle.1
-- man/gemfile.5
-- man/index.txt
 homepage: https://bundler.io
 licenses:
 - MIT
@@ -351,7 +351,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 2.5.2
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.3.0.dev
 signing_key: 
 specification_version: 4
 summary: The best way to manage your application's dependencies