bundler 1.17.1 → 1.17.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2333042f7dca5228f6f4b5a305fcfdcd06b0f271
-  data.tar.gz: cb3f8c37fb4ad47d1104bbaed8317be99c43c25c
+SHA256:
+  metadata.gz: e5fc321a02b0fa5dad6b3cd6571aec637a45f08a466b2c4ec606504dd78349c6
+  data.tar.gz: d35d0334cb32ed98e0acf906e259a2acd7b1bdcc2cd4d28834527fac61e71905
 SHA512:
-  metadata.gz: 91e16132554c567383930053eb902ce3c5a53eb98e807059cbd1a43947b46bb98d740dd9153d4f5451ae15a944c31beaed3793fe0e47c156d621136b9bc6fb8f
-  data.tar.gz: aca92a0e1371986f41f249bbe739f89e3b431f675db60b41903816fdcb8c67edeac0822f68690a8a439c8ab526cf7686ef22648f2bd298310c6a74b8cc3eeee9
+  metadata.gz: 6c5bb5cb584c6bd1671a4b977521029ad69b30c3f46b878315a434927ad1a24075b35b7e3fbbd65732eaf86dcb21e768ca3168efa73d3b1175ef939623f5dcbf
+  data.tar.gz: 676eb8c5a72ace883a6c635fc95b481b250d5cf56c212c58ea72ab664c83d3379a22996543d5abb311c8260857364b0fd960db62d29c0f0897c381a9b4ed2bad

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.17.2 (2018-12-11)
+
+ - Add compatability for bundler merge with Ruby 2.6
+
 ## 1.17.1 (2018-10-25)
 
  - Convert `Pathname`s to `String`s before sorting them, fixing #6760 and #6758 ([#6761](https://github.com/bundler/bundler/pull/6761), @alexggordon)

data/bundler.gemspec

@@ -1,7 +1,13 @@
 # coding: utf-8
 # frozen_string_literal: true
 
-require File.expand_path("../lib/bundler/version", __FILE__)
+begin
+  require File.expand_path("../lib/bundler/version", __FILE__)
+rescue LoadError
+  # for Ruby core repository
+  require File.expand_path("../bundler/version", __FILE__)
+end
+
 require "shellwords"
 
 Gem::Specification.new do |s|

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 = "2018-10-25".freeze
-    @git_commit_sha = "2760d72d3".freeze
+    @built_at = "2018-12-11".freeze
+    @git_commit_sha = "43e950846".freeze
     @release = true
     # end ivars
 
@@ -30,12 +30,19 @@ module Bundler
       # If Bundler has been installed without its .git directory and without a
       # commit instance variable then we can't determine its commits SHA.
       git_dir = File.join(File.expand_path("../../..", __FILE__), ".git")
-      return "unknown" unless File.directory?(git_dir)
+      if File.directory?(git_dir)
+        return @git_commit_sha = Dir.chdir(git_dir) { `git rev-parse --short HEAD`.strip.freeze }
+      end
 
-      # Otherwise shell out to git.
-      @git_commit_sha = Dir.chdir(File.expand_path("..", __FILE__)) do
-        `git rev-parse --short HEAD`.strip.freeze
+      # If Bundler is a submodule in RubyGems, get the submodule commit
+      git_sub_dir = File.join(File.expand_path("../../../..", __FILE__), ".git")
+      if File.directory?(git_sub_dir)
+        return @git_commit_sha = Dir.chdir(git_sub_dir) do
+          `git ls-tree --abbrev=8 HEAD bundler`.split(/\s/).fetch(2, "").strip.freeze
+        end
       end
+
+      @git_commit_sha ||= "unknown"
     end
 
     # Whether this is an official release build of Bundler.

data/lib/bundler/dsl.rb

@@ -305,7 +305,7 @@ module Bundler
         #   end
         repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
         # TODO: 2.0 upgrade this setting to the default
-        if Bundler.settings["github.https"]
+        if Bundler.feature_flag.github_https?
           Bundler::SharedHelpers.major_deprecation 2, "The `github.https` setting will be removed"
           "https://github.com/#{repo_name}.git"
         else

data/lib/bundler/feature_flag.rb

@@ -60,6 +60,8 @@ module Bundler
 
     settings_option(:default_cli_command) { bundler_2_mode? ? :cli_help : :install }
 
+    settings_method(:github_https?, "github.https") { bundler_2_mode? }
+
     def initialize(bundler_version)
       @bundler_version = Gem::Version.create(bundler_version)
     end

data/lib/bundler/shared_helpers.rb

@@ -274,7 +274,15 @@ module Bundler
       until !File.directory?(current) || current == previous
         if ENV["BUNDLE_SPEC_RUN"]
           # avoid stepping above the tmp directory when testing
-          return nil if File.file?(File.join(current, "bundler.gemspec"))
+          gemspec = if ENV["BUNDLE_RUBY"] && ENV["BUNDLE_GEM"]
+            # for Ruby Core
+            "lib/bundler.gemspec"
+          else
+            "bundler.gemspec"
+          end
+
+          # avoid stepping above the tmp directory when testing
+          return nil if File.file?(File.join(current, gemspec))
         end
 
         names.each do |name|
@@ -303,10 +311,12 @@ module Bundler
         unless File.exist?(exe_file)
           exe_file = File.expand_path("../../../exe/bundle", __FILE__)
         end
-
         Bundler::SharedHelpers.set_env "BUNDLE_BIN_PATH", exe_file
       rescue Gem::GemNotFoundException
-        Bundler::SharedHelpers.set_env "BUNDLE_BIN_PATH", File.expand_path("../../../exe/bundle", __FILE__)
+        exe_file = File.expand_path("../../../exe/bundle", __FILE__)
+        # for Ruby core repository
+        exe_file = File.expand_path("../../../../bin/bundle", __FILE__) unless File.exist?(exe_file)
+        Bundler::SharedHelpers.set_env "BUNDLE_BIN_PATH", exe_file
       end
 
       # Set BUNDLE_GEMFILE

data/lib/bundler/version.rb

@@ -7,7 +7,7 @@ module Bundler
   # We're doing this because we might write tests that deal
   # with other versions of bundler and we are unsure how to
   # handle this better.
-  VERSION = "1.17.1" unless defined?(::Bundler::VERSION)
+  VERSION = "1.17.2" unless defined?(::Bundler::VERSION)
 
   def self.overwrite_loaded_gem_version
     begin

data/man/bundle-add.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BUNDLE\-ADD" "1" "October 2018" "" ""
+.TH "BUNDLE\-ADD" "1" "November 2018" "" ""
 .
 .SH "NAME"
 \fBbundle\-add\fR \- Add gem to the Gemfile and run bundle install

data/man/bundle-add.1.txt

@@ -49,4 +49,4 @@ OPTIONS
 
 
 
-				 October 2018			 BUNDLE-ADD(1)
+				 November 2018			 BUNDLE-ADD(1)

data/man/bundle-binstubs.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BUNDLE\-BINSTUBS" "1" "October 2018" "" ""
+.TH "BUNDLE\-BINSTUBS" "1" "November 2018" "" ""
 .
 .SH "NAME"
 \fBbundle\-binstubs\fR \- Install the binstubs of the listed gems

data/man/bundle-binstubs.1.txt

@@ -45,4 +45,4 @@ BUNDLE INSTALL --BINSTUBS
 
 
 
-				 October 2018		    BUNDLE-BINSTUBS(1)
+				 November 2018		    BUNDLE-BINSTUBS(1)

data/man/bundle-check.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BUNDLE\-CHECK" "1" "October 2018" "" ""
+.TH "BUNDLE\-CHECK" "1" "November 2018" "" ""
 .
 .SH "NAME"
 \fBbundle\-check\fR \- Verifies if dependencies are satisfied by installed gems

data/man/bundle-check.1.txt

@@ -30,4 +30,4 @@ OPTIONS
 
 
 
-				 October 2018		       BUNDLE-CHECK(1)
+				 November 2018		       BUNDLE-CHECK(1)

data/man/bundle-clean.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BUNDLE\-CLEAN" "1" "October 2018" "" ""
+.TH "BUNDLE\-CLEAN" "1" "November 2018" "" ""
 .
 .SH "NAME"
 \fBbundle\-clean\fR \- Cleans up unused gems in your bundler directory

data/man/bundle-clean.1.txt

@@ -23,4 +23,4 @@ OPTIONS
 
 
 
-				 October 2018		       BUNDLE-CLEAN(1)
+				 November 2018		       BUNDLE-CLEAN(1)

data/man/bundle-config.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BUNDLE\-CONFIG" "1" "October 2018" "" ""
+.TH "BUNDLE\-CONFIG" "1" "December 2018" "" ""
 .
 .SH "NAME"
 \fBbundle\-config\fR \- Set bundler configuration options

data/man/bundle-config.1.txt

@@ -526,4 +526,4 @@ CONFIGURE BUNDLER DIRECTORIES
 
 
 
-				 October 2018		      BUNDLE-CONFIG(1)
+				 December 2018		      BUNDLE-CONFIG(1)

data/man/bundle-doctor.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BUNDLE\-DOCTOR" "1" "October 2018" "" ""
+.TH "BUNDLE\-DOCTOR" "1" "November 2018" "" ""
 .
 .SH "NAME"
 \fBbundle\-doctor\fR \- Checks the bundle for common problems

data/man/bundle-doctor.1.txt

@@ -41,4 +41,4 @@ OPTIONS
 
 
 
-				 October 2018		      BUNDLE-DOCTOR(1)
+				 November 2018		      BUNDLE-DOCTOR(1)

data/man/bundle-exec.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BUNDLE\-EXEC" "1" "October 2018" "" ""
+.TH "BUNDLE\-EXEC" "1" "November 2018" "" ""
 .
 .SH "NAME"
 \fBbundle\-exec\fR \- Execute a command in the context of the bundle

data/man/bundle-exec.1.txt

@@ -175,4 +175,4 @@ RUBYGEMS PLUGINS
 
 
 
-				 October 2018			BUNDLE-EXEC(1)
+				 November 2018			BUNDLE-EXEC(1)

data/man/bundle-gem.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BUNDLE\-GEM" "1" "October 2018" "" ""
+.TH "BUNDLE\-GEM" "1" "November 2018" "" ""
 .
 .SH "NAME"
 \fBbundle\-gem\fR \- Generate a project skeleton for creating a rubygem

data/man/bundle-gem.1.txt

@@ -88,4 +88,4 @@ SEE ALSO
 
 
 
-				 October 2018			 BUNDLE-GEM(1)
+				 November 2018			 BUNDLE-GEM(1)

data/man/bundle-info.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BUNDLE\-INFO" "1" "October 2018" "" ""
+.TH "BUNDLE\-INFO" "1" "November 2018" "" ""
 .
 .SH "NAME"
 \fBbundle\-info\fR \- Show information for the given gem in your bundle

data/man/bundle-info.1.txt

@@ -18,4 +18,4 @@ OPTIONS
 
 
 
-				 October 2018			BUNDLE-INFO(1)
+				 November 2018			BUNDLE-INFO(1)

data/man/bundle-init.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BUNDLE\-INIT" "1" "October 2018" "" ""
+.TH "BUNDLE\-INIT" "1" "November 2018" "" ""
 .
 .SH "NAME"
 \fBbundle\-init\fR \- Generates a Gemfile into the current working directory

data/man/bundle-init.1.txt

@@ -31,4 +31,4 @@ SEE ALSO
 
 
 
-				 October 2018			BUNDLE-INIT(1)
+				 November 2018			BUNDLE-INIT(1)

data/man/bundle-inject.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BUNDLE\-INJECT" "1" "October 2018" "" ""
+.TH "BUNDLE\-INJECT" "1" "November 2018" "" ""
 .
 .SH "NAME"
 \fBbundle\-inject\fR \- Add named gem(s) with version requirements to Gemfile

data/man/bundle-inject.1.txt

@@ -29,4 +29,4 @@ DESCRIPTION
 
 
 
-				 October 2018		      BUNDLE-INJECT(1)
+				 November 2018		      BUNDLE-INJECT(1)

data/man/bundle-install.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BUNDLE\-INSTALL" "1" "October 2018" "" ""
+.TH "BUNDLE\-INSTALL" "1" "December 2018" "" ""
 .
 .SH "NAME"
 \fBbundle\-install\fR \- Install the dependencies specified in your Gemfile

data/man/bundle-install.1.txt

@@ -393,4 +393,4 @@ SEE ALSO
 
 
 
-				 October 2018		     BUNDLE-INSTALL(1)
+				 December 2018		     BUNDLE-INSTALL(1)

data/man/bundle-list.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BUNDLE\-LIST" "1" "October 2018" "" ""
+.TH "BUNDLE\-LIST" "1" "November 2018" "" ""
 .
 .SH "NAME"
 \fBbundle\-list\fR \- List all the gems in the bundle

data/man/bundle-list.1.txt

@@ -40,4 +40,4 @@ OPTIONS
 
 
 
-				 October 2018			BUNDLE-LIST(1)
+				 November 2018			BUNDLE-LIST(1)

data/man/bundle-lock.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BUNDLE\-LOCK" "1" "October 2018" "" ""
+.TH "BUNDLE\-LOCK" "1" "November 2018" "" ""
 .
 .SH "NAME"
 \fBbundle\-lock\fR \- Creates / Updates a lockfile without installing

data/man/bundle-lock.1.txt

@@ -90,4 +90,4 @@ PATCH LEVEL OPTIONS
 
 
 
-				 October 2018			BUNDLE-LOCK(1)
+				 November 2018			BUNDLE-LOCK(1)

data/man/bundle-open.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BUNDLE\-OPEN" "1" "October 2018" "" ""
+.TH "BUNDLE\-OPEN" "1" "November 2018" "" ""
 .
 .SH "NAME"
 \fBbundle\-open\fR \- Opens the source directory for a gem in your bundle

data/man/bundle-open.1.txt

@@ -26,4 +26,4 @@ DESCRIPTION
 
 
 
-				 October 2018			BUNDLE-OPEN(1)
+				 November 2018			BUNDLE-OPEN(1)

data/man/bundle-outdated.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BUNDLE\-OUTDATED" "1" "October 2018" "" ""
+.TH "BUNDLE\-OUTDATED" "1" "November 2018" "" ""
 .
 .SH "NAME"
 \fBbundle\-outdated\fR \- List installed gems with newer versions available

data/man/bundle-outdated.1.txt

@@ -128,4 +128,4 @@ FILTERING OUTPUT
 
 
 
-				 October 2018		    BUNDLE-OUTDATED(1)
+				 November 2018		    BUNDLE-OUTDATED(1)

data/man/bundle-package.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BUNDLE\-PACKAGE" "1" "October 2018" "" ""
+.TH "BUNDLE\-PACKAGE" "1" "November 2018" "" ""
 .
 .SH "NAME"
 \fBbundle\-package\fR \- Package your needed \fB\.gem\fR files into your application

data/man/bundle-package.1.txt

@@ -76,4 +76,4 @@ REMOTE FETCHING
 
 
 
-				 October 2018		     BUNDLE-PACKAGE(1)
+				 November 2018		     BUNDLE-PACKAGE(1)

data/man/bundle-platform.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BUNDLE\-PLATFORM" "1" "October 2018" "" ""
+.TH "BUNDLE\-PLATFORM" "1" "November 2018" "" ""
 .
 .SH "NAME"
 \fBbundle\-platform\fR \- Displays platform compatibility information

data/man/bundle-platform.1.txt

@@ -54,4 +54,4 @@ OPTIONS
 
 
 
-				 October 2018		    BUNDLE-PLATFORM(1)
+				 November 2018		    BUNDLE-PLATFORM(1)

data/man/bundle-pristine.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BUNDLE\-PRISTINE" "1" "October 2018" "" ""
+.TH "BUNDLE\-PRISTINE" "1" "November 2018" "" ""
 .
 .SH "NAME"
 \fBbundle\-pristine\fR \- Restores installed gems to their pristine condition

data/man/bundle-pristine.1.txt

@@ -41,4 +41,4 @@ DESCRIPTION
 
 
 
-				 October 2018		    BUNDLE-PRISTINE(1)
+				 November 2018		    BUNDLE-PRISTINE(1)

data/man/bundle-remove.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BUNDLE\-REMOVE" "1" "October 2018" "" ""
+.TH "BUNDLE\-REMOVE" "1" "November 2018" "" ""
 .
 .SH "NAME"
 \fBbundle\-remove\fR \- Removes gems from the Gemfile

data/man/bundle-remove.1.txt

@@ -31,4 +31,4 @@ OPTIONS
 
 
 
-				 October 2018		      BUNDLE-REMOVE(1)
+				 November 2018		      BUNDLE-REMOVE(1)

data/man/bundle-show.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BUNDLE\-SHOW" "1" "October 2018" "" ""
+.TH "BUNDLE\-SHOW" "1" "November 2018" "" ""
 .
 .SH "NAME"
 \fBbundle\-show\fR \- Shows all the gems in your bundle, or the path to a gem

data/man/bundle-show.1.txt

@@ -24,4 +24,4 @@ OPTIONS
 
 
 
-				 October 2018			BUNDLE-SHOW(1)
+				 November 2018			BUNDLE-SHOW(1)

data/man/bundle-update.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BUNDLE\-UPDATE" "1" "October 2018" "" ""
+.TH "BUNDLE\-UPDATE" "1" "December 2018" "" ""
 .
 .SH "NAME"
 \fBbundle\-update\fR \- Update your gems to the latest available versions

data/man/bundle-update.1.txt

@@ -388,4 +388,4 @@ RECOMMENDED WORKFLOW
 
 
 
-				 October 2018		      BUNDLE-UPDATE(1)
+				 December 2018		      BUNDLE-UPDATE(1)

data/man/bundle-viz.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BUNDLE\-VIZ" "1" "October 2018" "" ""
+.TH "BUNDLE\-VIZ" "1" "November 2018" "" ""
 .
 .SH "NAME"
 \fBbundle\-viz\fR \- Generates a visual dependency graph for your Gemfile

data/man/bundle-viz.1.txt

@@ -36,4 +36,4 @@ OPTIONS
 
 
 
-				 October 2018			 BUNDLE-VIZ(1)
+				 November 2018			 BUNDLE-VIZ(1)

data/man/bundle.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BUNDLE" "1" "October 2018" "" ""
+.TH "BUNDLE" "1" "November 2018" "" ""
 .
 .SH "NAME"
 \fBbundle\fR \- Ruby Dependency Management

data/man/bundle.1.txt

@@ -110,4 +110,4 @@ OBSOLETE
 
 
 
-				 October 2018			     BUNDLE(1)
+				 November 2018			     BUNDLE(1)

data/man/gemfile.5

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "GEMFILE" "5" "October 2018" "" ""
+.TH "GEMFILE" "5" "November 2018" "" ""
 .
 .SH "NAME"
 \fBGemfile\fR \- A format for describing gem dependencies for Ruby programs

data/man/gemfile.5.txt

@@ -650,4 +650,4 @@ SOURCE PRIORITY
 
 
 
-				 October 2018			    GEMFILE(5)
+				 November 2018			    GEMFILE(5)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bundler
 version: !ruby/object:Gem::Version
-  version: 1.17.1
+  version: 1.17.2
 platform: ruby
 authors:
 - André Arko
@@ -22,7 +22,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-25 00:00:00.000000000 Z
+date: 2018-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: automatiek
@@ -442,7 +442,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: The best way to manage your application's dependencies