diff options
| -rw-r--r-- | lib/bundler/installer.rb | 8 | ||||
| -rw-r--r-- | lib/bundler/resolver.rb | 2 | ||||
| -rw-r--r-- | spec/install/gems_spec.rb | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/lib/bundler/installer.rb b/lib/bundler/installer.rb index 2da82ab05e..affc66735b 100644 --- a/lib/bundler/installer.rb +++ b/lib/bundler/installer.rb @@ -16,15 +16,15 @@ module Bundler FileUtils.mkdir_p(Bundler.bundle_path) specs.sort_by { |s| s.name }.each do |spec| - # unless spec.source.is_a?(Source::SystemGems) - Bundler.ui.info "Installing #{spec.name} (#{spec.version}) from #{spec.source} " - # end - if (spec.groups & options[:without]).any? Bundler.ui.debug " * Not in requested group; skipping." next end + # unless spec.source.is_a?(Source::SystemGems) + Bundler.ui.info "Installing #{spec.name} (#{spec.version}) from #{spec.source} " + # end + spec.source.install(spec) Bundler.ui.info "" diff --git a/lib/bundler/resolver.rb b/lib/bundler/resolver.rb index f29887de0a..99a464a35e 100644 --- a/lib/bundler/resolver.rb +++ b/lib/bundler/resolver.rb @@ -1,6 +1,6 @@ require 'set' # This is the latest iteration of the gem dependency resolving algorithm. As of now, -# it can resolve (as a success of failure) any set of gem dependencies we throw at it +# it can resolve (as a success or failure) any set of gem dependencies we throw at it # in a reasonable amount of time. The most iterations I've seen it take is about 150. # The actual implementation of the algorithm is not as good as it could be yet, but that # can come later. diff --git a/spec/install/gems_spec.rb b/spec/install/gems_spec.rb index 79d32818b8..bd7fda3a6e 100644 --- a/spec/install/gems_spec.rb +++ b/spec/install/gems_spec.rb @@ -349,6 +349,10 @@ describe "gemfile install with gem sources" do should_not_be_installed "activesupport 2.3.5", :groups => [:default] end + it "does not say it installed gems from the excluded group" do + out.should_not include("activesupport") + end + it "allows Bundler.setup for specific groups" do out = run("require 'rack'; puts RACK", :default) out.should == '1.0.0' |