From 8aeb9a6c70e08a3e1b23e3a1fc5394b55e022a7e Mon Sep 17 00:00:00 2001 From: Grzesiek Kolodziejczyk Date: Thu, 18 May 2017 11:39:18 +0200 Subject: [PATCH] Relax Rails dependency to allow 5.1 --- .travis.yml | 1 + Gemfile | 2 +- Gemfile.lock | 195 ++++++++++-------- rswag-api/rswag-api.gemspec | 2 +- rswag-specs/rswag-specs.gemspec | 2 +- rswag-ui/rswag-ui.gemspec | 2 +- .../db/migrate/20160218212104_create_blogs.rb | 8 +- test-app/db/schema.rb | 15 +- 8 files changed, 127 insertions(+), 100 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6c59b5b..1e052a7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,7 @@ env: - "RAILS_VERSION=3.2.22" - "RAILS_VERSION=4.2.0" - "RAILS_VERSION=5.0.0" + - "RAILS_VERSION=5.1.1" cache: bundler install: bundle update before_script: diff --git a/Gemfile b/Gemfile index 298afb3..e642a0f 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" # Allow the rails version to come from an ENV setting so Travis can test multiple versions. # See http://www.schneems.com/post/50991826838/testing-against-multiple-rails-versions/ -rails_version = ENV['RAILS_VERSION'] || '3.2.22' +rails_version = ENV['RAILS_VERSION'] || '5.1.1' gem 'rails', "#{rails_version}" diff --git a/Gemfile.lock b/Gemfile.lock index 5afb841..b9ea1a4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,57 +1,67 @@ PATH - remote: ./rswag-api + remote: rswag-api specs: rswag-api (1.2.0) - rails (>= 3.1, < 5.1) + rails (>= 3.1, < 5.2) PATH - remote: ./rswag-specs + remote: rswag-specs specs: rswag-specs (1.2.0) json (~> 1.8) json-schema (~> 2.2) - rails (>= 3.1, < 5.1) + rails (>= 3.1, < 5.2) rspec-rails (>= 2.14, < 4) PATH - remote: ./rswag-ui + remote: rswag-ui specs: rswag-ui (1.2.0) - rails (>= 3.1, < 5.1) + rails (>= 3.1, < 5.2) GEM remote: https://rubygems.org/ specs: - actionmailer (3.2.22) - actionpack (= 3.2.22) - mail (~> 2.5.4) - actionpack (3.2.22) - activemodel (= 3.2.22) - activesupport (= 3.2.22) - 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.22) - activesupport (= 3.2.22) - builder (~> 3.0.0) - activerecord (3.2.22) - activemodel (= 3.2.22) - activesupport (= 3.2.22) - arel (~> 3.0.2) - tzinfo (~> 0.3.29) - activeresource (3.2.22) - activemodel (= 3.2.22) - activesupport (= 3.2.22) - activesupport (3.2.22) - i18n (~> 0.6, >= 0.6.4) - multi_json (~> 1.0) + actioncable (5.1.1) + actionpack (= 5.1.1) + nio4r (~> 2.0) + websocket-driver (~> 0.6.1) + actionmailer (5.1.1) + actionpack (= 5.1.1) + actionview (= 5.1.1) + activejob (= 5.1.1) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.1.1) + actionview (= 5.1.1) + activesupport (= 5.1.1) + rack (~> 2.0) + rack-test (~> 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.1.1) + activesupport (= 5.1.1) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.1.1) + activesupport (= 5.1.1) + globalid (>= 0.3.6) + activemodel (5.1.1) + activesupport (= 5.1.1) + activerecord (5.1.1) + activemodel (= 5.1.1) + activesupport (= 5.1.1) + arel (~> 8.0) + activesupport (5.1.1) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (~> 0.7) + minitest (~> 5.1) + tzinfo (~> 1.1) addressable (2.4.0) - arel (3.0.3) - builder (3.0.4) + arel (8.0.0) + builder (3.2.3) capybara (2.10.1) addressable mime-types (>= 1.16) @@ -62,55 +72,65 @@ GEM capybara-webkit (1.1.0) capybara (~> 2.0, >= 2.0.2) json + concurrent-ruby (1.0.5) diff-lcs (1.2.5) - erubis (2.7.0) + erubi (1.6.0) execjs (2.7.0) generator_spec (0.9.3) activesupport (>= 3.0.0) railties (>= 3.0.0) - hike (1.2.3) - i18n (0.7.0) - journey (1.0.4) - json (1.8.3) - json-schema (2.7.0) + globalid (0.4.0) + activesupport (>= 4.2.0) + i18n (0.8.1) + json (1.8.6) + json-schema (2.8.0) addressable (>= 2.4) libv8 (3.16.14.15) - mail (2.5.4) - mime-types (~> 1.16) - treetop (~> 1.4.8) - mime-types (1.25.1) + loofah (2.0.3) + nokogiri (>= 1.5.9) + mail (2.6.5) + mime-types (>= 1.16, < 4) + method_source (0.8.2) + mime-types (3.1) + mime-types-data (~> 3.2015) + mime-types-data (3.2016.0521) mini_portile2 (2.1.0) - multi_json (1.12.1) + minitest (5.10.2) + nio4r (2.0.0) nokogiri (1.6.8.1) mini_portile2 (~> 2.1.0) - polyglot (0.3.5) power_assert (0.3.1) - rack (1.4.7) - rack-cache (1.6.1) - rack (>= 0.4) - rack-ssl (1.3.4) - rack + rack (2.0.3) rack-test (0.6.3) rack (>= 1.0) - rails (3.2.22) - actionmailer (= 3.2.22) - actionpack (= 3.2.22) - activerecord (= 3.2.22) - activeresource (= 3.2.22) - activesupport (= 3.2.22) - bundler (~> 1.0) - railties (= 3.2.22) - railties (3.2.22) - actionpack (= 3.2.22) - activesupport (= 3.2.22) - rack-ssl (~> 1.3.2) + rails (5.1.1) + actioncable (= 5.1.1) + actionmailer (= 5.1.1) + actionpack (= 5.1.1) + actionview (= 5.1.1) + activejob (= 5.1.1) + activemodel (= 5.1.1) + activerecord (= 5.1.1) + activesupport (= 5.1.1) + bundler (>= 1.3.0, < 2.0) + railties (= 5.1.1) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.0.3) + loofah (~> 2.0) + railties (5.1.1) + actionpack (= 5.1.1) + activesupport (= 5.1.1) + method_source rake (>= 0.8.7) - rdoc (~> 3.4) - thor (>= 0.14.6, < 2.0) - rake (11.3.0) - rdoc (3.12.2) - json (~> 1.4) + thor (>= 0.18.1, < 2.0) + rake (12.0.0) ref (2.0.0) + responders (2.4.0) + actionpack (>= 4.2.0, < 5.3) + railties (>= 4.2.0, < 5.3) rspec-core (3.5.4) rspec-support (~> 3.5.0) rspec-expectations (3.5.0) @@ -128,30 +148,28 @@ GEM rspec-mocks (~> 3.5.0) rspec-support (~> 3.5.0) rspec-support (3.5.0) - sprockets (2.2.3) - hike (~> 1.2) - multi_json (~> 1.0) - rack (~> 1.0) - tilt (~> 1.1, != 1.3.0) + sprockets (3.7.1) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.0) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) sqlite3 (1.3.12) - strong_parameters (0.2.3) - actionpack (~> 3.0) - activemodel (~> 3.0) - activesupport (~> 3.0) - railties (~> 3.0) test-unit (3.2.1) power_assert therubyracer (0.12.2) libv8 (~> 3.16.14.0) ref - thor (0.19.1) - tilt (1.4.1) - treetop (1.4.15) - polyglot - polyglot (>= 0.3.1) - tzinfo (0.3.51) + thor (0.19.4) + thread_safe (0.3.6) + tzinfo (1.2.3) + thread_safe (~> 0.1) uglifier (3.0.2) execjs (>= 0.3.0, < 3) + websocket-driver (0.6.5) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.2) xpath (2.0.0) nokogiri (~> 1.3) @@ -162,13 +180,16 @@ DEPENDENCIES capybara capybara-webkit generator_spec - rails (= 3.2.22) + rails (= 5.1.1) + responders rspec-rails rswag-api! rswag-specs! rswag-ui! sqlite3 - strong_parameters test-unit therubyracer uglifier + +BUNDLED WITH + 1.14.6 diff --git a/rswag-api/rswag-api.gemspec b/rswag-api/rswag-api.gemspec index 5275ea2..b76df41 100644 --- a/rswag-api/rswag-api.gemspec +++ b/rswag-api/rswag-api.gemspec @@ -16,5 +16,5 @@ Gem::Specification.new do |s| s.files = Dir["{lib}/**/*"] + ["MIT-LICENSE", "Rakefile" ] - s.add_dependency "rails", ">= 3.1", "< 5.1" + s.add_dependency "rails", ">= 3.1", "< 5.2" end diff --git a/rswag-specs/rswag-specs.gemspec b/rswag-specs/rswag-specs.gemspec index 6e866a6..17daaab 100644 --- a/rswag-specs/rswag-specs.gemspec +++ b/rswag-specs/rswag-specs.gemspec @@ -16,7 +16,7 @@ Gem::Specification.new do |s| s.files = Dir["{lib}/**/*"] + ["MIT-LICENSE", "Rakefile" ] - s.add_dependency "rails", ">= 3.1", "< 5.1" + s.add_dependency "rails", ">= 3.1", "< 5.2" s.add_dependency 'json', '~> 1.8' s.add_dependency 'json-schema', '~> 2.2' s.add_dependency 'rspec-rails', '>= 2.14', '< 4' diff --git a/rswag-ui/rswag-ui.gemspec b/rswag-ui/rswag-ui.gemspec index 2634542..edbbf82 100644 --- a/rswag-ui/rswag-ui.gemspec +++ b/rswag-ui/rswag-ui.gemspec @@ -16,5 +16,5 @@ Gem::Specification.new do |s| s.files = Dir["{app,config,lib,vendor}/**/*"] + ["MIT-LICENSE", "Rakefile" ] - s.add_dependency "rails", ">= 3.1", "< 5.1" + s.add_dependency "rails", ">= 3.1", "< 5.2" end diff --git a/test-app/db/migrate/20160218212104_create_blogs.rb b/test-app/db/migrate/20160218212104_create_blogs.rb index 81d9813..03e1463 100644 --- a/test-app/db/migrate/20160218212104_create_blogs.rb +++ b/test-app/db/migrate/20160218212104_create_blogs.rb @@ -1,4 +1,10 @@ -class CreateBlogs < ActiveRecord::Migration +migration_class = if Gem::Version.new(Rails.version) >= Gem::Version.new("5.0") + ActiveRecord::Migration[4.2] + else + ActiveRecord::Migration + end + +class CreateBlogs < migration_class def change create_table :blogs do |t| t.string :title diff --git a/test-app/db/schema.rb b/test-app/db/schema.rb index 082bb8d..4e72efd 100644 --- a/test-app/db/schema.rb +++ b/test-app/db/schema.rb @@ -1,4 +1,3 @@ -# encoding: UTF-8 # This file is auto-generated from the current state of the database. Instead # of editing this file, please use the migrations feature of Active Record to # incrementally modify your database, and then regenerate this schema definition. @@ -9,15 +8,15 @@ # from scratch. The latter is a flawed and unsustainable approach (the more migrations # you'll amass, the slower it'll run and the greater likelihood for issues). # -# It's strongly recommended to check this file into your version control system. +# It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(:version => 20160218212104) do +ActiveRecord::Schema.define(version: 20160218212104) do - create_table "blogs", :force => true do |t| - t.string "title" - t.text "content" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false + create_table "blogs", force: :cascade do |t| + t.string "title" + t.text "content" + t.datetime "created_at" + t.datetime "updated_at" end end