summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Evans <code@jeremyevans.net>2019-08-30 11:52:46 -0700
committerJeremy Evans <code@jeremyevans.net>2019-08-30 21:55:16 -0700
commitda7e1f55c86fd65001cf36ea6af86bdd88417161 (patch)
tree636624a9ca29aa765b5ba230be5e9a6091d55d0c
parent35781bbdbcf6f0394439aefd08afdf12ecfa4e08 (diff)
downloadbundler-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.
-rw-r--r--lib/bundler/vendor/thor/lib/thor.rb7
-rw-r--r--spec/runtime/inline_spec.rb7
2 files changed, 10 insertions, 4 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)
diff --git a/spec/runtime/inline_spec.rb b/spec/runtime/inline_spec.rb
index c3d632d75d..6c268a7c10 100644
--- a/spec/runtime/inline_spec.rb
+++ b/spec/runtime/inline_spec.rb
@@ -88,9 +88,10 @@ RSpec.describe "bundler/inline#gemfile" do
RUBY
expect(out).to include("Installing activesupport")
- err.gsub! %r{.*lib/sinatra/base\.rb:\d+: warning: constant ::Fixnum is deprecated$}, ""
- err.strip!
- expect(err).to be_empty
+ err.gsub! %r{(.*lib/sinatra/base\.rb:\d+: warning: constant ::Fixnum is deprecated$)}, ""
+ err_lines = err.split("\n")
+ err_lines.reject!{|line| line =~ /\.rb:\d+: warning: The last/ }
+ expect(err_lines).to be_empty
expect(exitstatus).to be_zero if exitstatus
end