From 40fed6d6d1c5f7495db515b43b4f8ec392c31052 Mon Sep 17 00:00:00 2001 From: bronzdoc Date: Sat, 5 Mar 2016 18:49:53 -0600 Subject: Make version_message configurable --- lib/bundler/source.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/bundler/source.rb b/lib/bundler/source.rb index 5f1eb130b7..b59ec20b0e 100644 --- a/lib/bundler/source.rb +++ b/lib/bundler/source.rb @@ -18,7 +18,11 @@ 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 += " (was #{locked_spec_version})" + message += if block_given? + yield locked_spec_version + else + " (was #{locked_spec_version})" + end end end -- cgit v1.2.1 From 4df29f94c7bac5c30613bec3df4cdd2499311512 Mon Sep 17 00:00:00 2001 From: bronzdoc Date: Sat, 5 Mar 2016 18:51:36 -0600 Subject: Add color to locked version --- lib/bundler/source/rubygems.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bundler/source/rubygems.rb b/lib/bundler/source/rubygems.rb index cebb68a700..6028fb48d3 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)}" + Bundler.ui.info "Using #{version_message(spec){ |version| " (\e[32mwas #{version}\e[0m)" }}" return nil # no post-install message end -- cgit v1.2.1 From ae9ea503f756a9aa340272e6159e473dab12ff93 Mon Sep 17 00:00:00 2001 From: bronzdoc Date: Mon, 7 Mar 2016 20:59:53 -0600 Subject: Adding add_color method --- lib/bundler/source.rb | 6 +----- lib/bundler/source/rubygems.rb | 2 +- lib/bundler/ui/shell.rb | 4 ++++ 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 -- cgit v1.2.1 From 2a084dcfeb9d1b91c9cbbb26451964cdb83c9403 Mon Sep 17 00:00:00 2001 From: bronzdoc Date: Mon, 7 Mar 2016 21:19:20 -0600 Subject: Update spec --- spec/bundler/source_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/bundler/source_spec.rb b/spec/bundler/source_spec.rb index 1b4e4bdde9..fc28220c7d 100644 --- a/spec/bundler/source_spec.rb +++ b/spec/bundler/source_spec.rb @@ -58,7 +58,7 @@ describe Bundler::Source do let(:locked_gem) { double(:locked_gem, :name => "nokogiri", :version => "< 1.5") } it "should return a string with the spec name and version and locked spec version" do - expect(subject.version_message(spec)).to eq("nokogiri >= 1.6 (was < 1.5)") + expect(subject.version_message(spec)).to eq("nokogiri >= 1.6 (\e[32mwas < 1.5\e[0m)") end end end -- cgit v1.2.1 From d5eeff68fe3a6171ea47017e4de291bb5e96eb69 Mon Sep 17 00:00:00 2001 From: bronzdoc Date: Tue, 8 Mar 2016 22:46:31 -0600 Subject: Adding add_color to silent UI --- lib/bundler/ui/silent.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/bundler/ui/silent.rb b/lib/bundler/ui/silent.rb index 9f387d9e9f..af512eced3 100644 --- a/lib/bundler/ui/silent.rb +++ b/lib/bundler/ui/silent.rb @@ -2,6 +2,9 @@ module Bundler module UI class Silent + def add_color(string, color) + end + def info(message, newline = nil) end -- cgit v1.2.1