Merge #7357

7357: Release 2.1.0.pre.2 r=hsbt a=deivid-rodriguez

This is the 2.1.0.pre.2 release branch, generated using `bin/rake release:prepare_patch`.

Co-authored-by: Bundlerbot <[email protected]>
Co-authored-by: David Rodríguez <[email protected]>

Author: bundlerbot

.travis.yml

@@ -26,9 +26,9 @@ notifications:
       - secure: JxBi7DDJGkIF/7f/FSN/HUHpvV4EKfQccZHTPd1b2pNJn3GXo6u+tNVbAw2WjxYzPyPQI3ZcYBCU9SEXp/i7VmG8uMzh8Kyildw+miSKYKVb90uYqcsXWzbxwyNBgJLvyDkzST45H5lgnyAicee3WkFes/WDZikIajbH7ztdb04=
 
 rvm:
-  - 2.6.3
-  - 2.5.5
-  - 2.4.6
+  - 2.6.4
+  - 2.5.6
+  - 2.4.7
 
 stages:
   - linting
@@ -44,7 +44,7 @@ env:
 
 jobs:
   include:
-    - rvm: 2.6.3
+    - rvm: 2.6.4
       script: rake rubocop
       stage: linting
     # Ruby 2.3 also tested in 2.x mode
@@ -55,11 +55,11 @@ jobs:
       env: RGV=v3.0.6
       stage: test
     # Ruby 2.5, Rubygems 2.7
-    - rvm: 2.5.5
+    - rvm: 2.5.6
       env: RGV=v2.7.10
       stage: test
     # Ruby 2.4, Rubygems 2.6
-    - rvm: 2.4.6
+    - rvm: 2.4.7
       env: RGV=v2.6.14
       stage: test
     # Ruby 2.3, Rubygems 2.5

CHANGELOG.md

@@ -1,4 +1,11 @@
-## 2.1.0.pre.1
+## 2.1.0.pre.2
+
+Bugfixes:
+
+  - Fix `bundle clean` trying to delete non-existent directory ([#7340](https://github.com/bundler/bundler/pull/7340))
+  - Fix warnings about keywork argument separation on ruby 2.7 ([#7337](https://github.com/bundler/bundler/pull/7337))
+
+## 2.1.0.pre.1 (August 28, 2019)
 
 One of the biggest changes in bundler 2.1.0 is that deprecations for upcoming
 breaking changes in bundler 3 will be turned on by default. We do this to grab

Rakefile

@@ -187,6 +187,7 @@ namespace :man do
       Spec::Rubygems.gem_require("ronn")
     rescue Gem::LoadError => e
       task(:build) { abort "We couln't activate ronn (#{e.requirement}). Try `gem install ronn:'#{e.requirement}'` to be able to build the help pages" }
+      task(:check) { abort "We couln't activate ronn (#{e.requirement}). Try `gem install ronn:'#{e.requirement}'` to be able to build the help pages" }
     else
       directory "man"
 

doc/playbooks/RELEASING.md

@@ -48,7 +48,8 @@ using:
 $ git cherry-pick -m 1 dd6aef9
 ```
 
-The `rake release:patch` command will automatically handle cherry-picking, and is further detailed below.
+The `rake release:prepare_patch` command will automatically handle
+cherry-picking, and is further detailed below.
 
 ## Changelog
 
@@ -128,16 +129,22 @@ per bug fixed. Then run `rake release` from the `-stable` branch,
 and pour yourself a tasty drink!
 
 PRs containing regression fixes for a patch release of the current minor version
-are merged to master. These commits are then cherry-picked from master onto the
-minor branch (`1-12-stable`).
-
-There is a `rake release:patch` rake task that automates creating a patch release.
-It takes a single argument, the _exact_ patch release being made (e.g. `1.12.3`),
-and checks out the appropriate stable branch (`1-12-stable`), grabs the `1.12.3`
-milestone from GitHub, ensures all PRs are closed, and then cherry-picks those changes
-(and only those changes) to the stable branch. The task then bumps the version in the
-version file, prompts you to update the `CHANGELOG.md`, then will commit those changes
-and run `rake release`!
+are merged to master. These commits need to be cherry-picked from master onto
+the minor branch (`1-12-stable`).
+
+There is a `rake release:prepare_patch` rake task that helps with creating a patch
+release. It takes a single argument, the _exact_ patch release being made (e.g.
+`1.12.3`), but if not given it will bump the tiny version number by one. This
+task checks out the appropriate stable branch (`1-12-stable`), grabs the
+`1.12.3` milestone from GitHub, ensures all PRs are closed, and then
+cherry-picks those changes (and only those changes) to a new branch based off
+the stable branch. Then bumps the version in the version file and commits that
+change on top of the cherry-picks.
+
+Now you have a release branch ready to be merged into the stable branch. You'll
+want to open a PR from this branch into the stable branch and provided CI is
+green, you can go ahead, merge the PR and run `rake release` from the updated
+stable branch.
 
 ## Beta testing
 

lib/bundler/definition.rb

@@ -317,7 +317,7 @@ def has_local_dependencies?
     end
 
     def spec_git_paths
-      sources.git_sources.map {|s| File.realpath(s.path) }
+      sources.git_sources.map {|s| File.realpath(s.path) if File.exist?(s.path) }.compact
     end
 
     def groups

lib/bundler/resolver/spec_group.rb

@@ -62,6 +62,7 @@ def ==(other)
       end
 
       def eql?(other)
+        return unless other.is_a?(SpecGroup)
         name.eql?(other.name) &&
           version.eql?(other.version) &&
           source.eql?(other.source)

lib/bundler/vendor/thor/lib/thor.rb

@@ -90,9 +90,14 @@ def long_desc(long_description, options = {})
     # ==== Parameters
     # Hash[String|Array => Symbol]:: Maps the string or the strings in the array to the given command.
     #
-    def map(mappings = nil)
+    def map(mappings = nil, **kw)
       @map ||= from_superclass(:map, {})
 
+      if mappings && !kw.empty?
+        mappings = kw.merge!(mappings)
+      else
+        mappings ||= kw
+      end
       if mappings
         mappings.each do |key, value|
           if key.respond_to?(:each)

lib/bundler/version.rb

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

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" "August 2019" "" ""
+.TH "BUNDLE\-ADD" "1" "September 2019" "" ""
 .
 .SH "NAME"
 \fBbundle\-add\fR \- Add gem to the Gemfile and run bundle install

man/bundle-add.1.txt

@@ -55,4 +55,4 @@ OPTIONS
 
 
 
-				  August 2019			 BUNDLE-ADD(1)
+				September 2019			 BUNDLE-ADD(1)