From 0a6efefe44e449d6d3d703edb307f0f5a3443919 Mon Sep 17 00:00:00 2001 From: Eric Skogen Date: Fri, 4 Oct 2013 11:01:00 -0500 Subject: [PATCH 1/2] update Gemfile.lock, use current version of bundler --- Gemfile | 2 +- Gemfile.lock | 111 +++++++++++++++++++++++++-------------------------- 2 files changed, 55 insertions(+), 58 deletions(-) diff --git a/Gemfile b/Gemfile index 329d9ca..a7d6dfd 100644 --- a/Gemfile +++ b/Gemfile @@ -23,6 +23,6 @@ group :development do gem "rspec" gem "cucumber", ">= 0" gem "aruba" - gem "bundler", "~> 1.2.3" + gem "bundler" gem "jeweler", "~> 1.6.4" end diff --git a/Gemfile.lock b/Gemfile.lock index 9eba0f7..873a636 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -5,86 +5,83 @@ GEM Platform (>= 0.4.0) open4 Platform (0.4.0) - addressable (2.3.2) - aruba (0.4.11) - childprocess (>= 0.2.3) + aruba (0.5.3) + childprocess (>= 0.3.6) cucumber (>= 1.1.1) - ffi (>= 1.0.11) - rspec (>= 2.7.0) - builder (3.0.0) - childprocess (0.3.5) - ffi (~> 1.0, >= 1.0.6) - chunky_png (1.2.6) - commonjs (0.2.6) + rspec-expectations (>= 2.7.0) + builder (3.2.2) + childprocess (0.3.9) + ffi (~> 1.0, >= 1.0.11) + chunky_png (1.2.8) + commonjs (0.2.7) compass (0.12.2) chunky_png (~> 1.2) fssm (>= 0.2.7) sass (~> 3.1) - cucumber (1.2.1) + cucumber (1.3.8) builder (>= 2.1.2) diff-lcs (>= 1.1.3) - gherkin (~> 2.11.0) - json (>= 1.4.6) - diff-lcs (1.1.3) - em-websocket (0.3.8) - addressable (>= 2.1.1) + gherkin (~> 2.12.1) + multi_json (>= 1.7.5, < 2.0) + multi_test (>= 0.0.2) + diff-lcs (1.2.4) + em-websocket (0.5.0) eventmachine (>= 0.12.9) - eventmachine (0.12.10) - ffi (1.1.5) - fssm (0.2.9) - gherkin (2.11.1) - json (>= 1.4.6) - git (1.2.5) - guard (1.3.0) + http_parser.rb (~> 0.5.3) + eventmachine (1.0.3) + ffi (1.9.0) + fssm (0.2.10) + gherkin (2.12.1) + multi_json (~> 1.3) + git (1.2.6) + guard (1.3.3) listen (>= 0.4.2) thor (>= 0.14.6) - guard-livereload (1.0.0) + guard-livereload (1.0.3) em-websocket (>= 0.2.0) guard (>= 1.1.0) multi_json (~> 1.0) - hike (1.2.1) + hike (1.2.3) + http_parser.rb (0.5.3) jeweler (1.6.4) bundler (~> 1.0) git (>= 1.2.5) rake - json (1.6.7) - less (2.0.12) - commonjs (~> 0.2.0) - therubyracer (~> 0.9.9) - libv8 (3.3.10.4) - listen (0.4.7) - rb-fchange (~> 0.0.5) - rb-fsevent (~> 0.9.1) - rb-inotify (~> 0.8.8) - multi_json (1.3.6) + json (1.8.0) + less (2.2.2) + commonjs (~> 0.2.6) + listen (1.3.1) + rb-fsevent (>= 0.9.3) + rb-inotify (>= 0.9) + rb-kqueue (>= 0.2) + multi_json (1.8.0) + multi_test (0.0.2) open4 (1.3.0) - rack (1.3.6) - rake (0.9.2.2) - rb-fchange (0.0.5) - ffi - rb-fsevent (0.9.1) - rb-inotify (0.8.8) + rack (1.3.10) + rake (10.1.0) + rb-fsevent (0.9.3) + rb-inotify (0.9.2) ffi (>= 0.5.0) - rspec (2.11.0) - rspec-core (~> 2.11.0) - rspec-expectations (~> 2.11.0) - rspec-mocks (~> 2.11.0) - rspec-core (2.11.1) - rspec-expectations (2.11.2) - diff-lcs (~> 1.1.3) - rspec-mocks (2.11.2) + rb-kqueue (0.2.0) + ffi (>= 0.5.0) + rspec (2.14.1) + rspec-core (~> 2.14.0) + rspec-expectations (~> 2.14.0) + rspec-mocks (~> 2.14.0) + rspec-core (2.14.5) + rspec-expectations (2.14.3) + diff-lcs (>= 1.1.3, < 2.0) + rspec-mocks (2.14.3) rubyzip (0.9.9) - sass (3.2.0) + sass (3.2.11) sprockets (2.0.4) hike (~> 1.2) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) sprockets-sass (0.3.0) sprockets (~> 2.0) - therubyracer (0.9.10) - libv8 (~> 3.3.10) thor (0.15.4) - tilt (1.3.3) + tilt (1.4.1) yui-compressor (0.9.6) POpen4 (>= 0.1.4) @@ -93,14 +90,14 @@ PLATFORMS DEPENDENCIES aruba - bundler (~> 1.0.0) + bundler compass (~> 0.12.2) cucumber guard (~> 1.3.0) - guard-livereload (~> 1.0.0) + guard-livereload (~> 1.0.3) jeweler (~> 1.6.4) - json (~> 1.6.1) - less (~> 2.0.7) + json (~> 1.8.0) + less (~> 2.2.2) rack (~> 1.3.5) rb-fsevent (~> 0.9.1) rspec From 0c68243efe9e947dea1bc3dbfa83876f18059958 Mon Sep 17 00:00:00 2001 From: Eric Skogen Date: Fri, 4 Oct 2013 12:04:19 -0500 Subject: [PATCH 2/2] upgrade to sprockets 2.10.0 fixes https://github.com/thethemefoundry/forge/issues/67 --- Gemfile | 2 +- Gemfile.lock | 5 +++-- forge.gemspec | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index a7d6dfd..94d2649 100644 --- a/Gemfile +++ b/Gemfile @@ -5,7 +5,7 @@ source "http://rubygems.org" gem "thor", "~> 0.15.4" gem "guard", "~> 1.3.0" -gem "sprockets", "~> 2.0.2" +gem "sprockets", "2.10.0" gem "rubyzip", "~> 0.9.4" gem "json", "~> 1.8.0" gem "sass", "~> 3.2.0" diff --git a/Gemfile.lock b/Gemfile.lock index 873a636..6a2125d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -74,8 +74,9 @@ GEM rspec-mocks (2.14.3) rubyzip (0.9.9) sass (3.2.11) - sprockets (2.0.4) + sprockets (2.10.0) hike (~> 1.2) + multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) sprockets-sass (0.3.0) @@ -103,7 +104,7 @@ DEPENDENCIES rspec rubyzip (~> 0.9.4) sass (~> 3.2.0) - sprockets (~> 2.0.2) + sprockets sprockets-sass (~> 0.3.0) thor (~> 0.15.4) yui-compressor (~> 0.9.6) diff --git a/forge.gemspec b/forge.gemspec index 7304576..7248ca8 100644 --- a/forge.gemspec +++ b/forge.gemspec @@ -82,7 +82,7 @@ Gem::Specification.new do |s| if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then s.add_runtime_dependency(%q, ["~> 0.15.4"]) s.add_runtime_dependency(%q, ["~> 1.3.0"]) - s.add_runtime_dependency(%q, ["~> 2.0.2"]) + s.add_runtime_dependency(%q, ["~> 2.10.0"]) s.add_runtime_dependency(%q, ["~> 0.9.4"]) s.add_runtime_dependency(%q, ["~> 1.8.0"]) s.add_runtime_dependency(%q, ["~> 3.2.0"]) @@ -101,7 +101,7 @@ Gem::Specification.new do |s| else s.add_dependency(%q, ["~> 0.15.4"]) s.add_dependency(%q, ["~> 1.3.0"]) - s.add_dependency(%q, ["~> 2.0.2"]) + s.add_dependency(%q, ["~> 2.10.0"]) s.add_dependency(%q, ["~> 0.9.4"]) s.add_dependency(%q, ["~> 1.8.0"]) s.add_dependency(%q, ["~> 3.2.0"])