summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbronzdoc <lsagastume1990@gmail.com>2016-03-07 20:59:53 -0600
committerbronzdoc <lsagastume1990@gmail.com>2016-03-07 21:00:44 -0600
commitae9ea503f756a9aa340272e6159e473dab12ff93 (patch)
tree2fca2e4b126da043c20715ca5a61e129702755db
parent4df29f94c7bac5c30613bec3df4cdd2499311512 (diff)
downloadbundler-ae9ea503f756a9aa340272e6159e473dab12ff93.tar.gz
Adding add_color method
-rw-r--r--lib/bundler/source.rb6
-rw-r--r--lib/bundler/source/rubygems.rb2
-rw-r--r--lib/bundler/ui/shell.rb4
3 files changed, 6 insertions, 6 deletions
diff --git a/lib/bundler/source.rb b/lib/bundler/source.rb
index b59ec20b0e..eee4ade45b 100644
--- a/lib/bundler/source.rb
+++ b/lib/bundler/source.rb
@@ -18,11 +18,7 @@ module Bundler
locked_spec = Bundler.locked_gems.specs.find {|s| s.name == spec.name }
locked_spec_version = locked_spec.version if locked_spec
if locked_spec_version && spec.version != locked_spec_version
- message += if block_given?
- yield locked_spec_version
- else
- " (was #{locked_spec_version})"
- end
+ message += " (#{Bundler.ui.add_color("was #{locked_spec_version}", :green)})"
end
end
diff --git a/lib/bundler/source/rubygems.rb b/lib/bundler/source/rubygems.rb
index 6028fb48d3..cebb68a700 100644
--- a/lib/bundler/source/rubygems.rb
+++ b/lib/bundler/source/rubygems.rb
@@ -100,7 +100,7 @@ module Bundler
end
if installed?(spec) && (!force || spec.name.eql?("bundler"))
- Bundler.ui.info "Using #{version_message(spec){ |version| " (\e[32mwas #{version}\e[0m)" }}"
+ Bundler.ui.info "Using #{version_message(spec)}"
return nil # no post-install message
end
diff --git a/lib/bundler/ui/shell.rb b/lib/bundler/ui/shell.rb
index 425ffae332..1317b1838a 100644
--- a/lib/bundler/ui/shell.rb
+++ b/lib/bundler/ui/shell.rb
@@ -17,6 +17,10 @@ module Bundler
@warning_history = []
end
+ def add_color(string, color)
+ @shell.set_color(string, color)
+ end
+
def info(msg, newline = nil)
tell_me(msg, nil, newline) if level("info")
end