remove Gemfile.all and move rufus/tokyo to rails-2.3.x and rails-3.x …

…Gemfiles
schland · Nov 18, 2010 · eb43f3f · eb43f3f
1 parent 93dbfb6
commit eb43f3f
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 35 deletions.
diff --git a/ci/Gemfile.all b/ci/Gemfile.all
diff --git a/ci/Gemfile.all.lock b/ci/Gemfile.all.lock
diff --git a/ci/Gemfile.rails-2.3.x b/ci/Gemfile.rails-2.3.x
@@ -4,4 +4,6 @@ gem 'activesupport', '~> 2.3'
 gem 'sqlite3-ruby'
 gem 'mocha'
 gem 'test_declarative'
+gem 'rufus-tokyo'
+gem 'ffi'
 
diff --git a/ci/Gemfile.rails-2.3.x.lock b/ci/Gemfile.rails-2.3.x.lock
@@ -2,9 +2,12 @@ GEM
   remote: http://rubygems.org/
   specs:
     activesupport (2.3.10)
+    ffi (0.6.3)
+      rake (>= 0.8.7)
     mocha (0.9.9)
       rake
     rake (0.8.7)
+    rufus-tokyo (1.0.7)
     sqlite3-ruby (1.3.2)
     test_declarative (0.0.4)
 
@@ -13,7 +16,9 @@ PLATFORMS
 
 DEPENDENCIES
   activesupport (~> 2.3)
+  ffi
   mocha
+  rufus-tokyo
   sqlite3-ruby
   test_declarative
 

diff --git a/ci/Gemfile.rails-3.x b/ci/Gemfile.rails-3.x
@@ -4,4 +4,6 @@ gem 'activesupport', '~> 3.0.0'
 gem 'sqlite3-ruby'
 gem 'mocha'
 gem 'test_declarative'
+gem 'rufus-tokyo'
+gem 'ffi'
 
diff --git a/ci/Gemfile.rails-3.x.lock b/ci/Gemfile.rails-3.x.lock
@@ -2,9 +2,12 @@ GEM
   remote: http://rubygems.org/
   specs:
     activesupport (3.0.1)
+    ffi (0.6.3)
+      rake (>= 0.8.7)
     mocha (0.9.9)
       rake
     rake (0.8.7)
+    rufus-tokyo (1.0.7)
     sqlite3-ruby (1.3.2)
     test_declarative (0.0.4)
 
@@ -13,7 +16,9 @@ PLATFORMS
 
 DEPENDENCIES
   activesupport (~> 3.0.0)
+  ffi
   mocha
+  rufus-tokyo
   sqlite3-ruby
   test_declarative
 

diff --git a/test/run_all.rb b/test/run_all.rb
@@ -3,7 +3,7 @@ def bundle_check
 end
 
 command  = 'ruby -w -Ilib -Itest test/all.rb'
-gemfiles = %w(ci/Gemfile.all ci/Gemfile.rails-3.x ci/Gemfile.rails-2.3.x ci/Gemfile.no-rails)
+gemfiles = %w(ci/Gemfile.rails-3.x ci/Gemfile.rails-2.3.x ci/Gemfile.no-rails)
 
 results = gemfiles.map do |gemfile|
   puts "BUNDLE_GEMFILE=#{gemfile}"