diff options
| author | Matthew Smith <matthew.smith2@extendhealth.com> | 2011-06-24 15:59:45 -0600 |
|---|---|---|
| committer | Matthew Smith <matthew.smith2@extendhealth.com> | 2011-06-24 15:59:45 -0600 |
| commit | 332a17c248dda13af0212744ca505821849b096c (patch) | |
| tree | 274929844b4f557e4fa02e644ea777f69b640aed /lib | |
| parent | 448c1d443e3a8d47f78555bafd0f8e61a16cd46e (diff) | |
| parent | d042d377575c7cec6a30bb4bd4416aad9d1896c5 (diff) | |
| download | bundler-332a17c248dda13af0212744ca505821849b096c.tar.gz | |
Merge branch '1-0-stable' of git://github.com/carlhuda/bundler into 1-0-stable
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/bundler/cli.rb | 2 | ||||
| -rw-r--r-- | lib/bundler/source.rb | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/bundler/cli.rb b/lib/bundler/cli.rb index 9d53384a..87131931 100644 --- a/lib/bundler/cli.rb +++ b/lib/bundler/cli.rb @@ -347,7 +347,7 @@ module Bundler exit 126 rescue Errno::ENOENT Bundler.ui.error "bundler: command not found: #{ARGV.first}" - Bundler.ui.warn "Install missing gem binaries with `bundle install`" + Bundler.ui.warn "Install missing gem executables with `bundle install`" exit 127 end end diff --git a/lib/bundler/source.rb b/lib/bundler/source.rb index bea3f987..29e5139a 100644 --- a/lib/bundler/source.rb +++ b/lib/bundler/source.rb @@ -362,9 +362,9 @@ module Bundler s.relative_loaded_from = "#{@name}.gemspec" s.authors = ["no one"] if expanded_path.join("bin").exist? - binaries = expanded_path.join("bin").children - binaries.reject!{|p| File.directory?(p) } - s.executables = binaries.map{|c| c.basename.to_s } + executables = expanded_path.join("bin").children + executables.reject!{|p| File.directory?(p) } + s.executables = executables.map{|c| c.basename.to_s } end end end |