From d7038acd0ffb05deef669f2132e7807985d8564a Mon Sep 17 00:00:00 2001 From: Joshua Moody Date: Fri, 9 Jan 2015 18:56:13 +0100 Subject: [PATCH 1/6] Update awesome-print dependency to 1.6 --- run_loop.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run_loop.gemspec b/run_loop.gemspec index b7dc82e9..85122d0c 100644 --- a/run_loop.gemspec +++ b/run_loop.gemspec @@ -22,7 +22,7 @@ Gem::Specification.new do |s| s.add_dependency('json', '~> 1.8') # Matches XTC requirement; would like to use ~> 1.4.0. s.add_dependency 'retriable', '~> 1.3.3.1' - s.add_dependency('awesome_print', '~> 1.2.0') + s.add_dependency('awesome_print', '~> 1.6') s.add_dependency('CFPropertyList','~> 2.2') s.add_development_dependency('bundler', '~> 1.6') From f3447df644aae8eec9acb32291af371f202c7091 Mon Sep 17 00:00:00 2001 From: Joshua Moody Date: Fri, 9 Jan 2015 18:56:44 +0100 Subject: [PATCH 2/6] Remove pre 1.6 awesome-print monkey patches --- .irbrc | 15 --------------- spec/spec_helper.rb | 15 --------------- 2 files changed, 30 deletions(-) diff --git a/.irbrc b/.irbrc index e18e3c55..490d2ead 100644 --- a/.irbrc +++ b/.irbrc @@ -8,21 +8,6 @@ ARGV.concat [ '--readline', '--prompt-mode', 'simple'] -# monkey patch for AwesomePrint + objects that implement '==' -module AwesomePrint - class Formatter - def awesome_self(object, type) - if @options[:raw] && object.instance_variables.any? - awesome_object(object) - elsif object.respond_to?(:to_hash) - awesome_hash(object.to_hash) - else - colorize(object.inspect.to_s, type) - end - end - end -end - # 25 entries in the list IRB.conf[:SAVE_HISTORY] = 50 diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 352c7901..71683e67 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -5,21 +5,6 @@ require 'stub_env' require 'pry' -# monkey patch for AwesomePrint + objects that implement '==' -module AwesomePrint - class Formatter - def awesome_self(object, type) - if @options[:raw] && object.instance_variables.any? - awesome_object(object) - elsif object.respond_to?(:to_hash) - awesome_hash(object.to_hash) - else - colorize(object.inspect.to_s, type) - end - end - end -end - module Kernel def capture_stdout out = StringIO.new From 232c351937b332a05cf7946da545f716cd355cf7 Mon Sep 17 00:00:00 2001 From: Joshua Moody Date: Fri, 9 Jan 2015 19:00:12 +0100 Subject: [PATCH 3/6] Update guard config for > 2.9 compat --- .guardrc | 3 ++- Guardfile | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.guardrc b/.guardrc index ac1aa763..5c5c9a7d 100644 --- a/.guardrc +++ b/.guardrc @@ -1 +1,2 @@ -Guard.options[:clear] = true +# Configure the Pry interactor here. +# https://github.com/guard/guard/wiki/Configuration-files diff --git a/Guardfile b/Guardfile index d604dbae..100226ff 100644 --- a/Guardfile +++ b/Guardfile @@ -1,5 +1,6 @@ notification :growl, sticky: false, priority: 0 logger level: :info +clearing :on guard 'bundler' do watch('Gemfile') From 30f256be685c5f4a349dc33960173c3239adb821 Mon Sep 17 00:00:00 2001 From: Joshua Moody Date: Sat, 10 Jan 2015 05:04:34 +0100 Subject: [PATCH 4/6] Temporarily pin json gem to 1.8.1 Waiting on XTC changes to support 1.8.2. --- run_loop.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run_loop.gemspec b/run_loop.gemspec index b7dc82e9..35935b27 100644 --- a/run_loop.gemspec +++ b/run_loop.gemspec @@ -19,7 +19,7 @@ Gem::Specification.new do |s| s.required_ruby_version = '>= 1.9' s.add_dependency('thor', '>= 0.18') - s.add_dependency('json', '~> 1.8') + s.add_dependency('json', '1.8.1') # Matches XTC requirement; would like to use ~> 1.4.0. s.add_dependency 'retriable', '~> 1.3.3.1' s.add_dependency('awesome_print', '~> 1.2.0') From 83998baa2ff46e20f86b219757742e07fbd30526 Mon Sep 17 00:00:00 2001 From: Joshua Moody Date: Sat, 10 Jan 2015 12:54:56 +0100 Subject: [PATCH 5/6] Bump version to 1.2.2 --- lib/run_loop/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/run_loop/version.rb b/lib/run_loop/version.rb index 13c622da..f4053b29 100644 --- a/lib/run_loop/version.rb +++ b/lib/run_loop/version.rb @@ -1,5 +1,5 @@ module RunLoop - VERSION = '1.2.1' + VERSION = '1.2.2' # A model of a software release version that can be used to compare two versions. # From 053102244f335cb78129b292cb8605d848056126 Mon Sep 17 00:00:00 2001 From: Joshua Moody Date: Sat, 10 Jan 2015 12:55:56 +0100 Subject: [PATCH 6/6] Add release notes for 1.2.2 --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index bff29be6..a68d16fa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ ## Change Log +### 1.2.2 + +* #105 update awesome print to 1.6 + ### 1.2.1 * #101 Escape binary path in argument to lipo. @gredman