summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndre Arko <andre@arko.net>2015-06-08 00:01:57 -0700
committerAndre Arko <andre@arko.net>2015-06-08 00:01:57 -0700
commit54ae9be94ede7cc412fe6b989b21120776b1d77e (patch)
tree5ded5d5f9d2d11e31cfb82ba2933c7ab04d5f997
parent0a0adff11d95a49a8c74c986b91eee8a106773a0 (diff)
downloadbundler-54ae9be94ede7cc412fe6b989b21120776b1d77e.tar.gz
fix post-install messages from git and path gems
-rw-r--r--lib/bundler/source/git.rb11
-rw-r--r--lib/bundler/source/path.rb3
-rw-r--r--lib/bundler/source/rubygems.rb3
3 files changed, 9 insertions, 8 deletions
diff --git a/lib/bundler/source/git.rb b/lib/bundler/source/git.rb
index 230aa8fc40..59deb58a76 100644
--- a/lib/bundler/source/git.rb
+++ b/lib/bundler/source/git.rb
@@ -160,18 +160,17 @@ module Bundler
end
def install(spec, force = false)
- debug = nil
+ Bundler.ui.info "Using #{version_message(spec)} from #{to_s}"
+
if requires_checkout? && !@copied && !force
- debug = " * Checking out revision: #{ref}"
+ Bundler.ui.debug " * Checking out revision: #{ref}"
git_proxy.copy_to(install_path, submodules)
serialize_gemspecs_in(install_path)
@copied = true
end
generate_bin(spec)
- if requires_checkout? && spec.post_install_message
- Installer.post_install_messages[spec.name] = spec.post_install_message
- end
- ["Using #{version_message(spec)} from #{to_s}", nil, debug]
+
+ requires_checkout? ? spec.post_install_message : nil
end
def cache(spec, custom_path = nil)
diff --git a/lib/bundler/source/path.rb b/lib/bundler/source/path.rb
index e586c60bce..a3f6370c91 100644
--- a/lib/bundler/source/path.rb
+++ b/lib/bundler/source/path.rb
@@ -69,8 +69,9 @@ module Bundler
end
def install(spec, force = false)
+ Bundler.ui.info "Using #{version_message(spec)} from #{to_s}"
generate_bin(spec, :disable_extensions)
- ["Using #{version_message(spec)} from #{to_s}", nil]
+ nil # no post-install message
end
def cache(spec, custom_path = nil)
diff --git a/lib/bundler/source/rubygems.rb b/lib/bundler/source/rubygems.rb
index d98514faed..c066e898a5 100644
--- a/lib/bundler/source/rubygems.rb
+++ b/lib/bundler/source/rubygems.rb
@@ -99,7 +99,8 @@ module Bundler
end
if installed_specs[spec].any? && !force
- return Bundler.ui.info "Using #{version_message(spec)}"
+ Bundler.ui.info "Using #{version_message(spec)}"
+ return nil # no post-install message
end
# Download the gem to get the spec, because some specs that are returned