bundler 1.16.1 → 1.16.2

data/lib/bundler/installer/gem_installer.rb

@@ -44,7 +44,12 @@ module Bundler
     end
 
     def gem_install_message
-      "Make sure that `gem install #{spec.name} -v '#{spec.version}'` succeeds before bundling."
+      remotes = spec.source.remotes
+      if remotes.size == 1
+        "Make sure that `gem install #{spec.name} -v '#{spec.version}' --source '#{remotes.first}'` succeeds before bundling."
+      else
+        "Make sure that `gem install #{spec.name} -v '#{spec.version}'` succeeds before bundling."
+      end
     end
 
     def spec_settings

data/lib/bundler/plugin/index.rb

@@ -29,7 +29,12 @@ module Bundler
         @hooks = {}
         @load_paths = {}
 
-        load_index(global_index_file, true)
+        begin
+          load_index(global_index_file, true)
+        rescue GenericSystemCallError
+          # no need to fail when on a read-only FS, for example
+          nil
+        end
         load_index(local_index_file) if SharedHelpers.in_bundle?
       end
 

data/lib/bundler/resolver/spec_group.rb

@@ -14,7 +14,6 @@ module Bundler
         @version = exemplary_spec.version
         @source = exemplary_spec.source
 
-        @required_by = []
         @activated_platforms = []
         @dependencies = nil
         @specs        = Hash.new do |specs, platform|

data/lib/bundler/rubygems_integration.rb

@@ -132,7 +132,11 @@ module Bundler
     end
 
     def inflate(obj)
-      Gem.inflate(obj)
+      if defined?(Gem::Util)
+        Gem::Util.inflate(obj)
+      else
+        Gem.inflate(obj)
+      end
     end
 
     def sources=(val)
@@ -570,8 +574,10 @@ module Bundler
       @replaced_methods.each do |(sym, klass), method|
         redefine_method(klass, sym, method)
       end
-      post_reset_hooks.reject! do |proc|
-        proc.binding.eval("__FILE__") == __FILE__
+      if Binding.public_method_defined?(:source_location)
+        post_reset_hooks.reject! {|proc| proc.binding.source_location[0] == __FILE__ }
+      else
+        post_reset_hooks.reject! {|proc| proc.binding.eval("__FILE__") == __FILE__ }
       end
       @replaced_methods.clear
     end

data/lib/bundler/runtime.rb

@@ -10,7 +10,7 @@ module Bundler
     end
 
     def setup(*groups)
-      @definition.ensure_equivalent_gemfile_and_lockfile if Bundler.frozen?
+      @definition.ensure_equivalent_gemfile_and_lockfile if Bundler.frozen_bundle?
 
       groups.map!(&:to_sym)
 

data/lib/bundler/source/git.rb

@@ -21,6 +21,7 @@ module Bundler
         %w[ref branch tag revision].each {|k| options[k] = options[k].to_s if options[k] }
 
         @uri        = options["uri"] || ""
+        @safe_uri   = URICredentialsFilter.credential_filtered_uri(@uri)
         @branch     = options["branch"]
         @ref        = options["ref"] || options["branch"] || options["tag"] || "master"
         @submodules = options["submodules"]
@@ -77,7 +78,7 @@ module Bundler
                 nil
               end
 
-        "#{uri} (at #{at}#{rev})"
+        "#{@safe_uri} (at #{at}#{rev})"
       end
 
       def name

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

@@ -131,7 +131,12 @@ module Bundler
           # method 2
           SharedHelpers.chdir(destination) do
             git_retry %(fetch --force --quiet --tags "#{path}")
-            git "reset --hard #{@revision}"
+
+            begin
+              git "reset --hard #{@revision}"
+            rescue GitCommandError
+              raise MissingGitRevisionError.new(@revision, URICredentialsFilter.credential_filtered_uri(uri))
+            end
 
             if submodules
               git_retry "submodule update --init --recursive"

data/lib/bundler/source/rubygems.rb

@@ -138,6 +138,8 @@ module Bundler
             bin_path     = Bundler.system_bindir
           end
 
+          Bundler.mkdir_p bin_path unless spec.executables.empty? || Bundler.rubygems.provides?(">= 2.7.5")
+
           installed_spec = nil
           Bundler.rubygems.preserve_paths do
             installed_spec = Bundler::RubyGemsGemInstaller.at(
@@ -477,7 +479,10 @@ module Bundler
         else
           uri = spec.remote.uri
           Bundler.ui.confirm("Fetching #{version_message(spec)}")
-          Bundler.rubygems.download_gem(spec, uri, download_path)
+          rubygems_local_path = Bundler.rubygems.download_gem(spec, uri, download_path)
+          if rubygems_local_path != local_path
+            FileUtils.mv(rubygems_local_path, local_path)
+          end
           cache_globally(spec, local_path)
         end
       end

data/lib/bundler/spec_set.rb

@@ -37,7 +37,10 @@ module Bundler
         elsif check
           return false
         elsif raise_on_missing
-          raise "Unable to find a spec satisfying #{dep} in the set. Perhaps the lockfile is corrupted?"
+          others = lookup[dep.name] if match_current_platform
+          message = "Unable to find a spec satisfying #{dep} in the set. Perhaps the lockfile is corrupted?"
+          message += " Found #{others.join(", ")} that did not match the current platform." if others && !others.empty?
+          raise GemNotFound, message
         end
       end
 

data/lib/bundler/templates/Executable

@@ -15,7 +15,7 @@ ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../<%= relative_gemfile_path %>",
 bundle_binstub = File.expand_path("../bundle", __FILE__)
 
 if File.file?(bundle_binstub)
-  if File.read(bundle_binstub, 150) =~ /This file was generated by Bundler/
+  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
     load(bundle_binstub)
   else
     abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.

data/lib/bundler/templates/newgem/newgem.gemspec.tt

@@ -28,8 +28,10 @@ Gem::Specification.new do |spec|
       "public gem pushes."
   end
 
-  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
-    f.match(%r{^(test|spec|features)/})
+  # Specify which files should be added to the gem when it is released.
+  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
+  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }

data/lib/bundler/ui/shell.rb

@@ -109,7 +109,9 @@ module Bundler
       end
 
       def tell_err(message, color = nil, newline = nil)
-        newline = message.to_s !~ /( |\t)\Z/ unless newline
+        return if @shell.send(:stderr).closed?
+
+        newline ||= message.to_s !~ /( |\t)\Z/
         message = word_wrap(message) if newline.is_a?(Hash) && newline[:wrap]
 
         color = nil if color && !$stderr.tty?

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.16.1" unless defined?(::Bundler::VERSION)
+  VERSION = "1.16.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" "June 2017" "" ""
+.TH "BUNDLE\-ADD" "1" "January 2018" "" ""
 .
 .SH "NAME"
 \fBbundle\-add\fR \- Add gem to the Gemfile and run bundle install

data/man/bundle-add.1.txt

@@ -37,4 +37,4 @@ OPTIONS
 
 
 
-				   June 2017			 BUNDLE-ADD(1)
+				 January 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 2017" "" ""
+.TH "BUNDLE\-BINSTUBS" "1" "February 2018" "" ""
 .
 .SH "NAME"
 \fBbundle\-binstubs\fR \- Install the binstubs of the listed gems
@@ -10,7 +10,7 @@
 \fBbundle binstubs\fR \fIGEM_NAME\fR [\-\-force] [\-\-path PATH] [\-\-standalone]
 .
 .SH "DESCRIPTION"
-Binstubs are scripts that wrap aroung executables\. Bundler creates a small Ruby file (a binstub) that loads Bundler, runs the command, and puts it into \fBbin/\fR\. Binstubs are a shortcut\-or alternative\- to always using \fBbundle exec\fR\. This gives you a file that can by run directly, and one that will always run the correct gem version used by the application\.
+Binstubs are scripts that wrap around executables\. Bundler creates a small Ruby file (a binstub) that loads Bundler, runs the command, and puts it into \fBbin/\fR\. Binstubs are a shortcut\-or alternative\- to always using \fBbundle exec\fR\. This gives you a file that can by run directly, and one that will always run the correct gem version used by the application\.
 .
 .P
 For example, if you run \fBbundle binstubs rspec\-core\fR, Bundler will create the file \fBbin/rspec\fR\. That file will contain enough code to load Bundler, tell it to load the bundled gems, and then run rspec\.
@@ -33,8 +33,8 @@ The location to install the specified binstubs to\. This defaults to \fBbin\fR\.
 Makes binstubs that can work without depending on Rubygems or Bundler at runtime\.
 .
 .TP
-\fB\-\-sheband\fR
+\fB\-\-shebang\fR
 Specify a different shebang executable name than the default (default \'ruby\')
 .
 .SH "BUNDLE INSTALL \-\-BINSTUBS"
-To create binstubs for all the gems in the bundle you can use the \fB\-\-binstubs\fR flag in [bundle install(1)][bundle\-install]\.
+To create binstubs for all the gems in the bundle you can use the \fB\-\-binstubs\fR flag in [bundle install(1)][bundle\-install(1)]\.

data/man/bundle-binstubs.1.txt

@@ -9,7 +9,7 @@ SYNOPSIS
        bundle binstubs GEM_NAME [--force] [--path PATH] [--standalone]
 
 DESCRIPTION
-       Binstubs  are  scripts  that wrap aroung executables. Bundler creates a
+       Binstubs  are  scripts  that wrap around executables. Bundler creates a
        small Ruby file (a binstub) that loads Bundler, runs the  command,  and
        puts  it  into  bin/. Binstubs are a shortcut-or alternative- to always
        using bundle exec. This gives you a file that can by run directly,  and
@@ -35,14 +35,14 @@ OPTIONS
 	      Makes  binstubs  that  can work without depending on Rubygems or
 	      Bundler at runtime.
 
-       --sheband
+       --shebang
 	      Specify a different shebang executable  name  than  the  default
 	      (default 'ruby')
 
 BUNDLE INSTALL --BINSTUBS
        To  create  binstubs  for  all  the  gems in the bundle you can use the
-       --binstubs flag in [bundle install(1)][bundle-install].
+       --binstubs flag in [bundle install(1)][bundle-install(1)].
 
 
 
-				 October 2017		    BUNDLE-BINSTUBS(1)
+				 February 2018		    BUNDLE-BINSTUBS(1)

data/man/bundle-binstubs.ronn

@@ -7,7 +7,7 @@ bundle-binstubs(1) -- Install the binstubs of the listed gems
 
 ## DESCRIPTION
 
-Binstubs are scripts that wrap aroung executables. Bundler creates a
+Binstubs are scripts that wrap around executables. Bundler creates a
 small Ruby file (a binstub) that loads Bundler, runs the command,
 and puts it into `bin/`. Binstubs are a shortcut-or alternative-
 to always using `bundle exec`. This gives you a file that can by run
@@ -34,10 +34,10 @@ Calling binstubs with [GEM [GEM]] will create binstubs for all given gems.
   Makes binstubs that can work without depending on Rubygems or Bundler at
   runtime.
 
-* `--sheband`:
+* `--shebang`:
   Specify a different shebang executable name than the default (default 'ruby')
 
 ## BUNDLE INSTALL --BINSTUBS
 
 To create binstubs for all the gems in the bundle you can use the `--binstubs`
-flag in [bundle install(1)][bundle-install].
+flag in [bundle install(1)][bundle-install(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" "February 2017" "" ""
+.TH "BUNDLE\-CHECK" "1" "February 2018" "" ""
 .
 .SH "NAME"
 \fBbundle\-check\fR \- Verifies if dependencies are satisfied by installed gems
@@ -19,13 +19,13 @@ If not, the first missing gem is listed and Bundler exits status 1\.
 .
 .TP
 \fB\-\-dry\-run\fR
-Locks the \fBGemfile(5)\fR before running the command\.
+Locks the [\fBGemfile(5)\fR][Gemfile(5)] before running the command\.
 .
 .TP
 \fB\-\-gemfile\fR
-Use the specified gemfile instead of the \fBGemfile(5)\fR
+Use the specified gemfile instead of the [\fBGemfile(5)\fR][Gemfile(5)]\.
 .
 .TP
 \fB\-\-path\fR
-Specify a different path than the system default ($BUNDLE_PATH or $GEM_HOME)\. Bundler will remember this value for future installs on this machine\.
+Specify a different path than the system default (\fB$BUNDLE_PATH\fR or \fB$GEM_HOME\fR)\. Bundler will remember this value for future installs on this machine\.
 

data/man/bundle-check.1.txt

@@ -17,16 +17,17 @@ DESCRIPTION
 
 OPTIONS
        --dry-run
-	      Locks the Gemfile(5) before running the command.
+	      Locks the [Gemfile(5)][Gemfile(5)] before running the command.
 
        --gemfile
-	      Use the specified gemfile instead of the Gemfile(5)
+	      Use the  specified  gemfile  instead  of	the  [Gemfile(5)][Gem-
+	      file(5)].
 
-       --path Specify a different path than the system	default  ($BUNDLE_PATH
-	      or  $GEM_HOME).  Bundler	will  remember	this  value for future
+       --path Specify  a  different path than the system default ($BUNDLE_PATH
+	      or $GEM_HOME). Bundler  will  remember  this  value  for	future
 	      installs on this machine.
 
 
 
 
-				 February 2017		       BUNDLE-CHECK(1)
+				 February 2018		       BUNDLE-CHECK(1)

data/man/bundle-check.ronn

@@ -18,9 +18,9 @@ If not, the first missing gem is listed and Bundler exits status 1.
 ## OPTIONS
 
 * `--dry-run`:
-  Locks the `Gemfile(5)` before running the command.
+  Locks the [`Gemfile(5)`][Gemfile(5)] before running the command.
 * `--gemfile`:
-  Use the specified gemfile instead of the `Gemfile(5)`
+  Use the specified gemfile instead of the [`Gemfile(5)`][Gemfile(5)].
 * `--path`:
-  Specify a different path than the system default ($BUNDLE_PATH or $GEM_HOME).
+  Specify a different path than the system default (`$BUNDLE_PATH` or `$GEM_HOME`).
   Bundler will remember this value for future installs on this machine.

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" "December 2017" "" ""
+.TH "BUNDLE\-CONFIG" "1" "May 2018" "" ""
 .
 .SH "NAME"
 \fBbundle\-config\fR \- Set bundler configuration options
@@ -10,7 +10,24 @@
 \fBbundle config\fR [\fIname\fR [\fIvalue\fR]]
 .
 .SH "DESCRIPTION"
-This command allows you to interact with bundler\'s configuration system\. Bundler retrieves its configuration from the local application (\fBapp/\.bundle/config\fR), environment variables, and the user\'s home directory (\fB~/\.bundle/config\fR), in that order of priority\.
+This command allows you to interact with Bundler\'s configuration system\.
+.
+.P
+Bundler loads configuration settings in this order:
+.
+.IP "1." 4
+Local config (\fBapp/\.bundle/config\fR)
+.
+.IP "2." 4
+Environmental variables (\fBENV\fR)
+.
+.IP "3." 4
+Global config (\fB~/\.bundle/config\fR)
+.
+.IP "4." 4
+Bundler default config
+.
+.IP "" 0
 .
 .P
 Executing \fBbundle config\fR with no parameters will print a list of all bundler configuration for the current bundle, and where that configuration was set\.
@@ -63,7 +80,7 @@ A space\-separated list of groups referencing gems to skip during installation\.
 A space\-separated list of groups referencing gems to include during installation\.
 .
 .SH "BUILD OPTIONS"
-You can use \fBbundle config\fR to give bundler the flags to pass to the gem installer every time bundler tries to install a particular gem\.
+You can use \fBbundle config\fR to give Bundler the flags to pass to the gem installer every time bundler tries to install a particular gem\.
 .
 .P
 A very common example, the \fBmysql\fR gem, requires Snow Leopard users to pass configuration flags to \fBgem install\fR to specify where to find the \fBmysql_config\fR executable\.
@@ -98,7 +115,7 @@ After running this command, every time bundler needs to install the \fBmysql\fR
 Configuration keys in bundler have two forms: the canonical form and the environment variable form\.
 .
 .P
-For instance, passing the \fB\-\-without\fR flag to [bundle install(1)][bundle\-install] prevents Bundler from installing certain groups specified in the Gemfile(5)\. Bundler persists this value in \fBapp/\.bundle/config\fR so that calls to \fBBundler\.setup\fR do not try to find gems from the \fBGemfile\fR that you didn\'t install\. Additionally, subsequent calls to [bundle install(1)][bundle\-install] remember this setting and skip those groups\.
+For instance, passing the \fB\-\-without\fR flag to [bundle install(1)][bundle\-install(1)] prevents Bundler from installing certain groups specified in the Gemfile(5)\. Bundler persists this value in \fBapp/\.bundle/config\fR so that calls to \fBBundler\.setup\fR do not try to find gems from the \fBGemfile\fR that you didn\'t install\. Additionally, subsequent calls to [bundle install(1)][bundle\-install(1)] remember this setting and skip those groups\.
 .
 .P
 The canonical form of this configuration is \fB"without"\fR\. To convert the canonical form to the environment variable form, capitalize it, and prepend \fBBUNDLE_\fR\. The environment variable form of \fB"without"\fR is \fBBUNDLE_WITHOUT\fR\.
@@ -107,7 +124,7 @@ The canonical form of this configuration is \fB"without"\fR\. To convert the can
 Any periods in the configuration keys must be replaced with two underscores when setting it via environment variables\. The configuration key \fBlocal\.rack\fR becomes the environment variable \fBBUNDLE_LOCAL__RACK\fR\.
 .
 .SH "LIST OF AVAILABLE KEYS"
-The following is a list of all configuration keys and their purpose\. You can learn more about their operation in [bundle install(1)][bundle\-install]\.
+The following is a list of all configuration keys and their purpose\. You can learn more about their operation in [bundle install(1)][bundle\-install(1)]\.
 .
 .IP "\(bu" 4
 \fBallow_bundler_dependency_conflicts\fR (\fBBUNDLE_ALLOW_BUNDLER_DEPENDENCY_CONFLICTS\fR): Allow resolving to specifications that have dependencies on \fBbundler\fR that are incompatible with the running Bundler version\.
@@ -280,7 +297,7 @@ The following is a list of all configuration keys and their purpose\. You can le
 .IP "" 0
 .
 .P
-In general, you should set these settings per\-application by using the applicable flag to the [bundle install(1)][bundle\-install] or [bundle package(1)][bundle\-package] command\.
+In general, you should set these settings per\-application by using the applicable flag to the [bundle install(1)][bundle\-install(1)] or [bundle package(1)][bundle\-package(1)] command\.
 .
 .P
 You can set them globally either via environment variables or \fBbundle config\fR, whichever is preferable for your setup\. If you use both, environment variables will take preference over global settings\.

data/man/bundle-config.1.txt

@@ -9,10 +9,20 @@ SYNOPSIS
        bundle config [name [value]]
 
 DESCRIPTION
-       This  command  allows you to interact with bundler's configuration sys-
-       tem. Bundler retrieves its configuration  from  the  local  application
-       (app/.bundle/config), environment variables, and the user's home direc-
-       tory (~/.bundle/config), in that order of priority.
+       This  command  allows you to interact with Bundler's configuration sys-
+       tem.
+
+       Bundler loads configuration settings in this order:
+
+       1.  Local config (app/.bundle/config)
+
+       2.  Environmental variables (ENV)
+
+       3.  Global config (~/.bundle/config)
+
+       4.  Bundler default config
+
+
 
        Executing bundle config with no parameters will print  a  list  of  all
        bundler configuration for the current bundle, and where that configura-
@@ -81,7 +91,7 @@ REMEMBERING OPTIONS
 	      during installation.
 
 BUILD OPTIONS
-       You  can use bundle config to give bundler the flags to pass to the gem
+       You  can use bundle config to give Bundler the flags to pass to the gem
        installer every time bundler tries to install a particular gem.
 
        A very common example, the mysql gem, requires Snow  Leopard  users  to
@@ -111,12 +121,12 @@ CONFIGURATION KEYS
        the environment variable form.
 
        For  instance,  passing	the --without flag to [bundle install(1)][bun-
-       dle-install] prevents Bundler from installing certain groups  specified
-       in the Gemfile(5). Bundler persists this value in app/.bundle/config so
-       that calls to Bundler.setup do not try to find gems  from  the  Gemfile
-       that  you  didn't  install.  Additionally,  subsequent calls to [bundle
-       install(1)][bundle-install]  remember  this  setting  and  skip	 those
-       groups.
+       dle-install(1)] prevents Bundler from installing certain groups	speci-
+       fied in the Gemfile(5). Bundler persists this value in app/.bundle/con-
+       fig so that calls to Bundler.setup do not try to  find  gems  from  the
+       Gemfile	that  you  didn't  install.  Additionally, subsequent calls to
+       [bundle install(1)][bundle-install(1)] remember this setting  and  skip
+       those groups.
 
        The  canonical  form of this configuration is "without". To convert the
        canonical form to the environment variable  form,  capitalize  it,  and
@@ -130,7 +140,7 @@ CONFIGURATION KEYS
 LIST OF AVAILABLE KEYS
        The following is a list of all configuration keys  and  their  purpose.
        You  can  learn	more about their operation in [bundle install(1)][bun-
-       dle-install].
+       dle-install(1)].
 
        o   allow_bundler_dependency_conflicts	  (BUNDLE_ALLOW_BUNDLER_DEPEN-
 	   DENCY_CONFLICTS):  Allow  resolving	to  specifications  that  have
@@ -342,8 +352,8 @@ LIST OF AVAILABLE KEYS
 
 
        In general, you should set these settings per-application by using  the
-       applicable  flag  to the [bundle install(1)][bundle-install] or [bundle
-       package(1)][bundle-package] command.
+       applicable  flag to the [bundle install(1)][bundle-install(1)] or [bun-
+       dle package(1)][bundle-package(1)] command.
 
        You can set them globally either via environment  variables  or	bundle
        config,	whichever is preferable for your setup. If you use both, envi-
@@ -488,4 +498,4 @@ CREDENTIALS FOR GEM SOURCES
 
 
 
-				 December 2017		      BUNDLE-CONFIG(1)
+				   May 2018		      BUNDLE-CONFIG(1)