Skip to content

Commit

Permalink
update to schema_dev 3.7 and test on activerecord 5.0
Browse files Browse the repository at this point in the history
  • Loading branch information
ronen committed Apr 19, 2016
1 parent ef810e5 commit 3dfe749
Show file tree
Hide file tree
Showing 10 changed files with 61 additions and 5 deletions.
15 changes: 15 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,28 @@
sudo: false
rvm:
- 2.1.5
- 2.3.0
gemfile:
- gemfiles/activerecord-4.2/Gemfile.mysql2
- gemfiles/activerecord-4.2/Gemfile.postgresql
- gemfiles/activerecord-4.2/Gemfile.sqlite3
- gemfiles/activerecord-5.0/Gemfile.mysql2
- gemfiles/activerecord-5.0/Gemfile.postgresql
- gemfiles/activerecord-5.0/Gemfile.sqlite3
env: POSTGRESQL_DB_USER=postgres MYSQL_DB_USER=travis
addons:
postgresql: '9.4'
before_script: bundle exec rake create_databases
after_script: bundle exec rake drop_databases
script: bundle exec rake travis
matrix:
exclude:
- rvm: 2.1.5
gemfile: gemfiles/activerecord-5.0/Gemfile.mysql2
env: POSTGRESQL_DB_USER=postgres MYSQL_DB_USER=travis
- rvm: 2.1.5
gemfile: gemfiles/activerecord-5.0/Gemfile.postgresql
env: POSTGRESQL_DB_USER=postgres MYSQL_DB_USER=travis
- rvm: 2.1.5
gemfile: gemfiles/activerecord-5.0/Gemfile.sqlite3
env: POSTGRESQL_DB_USER=postgres MYSQL_DB_USER=travis
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,8 @@ SchemaMonkey is tested on:
<!-- SCHEMA_DEV: MATRIX - begin -->
<!-- These lines are auto-generated by schema_dev based on schema_dev.yml -->
* ruby **2.1.5** with activerecord **4.2**, using **mysql2**, **sqlite3** or **postgresql**
* ruby **2.3.0** with activerecord **4.2**, using **mysql2**, **sqlite3** or **postgresql**
* ruby **2.3.0** with activerecord **5.0**, using **mysql2**, **sqlite3** or **postgresql**

<!-- SCHEMA_DEV: MATRIX - end -->

Expand Down
2 changes: 1 addition & 1 deletion gemfiles/activerecord-4.2/Gemfile.base
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
eval File.read File.expand_path('../../Gemfile.base', __FILE__)

gem "activerecord", "~> 4.2.0"
gem "activerecord", "~> 4.2.6"
4 changes: 2 additions & 2 deletions gemfiles/activerecord-4.2/Gemfile.mysql2
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ require "pathname"
eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)

platform :ruby do
gem "mysql2"
gem "mysql2", '>= 0.3.18', '< 0.5'
end

platform :jruby do
gem 'activerecord-jdbcmysql-adapter'
end
end
3 changes: 3 additions & 0 deletions gemfiles/activerecord-5.0/Gemfile.base
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
eval File.read File.expand_path('../../Gemfile.base', __FILE__)

gem "activerecord", ">= 5.0.0.beta1", "< 5.1"
10 changes: 10 additions & 0 deletions gemfiles/activerecord-5.0/Gemfile.mysql2
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
require "pathname"
eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)

platform :ruby do
gem "mysql2"
end

platform :jruby do
gem 'activerecord-jdbcmysql-adapter'
end
10 changes: 10 additions & 0 deletions gemfiles/activerecord-5.0/Gemfile.postgresql
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
require "pathname"
eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)

platform :ruby do
gem "pg"
end

platform :jruby do
gem 'activerecord-jdbcpostgresql-adapter'
end
10 changes: 10 additions & 0 deletions gemfiles/activerecord-5.0/Gemfile.sqlite3
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
require "pathname"
eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)

platform :ruby do
gem "sqlite3"
end

platform :jruby do
gem 'activerecord-jdbcsqlite3-adapter', '>=1.3.0.beta2'
end
6 changes: 6 additions & 0 deletions schema_dev.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
ruby:
- 2.1.5
- 2.3.0
activerecord:
- 4.2
- 5.0
db:
- mysql2
- sqlite3
- postgresql
exclude:
-
ruby: 2.1.5
activerecord: 5.0
4 changes: 2 additions & 2 deletions schema_monkey.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@ Gem::Specification.new do |spec|
spec.require_paths = ["lib"]

spec.required_ruby_version = ">= 2.1.0"
spec.add_dependency "activerecord", "~> 4.2"
spec.add_dependency "activerecord", ">= 4.2"
spec.add_dependency "its-it"
spec.add_dependency "modware", "~> 0.1"

spec.add_development_dependency "bundler", "~> 1.7"
spec.add_development_dependency "rake", "~> 10.0"
spec.add_development_dependency "rspec", "~> 3.0"
spec.add_development_dependency "rspec-given", "~> 3.6"
spec.add_development_dependency "schema_dev", "~> 3.0"
spec.add_development_dependency "schema_dev", "~> 3.7"
spec.add_development_dependency "simplecov"
spec.add_development_dependency "simplecov-gem-profile"
end

0 comments on commit 3dfe749

Please sign in to comment.