diff options
| author | Carl Lerche <carllerche@mac.com> | 2010-08-23 13:54:59 -0700 |
|---|---|---|
| committer | Carl Lerche <carllerche@mac.com> | 2010-08-23 14:13:36 -0700 |
| commit | 67e33109bd9d82dd770ffa65e207ed17ed425dd1 (patch) | |
| tree | 5c82d3fa3d81cac6a6620c7be8d56f6ecc6dacc3 /lib/bundler.rb | |
| parent | 1012be895c22241d65bf9f378a886b8c38a674f7 (diff) | |
| download | bundler-67e33109bd9d82dd770ffa65e207ed17ed425dd1.tar.gz | |
Integrate the new bundler man pages with bundle help
Diffstat (limited to 'lib/bundler.rb')
| -rw-r--r-- | lib/bundler.rb | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/bundler.rb b/lib/bundler.rb index 2cceb4ef..bb007f04 100644 --- a/lib/bundler.rb +++ b/lib/bundler.rb @@ -45,6 +45,11 @@ module Bundler class ProductionError < BundlerError; status_code(16) ; end class InvalidOption < DslError ; end + + WINDOWS = RbConfig::CONFIG["host_os"] =~ %r!(msdos|mswin|djgpp|mingw)! + NULL = WINDOWS ? "NUL" : "/dev/null" + + class VersionConflict < BundlerError attr_reader :conflicts @@ -186,9 +191,6 @@ module Bundler SharedHelpers.default_lockfile end - WINDOWS = RbConfig::CONFIG["host_os"] =~ %r!(msdos|mswin|djgpp|mingw)! - NULL = WINDOWS ? "NUL" : "/dev/null" - def requires_sudo? path = bundle_path path = path.parent until path.exist? |