From 440b21e9a3cfb1c2c046f0d1c28ee2d8d8b5cc54 Mon Sep 17 00:00:00 2001 From: "Peter M. Goldstein" Date: Thu, 26 Dec 2013 19:26:11 -0800 Subject: [PATCH] Add Rails 4.1.0.beta1. Get Rubinius build running. Enable supported configurations for Rubinius and JRuby. --- .gitignore | 2 ++ .travis.yml | 11 ++++++----- gemfiles/rails_3.2.gemfile | 5 +++-- gemfiles/rails_4.0.gemfile | 5 +++-- gemfiles/rails_4.1.gemfile | 11 +++++++++++ 5 files changed, 25 insertions(+), 9 deletions(-) create mode 100644 gemfiles/rails_4.1.gemfile diff --git a/.gitignore b/.gitignore index 07c24b92..2496467c 100644 --- a/.gitignore +++ b/.gitignore @@ -6,8 +6,10 @@ coverage pkg rdoc Gemfile.lock +gemfiles/*.lock spec/debug.log spec/*.db TODO .rvmrc +.ruby-version alto diff --git a/.travis.yml b/.travis.yml index cc99446e..ed3e834c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,7 @@ rvm: - 1.9.2 - 1.9.3 - 2.0.0 + - 2.1.0 # - jruby-18mode # JRuby in 1.8 mode - jruby-19mode # JRuby in 1.9 mode - rbx-2.2.1 @@ -14,6 +15,7 @@ services: mongodb gemfile: - gemfiles/rails_3.2.gemfile - gemfiles/rails_4.0.gemfile + - gemfiles/rails_4.1.gemfile matrix: allow_failures: @@ -21,9 +23,8 @@ matrix: - rvm: jruby-19mode exclude: - { rvm: 1.8.7, gemfile: gemfiles/rails_4.0.gemfile } + - { rvm: 1.8.7, gemfile: gemfiles/rails_4.1.gemfile } - { rvm: 1.9.2, gemfile: gemfiles/rails_4.0.gemfile } - - { rvm: 1.9.3, gemfile: gemfiles/rails_4.0.gemfile } - - { rvm: jruby-19mode, gemfile: gemfiles/rails_3.2.gemfile } - - { rvm: jruby-19mode, gemfile: gemfiles/rails_4.0.gemfile } - - { rvm: rbx-2.2.1, gemfile: gemfiles/rails_3.2.gemfile } - - { rvm: rbx-2.2.1, gemfile: gemfiles/rails_4.0.gemfile } + - { rvm: 1.9.2, gemfile: gemfiles/rails_4.1.gemfile } + - { rvm: 1.9.3, gemfile: gemfiles/rails_4.1.gemfile } + - { rvm: jruby-19mode, gemfile: gemfiles/rails_4.1.gemfile } diff --git a/gemfiles/rails_3.2.gemfile b/gemfiles/rails_3.2.gemfile index 865c38f1..0f4f8a73 100644 --- a/gemfiles/rails_3.2.gemfile +++ b/gemfiles/rails_3.2.gemfile @@ -1,11 +1,12 @@ source "https://rubygems.org" gem "sqlite3", :platforms => :ruby -gem "coveralls", :platforms => :ruby +gem "coveralls" gem 'rubysl', :platforms => :rbx +gem 'rubinius-developer_tools', :platforms => :rbx gem "jruby-openssl", :platforms => :jruby gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby -gem "rails", "3.2.15" +gem "rails", "3.2.16" gem 'mongoid' if Gem::Version.create(RUBY_VERSION.dup) >= Gem::Version.create('1.9.3') gemspec :path => "../" diff --git a/gemfiles/rails_4.0.gemfile b/gemfiles/rails_4.0.gemfile index f01befbf..1ddad1b6 100644 --- a/gemfiles/rails_4.0.gemfile +++ b/gemfiles/rails_4.0.gemfile @@ -1,10 +1,11 @@ source "https://rubygems.org" gem "sqlite3", :platforms => :ruby -gem "coveralls", :platforms => :ruby +gem "coveralls" gem 'rubysl', :platforms => :rbx +gem 'rubinius-developer_tools', :platforms => :rbx gem "jruby-openssl", :platforms => :jruby gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby -gem "rails", "4.0.1" +gem "rails", "4.0.2" gemspec :path => "../" diff --git a/gemfiles/rails_4.1.gemfile b/gemfiles/rails_4.1.gemfile new file mode 100644 index 00000000..69e4e8b2 --- /dev/null +++ b/gemfiles/rails_4.1.gemfile @@ -0,0 +1,11 @@ +source "https://rubygems.org" + +gem "sqlite3", :platforms => :ruby +gem "coveralls" +gem 'rubysl', :platforms => :rbx +gem 'rubinius-developer_tools', :platforms => :rbx +gem "jruby-openssl", :platforms => :jruby +gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby +gem "rails", "4.1.0.beta1" + +gemspec :path => "../" \ No newline at end of file