Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

upgrade to ruby-1.9.3-p374 and chef 10.18

  • Loading branch information...
commit 4d3427452ed3ad49d296db665f8027acf20ab23e 1 parent 3c3c7bf
@hollow hollow authored
Showing with 25 additions and 24 deletions.
  1. +1 −1  .rvmrc
  2. +2 −2 Gemfile
  3. +22 −21 Gemfile.lock
View
2  .rvmrc
@@ -1 +1 @@
-rvm --create --install ruby-1.9.3-p194@chef
+rvm use --create --install ruby-1.9.3-p374@chef
View
4 Gemfile
@@ -1,7 +1,7 @@
source :rubygems
-gem 'chef', '~> 10.14'
-gem 'ohai', '= 0.6.12' # 6.14.0 breaks mac os
+gem 'chef', '~> 10.18'
+gem 'ohai', '~> 6.16'
gem 'highline'
gem 'rake'
gem 'showoff'
View
43 Gemfile.lock
@@ -5,7 +5,7 @@ GEM
blankslate (2.1.2.4)
bluecloth (2.2.0)
bunny (0.7.9)
- chef (10.14.2)
+ chef (10.18.2)
bunny (>= 0.6.0, < 0.8.0)
erubis
highline (>= 1.6.9)
@@ -15,7 +15,7 @@ GEM
mixlib-config (>= 1.1.2)
mixlib-log (>= 1.3.0)
mixlib-shellout
- moneta
+ moneta (< 0.7.0)
net-ssh (~> 2.2.2)
net-ssh-multi (~> 1.1.0)
ohai (>= 0.6.0)
@@ -23,24 +23,24 @@ GEM
treetop (~> 1.4.9)
uuidtools
yajl-ruby (~> 1.1)
- childprocess (0.3.5)
+ childprocess (0.3.7)
ffi (~> 1.0, >= 1.0.6)
- coderay (1.0.7)
+ coderay (1.0.8)
erubis (2.7.0)
- ffi (1.1.5)
- foodcritic (1.6.1)
+ ffi (1.3.1)
+ foodcritic (1.7.0)
erubis
gherkin (~> 2.11.1)
gist (~> 3.1.0)
- nokogiri (= 1.5.0)
+ nokogiri (~> 1.5.4)
pry (~> 0.9.8.4)
rak (~> 1.4)
treetop (~> 1.4.10)
yajl-ruby (~> 1.1.0)
- gherkin (2.11.2)
+ gherkin (2.11.5)
json (>= 1.4.6)
- gist (3.1.0)
- gli (2.1.0)
+ gist (3.1.1)
+ gli (2.5.4)
highline (1.6.15)
i18n (0.6.1)
ipaddress (0.8.0)
@@ -50,7 +50,7 @@ GEM
mime-types (1.19)
mixlib-authentication (1.3.0)
mixlib-log
- mixlib-cli (1.2.2)
+ mixlib-cli (1.3.0)
mixlib-config (1.1.2)
mixlib-log (1.4.1)
mixlib-shellout (1.1.0)
@@ -63,26 +63,27 @@ GEM
net-ssh-multi (1.1)
net-ssh (>= 2.1.4)
net-ssh-gateway (>= 0.99.0)
- nokogiri (1.5.0)
- ohai (0.6.12)
+ nokogiri (1.5.6)
+ ohai (6.16.0)
ipaddress
mixlib-cli
mixlib-config
mixlib-log
+ mixlib-shellout
systemu
yajl-ruby
- parslet (1.4.0)
+ parslet (1.5.0)
blankslate (~> 2.0)
polyglot (0.3.3)
pry (0.9.8.4)
coderay (~> 1.0.5)
method_source (~> 0.7.1)
slop (>= 2.4.4, < 3)
- rack (1.4.1)
- rack-protection (1.2.0)
+ rack (1.5.0)
+ rack-protection (1.3.2)
rack
rak (1.4)
- rake (0.9.2.2)
+ rake (10.0.3)
rest-client (1.6.7)
mime-types (>= 1.16)
showoff (0.7.0)
@@ -99,11 +100,11 @@ GEM
slop (2.4.4)
systemu (2.5.2)
tilt (1.3.3)
- treetop (1.4.10)
+ treetop (1.4.12)
polyglot
polyglot (>= 0.3.1)
uuidtools (2.1.3)
- vagrant (1.0.4)
+ vagrant (1.0.6)
archive-tar-minitar (= 0.5.2)
childprocess (~> 0.3.1)
erubis (~> 2.7.0)
@@ -120,10 +121,10 @@ PLATFORMS
ruby
DEPENDENCIES
- chef (~> 10.14)
+ chef (~> 10.18)
foodcritic
highline
- ohai (= 0.6.12)
+ ohai (~> 6.16)
rake
showoff
vagrant
Please sign in to comment.
Something went wrong with that request. Please try again.