From c856f37d44f73a7129ddc004c13a23b4751b5d7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20O=E2=80=99Shannessy?= Date: Mon, 19 Aug 2013 18:24:48 -0700 Subject: [PATCH 1/3] Remove ActiveRecord deps from dummy app --- test/dummy/config/application.rb | 7 +++++- test/dummy/config/database.yml | 25 ------------------- test/dummy/config/environments/development.rb | 3 --- test/dummy/db/test.sqlite3 | 0 4 files changed, 6 insertions(+), 29 deletions(-) delete mode 100644 test/dummy/config/database.yml delete mode 100644 test/dummy/db/test.sqlite3 diff --git a/test/dummy/config/application.rb b/test/dummy/config/application.rb index fe83c9c7..e619601c 100644 --- a/test/dummy/config/application.rb +++ b/test/dummy/config/application.rb @@ -1,6 +1,11 @@ require File.expand_path('../boot', __FILE__) -require 'rails/all' +# Pick the frameworks you want: +# require "active_record/railtie" +require "action_controller/railtie" +require "action_mailer/railtie" +require "sprockets/railtie" +require "rails/test_unit/railtie" Bundler.require(*Rails.groups) require "react-rails" diff --git a/test/dummy/config/database.yml b/test/dummy/config/database.yml deleted file mode 100644 index 51a4dd45..00000000 --- a/test/dummy/config/database.yml +++ /dev/null @@ -1,25 +0,0 @@ -# SQLite version 3.x -# gem install sqlite3 -# -# Ensure the SQLite 3 gem is defined in your Gemfile -# gem 'sqlite3' -development: - adapter: sqlite3 - database: db/development.sqlite3 - pool: 5 - timeout: 5000 - -# Warning: The database defined as "test" will be erased and -# re-generated from your development database when you run "rake". -# Do not set this db to the same as development or production. -test: - adapter: sqlite3 - database: db/test.sqlite3 - pool: 5 - timeout: 5000 - -production: - adapter: sqlite3 - database: db/production.sqlite3 - pool: 5 - timeout: 5000 diff --git a/test/dummy/config/environments/development.rb b/test/dummy/config/environments/development.rb index 9d26e125..efb7d17e 100644 --- a/test/dummy/config/environments/development.rb +++ b/test/dummy/config/environments/development.rb @@ -19,9 +19,6 @@ # Print deprecation notices to the Rails logger. config.active_support.deprecation = :log - # Raise an error on page load if there are pending migrations - config.active_record.migration_error = :page_load - # Debug mode disables concatenation and preprocessing of assets. # This option may cause significant delays in view rendering with a large # number of complex assets. diff --git a/test/dummy/db/test.sqlite3 b/test/dummy/db/test.sqlite3 deleted file mode 100644 index e69de29b..00000000 From 69030d39197c5b28d7289070398c971123ee81a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20O=E2=80=99Shannessy?= Date: Mon, 19 Aug 2013 18:27:58 -0700 Subject: [PATCH 2/3] Remove sqlite, update Appraisal lock files Running `rake appraisal:install` added the jruby dependencies. --- gemfiles/rails_3.1.gemfile.lock | 6 +++--- gemfiles/rails_3.2.gemfile.lock | 6 +++--- gemfiles/rails_4.0.gemfile.lock | 8 +++++--- react-rails.gemspec | 1 - 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/gemfiles/rails_3.1.gemfile.lock b/gemfiles/rails_3.1.gemfile.lock index 92256949..f9b21b12 100644 --- a/gemfiles/rails_3.1.gemfile.lock +++ b/gemfiles/rails_3.1.gemfile.lock @@ -1,5 +1,5 @@ PATH - remote: /home/jakub/code/react-rails + remote: /Users/poshannessy/FB/code/react-rails specs: react-rails (0.4.1.0) execjs @@ -48,6 +48,7 @@ GEM i18n (0.6.4) journey (1.0.4) json (1.8.0) + json (1.8.0-java) mail (2.5.4) mime-types (~> 1.16) treetop (~> 1.4.8) @@ -85,7 +86,6 @@ GEM multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - sqlite3 (1.3.7) thor (0.18.1) tilt (1.4.1) treetop (1.4.14) @@ -94,6 +94,7 @@ GEM tzinfo (0.3.37) PLATFORMS + java ruby DEPENDENCIES @@ -101,4 +102,3 @@ DEPENDENCIES bundler (>= 1.2.2) rails (~> 3.1) react-rails! - sqlite3 diff --git a/gemfiles/rails_3.2.gemfile.lock b/gemfiles/rails_3.2.gemfile.lock index 502eb9d2..2e47b2c9 100644 --- a/gemfiles/rails_3.2.gemfile.lock +++ b/gemfiles/rails_3.2.gemfile.lock @@ -1,5 +1,5 @@ PATH - remote: /home/jakub/code/react-rails + remote: /Users/poshannessy/FB/code/react-rails specs: react-rails (0.4.1.0) execjs @@ -48,6 +48,7 @@ GEM i18n (0.6.4) journey (1.0.4) json (1.8.0) + json (1.8.0-java) mail (2.5.4) mime-types (~> 1.16) treetop (~> 1.4.8) @@ -85,7 +86,6 @@ GEM multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - sqlite3 (1.3.7) thor (0.18.1) tilt (1.4.1) treetop (1.4.14) @@ -94,6 +94,7 @@ GEM tzinfo (0.3.37) PLATFORMS + java ruby DEPENDENCIES @@ -101,4 +102,3 @@ DEPENDENCIES bundler (>= 1.2.2) rails (~> 3.2) react-rails! - sqlite3 diff --git a/gemfiles/rails_4.0.gemfile.lock b/gemfiles/rails_4.0.gemfile.lock index 70fd357c..40f9583f 100644 --- a/gemfiles/rails_4.0.gemfile.lock +++ b/gemfiles/rails_4.0.gemfile.lock @@ -1,5 +1,5 @@ PATH - remote: /home/jakub/code/react-rails + remote: /Users/poshannessy/FB/code/react-rails specs: react-rails (0.4.1.0) execjs @@ -38,6 +38,7 @@ GEM rake arel (4.0.0) atomic (1.1.12) + atomic (1.1.12-java) builder (3.1.4) erubis (2.7.0) execjs (1.4.0) @@ -78,10 +79,11 @@ GEM actionpack (>= 3.0) activesupport (>= 3.0) sprockets (~> 2.8) - sqlite3 (1.3.7) thor (0.18.1) thread_safe (0.1.2) atomic + thread_safe (0.1.2-java) + atomic tilt (1.4.1) treetop (1.4.14) polyglot @@ -89,6 +91,7 @@ GEM tzinfo (0.3.37) PLATFORMS + java ruby DEPENDENCIES @@ -96,4 +99,3 @@ DEPENDENCIES bundler (>= 1.2.2) rails (~> 4.0) react-rails! - sqlite3 diff --git a/react-rails.gemspec b/react-rails.gemspec index 0856090b..966ca100 100644 --- a/react-rails.gemspec +++ b/react-rails.gemspec @@ -16,7 +16,6 @@ Gem::Specification.new do |s| s.add_development_dependency "bundler", [">= 1.2.2"] s.add_development_dependency "appraisal" - s.add_development_dependency "sqlite3" # needed for the dummy app s.add_dependency 'execjs' s.add_dependency 'rails', '>= 3.1' From cb5d7a5bcb83dfbba58f52410c07c051fefc2fcc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20O=E2=80=99Shannessy?= Date: Mon, 19 Aug 2013 18:31:51 -0700 Subject: [PATCH 3/3] Test jruby on travis --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index c11e96d6..24d786c1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,7 @@ language: ruby rvm: - 2.0.0 - 1.9.3 + - jruby-19mode before_install: - gem install bundler --version '>= 1.2.2' before_script: 'bundle exec rake appraisal:install'