From dbc7824ee9d32721b74b28f603b7a0984ed88550 Mon Sep 17 00:00:00 2001 From: Bo Jeanes Date: Sat, 9 Mar 2013 13:11:15 -0600 Subject: [PATCH 1/4] Travis support --- .travis.yml | 10 ++++++++++ config/database.travis.yml | 4 ++++ 2 files changed, 14 insertions(+) create mode 100644 .travis.yml create mode 100644 config/database.travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 00000000..19614609 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,10 @@ +language: ruby +bundler_args: --without development:assets:production +rvm: + - 1.9.3 + - jruby-19mode + - rbx-19mode +before_script: + - cp -f config/database.travis.yml config/database.yml + - RAILS_ENV=test rake db:create db:migrate db:test:prepare +script: bundle exec rspec spec \ No newline at end of file diff --git a/config/database.travis.yml b/config/database.travis.yml new file mode 100644 index 00000000..8b91559f --- /dev/null +++ b/config/database.travis.yml @@ -0,0 +1,4 @@ +test: + adapter: postgresql + database: myapp_test + username: postgres \ No newline at end of file From e215c801385d42e3b2435d1dfe8320640b1cdb6d Mon Sep 17 00:00:00 2001 From: Bo Jeanes Date: Sat, 9 Mar 2013 13:54:10 -0600 Subject: [PATCH 2/4] Put fdoc gem in bundler :test group as it is required in spec_helper See https://travis-ci.org/bjeanes/squash-web/jobs/5371290 for related failure. --- Gemfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 66653d80..2a4d9c2e 100644 --- a/Gemfile +++ b/Gemfile @@ -66,10 +66,8 @@ group :development do # DOCS gem 'yard', require: nil gem 'redcarpet', require: nil, platform: :mri - gem 'fdoc' end - group :test do # SPECS gem 'rspec-rails' @@ -77,4 +75,7 @@ group :test do gem 'fakeweb' end -gem 'sql_origin', groups: [:development, :test] +group :test, :development do + gem 'fdoc' + gem 'sql_origin' +end From 19aec08d060779437686133561243ffe60cded4f Mon Sep 17 00:00:00 2001 From: Bo Jeanes Date: Sat, 9 Mar 2013 16:17:26 -0600 Subject: [PATCH 3/4] Upgrade activerecord-jdbc-adapter 1.2.7 fixes the bind bug/vulnerability that was in 1.2.6. See https://github.com/jruby/activerecord-jdbc-adapter/issues/322 --- Gemfile | 3 +-- Gemfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index 2a4d9c2e..ebb2d583 100644 --- a/Gemfile +++ b/Gemfile @@ -12,8 +12,7 @@ gem 'rack-cors', require: 'rack/cors' # MODELS gem 'pg', platform: :mri -# Version 1.2.6 introduces a bug relating to SQL binds -gem 'activerecord-jdbc-adapter', '1.2.5', platform: :jruby +gem 'activerecord-jdbc-adapter', '1.2.7', platform: :jruby gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby gem 'has_metadata_column', git: 'git://github.com/RISCfuture/has_metadata_column.git' gem 'slugalicious' diff --git a/Gemfile.lock b/Gemfile.lock index 4559daf7..3e6d0b41 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -70,9 +70,9 @@ GIT GEM remote: https://rubygems.org/ specs: - activerecord-jdbc-adapter (1.2.5) - activerecord-jdbcpostgresql-adapter (1.2.5) - activerecord-jdbc-adapter (~> 1.2.5) + activerecord-jdbc-adapter (1.2.7) + activerecord-jdbcpostgresql-adapter (1.2.7) + activerecord-jdbc-adapter (~> 1.2.7) jdbc-postgres (>= 9.1, < 9.3) activerecord-postgresql-cursors (0.0.2) addressable (2.3.2) @@ -241,7 +241,7 @@ PLATFORMS ruby DEPENDENCIES - activerecord-jdbc-adapter (= 1.2.5) + activerecord-jdbc-adapter (= 1.2.7) activerecord-jdbcpostgresql-adapter activerecord-postgresql-cursors coffee-rails From c0ba68b74adb84c38d046c3f98a73db7532dc663 Mon Sep 17 00:00:00 2001 From: Bo Jeanes Date: Sat, 9 Mar 2013 16:29:25 -0600 Subject: [PATCH 4/4] Remove rubinius from travis.yml --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 19614609..9d63bfa4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,6 @@ bundler_args: --without development:assets:production rvm: - 1.9.3 - jruby-19mode - - rbx-19mode before_script: - cp -f config/database.travis.yml config/database.yml - RAILS_ENV=test rake db:create db:migrate db:test:prepare