From 04aaa01e3162ddf7bc90a5df4e125a10a94e0433 Mon Sep 17 00:00:00 2001 From: Jakub Malinowski Date: Sun, 11 Aug 2013 00:27:39 +0200 Subject: [PATCH 1/7] Add appraisal as dev dependency --- Rakefile | 5 ++--- react-rails.gemspec | 7 ++++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Rakefile b/Rakefile index f7144251b..46cac8b31 100644 --- a/Rakefile +++ b/Rakefile @@ -4,9 +4,10 @@ rescue LoadError puts 'You must `gem install bundler` and `bundle install` to run rake tasks' end - Bundler::GemHelper.install_tasks +require 'appraisal' + require 'rake/testtask' Rake::TestTask.new(:test) do |t| @@ -16,6 +17,4 @@ Rake::TestTask.new(:test) do |t| t.verbose = false end - task default: :test - diff --git a/react-rails.gemspec b/react-rails.gemspec index cf964f1df..0856090b7 100644 --- a/react-rails.gemspec +++ b/react-rails.gemspec @@ -14,13 +14,14 @@ Gem::Specification.new do |s| s.author = ['Paul O’Shannessy'] s.email = ['paul@oshannessy.com'] + 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' s.add_dependency 'react-source', '0.4.1' - # needed for the dummy app - s.add_development_dependency "sqlite3" - s.files = Dir[ 'lib/**/*', 'README.md', From 5e254836079c78529ad0880634502f936654f366 Mon Sep 17 00:00:00 2001 From: Jakub Malinowski Date: Sun, 11 Aug 2013 01:22:39 +0200 Subject: [PATCH 2/7] Fix tests with appraisal --- Appraisals | 11 ++ gemfiles/rails31.gemfile | 7 ++ gemfiles/rails31.gemfile.lock | 104 ++++++++++++++++++ gemfiles/rails32.gemfile | 7 ++ gemfiles/rails32.gemfile.lock | 104 ++++++++++++++++++ gemfiles/rails4.gemfile | 7 ++ gemfiles/rails4.gemfile.lock | 99 +++++++++++++++++ lib/react/rails/engine.rb | 6 +- lib/react/rails/railstie.rb | 3 +- test/dummy/config/application.rb | 3 + .../dummy/config/initializers/secret_token.rb | 5 + 11 files changed, 351 insertions(+), 5 deletions(-) create mode 100644 Appraisals create mode 100644 gemfiles/rails31.gemfile create mode 100644 gemfiles/rails31.gemfile.lock create mode 100644 gemfiles/rails32.gemfile create mode 100644 gemfiles/rails32.gemfile.lock create mode 100644 gemfiles/rails4.gemfile create mode 100644 gemfiles/rails4.gemfile.lock diff --git a/Appraisals b/Appraisals new file mode 100644 index 000000000..8d14ed8ed --- /dev/null +++ b/Appraisals @@ -0,0 +1,11 @@ +appraise "rails31" do + gem 'rails', '~> 3.1' +end + +appraise "rails32" do + gem 'rails', '~> 3.2' +end + +appraise "rails4" do + gem 'rails', '~> 4.0' +end diff --git a/gemfiles/rails31.gemfile b/gemfiles/rails31.gemfile new file mode 100644 index 000000000..58db7a878 --- /dev/null +++ b/gemfiles/rails31.gemfile @@ -0,0 +1,7 @@ +# This file was generated by Appraisal + +source "http://rubygems.org" + +gem "rails", "~> 3.1" + +gemspec :path=>"../" \ No newline at end of file diff --git a/gemfiles/rails31.gemfile.lock b/gemfiles/rails31.gemfile.lock new file mode 100644 index 000000000..077a310c1 --- /dev/null +++ b/gemfiles/rails31.gemfile.lock @@ -0,0 +1,104 @@ +PATH + remote: /home/jakub/code/react-rails + specs: + react-rails (0.4.1.0) + execjs + rails (>= 3.1) + react-source (= 0.4.1) + +GEM + remote: http://rubygems.org/ + specs: + actionmailer (3.2.14) + actionpack (= 3.2.14) + mail (~> 2.5.4) + actionpack (3.2.14) + activemodel (= 3.2.14) + activesupport (= 3.2.14) + builder (~> 3.0.0) + erubis (~> 2.7.0) + journey (~> 1.0.4) + rack (~> 1.4.5) + rack-cache (~> 1.2) + rack-test (~> 0.6.1) + sprockets (~> 2.2.1) + activemodel (3.2.14) + activesupport (= 3.2.14) + builder (~> 3.0.0) + activerecord (3.2.14) + activemodel (= 3.2.14) + activesupport (= 3.2.14) + arel (~> 3.0.2) + tzinfo (~> 0.3.29) + activeresource (3.2.14) + activemodel (= 3.2.14) + activesupport (= 3.2.14) + activesupport (3.2.14) + i18n (~> 0.6, >= 0.6.4) + multi_json (~> 1.0) + appraisal (0.5.2) + bundler + rake + arel (3.0.2) + builder (3.0.4) + erubis (2.7.0) + execjs (1.4.0) + multi_json (~> 1.0) + hike (1.2.3) + i18n (0.6.4) + journey (1.0.4) + json (1.8.0) + mail (2.5.4) + mime-types (~> 1.16) + treetop (~> 1.4.8) + mime-types (1.23) + multi_json (1.7.7) + polyglot (0.3.3) + rack (1.4.5) + rack-cache (1.2) + rack (>= 0.4) + rack-ssl (1.3.3) + rack + rack-test (0.6.2) + rack (>= 1.0) + rails (3.2.14) + actionmailer (= 3.2.14) + actionpack (= 3.2.14) + activerecord (= 3.2.14) + activeresource (= 3.2.14) + activesupport (= 3.2.14) + bundler (~> 1.0) + railties (= 3.2.14) + railties (3.2.14) + actionpack (= 3.2.14) + activesupport (= 3.2.14) + rack-ssl (~> 1.3.2) + rake (>= 0.8.7) + rdoc (~> 3.4) + thor (>= 0.14.6, < 2.0) + rake (10.1.0) + rdoc (3.12.2) + json (~> 1.4) + react-source (0.4.1) + sprockets (2.2.2) + hike (~> 1.2) + 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) + polyglot + polyglot (>= 0.3.1) + tzinfo (0.3.37) + +PLATFORMS + ruby + +DEPENDENCIES + appraisal + bundler (>= 1.2.2) + rails (~> 3.1) + react-rails! + sqlite3 diff --git a/gemfiles/rails32.gemfile b/gemfiles/rails32.gemfile new file mode 100644 index 000000000..779ce7c6e --- /dev/null +++ b/gemfiles/rails32.gemfile @@ -0,0 +1,7 @@ +# This file was generated by Appraisal + +source "http://rubygems.org" + +gem "rails", "~> 3.2" + +gemspec :path=>"../" \ No newline at end of file diff --git a/gemfiles/rails32.gemfile.lock b/gemfiles/rails32.gemfile.lock new file mode 100644 index 000000000..680050ca7 --- /dev/null +++ b/gemfiles/rails32.gemfile.lock @@ -0,0 +1,104 @@ +PATH + remote: /home/jakub/code/react-rails + specs: + react-rails (0.4.1.0) + execjs + rails (>= 3.1) + react-source (= 0.4.1) + +GEM + remote: http://rubygems.org/ + specs: + actionmailer (3.2.14) + actionpack (= 3.2.14) + mail (~> 2.5.4) + actionpack (3.2.14) + activemodel (= 3.2.14) + activesupport (= 3.2.14) + builder (~> 3.0.0) + erubis (~> 2.7.0) + journey (~> 1.0.4) + rack (~> 1.4.5) + rack-cache (~> 1.2) + rack-test (~> 0.6.1) + sprockets (~> 2.2.1) + activemodel (3.2.14) + activesupport (= 3.2.14) + builder (~> 3.0.0) + activerecord (3.2.14) + activemodel (= 3.2.14) + activesupport (= 3.2.14) + arel (~> 3.0.2) + tzinfo (~> 0.3.29) + activeresource (3.2.14) + activemodel (= 3.2.14) + activesupport (= 3.2.14) + activesupport (3.2.14) + i18n (~> 0.6, >= 0.6.4) + multi_json (~> 1.0) + appraisal (0.5.2) + bundler + rake + arel (3.0.2) + builder (3.0.4) + erubis (2.7.0) + execjs (1.4.0) + multi_json (~> 1.0) + hike (1.2.3) + i18n (0.6.4) + journey (1.0.4) + json (1.8.0) + mail (2.5.4) + mime-types (~> 1.16) + treetop (~> 1.4.8) + mime-types (1.23) + multi_json (1.7.7) + polyglot (0.3.3) + rack (1.4.5) + rack-cache (1.2) + rack (>= 0.4) + rack-ssl (1.3.3) + rack + rack-test (0.6.2) + rack (>= 1.0) + rails (3.2.14) + actionmailer (= 3.2.14) + actionpack (= 3.2.14) + activerecord (= 3.2.14) + activeresource (= 3.2.14) + activesupport (= 3.2.14) + bundler (~> 1.0) + railties (= 3.2.14) + railties (3.2.14) + actionpack (= 3.2.14) + activesupport (= 3.2.14) + rack-ssl (~> 1.3.2) + rake (>= 0.8.7) + rdoc (~> 3.4) + thor (>= 0.14.6, < 2.0) + rake (10.1.0) + rdoc (3.12.2) + json (~> 1.4) + react-source (0.4.1) + sprockets (2.2.2) + hike (~> 1.2) + 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) + polyglot + polyglot (>= 0.3.1) + tzinfo (0.3.37) + +PLATFORMS + ruby + +DEPENDENCIES + appraisal + bundler (>= 1.2.2) + rails (~> 3.2) + react-rails! + sqlite3 diff --git a/gemfiles/rails4.gemfile b/gemfiles/rails4.gemfile new file mode 100644 index 000000000..d54014891 --- /dev/null +++ b/gemfiles/rails4.gemfile @@ -0,0 +1,7 @@ +# This file was generated by Appraisal + +source "http://rubygems.org" + +gem "rails", "~> 4.0" + +gemspec :path=>"../" \ No newline at end of file diff --git a/gemfiles/rails4.gemfile.lock b/gemfiles/rails4.gemfile.lock new file mode 100644 index 000000000..70fd357cf --- /dev/null +++ b/gemfiles/rails4.gemfile.lock @@ -0,0 +1,99 @@ +PATH + remote: /home/jakub/code/react-rails + specs: + react-rails (0.4.1.0) + execjs + rails (>= 3.1) + react-source (= 0.4.1) + +GEM + remote: http://rubygems.org/ + specs: + actionmailer (4.0.0) + actionpack (= 4.0.0) + mail (~> 2.5.3) + actionpack (4.0.0) + activesupport (= 4.0.0) + builder (~> 3.1.0) + erubis (~> 2.7.0) + rack (~> 1.5.2) + rack-test (~> 0.6.2) + activemodel (4.0.0) + activesupport (= 4.0.0) + builder (~> 3.1.0) + activerecord (4.0.0) + activemodel (= 4.0.0) + activerecord-deprecated_finders (~> 1.0.2) + activesupport (= 4.0.0) + arel (~> 4.0.0) + activerecord-deprecated_finders (1.0.3) + activesupport (4.0.0) + i18n (~> 0.6, >= 0.6.4) + minitest (~> 4.2) + multi_json (~> 1.3) + thread_safe (~> 0.1) + tzinfo (~> 0.3.37) + appraisal (0.5.2) + bundler + rake + arel (4.0.0) + atomic (1.1.12) + builder (3.1.4) + erubis (2.7.0) + execjs (1.4.0) + multi_json (~> 1.0) + hike (1.2.3) + i18n (0.6.4) + mail (2.5.4) + mime-types (~> 1.16) + treetop (~> 1.4.8) + mime-types (1.23) + minitest (4.7.5) + multi_json (1.7.8) + polyglot (0.3.3) + rack (1.5.2) + rack-test (0.6.2) + rack (>= 1.0) + rails (4.0.0) + actionmailer (= 4.0.0) + actionpack (= 4.0.0) + activerecord (= 4.0.0) + activesupport (= 4.0.0) + bundler (>= 1.3.0, < 2.0) + railties (= 4.0.0) + sprockets-rails (~> 2.0.0) + railties (4.0.0) + actionpack (= 4.0.0) + activesupport (= 4.0.0) + rake (>= 0.8.7) + thor (>= 0.18.1, < 2.0) + rake (10.1.0) + react-source (0.4.1) + sprockets (2.10.0) + hike (~> 1.2) + multi_json (~> 1.0) + rack (~> 1.0) + tilt (~> 1.1, != 1.3.0) + sprockets-rails (2.0.0) + actionpack (>= 3.0) + activesupport (>= 3.0) + sprockets (~> 2.8) + sqlite3 (1.3.7) + thor (0.18.1) + thread_safe (0.1.2) + atomic + tilt (1.4.1) + treetop (1.4.14) + polyglot + polyglot (>= 0.3.1) + tzinfo (0.3.37) + +PLATFORMS + ruby + +DEPENDENCIES + appraisal + bundler (>= 1.2.2) + rails (~> 4.0) + react-rails! + sqlite3 diff --git a/lib/react/rails/engine.rb b/lib/react/rails/engine.rb index 8b9c0bb18..c6afcc8f1 100644 --- a/lib/react/rails/engine.rb +++ b/lib/react/rails/engine.rb @@ -1,10 +1,8 @@ module React module Rails class Engine < ::Rails::Engine - config.before_initialize do |app| - # force autoloading? what? - Sprockets::Engines - Sprockets.register_engine '.jsx', React::JSX::Template + initializer "react_rails.setup_engine", :after => "sprockets.environment", :group => :all do |app| + app.assets.register_engine '.jsx', React::JSX::Template end end end diff --git a/lib/react/rails/railstie.rb b/lib/react/rails/railstie.rb index fd28c8068..c008e3e19 100644 --- a/lib/react/rails/railstie.rb +++ b/lib/react/rails/railstie.rb @@ -5,7 +5,7 @@ module Rails class Railtie < ::Rails::Railtie config.react = ActiveSupport::OrderedOptions.new - initializer "react_rails.setup_vendor" do |app| + initializer "react_rails.setup_vendor", :after => "sprockets.environment" do |app| variant = app.config.react.variant # Mimic behavior of ember-rails... @@ -24,6 +24,7 @@ class Railtie < ::Rails::Railtie tmp_path.join('react.js')) FileUtils.cp(::React::Source.bundled_path_for('JSXTransformer.js'), tmp_path.join('JSXTransformer.js')) + # Make sure it can be found app.assets.append_path(tmp_path) end diff --git a/test/dummy/config/application.rb b/test/dummy/config/application.rb index 76a9c3d72..6455cc3c2 100644 --- a/test/dummy/config/application.rb +++ b/test/dummy/config/application.rb @@ -1,5 +1,6 @@ require File.expand_path('../boot', __FILE__) + require 'rails/all' Bundler.require(*Rails.groups) @@ -19,6 +20,8 @@ class Application < Rails::Application # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s] # config.i18n.default_locale = :de config.react.variant = :production + + config.assets.enabled = true end end diff --git a/test/dummy/config/initializers/secret_token.rb b/test/dummy/config/initializers/secret_token.rb index 3b121f749..394e2b032 100644 --- a/test/dummy/config/initializers/secret_token.rb +++ b/test/dummy/config/initializers/secret_token.rb @@ -7,6 +7,11 @@ # no regular words or you'll be exposed to dictionary attacks. # You can use `rake secret` to generate a secure secret key. + + # Make sure your secret_key_base is kept private # if you're sharing your code publicly. Dummy::Application.config.secret_key_base = '43fa5672451bbd0a171668e625edc433eb00eeeb14c2606546e262e499ab853cfb532998d4809abe5019bf13888863e3a2c7d5cf7757de7a2b1fb50826d9874e' + +#for rails 3.1 & 3.2 +Dummy::Application.config.secret_token = Dummy::Application.config.secret_key_base From 81fcc20072065a2429d160f7a58bd5976fae5891 Mon Sep 17 00:00:00 2001 From: Jakub Malinowski Date: Sun, 11 Aug 2013 01:40:43 +0200 Subject: [PATCH 3/7] Update travis config to use appraisal --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index 23741716c..c11e96d6a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,3 +3,7 @@ language: ruby rvm: - 2.0.0 - 1.9.3 +before_install: + - gem install bundler --version '>= 1.2.2' +before_script: 'bundle exec rake appraisal:install' +script: 'bundle exec rake appraisal test' From f6db70321aebf9f9f58e981bbaff5f738def5ca4 Mon Sep 17 00:00:00 2001 From: Jakub Malinowski Date: Sun, 11 Aug 2013 13:02:16 +0200 Subject: [PATCH 4/7] Removing appraisal gemfile locks There is no reason to keep them. Just as we don't keep Gemfile.lock for a gem, there is no point in enforcing particular version of gems when testing different versions of rails with appraisal. --- .gitignore | 2 + gemfiles/rails31.gemfile.lock | 104 ---------------------------------- gemfiles/rails32.gemfile.lock | 104 ---------------------------------- gemfiles/rails4.gemfile.lock | 99 -------------------------------- 4 files changed, 2 insertions(+), 307 deletions(-) delete mode 100644 gemfiles/rails31.gemfile.lock delete mode 100644 gemfiles/rails32.gemfile.lock delete mode 100644 gemfiles/rails4.gemfile.lock diff --git a/.gitignore b/.gitignore index 3ce611f97..66d212495 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ Gemfile.lock *.log test/dummy/tmp + +gemfiles/*.gemfile.lock diff --git a/gemfiles/rails31.gemfile.lock b/gemfiles/rails31.gemfile.lock deleted file mode 100644 index 077a310c1..000000000 --- a/gemfiles/rails31.gemfile.lock +++ /dev/null @@ -1,104 +0,0 @@ -PATH - remote: /home/jakub/code/react-rails - specs: - react-rails (0.4.1.0) - execjs - rails (>= 3.1) - react-source (= 0.4.1) - -GEM - remote: http://rubygems.org/ - specs: - actionmailer (3.2.14) - actionpack (= 3.2.14) - mail (~> 2.5.4) - actionpack (3.2.14) - activemodel (= 3.2.14) - activesupport (= 3.2.14) - builder (~> 3.0.0) - erubis (~> 2.7.0) - journey (~> 1.0.4) - rack (~> 1.4.5) - rack-cache (~> 1.2) - rack-test (~> 0.6.1) - sprockets (~> 2.2.1) - activemodel (3.2.14) - activesupport (= 3.2.14) - builder (~> 3.0.0) - activerecord (3.2.14) - activemodel (= 3.2.14) - activesupport (= 3.2.14) - arel (~> 3.0.2) - tzinfo (~> 0.3.29) - activeresource (3.2.14) - activemodel (= 3.2.14) - activesupport (= 3.2.14) - activesupport (3.2.14) - i18n (~> 0.6, >= 0.6.4) - multi_json (~> 1.0) - appraisal (0.5.2) - bundler - rake - arel (3.0.2) - builder (3.0.4) - erubis (2.7.0) - execjs (1.4.0) - multi_json (~> 1.0) - hike (1.2.3) - i18n (0.6.4) - journey (1.0.4) - json (1.8.0) - mail (2.5.4) - mime-types (~> 1.16) - treetop (~> 1.4.8) - mime-types (1.23) - multi_json (1.7.7) - polyglot (0.3.3) - rack (1.4.5) - rack-cache (1.2) - rack (>= 0.4) - rack-ssl (1.3.3) - rack - rack-test (0.6.2) - rack (>= 1.0) - rails (3.2.14) - actionmailer (= 3.2.14) - actionpack (= 3.2.14) - activerecord (= 3.2.14) - activeresource (= 3.2.14) - activesupport (= 3.2.14) - bundler (~> 1.0) - railties (= 3.2.14) - railties (3.2.14) - actionpack (= 3.2.14) - activesupport (= 3.2.14) - rack-ssl (~> 1.3.2) - rake (>= 0.8.7) - rdoc (~> 3.4) - thor (>= 0.14.6, < 2.0) - rake (10.1.0) - rdoc (3.12.2) - json (~> 1.4) - react-source (0.4.1) - sprockets (2.2.2) - hike (~> 1.2) - 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) - polyglot - polyglot (>= 0.3.1) - tzinfo (0.3.37) - -PLATFORMS - ruby - -DEPENDENCIES - appraisal - bundler (>= 1.2.2) - rails (~> 3.1) - react-rails! - sqlite3 diff --git a/gemfiles/rails32.gemfile.lock b/gemfiles/rails32.gemfile.lock deleted file mode 100644 index 680050ca7..000000000 --- a/gemfiles/rails32.gemfile.lock +++ /dev/null @@ -1,104 +0,0 @@ -PATH - remote: /home/jakub/code/react-rails - specs: - react-rails (0.4.1.0) - execjs - rails (>= 3.1) - react-source (= 0.4.1) - -GEM - remote: http://rubygems.org/ - specs: - actionmailer (3.2.14) - actionpack (= 3.2.14) - mail (~> 2.5.4) - actionpack (3.2.14) - activemodel (= 3.2.14) - activesupport (= 3.2.14) - builder (~> 3.0.0) - erubis (~> 2.7.0) - journey (~> 1.0.4) - rack (~> 1.4.5) - rack-cache (~> 1.2) - rack-test (~> 0.6.1) - sprockets (~> 2.2.1) - activemodel (3.2.14) - activesupport (= 3.2.14) - builder (~> 3.0.0) - activerecord (3.2.14) - activemodel (= 3.2.14) - activesupport (= 3.2.14) - arel (~> 3.0.2) - tzinfo (~> 0.3.29) - activeresource (3.2.14) - activemodel (= 3.2.14) - activesupport (= 3.2.14) - activesupport (3.2.14) - i18n (~> 0.6, >= 0.6.4) - multi_json (~> 1.0) - appraisal (0.5.2) - bundler - rake - arel (3.0.2) - builder (3.0.4) - erubis (2.7.0) - execjs (1.4.0) - multi_json (~> 1.0) - hike (1.2.3) - i18n (0.6.4) - journey (1.0.4) - json (1.8.0) - mail (2.5.4) - mime-types (~> 1.16) - treetop (~> 1.4.8) - mime-types (1.23) - multi_json (1.7.7) - polyglot (0.3.3) - rack (1.4.5) - rack-cache (1.2) - rack (>= 0.4) - rack-ssl (1.3.3) - rack - rack-test (0.6.2) - rack (>= 1.0) - rails (3.2.14) - actionmailer (= 3.2.14) - actionpack (= 3.2.14) - activerecord (= 3.2.14) - activeresource (= 3.2.14) - activesupport (= 3.2.14) - bundler (~> 1.0) - railties (= 3.2.14) - railties (3.2.14) - actionpack (= 3.2.14) - activesupport (= 3.2.14) - rack-ssl (~> 1.3.2) - rake (>= 0.8.7) - rdoc (~> 3.4) - thor (>= 0.14.6, < 2.0) - rake (10.1.0) - rdoc (3.12.2) - json (~> 1.4) - react-source (0.4.1) - sprockets (2.2.2) - hike (~> 1.2) - 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) - polyglot - polyglot (>= 0.3.1) - tzinfo (0.3.37) - -PLATFORMS - ruby - -DEPENDENCIES - appraisal - bundler (>= 1.2.2) - rails (~> 3.2) - react-rails! - sqlite3 diff --git a/gemfiles/rails4.gemfile.lock b/gemfiles/rails4.gemfile.lock deleted file mode 100644 index 70fd357cf..000000000 --- a/gemfiles/rails4.gemfile.lock +++ /dev/null @@ -1,99 +0,0 @@ -PATH - remote: /home/jakub/code/react-rails - specs: - react-rails (0.4.1.0) - execjs - rails (>= 3.1) - react-source (= 0.4.1) - -GEM - remote: http://rubygems.org/ - specs: - actionmailer (4.0.0) - actionpack (= 4.0.0) - mail (~> 2.5.3) - actionpack (4.0.0) - activesupport (= 4.0.0) - builder (~> 3.1.0) - erubis (~> 2.7.0) - rack (~> 1.5.2) - rack-test (~> 0.6.2) - activemodel (4.0.0) - activesupport (= 4.0.0) - builder (~> 3.1.0) - activerecord (4.0.0) - activemodel (= 4.0.0) - activerecord-deprecated_finders (~> 1.0.2) - activesupport (= 4.0.0) - arel (~> 4.0.0) - activerecord-deprecated_finders (1.0.3) - activesupport (4.0.0) - i18n (~> 0.6, >= 0.6.4) - minitest (~> 4.2) - multi_json (~> 1.3) - thread_safe (~> 0.1) - tzinfo (~> 0.3.37) - appraisal (0.5.2) - bundler - rake - arel (4.0.0) - atomic (1.1.12) - builder (3.1.4) - erubis (2.7.0) - execjs (1.4.0) - multi_json (~> 1.0) - hike (1.2.3) - i18n (0.6.4) - mail (2.5.4) - mime-types (~> 1.16) - treetop (~> 1.4.8) - mime-types (1.23) - minitest (4.7.5) - multi_json (1.7.8) - polyglot (0.3.3) - rack (1.5.2) - rack-test (0.6.2) - rack (>= 1.0) - rails (4.0.0) - actionmailer (= 4.0.0) - actionpack (= 4.0.0) - activerecord (= 4.0.0) - activesupport (= 4.0.0) - bundler (>= 1.3.0, < 2.0) - railties (= 4.0.0) - sprockets-rails (~> 2.0.0) - railties (4.0.0) - actionpack (= 4.0.0) - activesupport (= 4.0.0) - rake (>= 0.8.7) - thor (>= 0.18.1, < 2.0) - rake (10.1.0) - react-source (0.4.1) - sprockets (2.10.0) - hike (~> 1.2) - multi_json (~> 1.0) - rack (~> 1.0) - tilt (~> 1.1, != 1.3.0) - sprockets-rails (2.0.0) - actionpack (>= 3.0) - activesupport (>= 3.0) - sprockets (~> 2.8) - sqlite3 (1.3.7) - thor (0.18.1) - thread_safe (0.1.2) - atomic - tilt (1.4.1) - treetop (1.4.14) - polyglot - polyglot (>= 0.3.1) - tzinfo (0.3.37) - -PLATFORMS - ruby - -DEPENDENCIES - appraisal - bundler (>= 1.2.2) - rails (~> 4.0) - react-rails! - sqlite3 From 04ab42bb871f536d7cceaea38dd345f4ea994963 Mon Sep 17 00:00:00 2001 From: Jakub Malinowski Date: Sun, 11 Aug 2013 13:19:16 +0200 Subject: [PATCH 5/7] Better naming convention for appraisals --- Appraisals | 6 +++--- gemfiles/{rails31.gemfile => rails_3.1.gemfile} | 0 gemfiles/{rails32.gemfile => rails_3.2.gemfile} | 0 gemfiles/{rails4.gemfile => rails_4.0.gemfile} | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename gemfiles/{rails31.gemfile => rails_3.1.gemfile} (100%) rename gemfiles/{rails32.gemfile => rails_3.2.gemfile} (100%) rename gemfiles/{rails4.gemfile => rails_4.0.gemfile} (100%) diff --git a/Appraisals b/Appraisals index 8d14ed8ed..3002ea395 100644 --- a/Appraisals +++ b/Appraisals @@ -1,11 +1,11 @@ -appraise "rails31" do +appraise "rails-3.1" do gem 'rails', '~> 3.1' end -appraise "rails32" do +appraise "rails-3.2" do gem 'rails', '~> 3.2' end -appraise "rails4" do +appraise "rails-4.0" do gem 'rails', '~> 4.0' end diff --git a/gemfiles/rails31.gemfile b/gemfiles/rails_3.1.gemfile similarity index 100% rename from gemfiles/rails31.gemfile rename to gemfiles/rails_3.1.gemfile diff --git a/gemfiles/rails32.gemfile b/gemfiles/rails_3.2.gemfile similarity index 100% rename from gemfiles/rails32.gemfile rename to gemfiles/rails_3.2.gemfile diff --git a/gemfiles/rails4.gemfile b/gemfiles/rails_4.0.gemfile similarity index 100% rename from gemfiles/rails4.gemfile rename to gemfiles/rails_4.0.gemfile From 00eab079342c5e1a673ea25132835f165551dd9d Mon Sep 17 00:00:00 2001 From: Jakub Malinowski Date: Sun, 11 Aug 2013 13:23:14 +0200 Subject: [PATCH 6/7] Whitespace fixes --- Rakefile | 1 - test/dummy/config/application.rb | 2 -- test/dummy/config/initializers/secret_token.rb | 4 +--- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/Rakefile b/Rakefile index 46cac8b31..8c1d05bae 100644 --- a/Rakefile +++ b/Rakefile @@ -7,7 +7,6 @@ end Bundler::GemHelper.install_tasks require 'appraisal' - require 'rake/testtask' Rake::TestTask.new(:test) do |t| diff --git a/test/dummy/config/application.rb b/test/dummy/config/application.rb index 6455cc3c2..fe83c9c76 100644 --- a/test/dummy/config/application.rb +++ b/test/dummy/config/application.rb @@ -1,6 +1,5 @@ require File.expand_path('../boot', __FILE__) - require 'rails/all' Bundler.require(*Rails.groups) @@ -24,4 +23,3 @@ class Application < Rails::Application config.assets.enabled = true end end - diff --git a/test/dummy/config/initializers/secret_token.rb b/test/dummy/config/initializers/secret_token.rb index 394e2b032..bbb0cf04a 100644 --- a/test/dummy/config/initializers/secret_token.rb +++ b/test/dummy/config/initializers/secret_token.rb @@ -7,11 +7,9 @@ # no regular words or you'll be exposed to dictionary attacks. # You can use `rake secret` to generate a secure secret key. - - # Make sure your secret_key_base is kept private # if you're sharing your code publicly. Dummy::Application.config.secret_key_base = '43fa5672451bbd0a171668e625edc433eb00eeeb14c2606546e262e499ab853cfb532998d4809abe5019bf13888863e3a2c7d5cf7757de7a2b1fb50826d9874e' -#for rails 3.1 & 3.2 +# for rails 3.1 & 3.2 Dummy::Application.config.secret_token = Dummy::Application.config.secret_key_base From f01ed3f72c0f1405eebc083f0847a6eb91a57fbd Mon Sep 17 00:00:00 2001 From: Jakub Malinowski Date: Mon, 12 Aug 2013 00:21:59 +0200 Subject: [PATCH 7/7] Include appraisal's gemfile locks as recommended --- .gitignore | 2 - gemfiles/rails_3.1.gemfile.lock | 104 ++++++++++++++++++++++++++++++++ gemfiles/rails_3.2.gemfile.lock | 104 ++++++++++++++++++++++++++++++++ gemfiles/rails_4.0.gemfile.lock | 99 ++++++++++++++++++++++++++++++ 4 files changed, 307 insertions(+), 2 deletions(-) create mode 100644 gemfiles/rails_3.1.gemfile.lock create mode 100644 gemfiles/rails_3.2.gemfile.lock create mode 100644 gemfiles/rails_4.0.gemfile.lock diff --git a/.gitignore b/.gitignore index 66d212495..3ce611f97 100644 --- a/.gitignore +++ b/.gitignore @@ -2,5 +2,3 @@ Gemfile.lock *.log test/dummy/tmp - -gemfiles/*.gemfile.lock diff --git a/gemfiles/rails_3.1.gemfile.lock b/gemfiles/rails_3.1.gemfile.lock new file mode 100644 index 000000000..922569492 --- /dev/null +++ b/gemfiles/rails_3.1.gemfile.lock @@ -0,0 +1,104 @@ +PATH + remote: /home/jakub/code/react-rails + specs: + react-rails (0.4.1.0) + execjs + rails (>= 3.1) + react-source (= 0.4.1) + +GEM + remote: http://rubygems.org/ + specs: + actionmailer (3.2.14) + actionpack (= 3.2.14) + mail (~> 2.5.4) + actionpack (3.2.14) + activemodel (= 3.2.14) + activesupport (= 3.2.14) + builder (~> 3.0.0) + erubis (~> 2.7.0) + journey (~> 1.0.4) + rack (~> 1.4.5) + rack-cache (~> 1.2) + rack-test (~> 0.6.1) + sprockets (~> 2.2.1) + activemodel (3.2.14) + activesupport (= 3.2.14) + builder (~> 3.0.0) + activerecord (3.2.14) + activemodel (= 3.2.14) + activesupport (= 3.2.14) + arel (~> 3.0.2) + tzinfo (~> 0.3.29) + activeresource (3.2.14) + activemodel (= 3.2.14) + activesupport (= 3.2.14) + activesupport (3.2.14) + i18n (~> 0.6, >= 0.6.4) + multi_json (~> 1.0) + appraisal (0.5.2) + bundler + rake + arel (3.0.2) + builder (3.0.4) + erubis (2.7.0) + execjs (1.4.0) + multi_json (~> 1.0) + hike (1.2.3) + i18n (0.6.4) + journey (1.0.4) + json (1.8.0) + mail (2.5.4) + mime-types (~> 1.16) + treetop (~> 1.4.8) + mime-types (1.23) + multi_json (1.7.8) + polyglot (0.3.3) + rack (1.4.5) + rack-cache (1.2) + rack (>= 0.4) + rack-ssl (1.3.3) + rack + rack-test (0.6.2) + rack (>= 1.0) + rails (3.2.14) + actionmailer (= 3.2.14) + actionpack (= 3.2.14) + activerecord (= 3.2.14) + activeresource (= 3.2.14) + activesupport (= 3.2.14) + bundler (~> 1.0) + railties (= 3.2.14) + railties (3.2.14) + actionpack (= 3.2.14) + activesupport (= 3.2.14) + rack-ssl (~> 1.3.2) + rake (>= 0.8.7) + rdoc (~> 3.4) + thor (>= 0.14.6, < 2.0) + rake (10.1.0) + rdoc (3.12.2) + json (~> 1.4) + react-source (0.4.1) + sprockets (2.2.2) + hike (~> 1.2) + 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) + polyglot + polyglot (>= 0.3.1) + tzinfo (0.3.37) + +PLATFORMS + ruby + +DEPENDENCIES + appraisal + 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 new file mode 100644 index 000000000..502eb9d23 --- /dev/null +++ b/gemfiles/rails_3.2.gemfile.lock @@ -0,0 +1,104 @@ +PATH + remote: /home/jakub/code/react-rails + specs: + react-rails (0.4.1.0) + execjs + rails (>= 3.1) + react-source (= 0.4.1) + +GEM + remote: http://rubygems.org/ + specs: + actionmailer (3.2.14) + actionpack (= 3.2.14) + mail (~> 2.5.4) + actionpack (3.2.14) + activemodel (= 3.2.14) + activesupport (= 3.2.14) + builder (~> 3.0.0) + erubis (~> 2.7.0) + journey (~> 1.0.4) + rack (~> 1.4.5) + rack-cache (~> 1.2) + rack-test (~> 0.6.1) + sprockets (~> 2.2.1) + activemodel (3.2.14) + activesupport (= 3.2.14) + builder (~> 3.0.0) + activerecord (3.2.14) + activemodel (= 3.2.14) + activesupport (= 3.2.14) + arel (~> 3.0.2) + tzinfo (~> 0.3.29) + activeresource (3.2.14) + activemodel (= 3.2.14) + activesupport (= 3.2.14) + activesupport (3.2.14) + i18n (~> 0.6, >= 0.6.4) + multi_json (~> 1.0) + appraisal (0.5.2) + bundler + rake + arel (3.0.2) + builder (3.0.4) + erubis (2.7.0) + execjs (1.4.0) + multi_json (~> 1.0) + hike (1.2.3) + i18n (0.6.4) + journey (1.0.4) + json (1.8.0) + mail (2.5.4) + mime-types (~> 1.16) + treetop (~> 1.4.8) + mime-types (1.23) + multi_json (1.7.8) + polyglot (0.3.3) + rack (1.4.5) + rack-cache (1.2) + rack (>= 0.4) + rack-ssl (1.3.3) + rack + rack-test (0.6.2) + rack (>= 1.0) + rails (3.2.14) + actionmailer (= 3.2.14) + actionpack (= 3.2.14) + activerecord (= 3.2.14) + activeresource (= 3.2.14) + activesupport (= 3.2.14) + bundler (~> 1.0) + railties (= 3.2.14) + railties (3.2.14) + actionpack (= 3.2.14) + activesupport (= 3.2.14) + rack-ssl (~> 1.3.2) + rake (>= 0.8.7) + rdoc (~> 3.4) + thor (>= 0.14.6, < 2.0) + rake (10.1.0) + rdoc (3.12.2) + json (~> 1.4) + react-source (0.4.1) + sprockets (2.2.2) + hike (~> 1.2) + 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) + polyglot + polyglot (>= 0.3.1) + tzinfo (0.3.37) + +PLATFORMS + ruby + +DEPENDENCIES + appraisal + 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 new file mode 100644 index 000000000..70fd357cf --- /dev/null +++ b/gemfiles/rails_4.0.gemfile.lock @@ -0,0 +1,99 @@ +PATH + remote: /home/jakub/code/react-rails + specs: + react-rails (0.4.1.0) + execjs + rails (>= 3.1) + react-source (= 0.4.1) + +GEM + remote: http://rubygems.org/ + specs: + actionmailer (4.0.0) + actionpack (= 4.0.0) + mail (~> 2.5.3) + actionpack (4.0.0) + activesupport (= 4.0.0) + builder (~> 3.1.0) + erubis (~> 2.7.0) + rack (~> 1.5.2) + rack-test (~> 0.6.2) + activemodel (4.0.0) + activesupport (= 4.0.0) + builder (~> 3.1.0) + activerecord (4.0.0) + activemodel (= 4.0.0) + activerecord-deprecated_finders (~> 1.0.2) + activesupport (= 4.0.0) + arel (~> 4.0.0) + activerecord-deprecated_finders (1.0.3) + activesupport (4.0.0) + i18n (~> 0.6, >= 0.6.4) + minitest (~> 4.2) + multi_json (~> 1.3) + thread_safe (~> 0.1) + tzinfo (~> 0.3.37) + appraisal (0.5.2) + bundler + rake + arel (4.0.0) + atomic (1.1.12) + builder (3.1.4) + erubis (2.7.0) + execjs (1.4.0) + multi_json (~> 1.0) + hike (1.2.3) + i18n (0.6.4) + mail (2.5.4) + mime-types (~> 1.16) + treetop (~> 1.4.8) + mime-types (1.23) + minitest (4.7.5) + multi_json (1.7.8) + polyglot (0.3.3) + rack (1.5.2) + rack-test (0.6.2) + rack (>= 1.0) + rails (4.0.0) + actionmailer (= 4.0.0) + actionpack (= 4.0.0) + activerecord (= 4.0.0) + activesupport (= 4.0.0) + bundler (>= 1.3.0, < 2.0) + railties (= 4.0.0) + sprockets-rails (~> 2.0.0) + railties (4.0.0) + actionpack (= 4.0.0) + activesupport (= 4.0.0) + rake (>= 0.8.7) + thor (>= 0.18.1, < 2.0) + rake (10.1.0) + react-source (0.4.1) + sprockets (2.10.0) + hike (~> 1.2) + multi_json (~> 1.0) + rack (~> 1.0) + tilt (~> 1.1, != 1.3.0) + sprockets-rails (2.0.0) + actionpack (>= 3.0) + activesupport (>= 3.0) + sprockets (~> 2.8) + sqlite3 (1.3.7) + thor (0.18.1) + thread_safe (0.1.2) + atomic + tilt (1.4.1) + treetop (1.4.14) + polyglot + polyglot (>= 0.3.1) + tzinfo (0.3.37) + +PLATFORMS + ruby + +DEPENDENCIES + appraisal + bundler (>= 1.2.2) + rails (~> 4.0) + react-rails! + sqlite3