Browse files

reorganise rake tasks for testing, update Gemfiles for integrations

  • Loading branch information...
1 parent 1b25106 commit ddc648627fe316b35ecb6706626916330888318f @zelig zelig committed Nov 10, 2012
Showing with 165 additions and 110 deletions.
  1. +2 −2 Gemfile-rails
  2. +21 −0 Gemfile-rails2
  3. +2 −2 Gemfile-rails31
  4. +122 −94 Gemfile-rails31.lock
  5. +18 −12 Rakefile
View
4 Gemfile-rails
@@ -26,8 +26,8 @@ group :rails do
# Asset template engines
gem 'sass-rails', ">= 3.1"
- gem 'coffee-script'
- gem 'uglifier'
+ gem 'coffee-rails'
+ gem 'uglifier'
gem 'jquery-rails'
gem 'turn', :require => false
View
21 Gemfile-rails2
@@ -0,0 +1,21 @@
+source "http://rubygems.org"
+
+gem "treetop", ">= 1.2.3"
+
+group :development do
+ gem "rspec", "~>2"
+ gem "rubyforge"
+ gem "rr"
+ gem "nokogiri"
+ gem "jeweler"
+ gem "haml"
+ gem "sass"
+ gem "erubis"
+ gem "rdoc", "~> 3.4"
+ gem "wrong", ">=0.5.4"
+end
+
+group :rails do
+ gem 'rails', '2.3.11'
+ gem 'sqlite3', '>=1.3.4'
+end
View
4 Gemfile-rails31
@@ -17,12 +17,12 @@ group :development do
end
group :rails do
- gem 'rails', '3.1.0.rc4'
+ gem 'rails', '~> 3.1'
# gem 'rails', :git => 'git://github.com/rails/rails.git' # for edge rails
gem 'sqlite3', '>=1.3.4'
# Asset template engines
- gem 'sass-rails', "~> 3.1.0.rc"
+ gem 'sass-rails'
gem 'coffee-script'
gem 'uglifier'
View
216 Gemfile-rails31.lock
@@ -1,126 +1,154 @@
GEM
remote: http://rubygems.org/
specs:
- actionmailer (3.1.0.rc4)
- actionpack (= 3.1.0.rc4)
- mail (~> 2.3.0)
- actionpack (3.1.0.rc4)
- activemodel (= 3.1.0.rc4)
- activesupport (= 3.1.0.rc4)
+ ParseTree (3.0.9)
+ RubyInline (~> 3.9.0)
+ sexp_processor (~> 3.2.0)
+ RubyInline (3.9.0)
+ ZenTest (~> 4.3)
+ ZenTest (4.8.2)
+ actionmailer (3.2.8)
+ actionpack (= 3.2.8)
+ mail (~> 2.4.4)
+ actionpack (3.2.8)
+ activemodel (= 3.2.8)
+ activesupport (= 3.2.8)
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)
+ journey (~> 1.0.4)
+ rack (~> 1.4.0)
+ rack-cache (~> 1.2)
+ rack-test (~> 0.6.1)
+ sprockets (~> 2.1.3)
+ activemodel (3.2.8)
+ activesupport (= 3.2.8)
builder (~> 3.0.0)
+ activerecord (3.2.8)
+ activemodel (= 3.2.8)
+ activesupport (= 3.2.8)
+ arel (~> 3.0.2)
+ tzinfo (~> 0.3.29)
+ activeresource (3.2.8)
+ activemodel (= 3.2.8)
+ activesupport (= 3.2.8)
+ activesupport (3.2.8)
i18n (~> 0.6)
- activerecord (3.1.0.rc4)
- activemodel (= 3.1.0.rc4)
- activesupport (= 3.1.0.rc4)
- arel (~> 2.1.1)
- tzinfo (~> 0.3.27)
- activeresource (3.1.0.rc4)
- activemodel (= 3.1.0.rc4)
- activesupport (= 3.1.0.rc4)
- activesupport (3.1.0.rc4)
multi_json (~> 1.0)
- ansi (1.3.0)
- arel (2.1.3)
- bcrypt-ruby (2.1.4)
- builder (3.0.0)
+ ansi (1.4.3)
+ arel (3.0.2)
+ builder (3.0.4)
coffee-script (2.2.0)
coffee-script-source
execjs
- coffee-script-source (1.1.1)
- diff-lcs (1.1.2)
+ coffee-script-source (1.4.0)
+ diff-lcs (1.1.3)
erubis (2.7.0)
- execjs (1.2.0)
+ execjs (1.4.0)
multi_json (~> 1.0)
+ file-tail (1.0.12)
+ tins (~> 0.5)
git (1.2.5)
- haml (3.1.2)
- hike (1.1.0)
- i18n (0.6.0)
- jeweler (1.6.4)
+ haml (3.1.7)
+ hike (1.2.1)
+ i18n (0.6.1)
+ jeweler (1.8.4)
bundler (~> 1.0)
git (>= 1.2.5)
rake
- jquery-rails (1.0.12)
- railties (~> 3.0)
+ rdoc
+ journey (1.0.4)
+ jquery-rails (2.1.3)
+ railties (>= 3.1.0, < 5.0)
thor (~> 0.14)
- json_pure (1.5.3)
- mail (2.3.0)
+ json (1.7.5)
+ json_pure (1.7.5)
+ mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
- mime-types (1.16)
- multi_json (1.0.3)
- nokogiri (1.5.0)
- polyglot (0.3.1)
- rack (1.3.1)
- rack-cache (1.0.2)
+ mime-types (1.19)
+ multi_json (1.3.7)
+ nokogiri (1.5.5)
+ polyglot (0.3.3)
+ predicated (0.2.6)
+ rack (1.4.1)
+ rack-cache (1.2)
rack (>= 0.4)
- rack-mount (0.8.1)
- rack (>= 1.0.0)
rack-ssl (1.3.2)
rack
- rack-test (0.6.0)
+ rack-test (0.6.2)
rack (>= 1.0)
- rails (3.1.0.rc4)
- actionmailer (= 3.1.0.rc4)
- actionpack (= 3.1.0.rc4)
- activerecord (= 3.1.0.rc4)
- activeresource (= 3.1.0.rc4)
- activesupport (= 3.1.0.rc4)
+ rails (3.2.8)
+ actionmailer (= 3.2.8)
+ actionpack (= 3.2.8)
+ activerecord (= 3.2.8)
+ activeresource (= 3.2.8)
+ activesupport (= 3.2.8)
bundler (~> 1.0)
- railties (= 3.1.0.rc4)
- railties (3.1.0.rc4)
- actionpack (= 3.1.0.rc4)
- activesupport (= 3.1.0.rc4)
+ railties (= 3.2.8)
+ railties (3.2.8)
+ actionpack (= 3.2.8)
+ activesupport (= 3.2.8)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
- thor (~> 0.14.6)
- rake (0.9.2)
- rdoc (3.8)
- rr (1.0.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)
- diff-lcs (~> 1.1.2)
- rspec-mocks (2.6.0)
+ thor (>= 0.14.6, < 2.0)
+ rake (0.9.2.2)
+ rdoc (3.12)
+ json (~> 1.4)
+ rr (1.0.4)
+ 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.3)
+ diff-lcs (~> 1.1.3)
+ rspec-mocks (2.11.3)
+ ruby2ruby (1.3.1)
+ ruby_parser (~> 2.0)
+ sexp_processor (~> 3.0)
+ ruby_parser (2.0.6)
+ sexp_processor (~> 3.0)
rubyforge (2.0.4)
json_pure (>= 1.1.7)
- sass (3.1.4)
- sass-rails (3.1.0.rc.4)
- actionpack (~> 3.1.0.rc1)
- railties (~> 3.1.0.rc1)
- sass (>= 3.1.4)
- sprockets (>= 2.0.0.beta.9)
- sprockets (2.0.0.beta.10)
- hike (~> 1.0)
+ sass (3.2.3)
+ sass-rails (3.2.5)
+ railties (~> 3.2.0)
+ sass (>= 3.1.10)
+ tilt (~> 1.3)
+ sexp_processor (3.2.0)
+ sourcify (0.5.0)
+ file-tail (>= 1.0.5)
+ ruby2ruby (>= 1.2.5)
+ ruby_parser (>= 2.0.5)
+ sexp_processor (>= 3.0.5)
+ sprockets (2.1.3)
+ hike (~> 1.2)
rack (~> 1.0)
- tilt (!= 1.3.0, ~> 1.1)
- sqlite3 (1.3.3)
- thor (0.14.6)
- tilt (1.3.2)
- treetop (1.4.9)
+ tilt (~> 1.1, != 1.3.0)
+ sqlite3 (1.3.6)
+ thor (0.16.0)
+ tilt (1.3.3)
+ tins (0.6.0)
+ treetop (1.4.12)
+ polyglot
polyglot (>= 0.3.1)
- turn (0.8.2)
- ansi (>= 1.2.2)
- tzinfo (0.3.29)
- uglifier (1.0.0)
+ turn (0.9.6)
+ ansi
+ tzinfo (0.3.35)
+ uglifier (1.3.0)
execjs (>= 0.3.0)
- multi_json (>= 1.0.2)
+ multi_json (~> 1.0, >= 1.0.2)
+ wrong (0.6.0)
+ ParseTree (~> 3.0)
+ diff-lcs (~> 1.1.2)
+ file-tail (~> 1.0)
+ predicated (>= 0.2.3)
+ ruby2ruby (~> 1.2)
+ ruby_parser (~> 2.0.4)
+ sexp_processor (~> 3.0)
+ sourcify (>= 0.3.0)
PLATFORMS
ruby
@@ -133,15 +161,15 @@ DEPENDENCIES
jeweler
jquery-rails
nokogiri
- rails (= 3.1.0.rc4)
- rake
+ rails (~> 3.1)
rdoc (~> 3.4)
rr
rspec (~> 2)
rubyforge
sass
- sass-rails (~> 3.1.0.rc)
- sqlite3
- treetop
+ sass-rails
+ sqlite3 (>= 1.3.4)
+ treetop (>= 1.2.3)
turn
uglifier
+ wrong (>= 0.5.4)
View
30 Rakefile
@@ -159,26 +159,32 @@ namespace :spec do
end
- desc "Run specs for erector's Rails integration."
- RSpec::Core::RakeTask.new(:rails) do |spec|
+ desc "Run specs for erector's Rails 3 integration."
+ RSpec::Core::RakeTask.new(:integration_rails3) do |spec|
spec.pattern = 'spec/rails_root/spec/*_spec.rb'
end
- desc "Run specs for erector's Rails integration under Rails 2."
+ desc "Run specs for erector's Rails 2 integration."
+ RSpec::Core::RakeTask.new(:integration_rails2) do |spec|
+ spec.pattern = 'spec/rails2/rails_app/spec/*_spec.rb'
+ end
+
+ desc "Run specs for erector's Rails integration under Rails 2. - prepare with 'bundle install --gemfile Gemfile-rails2"
task :rails2 do
- rails_app = "#{here}/spec/rails2/rails_app"
- gemfile = "#{rails_app}/Gemfile"
- Dir.chdir(rails_app) do
- # Bundler.with_clean_env do
- sh "BUNDLE_GEMFILE='#{gemfile}' bundle exec rake rails2"
- # end
- end
+ gemfile = "#{here}/Gemfile-rails2"
+ sh "BUNDLE_GEMFILE='#{gemfile}' bundle exec rake spec:core spec:integration_rails2"
end
desc "Run all specs under Rails 3.1 - prepare with 'bundle install --gemfile Gemfile-rails31'"
task :rails31 do
gemfile = "#{here}/Gemfile-rails31"
- sh "BUNDLE_GEMFILE='#{gemfile}' bundle exec rake spec:core spec:erect spec:rails"
+ sh "BUNDLE_GEMFILE='#{gemfile}' bundle exec rake spec:core spec:erect spec:integration_rails3"
+ end
+
+ desc "Run all specs under latest Rails - prepare with 'bundle install --gemfile Gemfile-rails'"
+ task :rails do
+ gemfile = "#{here}/Gemfile-rails"
+ sh "BUNDLE_GEMFILE='#{gemfile}' bundle exec rake spec:core spec:erect spec:integration_rails3"
end
desc "Run specs for the Erector web site."
@@ -189,4 +195,4 @@ namespace :spec do
end
desc "Run most specs"
-task :spec => ['spec:core', 'spec:erect', 'spec:rails', 'spec:rails2', 'spec:web']
+task :spec => ['spec:rails', 'spec:rails2', 'spec:web']

0 comments on commit ddc6486

Please sign in to comment.