From 714fb30ca38b70e04c10bee15369b6ddf60c160d Mon Sep 17 00:00:00 2001 From: "Anthony W. Juckel" Date: Sat, 1 Sep 2012 08:25:59 -0500 Subject: [PATCH] Further build tweaks --- .travis.yml | 2 -- Appraisals | 3 -- gemfiles/rails30.gemfile | 1 - gemfiles/rails30.gemfile.lock | 53 ------------------------------ gemfiles/rails31.gemfile | 1 - gemfiles/rails31.gemfile.lock | 62 ----------------------------------- gemfiles/rails32.gemfile | 1 - gemfiles/rails32.gemfile.lock | 60 --------------------------------- test/abstract_db_create.rb | 4 +++ 9 files changed, 4 insertions(+), 183 deletions(-) diff --git a/.travis.yml b/.travis.yml index cba6476e8..5b3e5f5f8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,4 @@ language: ruby -before_script: bundle exec rake appraisal:install script: bundle exec rake test_$DB rvm: - jruby-18mode @@ -11,7 +10,6 @@ env: - DB=hsqldb - DB=sqlite3 gemfile: - - Gemfile - gemfiles/rails23.gemfile - gemfiles/rails30.gemfile - gemfiles/rails31.gemfile diff --git a/Appraisals b/Appraisals index f549511db..fbed4b25f 100644 --- a/Appraisals +++ b/Appraisals @@ -5,15 +5,12 @@ end appraise "rails30" do gem "activerecord", "~> 3.0.15" - gem "rails", "~> 3.0.15" end appraise "rails31" do gem "activerecord", "~> 3.1.6" - gem "rails", "~> 3.1.6" end appraise "rails32" do gem "activerecord", "~> 3.2.6" - gem "rails", "~> 3.2.6" end diff --git a/gemfiles/rails30.gemfile b/gemfiles/rails30.gemfile index 108cada2e..013c9415b 100644 --- a/gemfiles/rails30.gemfile +++ b/gemfiles/rails30.gemfile @@ -6,5 +6,4 @@ gem "rake" gem "appraisal" gem "jruby-openssl", :group=>:development gem "activerecord", "~> 3.0.15" -gem "rails", "~> 3.0.15" diff --git a/gemfiles/rails30.gemfile.lock b/gemfiles/rails30.gemfile.lock index 2d26c7e27..9db9f8a3a 100644 --- a/gemfiles/rails30.gemfile.lock +++ b/gemfiles/rails30.gemfile.lock @@ -1,20 +1,6 @@ GEM remote: http://rubygems.org/ specs: - abstract (1.0.0) - actionmailer (3.0.17) - actionpack (= 3.0.17) - mail (~> 2.2.19) - actionpack (3.0.17) - activemodel (= 3.0.17) - activesupport (= 3.0.17) - builder (~> 2.1.2) - erubis (~> 2.6.6) - i18n (~> 0.5.0) - rack (~> 1.2.5) - rack-mount (~> 0.6.14) - rack-test (~> 0.5.7) - tzinfo (~> 0.3.23) activemodel (3.0.17) activesupport (= 3.0.17) builder (~> 2.1.2) @@ -24,9 +10,6 @@ GEM activesupport (= 3.0.17) arel (~> 2.0.10) tzinfo (~> 0.3.23) - activeresource (3.0.17) - activemodel (= 3.0.17) - activesupport (= 3.0.17) activesupport (3.0.17) appraisal (0.4.1) bundler @@ -34,45 +17,10 @@ GEM arel (2.0.10) bouncy-castle-java (1.5.0146.1) builder (2.1.2) - erubis (2.6.6) - abstract (>= 1.0.0) i18n (0.5.0) jruby-openssl (0.7.7) bouncy-castle-java (>= 1.5.0146.1) - json (1.7.5-java) - mail (2.2.19) - activesupport (>= 2.3.6) - i18n (>= 0.4.0) - mime-types (~> 1.16) - treetop (~> 1.4.8) - mime-types (1.19) - polyglot (0.3.3) - rack (1.2.5) - rack-mount (0.6.14) - rack (>= 1.0.0) - rack-test (0.5.7) - rack (>= 1.0) - rails (3.0.17) - actionmailer (= 3.0.17) - actionpack (= 3.0.17) - activerecord (= 3.0.17) - activeresource (= 3.0.17) - activesupport (= 3.0.17) - bundler (~> 1.0) - railties (= 3.0.17) - railties (3.0.17) - actionpack (= 3.0.17) - activesupport (= 3.0.17) - rake (>= 0.8.7) - rdoc (~> 3.4) - thor (~> 0.14.4) rake (0.9.2.2) - rdoc (3.12) - json (~> 1.4) - thor (0.14.6) - treetop (1.4.10) - polyglot - polyglot (>= 0.3.1) tzinfo (0.3.33) PLATFORMS @@ -82,5 +30,4 @@ DEPENDENCIES activerecord (~> 3.0.15) appraisal jruby-openssl - rails (~> 3.0.15) rake diff --git a/gemfiles/rails31.gemfile b/gemfiles/rails31.gemfile index 51e310d88..9cedc7ff0 100644 --- a/gemfiles/rails31.gemfile +++ b/gemfiles/rails31.gemfile @@ -6,5 +6,4 @@ gem "rake" gem "appraisal" gem "jruby-openssl", :group=>:development gem "activerecord", "~> 3.1.6" -gem "rails", "~> 3.1.6" diff --git a/gemfiles/rails31.gemfile.lock b/gemfiles/rails31.gemfile.lock index 7afa02095..19b8eca55 100644 --- a/gemfiles/rails31.gemfile.lock +++ b/gemfiles/rails31.gemfile.lock @@ -1,20 +1,6 @@ GEM remote: http://rubygems.org/ specs: - actionmailer (3.1.8) - actionpack (= 3.1.8) - mail (~> 2.3.3) - actionpack (3.1.8) - activemodel (= 3.1.8) - activesupport (= 3.1.8) - builder (~> 3.0.0) - erubis (~> 2.7.0) - i18n (~> 0.6) - rack (~> 1.3.6) - rack-cache (~> 1.2) - rack-mount (~> 0.8.2) - rack-test (~> 0.6.1) - sprockets (~> 2.0.4) activemodel (3.1.8) activesupport (= 3.1.8) builder (~> 3.0.0) @@ -24,9 +10,6 @@ GEM activesupport (= 3.1.8) arel (~> 2.2.3) tzinfo (~> 0.3.29) - activeresource (3.1.8) - activemodel (= 3.1.8) - activesupport (= 3.1.8) activesupport (3.1.8) multi_json (>= 1.0, < 1.3) appraisal (0.4.1) @@ -35,55 +18,11 @@ GEM arel (2.2.3) bouncy-castle-java (1.5.0146.1) builder (3.0.0) - erubis (2.7.0) - hike (1.2.1) i18n (0.6.1) jruby-openssl (0.7.7) bouncy-castle-java (>= 1.5.0146.1) - json (1.7.5-java) - mail (2.3.3) - i18n (>= 0.4.0) - mime-types (~> 1.16) - treetop (~> 1.4.8) - mime-types (1.19) multi_json (1.2.0) - polyglot (0.3.3) - rack (1.3.6) - rack-cache (1.2) - rack (>= 0.4) - rack-mount (0.8.3) - rack (>= 1.0.0) - rack-ssl (1.3.2) - rack - rack-test (0.6.1) - rack (>= 1.0) - rails (3.1.8) - actionmailer (= 3.1.8) - actionpack (= 3.1.8) - activerecord (= 3.1.8) - activeresource (= 3.1.8) - activesupport (= 3.1.8) - bundler (~> 1.0) - railties (= 3.1.8) - railties (3.1.8) - actionpack (= 3.1.8) - activesupport (= 3.1.8) - rack-ssl (~> 1.3.2) - rake (>= 0.8.7) - rdoc (~> 3.4) - thor (~> 0.14.6) rake (0.9.2.2) - rdoc (3.12) - json (~> 1.4) - sprockets (2.0.4) - hike (~> 1.2) - rack (~> 1.0) - tilt (~> 1.1, != 1.3.0) - thor (0.14.6) - tilt (1.3.3) - treetop (1.4.10) - polyglot - polyglot (>= 0.3.1) tzinfo (0.3.33) PLATFORMS @@ -93,5 +32,4 @@ DEPENDENCIES activerecord (~> 3.1.6) appraisal jruby-openssl - rails (~> 3.1.6) rake diff --git a/gemfiles/rails32.gemfile b/gemfiles/rails32.gemfile index 6e881137f..80b57af28 100644 --- a/gemfiles/rails32.gemfile +++ b/gemfiles/rails32.gemfile @@ -6,5 +6,4 @@ gem "rake" gem "appraisal" gem "jruby-openssl", :group=>:development gem "activerecord", "~> 3.2.6" -gem "rails", "~> 3.2.6" diff --git a/gemfiles/rails32.gemfile.lock b/gemfiles/rails32.gemfile.lock index e26128f73..df53a92ec 100644 --- a/gemfiles/rails32.gemfile.lock +++ b/gemfiles/rails32.gemfile.lock @@ -1,19 +1,6 @@ GEM remote: http://rubygems.org/ specs: - 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) - 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) @@ -22,9 +9,6 @@ GEM 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) multi_json (~> 1.0) @@ -34,54 +18,11 @@ GEM arel (3.0.2) bouncy-castle-java (1.5.0146.1) builder (3.0.0) - erubis (2.7.0) - hike (1.2.1) i18n (0.6.1) - journey (1.0.4) jruby-openssl (0.7.7) bouncy-castle-java (>= 1.5.0146.1) - json (1.7.5-java) - mail (2.4.4) - i18n (>= 0.4.0) - mime-types (~> 1.16) - treetop (~> 1.4.8) - mime-types (1.19) multi_json (1.3.6) - polyglot (0.3.3) - rack (1.4.1) - rack-cache (1.2) - rack (>= 0.4) - rack-ssl (1.3.2) - rack - rack-test (0.6.1) - rack (>= 1.0) - 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.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, < 2.0) rake (0.9.2.2) - rdoc (3.12) - json (~> 1.4) - sprockets (2.1.3) - hike (~> 1.2) - rack (~> 1.0) - tilt (~> 1.1, != 1.3.0) - thor (0.16.0) - tilt (1.3.3) - treetop (1.4.10) - polyglot - polyglot (>= 0.3.1) tzinfo (0.3.33) PLATFORMS @@ -91,5 +32,4 @@ DEPENDENCIES activerecord (~> 3.2.6) appraisal jruby-openssl - rails (~> 3.2.6) rake diff --git a/test/abstract_db_create.rb b/test/abstract_db_create.rb index 271439f1d..e9a477efc 100644 --- a/test/abstract_db_create.rb +++ b/test/abstract_db_create.rb @@ -82,6 +82,10 @@ def setup_rails2 end ar_version = $LOADED_FEATURES.grep(%r{active_record/version}).first ar_lib_path = $LOAD_PATH.detect {|p| p if File.exist?File.join(p, ar_version)} + # if the old style finder didn't work, assume we have the absolute path already + if ar_lib_path.nil? && File.exist?(ar_version) + ar_lib_path = ar_version.sub(%r{/active_record/version.*}, '') + end ar_lib_path = ar_lib_path.sub(%r{activerecord/lib}, 'railties/lib') # edge rails rails_lib_path = ar_lib_path.sub(/activerecord-([\d\.]+)/, 'rails-\1') # gem rails load "#{rails_lib_path}/tasks/databases.rake"