diff options
Diffstat (limited to 'lib/bundler/dsl.rb')
| -rw-r--r-- | lib/bundler/dsl.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/bundler/dsl.rb b/lib/bundler/dsl.rb index dfc5254b2a..1cc7908b8a 100644 --- a/lib/bundler/dsl.rb +++ b/lib/bundler/dsl.rb @@ -63,7 +63,7 @@ module Bundler development_group = opts[:development_group] || :development expanded_path = gemfile_root.join(path) - gemspecs = Dir[File.join(expanded_path, "{,*}.gemspec")].map {|g| Bundler.load_gemspec(g) }.compact + gemspecs = Gem::Util.glob_files_in_dir("{,*}.gemspec", expanded_path).map {|g| Bundler.load_gemspec(g) }.compact gemspecs.reject! {|s| s.name != name } if name Index.sort_specs(gemspecs) specs_by_name_and_version = gemspecs.group_by {|s| [s.name, s.version] } @@ -279,7 +279,7 @@ module Bundler raise GemfileError, "Undefined local variable or method `#{name}' for Gemfile" end - private + private def add_git_sources git_source(:github) do |repo_name| @@ -457,7 +457,7 @@ repo_name ||= user_name "Using `source` more than once without a block is a security risk, and " \ "may result in installing unexpected gems. To resolve this warning, use " \ "a block to indicate which gems should come from the secondary source. " \ - "To upgrade this warning to an error, run `bundle config set " \ + "To upgrade this warning to an error, run `bundle config set --local " \ "disable_multisource true`." end end @@ -567,7 +567,7 @@ The :#{name} git source is deprecated, and will be removed in the future.#{addit end end - private + private def parse_line_number_from_description description = self.description |