diff --git a/Gemfile b/Gemfile index 0ecca317..e11cac00 100644 --- a/Gemfile +++ b/Gemfile @@ -21,7 +21,7 @@ group :assets do end group :development, :test do - gem 'rake', '~> 0.9.2' + gem 'rake' gem 'localeapp' gem 'handlebars' gem 'localeapp-handlebars_i18n' diff --git a/Gemfile.lock b/Gemfile.lock index c5de1e09..fcdcc460 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,15 +1,15 @@ GIT remote: git://github.com/livingsocial/rake-pipeline.git - revision: 50b8d77b703c96539a433ee53a680c43542aaa75 + revision: 65b1e744defa208e313703d89f3453447cc103b2 specs: rake-pipeline (0.8.0) json - rake (~> 0.9.0) + rake (~> 10.0.0) thor GIT remote: git://github.com/wycats/rake-pipeline-web-filters.git - revision: 1a6dc173776b188836aa2ce2ac35b61c7f7daafe + revision: fd8d838491bd6b8de0bab72d90115b9a4f2da8a1 specs: rake-pipeline-web-filters (0.6.0) rack @@ -22,39 +22,40 @@ GEM Platform (>= 0.4.0) open4 Platform (0.4.0) - backports (2.6.5) - chunky_png (1.2.6) - coderay (1.0.8) + backports (3.0.3) + chunky_png (1.2.7) + coderay (1.0.9) coffee-script (2.2.0) coffee-script-source execjs - coffee-script-source (1.4.0) + coffee-script-source (1.5.0) commonjs (0.2.6) compass (0.12.2) chunky_png (~> 1.2) fssm (>= 0.2.7) sass (~> 3.1) - diff-lcs (1.1.3) + diff-lcs (1.2.1) eventmachine (1.0.0) execjs (1.4.0) multi_json (~> 1.0) - foreman (0.60.2) + foreman (0.61.0) thor (>= 0.13.6) - fssm (0.2.9) - gli (2.5.2) - guard (1.5.4) - listen (>= 0.4.2) + fssm (0.2.10) + gli (2.5.4) + guard (1.6.2) + listen (>= 0.6.0) lumberjack (>= 1.0.2) pry (>= 0.9.10) + terminal-table (>= 1.4.3) thor (>= 0.14.6) - handlebars (0.3.1) + handlebars (0.4.0) commonjs (~> 0.2.3) - therubyracer (~> 0.10.0) - i18n (0.6.1) - json (1.7.5) - libv8 (3.3.10.4) - listen (0.6.0) - localeapp (0.6.8) + therubyracer (~> 0.11.1) + i18n (0.6.3) + json (1.7.7) + libv8 (3.11.8.13) + listen (0.7.3) + localeapp (0.6.9) gli i18n json @@ -64,46 +65,47 @@ GEM localeapp lumberjack (1.0.2) method_source (0.8.1) - mime-types (1.19) - multi_json (1.5.0) + mime-types (1.21) + multi_json (1.6.1) open4 (1.3.0) - pry (0.9.10) + pry (0.9.12) coderay (~> 1.0.5) method_source (~> 0.8) - slop (~> 3.3.1) + slop (~> 3.4) puma (1.6.3) rack (~> 1.2) - rack (1.4.1) + rack (1.5.2) rack-cache (1.2) rack (>= 0.4) rack-mobile-detect (0.4.0) rack rack-protection (1.3.2) rack - rack-ssl (1.3.2) + rack-ssl (1.3.3) rack rack-test (0.6.2) rack (>= 1.0) - rake (0.9.6) + rake (10.0.3) rake-pipeline-i18n-filters (0.0.5) rake-pipeline (~> 0.6) - rb-fsevent (0.9.2) - rerun (0.7.1) + rb-fsevent (0.9.3) + ref (1.0.2) + rerun (0.8.0) listen rest-client (1.6.7) mime-types (>= 1.16) - rspec (2.12.0) - rspec-core (~> 2.12.0) - rspec-expectations (~> 2.12.0) - rspec-mocks (~> 2.12.0) - rspec-core (2.12.2) - rspec-expectations (2.12.0) - diff-lcs (~> 1.1.3) - rspec-mocks (2.12.0) - sass (3.2.3) - sinatra (1.3.3) - rack (~> 1.3, >= 1.3.6) - rack-protection (~> 1.2) + rspec (2.13.0) + rspec-core (~> 2.13.0) + rspec-expectations (~> 2.13.0) + rspec-mocks (~> 2.13.0) + rspec-core (2.13.0) + rspec-expectations (2.13.0) + diff-lcs (>= 1.1.3, < 2.0) + rspec-mocks (2.13.0) + sass (3.2.6) + sinatra (1.3.5) + rack (~> 1.4) + rack-protection (~> 1.3) tilt (~> 1.3, >= 1.3.3) sinatra-contrib (1.3.2) backports (>= 2.0) @@ -112,10 +114,12 @@ GEM rack-test sinatra (~> 1.3.0) tilt (~> 1.3) - slop (3.3.3) - therubyracer (0.10.2) - libv8 (~> 3.3.10) - thor (0.16.0) + slop (3.4.3) + terminal-table (1.4.5) + therubyracer (0.11.4) + libv8 (~> 3.11.8.12) + ref + thor (0.17.0) tilt (1.3.3) uglifier (1.3.0) execjs (>= 0.3.0) @@ -140,7 +144,7 @@ DEPENDENCIES rack-mobile-detect rack-protection (~> 1.3) rack-ssl (~> 1.3) - rake (~> 0.9.2) + rake rake-pipeline! rake-pipeline-i18n-filters rake-pipeline-web-filters!