diff options
| author | Jeremy Evans <code@jeremyevans.net> | 2019-08-30 11:52:46 -0700 |
|---|---|---|
| committer | Jeremy Evans <code@jeremyevans.net> | 2019-08-30 21:55:16 -0700 |
| commit | da7e1f55c86fd65001cf36ea6af86bdd88417161 (patch) | |
| tree | 636624a9ca29aa765b5ba230be5e9a6091d55d0c /lib/bundler/vendor/thor/lib/thor.rb | |
| parent | 35781bbdbcf6f0394439aefd08afdf12ecfa4e08 (diff) | |
| download | bundler-da7e1f55c86fd65001cf36ea6af86bdd88417161.tar.gz | |
Fix a couple of bundler issues with keyword argument separation
There are more issues than this, but hopefully this is enough
to get make test-bundler passing in CI.
Diffstat (limited to 'lib/bundler/vendor/thor/lib/thor.rb')
| -rw-r--r-- | lib/bundler/vendor/thor/lib/thor.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/bundler/vendor/thor/lib/thor.rb b/lib/bundler/vendor/thor/lib/thor.rb index 6017ee9ad8..395fad28eb 100644 --- a/lib/bundler/vendor/thor/lib/thor.rb +++ b/lib/bundler/vendor/thor/lib/thor.rb @@ -90,9 +90,14 @@ class Bundler::Thor # ==== 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) |