diff options
author | Carl Lerche <carllerche@mac.com> | 2009-07-22 16:50:23 -0700 |
---|---|---|
committer | Carl Lerche <carllerche@mac.com> | 2009-07-22 16:50:23 -0700 |
commit | 7f1662efb855da76d19c5545e203a493d47aa79a (patch) | |
tree | 3c6b48607af721d240758190e7bf07d0584fc6d6 | |
parent | 06f68399ca017fb190021ab0ff525aaa77564e86 (diff) | |
download | bundler-7f1662efb855da76d19c5545e203a493d47aa79a.tar.gz |
Output a log message when deleting gems
-rw-r--r-- | lib/bundler/manifest.rb | 25 | ||||
-rw-r--r-- | spec/bundler/manifest_spec.rb | 5 |
2 files changed, 16 insertions, 14 deletions
diff --git a/lib/bundler/manifest.rb b/lib/bundler/manifest.rb index c11e6a2c90..7af44c5c00 100644 --- a/lib/bundler/manifest.rb +++ b/lib/bundler/manifest.rb @@ -11,18 +11,6 @@ module Bundler @sources, @dependencies, @path = sources, dependencies, Pathname.new(path) end - def fetch - return if all_gems_installed? - - finder = Finder.new(*sources) - unless bundle = finder.resolve(*gem_dependencies) - gems = @dependencies.map {|d| " #{d.to_s}" }.join("\n") - raise VersionConflict, "No compatible versions could be found for:\n#{gems}" - end - - bundle.download(@path) - end - def install(options = {}) fetch installer = Installer.new(@path) @@ -59,6 +47,18 @@ module Bundler private + def fetch + return if all_gems_installed? + + finder = Finder.new(*sources) + unless bundle = finder.resolve(*gem_dependencies) + gems = @dependencies.map {|d| " #{d.to_s}" }.join("\n") + raise VersionConflict, "No compatible versions could be found for:\n#{gems}" + end + + bundle.download(@path) + end + def gem_dependencies @gem_dependencies ||= dependencies.map { |d| d.to_gem_dependency } end @@ -83,6 +83,7 @@ module Bundler base = @path.join("{cache,specifications,gems}") (Dir[base.join("*")] - Dir[base.join("{#{glob}}{.gemspec,.gem,}")]).each do |file| + Bundler.logger.info "Deleting #{File.basename(file)}" if File.basename(file) =~ /\.gem$/ FileUtils.rm_rf(file) end end diff --git a/spec/bundler/manifest_spec.rb b/spec/bundler/manifest_spec.rb index eb6919a240..08e0d1fd8b 100644 --- a/spec/bundler/manifest_spec.rb +++ b/spec/bundler/manifest_spec.rb @@ -80,7 +80,7 @@ describe "Bundler::Manifest" do @manifest.install tmp_dir.should have_cached_gem("rack-0.9.1") tmp_dir.should have_installed_gem("rack-0.9.1") - tmp_file("bin", "rackup").should be_exist + tmp_file("bin", "rackup").should exist deps = @deps.dup deps.pop @@ -89,7 +89,8 @@ describe "Bundler::Manifest" do tmp_dir.should_not have_cached_gem("rack-0.9.1") tmp_dir.should_not have_installed_gem("rack-0.9.1") - tmp_file("bin", "rackup").should_not be_exist + tmp_file("bin", "rackup").should_not exist + @log_output.should have_log_message("Deleting rack-0.9.1.gem") end it "removes stray specfiles" do |