diff options
author | Andre Arko <andre@arko.net> | 2013-07-03 13:55:02 -0700 |
---|---|---|
committer | Andre Arko <andre@arko.net> | 2013-07-03 13:57:18 -0700 |
commit | 6f8ed6c8756440538995e499a61f2572f959d110 (patch) | |
tree | 08e4e864aa7c5005d42cd5a7f8a40e9bd7d7830a /lib/bundler.rb | |
parent | b6926a7ce58907ac68573f46bd021042b374705c (diff) | |
parent | 3fb9d05bad23a4d69824c1c8a24f860e384c66d8 (diff) | |
download | bundler-6f8ed6c8756440538995e499a61f2572f959d110.tar.gz |
Merge pull request #2481 from eagletmt/parallel-install
Parallel installation
Diffstat (limited to 'lib/bundler.rb')
-rw-r--r-- | lib/bundler.rb | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/lib/bundler.rb b/lib/bundler.rb index ccb447de..969ad8c9 100644 --- a/lib/bundler.rb +++ b/lib/bundler.rb @@ -5,6 +5,7 @@ require 'bundler/gem_path_manipulation' require 'bundler/rubygems_ext' require 'bundler/rubygems_integration' require 'bundler/version' +require 'bundler/constants' module Bundler preserve_gem_path @@ -64,10 +65,6 @@ module Bundler class SecurityError < BundlerError; status_code(19) ; end class LockfileError < BundlerError; status_code(20) ; end - WINDOWS = RbConfig::CONFIG["host_os"] =~ %r!(msdos|mswin|djgpp|mingw)! - FREEBSD = RbConfig::CONFIG["host_os"] =~ /bsd/ - NULL = WINDOWS ? "NUL" : "/dev/null" - # Internal errors, should be rescued class VersionConflict < BundlerError attr_reader :conflicts @@ -315,7 +312,7 @@ module Bundler path = Pathname.new(file) # Eval the gemspec from its parent directory, because some gemspecs # depend on "./" relative paths. - Dir.chdir(path.dirname.to_s) do + SharedHelpers.chdir(path.dirname.to_s) do contents = path.read if contents[0..2] == "---" # YAML header eval_yaml_gemspec(path, contents) |