diff options
| author | Smit Shah <who828@gmail.com> | 2014-01-22 10:25:32 +0530 |
|---|---|---|
| committer | Smit Shah <who828@gmail.com> | 2014-01-22 10:38:00 +0530 |
| commit | 66acd02de593a6c7ee271bcbce3917eb3a01825a (patch) | |
| tree | e9d552f39570c5a1dd2f9bafef0e7bb5ab68f647 | |
| parent | f06ff3639aac23840d5685f6459c798dc15b1448 (diff) | |
| download | bundler-66acd02de593a6c7ee271bcbce3917eb3a01825a.tar.gz | |
Pick n-1 jobs by default
| -rw-r--r-- | CHANGELOG.md | 6 | ||||
| -rw-r--r-- | lib/bundler/installer.rb | 2 | ||||
| -rw-r--r-- | spec/support/permissions.rb | 1 |
3 files changed, 7 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 318d794e06..9df025f6fc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## 1.5.3 + +Bugfixes: + + - Use n-1 cores when given n jobs for parallel install (@jdickey) + ## 1.5.2 (2014-01-10) Bugfixes: diff --git a/lib/bundler/installer.rb b/lib/bundler/installer.rb index ede4a05e1a..d09b63d430 100644 --- a/lib/bundler/installer.rb +++ b/lib/bundler/installer.rb @@ -90,7 +90,7 @@ module Bundler # dependencies might actually affect the installation of a gem. # that said, it's a rare situation (other than rake), and parallel # installation is just SO MUCH FASTER. so we let people opt in. - jobs = [Bundler.settings[:jobs].to_i, 1].max + jobs = [Bundler.settings[:jobs].to_i-1, 1].max if jobs > 1 && can_install_parallely? install_in_parallel jobs, options[:standalone] else diff --git a/spec/support/permissions.rb b/spec/support/permissions.rb index 2f57961b8b..efdb4a5b28 100644 --- a/spec/support/permissions.rb +++ b/spec/support/permissions.rb @@ -8,4 +8,3 @@ module Spec end end end - |