aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetr Skocik <pskocik@gmail.com>2015-03-04 22:04:11 +0100
committerPetr Skocik <pskocik@gmail.com>2015-03-09 07:34:55 +0100
commit5b63bcbf587e4c6a87e17f783afe4bcd625b0f7c (patch)
tree43440fa8ae91014ffb9bc84ea7fd71bc61c7133f
parentdc0e847bc88554ebb40367dd18432f99d3097686 (diff)
downloadbundler-5b63bcbf587e4c6a87e17f783afe4bcd625b0f7c.tar.gz
gemspec should accept a glob option in its argument hash
-rw-r--r--lib/bundler/dsl.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/bundler/dsl.rb b/lib/bundler/dsl.rb
index 9736525a..5cb3be02 100644
--- a/lib/bundler/dsl.rb
+++ b/lib/bundler/dsl.rb
@@ -52,7 +52,8 @@ module Bundler
when 1
spec = Bundler.load_gemspec(gemspecs.first)
raise InvalidOption, "There was an error loading the gemspec at #{gemspecs.first}." unless spec
- gem spec.name, :path => path
+ opts ||= {}
+ gem spec.name, opts.merge(:path => path)
group(development_group) do
spec.development_dependencies.each do |dep|
gem dep.name, *(dep.requirement.as_list + [:type => :development])
@@ -224,7 +225,7 @@ module Bundler
end
def valid_keys
- @valid_keys ||= %w(group groups git path name branch ref tag require submodules platform platforms type source)
+ @valid_keys ||= %w(group groups git path glob name branch ref tag require submodules platform platforms type source)
end
def normalize_options(name, version, opts)