Permalink
Browse files

remove dependencies on yanked gems

  • Loading branch information...
1 parent 0f53836 commit 0ebc72d0e67fae1b01fc5cfc49f392a436c339ed @grosser committed Oct 27, 2011
Showing with 33 additions and 37 deletions.
  1. +30 −34 Gemfile.lock
  2. +2 −2 Rakefile
  3. +1 −1 test/easy_esi_test.rb
View
@@ -1,60 +1,56 @@
GEM
remote: http://rubygems.org/
specs:
- actionpack (3.1.0.rc4)
- activemodel (= 3.1.0.rc4)
- activesupport (= 3.1.0.rc4)
+ actionpack (3.1.1)
+ activemodel (= 3.1.1)
+ activesupport (= 3.1.1)
builder (~> 3.0.0)
erubis (~> 2.7.0)
i18n (~> 0.6)
- rack (~> 1.3.0)
- rack-cache (~> 1.0.1)
- rack-mount (~> 0.8.1)
- rack-test (~> 0.6.0)
- sprockets (~> 2.0.0.beta.10)
- tzinfo (~> 0.3.27)
- activemodel (3.1.0.rc4)
- activesupport (= 3.1.0.rc4)
- bcrypt-ruby (~> 2.1.4)
+ rack (~> 1.3.2)
+ rack-cache (~> 1.1)
+ rack-mount (~> 0.8.2)
+ rack-test (~> 0.6.1)
+ sprockets (~> 2.0.2)
+ activemodel (3.1.1)
+ activesupport (= 3.1.1)
builder (~> 3.0.0)
i18n (~> 0.6)
- activesupport (3.1.0.rc4)
+ activesupport (3.1.1)
multi_json (~> 1.0)
- bcrypt-ruby (2.1.4)
builder (3.0.0)
- diff-lcs (1.1.2)
+ diff-lcs (1.1.3)
erubis (2.7.0)
git (1.2.5)
- hike (1.1.0)
+ hike (1.2.1)
i18n (0.6.0)
- jeweler (1.6.2)
+ jeweler (1.6.4)
bundler (~> 1.0)
git (>= 1.2.5)
rake
multi_json (1.0.3)
- rack (1.3.0)
- rack-cache (1.0.2)
+ rack (1.3.5)
+ rack-cache (1.1)
rack (>= 0.4)
- rack-mount (0.8.1)
+ rack-mount (0.8.3)
rack (>= 1.0.0)
- rack-test (0.6.0)
+ rack-test (0.6.1)
rack (>= 1.0)
- rake (0.9.2)
+ rake (0.9.2.2)
redgreen (1.2.2)
- rspec (2.6.0)
- rspec-core (~> 2.6.0)
- rspec-expectations (~> 2.6.0)
- rspec-mocks (~> 2.6.0)
- rspec-core (2.6.4)
- rspec-expectations (2.6.0)
+ rspec (2.7.0)
+ rspec-core (~> 2.7.0)
+ rspec-expectations (~> 2.7.0)
+ rspec-mocks (~> 2.7.0)
+ rspec-core (2.7.1)
+ rspec-expectations (2.7.0)
diff-lcs (~> 1.1.2)
- rspec-mocks (2.6.0)
- sprockets (2.0.0.beta.10)
- hike (~> 1.0)
+ rspec-mocks (2.7.0)
+ sprockets (2.0.3)
+ hike (~> 1.2)
rack (~> 1.0)
- tilt (!= 1.3.0, ~> 1.1)
- tilt (1.3.2)
- tzinfo (0.3.28)
+ tilt (~> 1.1, != 1.3.0)
+ tilt (1.3.3)
PLATFORMS
ruby
View
@@ -6,8 +6,8 @@ Rake::TestTask.new(:test) do |test|
end
task :default do
- sh "RAILS=3.0.10 bundle && bundle exec rake test"
- sh "RAILS=3.1.0 bundle && bundle exec rake test"
+ sh "RAILS=3.0.10 && (bundle || bundle install) && bundle exec rake test"
+ sh "RAILS=3.1.0 && (bundle || bundle install) && bundle exec rake test"
end
begin
@@ -1,4 +1,4 @@
-require 'test/test_helper'
+require './test/test_helper'
class EsiDisabledController < ActionController::Base
self.view_paths = 'test/views'

0 comments on commit 0ebc72d

Please sign in to comment.