Gemfile.lock in marv-0.2.4 vs Gemfile.lock in marv-0.2.5

- old
+ new

@@ -4,37 +4,21 @@ aruba (0.4.11) childprocess (>= 0.2.3) cucumber (>= 1.1.1) ffi (>= 1.0.11) rspec (>= 2.7.0) - builder (3.0.0) + builder (3.0.4) celluloid (0.15.2) timers (~> 1.1.0) - celluloid-io (0.15.0) - celluloid (>= 0.15.0) - nio4r (>= 0.5.0) childprocess (0.3.5) ffi (~> 1.0, >= 1.0.6) - chunky_png (1.3.1) coderay (1.1.0) coffee-script (2.3.0) coffee-script-source execjs coffee-script-source (1.7.1) commonjs (0.2.7) - compass (1.0.0.alpha.21) - chunky_png (~> 1.2) - compass-core (~> 1.0.0.alpha.21) - compass-import-once (~> 1.0.4) - rb-fsevent (>= 0.9.3) - rb-inotify (>= 0.9) - sass (>= 3.3.0, < 3.5) - compass-core (1.0.0.alpha.21) - multi_json (~> 1.0) - sass (>= 3.3.0, < 3.5) - compass-import-once (1.0.4) - sass (>= 3.2, < 3.5) cucumber (1.2.1) builder (>= 2.1.2) diff-lcs (>= 1.1.3) gherkin (~> 2.11.0) json (>= 1.4.6) @@ -42,16 +26,16 @@ em-websocket (0.5.1) eventmachine (>= 0.12.9) http_parser.rb (~> 0.6.0) eventmachine (1.0.3) execjs (2.2.1) - ffi (1.1.5) - formatador (0.2.4) + ffi (1.9.3) + formatador (0.2.5) gherkin (2.11.1) json (>= 1.4.6) git (1.2.5) - guard (2.6.0) + guard (2.6.1) formatador (>= 0.2.4) listen (~> 2.7) lumberjack (~> 1.0) pry (>= 0.9.12) thor (>= 0.18.1) @@ -67,27 +51,25 @@ rake json (1.8.1) less (2.6.0) commonjs (~> 0.2.7) libv8 (3.16.14.3) - listen (2.7.1) + listen (2.7.9) celluloid (>= 0.15.2) - celluloid-io (>= 0.15.0) rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9) - lumberjack (1.0.5) + lumberjack (1.0.9) method_source (0.8.2) - multi_json (1.9.2) - nio4r (1.0.0) - pry (0.9.12.6) - coderay (~> 1.0) - method_source (~> 0.8) + multi_json (1.10.1) + pry (0.10.0) + coderay (~> 1.1.0) + method_source (~> 0.8.1) slop (~> 3.4) rack (1.5.2) rake (0.9.2.2) rb-fsevent (0.9.4) - rb-inotify (0.9.3) + rb-inotify (0.9.5) ffi (>= 0.5.0) ref (1.0.5) rspec (2.11.0) rspec-core (~> 2.11.0) rspec-expectations (~> 2.11.0) @@ -95,46 +77,42 @@ rspec-core (2.11.1) rspec-expectations (2.11.2) diff-lcs (~> 1.1.3) rspec-mocks (2.11.2) rubyzip (1.1.6) - sass (3.3.11) - slop (3.5.0) - sprockets (2.12.0) + sass (3.3.14) + slop (3.6.0) + sprockets (2.12.1) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - sprockets-sass (1.2.0) - sprockets (~> 2.0) - tilt (~> 1.1) therubyracer (0.12.1) libv8 (~> 3.16.14.0) ref thor (0.19.1) tilt (1.4.1) timers (1.1.0) - yui-compressor (0.12.0) + uglifier (2.5.3) + execjs (>= 0.3.0) + json (>= 1.8.0) PLATFORMS ruby DEPENDENCIES aruba coffee-script (>= 2.3.0) - compass (>= 1.0.0.alpha.20) cucumber guard (>= 2.2.1) - guard-livereload (>= 2.0.0) + guard-livereload (>= 2.3.0) jeweler - json (>= 1.8.0) less (>= 2.6.0) rack (>= 1.5.2) - rb-fsevent (>= 0.9.3) + rb-fsevent (>= 0.9.4) rspec - rubyzip (>= 1.0.0) + rubyzip (>= 1.1.6) sass (>= 3.3.0) sprockets (>= 2.12.0) - sprockets-sass (>= 1.2.0) therubyracer (>= 0.12.0) - thor (>= 0.18.1) - yui-compressor (>= 0.12.0) + thor (>= 0.19.1) + uglifier (>= 2.5.0)