Upgraded Ruby to 2.2.2 plus rebuild Gemfile.lock file

This commit is contained in:
Al Snow
2015-06-17 15:22:24 -04:00
parent 401c69b815
commit 26124739da
3 changed files with 23 additions and 14 deletions
+1 -1
View File
@@ -1 +1 @@
2.1.6 2.2.2
+2 -1
View File
@@ -3,7 +3,7 @@ source 'https://rubygems.org'
#don't upgrade #don't upgrade
gem 'rails', '4.0.13' gem 'rails', '4.0.13'
ruby '2.1.6' ruby '2.2.2'
# Bundle edge Rails instead: # Bundle edge Rails instead:
# gem 'rails', :git => 'git://github.com/rails/rails.git' # gem 'rails', :git => 'git://github.com/rails/rails.git'
@@ -40,6 +40,7 @@ group :development, :test, :mysql do
gem 'database_cleaner' gem 'database_cleaner'
gem 'poltergeist' gem 'poltergeist'
gem 'rspec-rails', '2.14.2' gem 'rspec-rails', '2.14.2'
gem 'test-unit'
end end
group :mysql do group :mysql do
+20 -12
View File
@@ -27,7 +27,7 @@ GEM
tzinfo (~> 0.3.37) tzinfo (~> 0.3.37)
addressable (2.3.8) addressable (2.3.8)
arel (4.0.2) arel (4.0.2)
aruba (0.5.4) aruba (0.6.2)
childprocess (>= 0.3.6) childprocess (>= 0.3.6)
cucumber (>= 1.1.1) cucumber (>= 1.1.1)
rspec-expectations (>= 2.7.0) rspec-expectations (>= 2.7.0)
@@ -72,12 +72,15 @@ GEM
execjs execjs
coffee-script-source (1.9.1.1) coffee-script-source (1.9.1.1)
crack (0.3.1) crack (0.3.1)
cucumber (1.3.15) cucumber (2.0.0)
builder (>= 2.1.2) builder (>= 2.1.2)
cucumber-core (~> 1.1.3)
diff-lcs (>= 1.1.3) diff-lcs (>= 1.1.3)
gherkin (~> 2.12) gherkin (~> 2.12)
multi_json (>= 1.7.5, < 2.0) multi_json (>= 1.7.5, < 2.0)
multi_test (>= 0.1.1) multi_test (>= 0.1.2)
cucumber-core (1.1.3)
gherkin (~> 2.12.0)
daemons (1.2.2) daemons (1.2.2)
database_cleaner (1.4.1) database_cleaner (1.4.1)
debug_inspector (0.0.2) debug_inspector (0.0.2)
@@ -94,11 +97,11 @@ GEM
foreman (0.78.0) foreman (0.78.0)
thor (~> 0.19.1) thor (~> 0.19.1)
formatador (0.2.5) formatador (0.2.5)
gauntlt (1.0.10) gauntlt (1.0.6)
aruba (= 0.5.4) aruba
cucumber (= 1.3.15) cucumber
nokogiri (= 1.6.1) nokogiri (~> 1.5.0)
trollop (~> 2.0) trollop
gherkin (2.12.2) gherkin (2.12.2)
multi_json (~> 1.3) multi_json (~> 1.3)
guard (2.12.6) guard (2.12.6)
@@ -142,7 +145,7 @@ GEM
launchy (2.4.3) launchy (2.4.3)
addressable (~> 2.3) addressable (~> 2.3)
libv8 (3.16.14.7) libv8 (3.16.14.7)
listen (2.10.0) listen (2.10.1)
celluloid (~> 0.16.0) celluloid (~> 0.16.0)
rb-fsevent (>= 0.9.3) rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9) rb-inotify (>= 0.9)
@@ -159,14 +162,12 @@ GEM
thin (~> 1.5.0) thin (~> 1.5.0)
method_source (0.8.2) method_source (0.8.2)
mime-types (2.6.1) mime-types (2.6.1)
mini_portile (0.5.3)
minitest (4.7.5) minitest (4.7.5)
multi_json (1.11.1) multi_json (1.11.1)
multi_test (0.1.2) multi_test (0.1.2)
mysql2 (0.3.18) mysql2 (0.3.18)
nenv (0.2.0) nenv (0.2.0)
nokogiri (1.6.1) nokogiri (1.5.11)
mini_portile (~> 0.5.0)
notiffany (0.0.6) notiffany (0.0.6)
nenv (~> 0.1) nenv (~> 0.1)
shellany (~> 0.0) shellany (~> 0.0)
@@ -177,6 +178,7 @@ GEM
websocket-driver (>= 0.2.0) websocket-driver (>= 0.2.0)
powder (0.3.0) powder (0.3.0)
thor (>= 0.11.5) thor (>= 0.11.5)
power_assert (0.2.3)
pry (0.10.1) pry (0.10.1)
coderay (~> 1.1.0) coderay (~> 1.1.0)
method_source (~> 0.8.1) method_source (~> 0.8.1)
@@ -260,6 +262,8 @@ GEM
sprockets (>= 2.8, < 4.0) sprockets (>= 2.8, < 4.0)
sqlite3 (1.3.10) sqlite3 (1.3.10)
terminal-table (1.4.5) terminal-table (1.4.5)
test-unit (3.1.2)
power_assert
therubyracer (0.12.2) therubyracer (0.12.2)
libv8 (~> 3.16.14.0) libv8 (~> 3.16.14.0)
ref ref
@@ -328,8 +332,12 @@ DEPENDENCIES
sass-rails sass-rails
simplecov simplecov
sqlite3 sqlite3
test-unit
therubyracer therubyracer
travis-lint travis-lint
turbolinks turbolinks
uglifier uglifier
unicorn unicorn
BUNDLED WITH
1.10.4