diff options
| author | Andre Arko <andre@arko.net> | 2011-08-09 11:07:41 -0700 |
|---|---|---|
| committer | Andre Arko <andre@arko.net> | 2011-08-09 11:07:41 -0700 |
| commit | 0452e9b9a21c720022da1023037e9dc2940ff652 (patch) | |
| tree | a69943b4f0edddb402cd37cacfc8d7a08a17bc62 /lib/bundler | |
| parent | e45135efaafa08c95d7f847b20894d740718c927 (diff) | |
| parent | 2bc173520a39ac333e54bc6a5a2bb680a77914c1 (diff) | |
| download | bundler-0452e9b9a21c720022da1023037e9dc2940ff652.tar.gz | |
Merge pull request #1295 from cldwalker/bundler
---
If theres a corresponding test for source.rb, let me know where and roughly what to test.
Diffstat (limited to 'lib/bundler')
| -rw-r--r-- | lib/bundler/dsl.rb | 2 | ||||
| -rw-r--r-- | lib/bundler/gem_helper.rb | 2 | ||||
| -rw-r--r-- | lib/bundler/source.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/bundler/dsl.rb b/lib/bundler/dsl.rb index fa80a76d..e9a2bd7a 100644 --- a/lib/bundler/dsl.rb +++ b/lib/bundler/dsl.rb @@ -22,7 +22,7 @@ module Bundler def gemspec(opts = nil) path = opts && opts[:path] || '.' - name = opts && opts[:name] || '*' + name = opts && opts[:name] || '{,*}' development_group = opts && opts[:development_group] || :development path = File.expand_path(path, Bundler.default_gemfile.dirname) gemspecs = Dir[File.join(path, "#{name}.gemspec")] diff --git a/lib/bundler/gem_helper.rb b/lib/bundler/gem_helper.rb index b906d5af..a3f83e58 100644 --- a/lib/bundler/gem_helper.rb +++ b/lib/bundler/gem_helper.rb @@ -16,7 +16,7 @@ module Bundler def initialize(base, name = nil) Bundler.ui = UI::Shell.new(Thor::Base.shell.new) @base = base - gemspecs = name ? [File.join(base, "#{name}.gemspec")] : Dir[File.join(base, "*.gemspec")] + gemspecs = name ? [File.join(base, "#{name}.gemspec")] : Dir[File.join(base, "{,*}.gemspec")] raise "Unable to determine name from existing gemspec. Use :name => 'gemname' in #install_tasks to manually set it." unless gemspecs.size == 1 @spec_path = gemspecs.first @gemspec = Bundler.load_gemspec(@spec_path) diff --git a/lib/bundler/source.rb b/lib/bundler/source.rb index 29e5139a..cf36e87f 100644 --- a/lib/bundler/source.rb +++ b/lib/bundler/source.rb @@ -280,7 +280,7 @@ module Bundler attr_writer :name attr_accessor :version - DEFAULT_GLOB = "{,*/}*.gemspec" + DEFAULT_GLOB = "{,*,*/*}.gemspec" def initialize(options) @options = options |