diff --git a/Appraisals b/Appraisals new file mode 100644 index 000000000..b3a6f646c --- /dev/null +++ b/Appraisals @@ -0,0 +1,16 @@ +appraise "rails23" do + gem "activerecord", "~> 2.3.14" + gem "rails", "~> 2.3.14" +end + +appraise "rails30" do + gem "activerecord", "~> 3.0.11" +end + +appraise "rails31" do + gem "activerecord", "~> 3.1.3" +end + +appraise "rails32" do + gem "activerecord", "~> 3.2.1" +end diff --git a/Gemfile b/Gemfile index d8b14e486..797dd2a54 100644 --- a/Gemfile +++ b/Gemfile @@ -1,11 +1,7 @@ source "http://rubygems.org" -# This may wreak havoc on the lockfile, but we need a way to test -# different AR versions -gem 'activerecord', ENV['AR_VERSION'] -gem 'rails', ENV['AR_VERSION'] - gem 'rake' +gem 'activerecord' gem 'appraisal' gem 'jruby-openssl', :group => :development diff --git a/Gemfile.lock b/Gemfile.lock index 841472fbb..21a4d99de 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -12,6 +12,9 @@ GEM activesupport (3.2.1) i18n (~> 0.6) multi_json (~> 1.0) + appraisal (0.4.0) + bundler + rake arel (3.0.0) bouncy-castle-java (1.5.0146.1) builder (3.0.0) @@ -34,6 +37,7 @@ PLATFORMS DEPENDENCIES activerecord + appraisal jruby-openssl mocha rake diff --git a/gemfiles/rails23.gemfile b/gemfiles/rails23.gemfile new file mode 100644 index 000000000..908bdcb66 --- /dev/null +++ b/gemfiles/rails23.gemfile @@ -0,0 +1,10 @@ +# This file was generated by Appraisal + +source "http://rubygems.org" + +gem "rake" +gem "appraisal" +gem "jruby-openssl", :group=>:development +gem "activerecord", "~> 2.3.14" +gem "rails", "~> 2.3.14" + diff --git a/gemfiles/rails23.gemfile.lock b/gemfiles/rails23.gemfile.lock new file mode 100644 index 000000000..bdae45017 --- /dev/null +++ b/gemfiles/rails23.gemfile.lock @@ -0,0 +1,38 @@ +GEM + remote: http://rubygems.org/ + specs: + actionmailer (2.3.14) + actionpack (= 2.3.14) + actionpack (2.3.14) + activesupport (= 2.3.14) + rack (~> 1.1.0) + activerecord (2.3.14) + activesupport (= 2.3.14) + activeresource (2.3.14) + activesupport (= 2.3.14) + activesupport (2.3.14) + appraisal (0.4.0) + bundler + rake + bouncy-castle-java (1.5.0146.1) + jruby-openssl (0.7.5) + bouncy-castle-java (>= 1.5.0146.1) + rack (1.1.3) + rails (2.3.14) + actionmailer (= 2.3.14) + actionpack (= 2.3.14) + activerecord (= 2.3.14) + activeresource (= 2.3.14) + activesupport (= 2.3.14) + rake (>= 0.8.3) + rake (0.9.2.2) + +PLATFORMS + java + +DEPENDENCIES + activerecord (~> 2.3.14) + appraisal + jruby-openssl + rails (~> 2.3.14) + rake diff --git a/gemfiles/rails30.gemfile b/gemfiles/rails30.gemfile new file mode 100644 index 000000000..6d1b4130b --- /dev/null +++ b/gemfiles/rails30.gemfile @@ -0,0 +1,9 @@ +# This file was generated by Appraisal + +source "http://rubygems.org" + +gem "rake" +gem "appraisal" +gem "jruby-openssl", :group=>:development +gem "activerecord", "~> 3.0.11" + diff --git a/gemfiles/rails30.gemfile.lock b/gemfiles/rails30.gemfile.lock new file mode 100644 index 000000000..b8a0ec6f1 --- /dev/null +++ b/gemfiles/rails30.gemfile.lock @@ -0,0 +1,33 @@ +GEM + remote: http://rubygems.org/ + specs: + activemodel (3.0.11) + activesupport (= 3.0.11) + builder (~> 2.1.2) + i18n (~> 0.5.0) + activerecord (3.0.11) + activemodel (= 3.0.11) + activesupport (= 3.0.11) + arel (~> 2.0.10) + tzinfo (~> 0.3.23) + activesupport (3.0.11) + appraisal (0.4.0) + bundler + rake + arel (2.0.10) + bouncy-castle-java (1.5.0146.1) + builder (2.1.2) + i18n (0.5.0) + jruby-openssl (0.7.5) + bouncy-castle-java (>= 1.5.0146.1) + rake (0.9.2.2) + tzinfo (0.3.31) + +PLATFORMS + java + +DEPENDENCIES + activerecord (~> 3.0.11) + appraisal + jruby-openssl + rake diff --git a/gemfiles/rails31.gemfile b/gemfiles/rails31.gemfile new file mode 100644 index 000000000..5d76c4573 --- /dev/null +++ b/gemfiles/rails31.gemfile @@ -0,0 +1,9 @@ +# This file was generated by Appraisal + +source "http://rubygems.org" + +gem "rake" +gem "appraisal" +gem "jruby-openssl", :group=>:development +gem "activerecord", "~> 3.1.3" + diff --git a/gemfiles/rails31.gemfile.lock b/gemfiles/rails31.gemfile.lock new file mode 100644 index 000000000..1a90cc01d --- /dev/null +++ b/gemfiles/rails31.gemfile.lock @@ -0,0 +1,35 @@ +GEM + remote: http://rubygems.org/ + specs: + activemodel (3.1.3) + activesupport (= 3.1.3) + builder (~> 3.0.0) + i18n (~> 0.6) + activerecord (3.1.3) + activemodel (= 3.1.3) + activesupport (= 3.1.3) + arel (~> 2.2.1) + tzinfo (~> 0.3.29) + activesupport (3.1.3) + multi_json (~> 1.0) + appraisal (0.4.0) + bundler + rake + arel (2.2.1) + bouncy-castle-java (1.5.0146.1) + builder (3.0.0) + i18n (0.6.0) + jruby-openssl (0.7.5) + bouncy-castle-java (>= 1.5.0146.1) + multi_json (1.0.4) + rake (0.9.2.2) + tzinfo (0.3.31) + +PLATFORMS + java + +DEPENDENCIES + activerecord (~> 3.1.3) + appraisal + jruby-openssl + rake diff --git a/gemfiles/rails32.gemfile b/gemfiles/rails32.gemfile new file mode 100644 index 000000000..54ce7a029 --- /dev/null +++ b/gemfiles/rails32.gemfile @@ -0,0 +1,9 @@ +# This file was generated by Appraisal + +source "http://rubygems.org" + +gem "rake" +gem "appraisal" +gem "jruby-openssl", :group=>:development +gem "activerecord", "~> 3.2.1" + diff --git a/gemfiles/rails32.gemfile.lock b/gemfiles/rails32.gemfile.lock new file mode 100644 index 000000000..3ff7e1bc6 --- /dev/null +++ b/gemfiles/rails32.gemfile.lock @@ -0,0 +1,35 @@ +GEM + remote: http://rubygems.org/ + specs: + activemodel (3.2.1) + activesupport (= 3.2.1) + builder (~> 3.0.0) + activerecord (3.2.1) + activemodel (= 3.2.1) + activesupport (= 3.2.1) + arel (~> 3.0.0) + tzinfo (~> 0.3.29) + activesupport (3.2.1) + i18n (~> 0.6) + multi_json (~> 1.0) + appraisal (0.4.0) + bundler + rake + arel (3.0.0) + bouncy-castle-java (1.5.0146.1) + builder (3.0.0) + i18n (0.6.0) + jruby-openssl (0.7.5) + bouncy-castle-java (>= 1.5.0146.1) + multi_json (1.0.4) + rake (0.9.2.2) + tzinfo (0.3.31) + +PLATFORMS + java + +DEPENDENCIES + activerecord (~> 3.2.1) + appraisal + jruby-openssl + rake diff --git a/test/jdbc_common.rb b/test/jdbc_common.rb index 0f47995e8..4aee3d5df 100644 --- a/test/jdbc_common.rb +++ b/test/jdbc_common.rb @@ -5,7 +5,7 @@ def jruby? require 'arjdbc' if jruby? puts "Using activerecord version #{ActiveRecord::VERSION::STRING}" -puts "Specify version with AR_VERSION={version} or RUBYLIB={path}" +puts "Specify version with 'rake appraisal:{version} default'. See 'rake -T'." require 'models/auto_id' require 'models/entry' require 'models/data_types'