revert "use specific version of builder"

airbrake · Nov 29, 2012 · 26ef8cd · 26ef8cd
1 parent 254cbf5
commit 26ef8cd
Show file tree

Hide file tree

Showing 5 changed files with 69 additions and 6 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -4,11 +4,26 @@ PATH
     airbrake (3.1.6)
       builder
       girl_friday
-      json
 
 GEM
   remote: http://rubygems.org/
   specs:
+    actionpack (3.2.9)
+      activemodel (= 3.2.9)
+      activesupport (= 3.2.9)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.4)
+      rack (~> 1.4.0)
+      rack-cache (~> 1.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.9)
+      activesupport (= 3.2.9)
+      builder (~> 3.0.0)
+    activesupport (3.2.9)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
     addressable (2.3.2)
     appraisal (0.5.1)
       bundler
@@ -50,13 +65,18 @@ GEM
       cucumber (>= 1.1.0)
       nokogiri (>= 1.5.0)
     diff-lcs (1.1.3)
+    erubis (2.7.0)
     fakeweb (1.3.0)
     ffi (1.1.5)
     gherkin (2.11.5)
       json (>= 1.4.6)
-    girl_friday (0.11.0)
+    girl_friday (0.11.1)
       connection_pool (~> 0.9.0)
+      rubinius-actor
     highline (1.6.15)
+    hike (1.2.1)
+    i18n (0.6.1)
+    journey (1.0.4)
     json (1.7.5)
     libwebsocket (0.1.5)
       addressable
@@ -74,12 +94,25 @@ GEM
       net-ssh (>= 1.99.1)
     nokogiri (1.5.5)
     rack (1.4.1)
+    rack-cache (1.2)
+      rack (>= 0.4)
     rack-protection (1.2.0)
       rack
+    rack-ssl (1.3.2)
+      rack
     rack-test (0.6.2)
       rack (>= 1.0)
+    railties (3.2.9)
+      actionpack (= 3.2.9)
+      activesupport (= 3.2.9)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (>= 0.14.6, < 2.0)
     rake (0.9.2.2)
     rdiscount (1.6.8)
+    rdoc (3.12)
+      json (~> 1.4)
     rspec (2.6.0)
       rspec-core (~> 2.6.0)
       rspec-expectations (~> 2.6.0)
@@ -88,6 +121,14 @@ GEM
     rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.6.0)
+    rspec-rails (2.6.1)
+      actionpack (~> 3.0)
+      activesupport (~> 3.0)
+      railties (~> 3.0)
+      rspec (~> 2.6.0)
+    rubinius-actor (0.0.2)
+      rubinius-core-api
+    rubinius-core-api (0.0.1)
     rubyzip (0.9.9)
     selenium-webdriver (2.26.0)
       childprocess (>= 0.2.5)
@@ -101,6 +142,12 @@ GEM
       rack (~> 1.3, >= 1.3.6)
       rack-protection (~> 1.2)
       tilt (~> 1.3, >= 1.3.3)
+    sprockets (2.2.2)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    thor (0.16.0)
     tilt (1.3.3)
     xpath (0.1.4)
       nokogiri (~> 1.3)
@@ -118,6 +165,7 @@ DEPENDENCIES
   fakeweb (~> 1.3.0)
   nokogiri (~> 1.5.0)
   rspec (~> 2.6.0)
+  rspec-rails
   sham_rack (~> 1.3.0)
   shoulda (~> 2.11.3)
   sinatra
diff --git a/airbrake.gemspec b/airbrake.gemspec
@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
     %w(airbrake.gemspec CHANGELOG Gemfile Guardfile INSTALL MIT-LICENSE Rakefile README_FOR_HEROKU_ADDON.md README.md TESTING.md SUPPORTED_RAILS_VERSIONS install.rb)
   s.test_files    = Dir.glob("{test,spec,features}/**/*")
 
-  s.add_runtime_dependency("builder", "~> 3.0.4")
+  s.add_runtime_dependency("builder")
   s.add_runtime_dependency("girl_friday")
 
   s.add_development_dependency("bourne",        ">= 1.0")

diff --git a/gemfiles/3.0.gemfile.lock b/gemfiles/3.0.gemfile.lock
@@ -4,7 +4,6 @@ PATH
     airbrake (3.1.6)
       builder
       girl_friday
-      json
 
 GEM
   remote: http://rubygems.org/
@@ -142,6 +141,11 @@ GEM
     rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.6.0)
+    rspec-rails (2.6.1)
+      actionpack (~> 3.0)
+      activesupport (~> 3.0)
+      railties (~> 3.0)
+      rspec (~> 2.6.0)
     rubinius-actor (0.0.2)
       rubinius-core-api
     rubinius-core-api (0.0.1)
@@ -180,6 +184,7 @@ DEPENDENCIES
   nokogiri (~> 1.5.0)
   rails (~> 3.0.17)
   rspec (~> 2.6.0)
+  rspec-rails
   sham_rack (~> 1.3.0)
   shoulda (~> 2.11.3)
   sinatra
diff --git a/gemfiles/3.1.gemfile.lock b/gemfiles/3.1.gemfile.lock
@@ -4,7 +4,6 @@ PATH
     airbrake (3.1.6)
       builder
       girl_friday
-      json
 
 GEM
   remote: http://rubygems.org/
@@ -149,6 +148,11 @@ GEM
     rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.6.0)
+    rspec-rails (2.6.1)
+      actionpack (~> 3.0)
+      activesupport (~> 3.0)
+      railties (~> 3.0)
+      rspec (~> 2.6.0)
     rubinius-actor (0.0.2)
       rubinius-core-api
     rubinius-core-api (0.0.1)
@@ -192,6 +196,7 @@ DEPENDENCIES
   nokogiri (~> 1.5.0)
   rails (~> 3.1.8)
   rspec (~> 2.6.0)
+  rspec-rails
   sham_rack (~> 1.3.0)
   shoulda (~> 2.11.3)
   sinatra
diff --git a/gemfiles/3.2.gemfile.lock b/gemfiles/3.2.gemfile.lock
@@ -4,7 +4,6 @@ PATH
     airbrake (3.1.6)
       builder
       girl_friday
-      json
 
 GEM
   remote: http://rubygems.org/
@@ -147,6 +146,11 @@ GEM
     rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.6.0)
+    rspec-rails (2.6.1)
+      actionpack (~> 3.0)
+      activesupport (~> 3.0)
+      railties (~> 3.0)
+      rspec (~> 2.6.0)
     rubinius-actor (0.0.2)
       rubinius-core-api
     rubinius-core-api (0.0.1)
@@ -191,6 +195,7 @@ DEPENDENCIES
   nokogiri (~> 1.5.0)
   rails (~> 3.2.9)
   rspec (~> 2.6.0)
+  rspec-rails
   sham_rack (~> 1.3.0)
   shoulda (~> 2.11.3)
   sinatra