Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release/1.2.2 #108

Merged
merged 8 commits into from
Jan 10, 2015
Merged

Release/1.2.2 #108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8e44ef5
Merge branch 'release/1.2.1' into develop
jmoody Jan 9, 2015
d7038ac
Update awesome-print dependency to 1.6
jmoody Jan 9, 2015
f3447df
Remove pre 1.6 awesome-print monkey patches
jmoody Jan 9, 2015
232c351
Update guard config for > 2.9 compat
jmoody Jan 9, 2015
30f256b
Temporarily pin json gem to 1.8.1
jmoody Jan 10, 2015
e19430e
Merge pull request #105 from calabash/feature/update-awesome-print-to…
jmoody Jan 10, 2015
83998ba
Bump version to 1.2.2
jmoody Jan 10, 2015
0531022
Add release notes for 1.2.2
jmoody Jan 10, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .guardrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
Guard.options[:clear] = true
# Configure the Pry interactor here.
# https://github.com/guard/guard/wiki/Configuration-files
15 changes: 0 additions & 15 deletions .irbrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 1 addition & 0 deletions Guardfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
notification :growl, sticky: false, priority: 0
logger level: :info
clearing :on

guard 'bundler' do
watch('Gemfile')
Expand Down
2 changes: 1 addition & 1 deletion lib/run_loop/version.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
#
Expand Down
4 changes: 2 additions & 2 deletions run_loop.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
15 changes: 0 additions & 15 deletions spec/spec_helper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down