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/.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/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 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') 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. # diff --git a/run_loop.gemspec b/run_loop.gemspec index b7dc82e9..febb91d9 100644 --- a/run_loop.gemspec +++ b/run_loop.gemspec @@ -19,10 +19,10 @@ 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') + s.add_dependency('awesome_print', '~> 1.6') s.add_dependency('CFPropertyList','~> 2.2') s.add_development_dependency('bundler', '~> 1.6') 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