diff --git a/.travis.yml b/.travis.yml index 5826b65f..749f58cc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -66,6 +66,13 @@ matrix: - rvm: jruby-9.0.4.0 gemfile: gemfiles/rails42.gemfile jdk: oraclejdk8 + # rails NG + - rvm: jruby-9.0.4.0 + gemfile: gemfiles/railsNG.gemfile + jdk: oraclejdk7 + - rvm: jruby-9.0.4.0 + gemfile: gemfiles/railsNG.gemfile + jdk: oraclejdk8 ## rails 2.3 --1.8 - rvm: jruby-1.7.4 gemfile: gemfiles/rails23.gemfile diff --git a/Appraisals b/Appraisals index b56bcf1d..478e1d85 100644 --- a/Appraisals +++ b/Appraisals @@ -29,6 +29,7 @@ appraise "rails42" do end appraise "railsNG" do - gem 'rails', :github => 'rails/rails', :branch => 'master' - gem 'arel', :github => 'rails/arel', :branch => 'master' + gem 'rails', "5.0.0.beta1" + #gem 'rails', :github => 'rails/rails', :branch => 'master' + #gem 'arel', :github => 'rails/arel', :branch => 'master' end diff --git a/gemfiles/railsNG.gemfile b/gemfiles/railsNG.gemfile index b082bfe5..17a24553 100644 --- a/gemfiles/railsNG.gemfile +++ b/gemfiles/railsNG.gemfile @@ -4,6 +4,5 @@ source "https://rubygems.org" gem "rake", "~> 10.4.2", :group=>:test, :require=>nil gem "rspec", "~> 2.14.1", :group=>:test -gem "rails", :github=>"rails/rails", :branch=>"master" -gem "arel", :github=>"rails/arel", :branch=>"master" +gem "rails", "5.0.0.beta1" diff --git a/gemfiles/railsNG.gemfile.lock b/gemfiles/railsNG.gemfile.lock index d68b6dee..8a77f951 100644 --- a/gemfiles/railsNG.gemfile.lock +++ b/gemfiles/railsNG.gemfile.lock @@ -1,77 +1,133 @@ -GIT - remote: git://github.com/rails/arel.git - revision: 51d552c2cdcb749c2aaa96e982b5789b73f12f56 - branch: master - specs: - arel (6.0.0.20140505020427) - -GIT - remote: git://github.com/rails/rails.git - revision: dd16a1029ac34c09ce66fe7b088431bba920c1ba - branch: master +GEM + remote: https://rubygems.org/ specs: - actionmailer (4.2.0.alpha) - actionpack (= 4.2.0.alpha) - actionview (= 4.2.0.alpha) - mail (~> 2.5.4) - actionpack (4.2.0.alpha) - actionview (= 4.2.0.alpha) - activesupport (= 4.2.0.alpha) - rack (~> 1.5.2) - rack-test (~> 0.6.2) - actionview (4.2.0.alpha) - activesupport (= 4.2.0.alpha) + actioncable (5.0.0.beta1) + actionpack (= 5.0.0.beta1) + celluloid (~> 0.17.2) + coffee-rails (~> 4.1.0) + em-hiredis (~> 0.3.0) + faye-websocket (~> 0.10.0) + redis (~> 3.0) + websocket-driver (~> 0.6.1) + actionmailer (5.0.0.beta1) + actionpack (= 5.0.0.beta1) + actionview (= 5.0.0.beta1) + activejob (= 5.0.0.beta1) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 1.0, >= 1.0.5) + actionpack (5.0.0.beta1) + actionview (= 5.0.0.beta1) + activesupport (= 5.0.0.beta1) + rack (~> 2.x) + rack-test (~> 0.6.3) + rails-dom-testing (~> 1.0, >= 1.0.5) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.0.0.beta1) + activesupport (= 5.0.0.beta1) builder (~> 3.1) erubis (~> 2.7.0) - activemodel (4.2.0.alpha) - activesupport (= 4.2.0.alpha) + rails-dom-testing (~> 1.0, >= 1.0.5) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + activejob (5.0.0.beta1) + activesupport (= 5.0.0.beta1) + globalid (>= 0.3.6) + activemodel (5.0.0.beta1) + activesupport (= 5.0.0.beta1) builder (~> 3.1) - activerecord (4.2.0.alpha) - activemodel (= 4.2.0.alpha) - activesupport (= 4.2.0.alpha) - arel (~> 6.0.0) - activesupport (4.2.0.alpha) - i18n (~> 0.6, >= 0.6.9) + activerecord (5.0.0.beta1) + activemodel (= 5.0.0.beta1) + activesupport (= 5.0.0.beta1) + arel (~> 7.0) + activesupport (5.0.0.beta1) + concurrent-ruby (~> 1.0) + i18n (~> 0.7) json (~> 1.7, >= 1.7.7) + method_source minitest (~> 5.1) - thread_safe (~> 0.1) tzinfo (~> 1.1) - rails (4.2.0.alpha) - actionmailer (= 4.2.0.alpha) - actionpack (= 4.2.0.alpha) - actionview (= 4.2.0.alpha) - activemodel (= 4.2.0.alpha) - activerecord (= 4.2.0.alpha) - activesupport (= 4.2.0.alpha) - bundler (>= 1.3.0, < 2.0) - railties (= 4.2.0.alpha) - sprockets-rails (~> 2.1) - railties (4.2.0.alpha) - actionpack (= 4.2.0.alpha) - activesupport (= 4.2.0.alpha) - rake (>= 0.8.7) - thor (>= 0.18.1, < 2.0) - -GEM - remote: https://rubygems.org/ - specs: + arel (7.0.0) builder (3.2.2) + celluloid (0.17.3) + celluloid-essentials + celluloid-extras + celluloid-fsm + celluloid-pool + celluloid-supervision + timers (>= 4.1.1) + celluloid-essentials (0.20.5) + timers (>= 4.1.1) + celluloid-extras (0.20.5) + timers (>= 4.1.1) + celluloid-fsm (0.20.5) + timers (>= 4.1.1) + celluloid-pool (0.20.5) + timers (>= 4.1.1) + celluloid-supervision (0.20.5) + timers (>= 4.1.1) + coffee-rails (4.1.1) + coffee-script (>= 2.2.0) + railties (>= 4.0.0, < 5.1.x) + coffee-script (2.4.1) + coffee-script-source + execjs + coffee-script-source (1.10.0) + concurrent-ruby (1.0.0-java) diff-lcs (1.2.5) + em-hiredis (0.3.0) + eventmachine (~> 1.0) + hiredis (~> 0.5.0) erubis (2.7.0) - hike (1.2.3) - i18n (0.6.9) - json (1.8.1-java) - mail (2.5.4) - mime-types (~> 1.16) - treetop (~> 1.4.8) - mime-types (1.25.1) - minitest (5.3.3) - multi_json (1.10.0) - polyglot (0.3.4) - rack (1.5.2) - rack-test (0.6.2) + eventmachine (1.0.9.1-java) + execjs (2.6.0) + faye-websocket (0.10.2) + eventmachine (>= 0.12.0) + websocket-driver (>= 0.5.1) + globalid (0.3.6) + activesupport (>= 4.1.0) + hiredis (0.5.2-java) + hitimes (1.2.3-java) + i18n (0.7.0) + json (1.8.3-java) + loofah (2.0.3) + nokogiri (>= 1.5.9) + mail (2.6.3) + mime-types (>= 1.16, < 3) + method_source (0.8.2) + mime-types (2.99) + minitest (5.8.4) + nokogiri (1.6.7.2-java) + rack (2.0.0.alpha) + json + rack-test (0.6.3) rack (>= 1.0) - rake (10.3.1) + rails (5.0.0.beta1) + actioncable (= 5.0.0.beta1) + actionmailer (= 5.0.0.beta1) + actionpack (= 5.0.0.beta1) + actionview (= 5.0.0.beta1) + activejob (= 5.0.0.beta1) + activemodel (= 5.0.0.beta1) + activerecord (= 5.0.0.beta1) + activesupport (= 5.0.0.beta1) + bundler (>= 1.3.0, < 2.0) + railties (= 5.0.0.beta1) + sprockets-rails (>= 2.0.0) + rails-deprecated_sanitizer (1.0.3) + activesupport (>= 4.2.0.alpha) + rails-dom-testing (1.0.7) + activesupport (>= 4.2.0.beta, < 5.0) + nokogiri (~> 1.6.0) + rails-deprecated_sanitizer (>= 1.0.1) + rails-html-sanitizer (1.0.2) + loofah (~> 2.0) + railties (5.0.0.beta1) + actionpack (= 5.0.0.beta1) + activesupport (= 5.0.0.beta1) + method_source + rake (>= 0.8.7) + thor (>= 0.18.1, < 2.0) + rake (10.4.2) + redis (3.2.2) rspec (2.14.1) rspec-core (~> 2.14.0) rspec-expectations (~> 2.14.0) @@ -80,29 +136,30 @@ GEM rspec-expectations (2.14.5) diff-lcs (>= 1.1.3, < 2.0) rspec-mocks (2.14.6) - sprockets (2.12.1) - hike (~> 1.2) - multi_json (~> 1.0) - rack (~> 1.0) - tilt (~> 1.1, != 1.3.0) - sprockets-rails (2.1.3) - actionpack (>= 3.0) - activesupport (>= 3.0) - sprockets (~> 2.8) + sprockets (3.5.2) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.0.0) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) thor (0.19.1) - thread_safe (0.3.3-java) - tilt (1.4.1) - treetop (1.4.15) - polyglot - polyglot (>= 0.3.1) - tzinfo (1.1.0) + thread_safe (0.3.5-java) + timers (4.1.1) + hitimes + tzinfo (1.2.2) thread_safe (~> 0.1) + websocket-driver (0.6.3-java) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.2) PLATFORMS java DEPENDENCIES - arel! - rails! - rake (~> 10.3.1) + rails (= 5.0.0.beta1) + rake (~> 10.4.2) rspec (~> 2.14.1) + +BUNDLED WITH + 1.11.2