Skip to content

Commit

Permalink
Merge pull request #47 from ddfreyne/release-2.7.x
Browse files Browse the repository at this point in the history
Release 2.7.x
  • Loading branch information
denisdefreyne committed Apr 29, 2015
2 parents 9cd6d2a + b3860ff commit 8255580
Show file tree
Hide file tree
Showing 3 changed files with 50 additions and 28 deletions.
64 changes: 37 additions & 27 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,51 +1,61 @@
PATH
remote: .
specs:
cri (2.6.1)
cri (2.7.0)
colored (~> 1.2)

GEM
remote: https://rubygems.org/
specs:
asciidoctor (0.1.4)
asciidoctor (1.5.2)
ast (2.0.0)
astrolabe (1.3.0)
parser (>= 2.2.0.pre.3, < 3.0)
colored (1.2)
coveralls (0.7.0)
multi_json (~> 1.3)
rest-client
simplecov (>= 0.7)
term-ansicolor
thor
docile (1.1.3)
mime-types (2.3)
minitest (5.3.4)
multi_json (1.10.1)
parser (2.2.0.2)
coveralls (0.8.1)
json (~> 1.8)
rest-client (>= 1.6.8, < 2)
simplecov (~> 0.10.0)
term-ansicolor (~> 1.3)
thor (~> 0.19.1)
docile (1.1.5)
domain_name (0.5.24)
unf (>= 0.0.5, < 1.0.0)
http-cookie (1.0.2)
domain_name (~> 0.5)
json (1.8.2)
mime-types (2.5)
minitest (5.6.1)
netrc (0.10.3)
parser (2.2.2.2)
ast (>= 1.1, < 3.0)
powerpack (0.0.9)
powerpack (0.1.0)
rainbow (2.0.0)
rake (10.3.2)
rest-client (1.6.7)
mime-types (>= 1.16)
rubocop (0.28.0)
rake (10.4.2)
rest-client (1.8.0)
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 3.0)
netrc (~> 0.7)
rubocop (0.30.1)
astrolabe (~> 1.3)
parser (>= 2.2.0.pre.7, < 3.0)
powerpack (~> 0.0.6)
parser (>= 2.2.2.1, < 3.0)
powerpack (~> 0.1)
rainbow (>= 1.99.1, < 3.0)
ruby-progressbar (~> 1.4)
ruby-progressbar (1.7.1)
simplecov (0.8.2)
ruby-progressbar (1.7.5)
simplecov (0.10.0)
docile (~> 1.1.0)
multi_json
simplecov-html (~> 0.8.0)
simplecov-html (0.8.0)
json (~> 1.8)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.0)
term-ansicolor (1.3.0)
tins (~> 1.0)
thor (0.19.1)
tins (1.3.0)
yard (0.8.7.4)
tins (1.5.1)
unf (0.1.4)
unf_ext
unf_ext (0.0.7.1)
yard (0.8.7.6)

PLATFORMS
ruby
Expand Down
12 changes: 12 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,18 @@
Cri News
========

2.7.0
-----

Features:

* Added support for hidden options (#43, #44) [Bart Mesuere]

Enhancements:

* Added option values to help output (#37, #40, #41)
* Made option descriptions wrap (#36, #45) [Bart Mesuere]

2.6.1
-----

Expand Down
2 changes: 1 addition & 1 deletion lib/cri/version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@

module Cri
# The current Cri version.
VERSION = '2.6.1'
VERSION = '2.7.0'
end

0 comments on commit 8255580

Please sign in to comment.