Rails 6 compatibility (#121)

pedrocunha · web-flow · commit efcec3c24014 · 2020-09-18T10:13:25.000+01:00
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -10,7 +10,6 @@
 #   * GEM_HOME
 #   * BUNDLE_PATH
 #   * BUNDLE_BIN
-
 common_ruby_environment: &common_ruby_environment
   environment:
     RAILS_ENV: test
@@ -33,8 +32,7 @@ jobs:
         environment:
           PGDATA: /dev/shm/pgdata
           <<: *common_pg_environment_vars
-
-      - image: redis:3-alpine
+      - image: redis:4-alpine
     steps:
       - checkout
 
@@ -116,8 +114,7 @@ jobs:
         environment:
           PGDATA: /dev/shm/pgdata
           <<: *common_pg_environment_vars
-
-      - image: redis:3-alpine
+      - image: redis:4-alpine
     steps:
       - checkout
 
@@ -199,8 +196,7 @@ jobs:
         environment:
           PGDATA: /dev/shm/pgdata
           <<: *common_pg_environment_vars
-
-      - image: redis:3-alpine
+      - image: redis:4-alpine
     steps:
       - checkout
 
@@ -282,8 +278,7 @@ jobs:
         environment:
           PGDATA: /dev/shm/pgdata
           <<: *common_pg_environment_vars
-
-      - image: redis:3-alpine
+      - image: redis:4-alpine
     steps:
       - checkout
 
@@ -365,8 +360,7 @@ jobs:
         environment:
           PGDATA: /dev/shm/pgdata
           <<: *common_pg_environment_vars
-
-      - image: redis:3-alpine
+      - image: redis:4-alpine
     steps:
       - checkout
 
@@ -448,8 +442,7 @@ jobs:
         environment:
           PGDATA: /dev/shm/pgdata
           <<: *common_pg_environment_vars
-
-      - image: redis:3-alpine
+      - image: redis:4-alpine
     steps:
       - checkout
 
@@ -531,8 +524,7 @@ jobs:
         environment:
           PGDATA: /dev/shm/pgdata
           <<: *common_pg_environment_vars
-
-      - image: redis:3-alpine
+      - image: redis:4-alpine
     steps:
       - checkout
 
@@ -614,8 +606,7 @@ jobs:
         environment:
           PGDATA: /dev/shm/pgdata
           <<: *common_pg_environment_vars
-
-      - image: redis:3-alpine
+      - image: redis:4-alpine
     steps:
       - checkout
 
@@ -689,6 +680,89 @@ jobs:
             - ~/project/vendor/bundle
             - ~/project/vendor/bundle-scaffold
 
+  build_2.6.5_rails_6:
+    docker:
+      - image: ruby:2.6.5-alpine
+        <<: *common_ruby_environment
+      - image: postgres:9.6-alpine
+        environment:
+          PGDATA: /dev/shm/pgdata
+          <<: *common_pg_environment_vars
+      - image: redis:4-alpine
+    steps:
+      - checkout
+
+      - run:
+          name: Setup RAM disk
+          command: |
+            rm -rf ~/project/tmp ;
+            mkdir /dev/shm/tmp ;
+            ln -s /dev/shm/tmp ~/project/tmp
+
+      - run:
+          name: Setup requirements
+          command: |
+            apk add --update git bash build-base postgresql-dev sqlite-dev tzdata nodejs
+
+      - run:
+          name: Configure bundler
+          command: |
+            unset \
+              BUNDLE_APP_CONFIG \
+              GEM_HOME \
+              BUNDLE_PATH \
+              BUNDLE_BIN
+            bundle config --local gemfile $PWD/gemfiles/rails_6.gemfile
+
+      - restore_cache:
+          keys:
+            - v2-bundle-2.6.5-rails_6-{{ .Branch }}
+            - v2-bundle-2.6.5-rails_6
+            - v2-bundle-2.6.5
+
+      - run:
+          name: Install bundle
+          command: |
+            unset \
+              BUNDLE_APP_CONFIG \
+              GEM_HOME \
+              BUNDLE_PATH \
+              BUNDLE_BIN
+            bundle install --jobs=3 --retry=3 --path=$PWD/vendor/bundle
+
+      # The default Ruby containers modify the behaviour of Bundler in a way that breaks
+      # the CI since it makes it harder to run multiple apps in a single container
+      # See https://github.com/docker-library/docs/pull/1221/files for a summary
+      # Unsettting the variables restores the default behaviour
+      - run:
+          name: Run test suite
+          command: |
+            unset \
+              RACK_ENV \
+              RAILS_ENV \
+              BUNDLE_APP_CONFIG \
+              GEM_HOME \
+              BUNDLE_PATH \
+              BUNDLE_BIN
+            bundle exec rspec
+
+      - save_cache:
+          key: v2-bundle-2.6.5-rails_6-{{ .Branch }}
+          paths:
+            - ~/project/vendor/bundle
+            - ~/project/vendor/bundle-scaffold
+      - save_cache:
+          key: v2-bundle-2.6.5-rails_6
+          paths:
+            - ~/project/vendor/bundle
+            - ~/project/vendor/bundle-scaffold
+      - save_cache:
+          key: v2-bundle-2.6.5
+          paths:
+            - ~/project/vendor/bundle
+            - ~/project/vendor/bundle-scaffold
+
+
 workflows:
   version: 2
   test:
@@ -710,3 +784,5 @@ workflows:
     
       - build_2.5.5_rails_5_2
     
+      - build_2.6.5_rails_6
+    
diff --git a/.circleci/config.yml.erb b/.circleci/config.yml.erb
@@ -10,7 +10,16 @@
 #   * GEM_HOME
 #   * BUNDLE_PATH
 #   * BUNDLE_BIN
-
+common_ruby_environment: &common_ruby_environment
+  environment:
+    RAILS_ENV: test
+    PGHOST: 127.0.0.1
+    PGUSER: postgres
+    POSTGRES_HOST_AUTH_METHOD: "trust"
+common_pg_environment_vars: &common_pg_environment_vars
+    POSTGRES_USER: postgres
+    POSTGRES_DB: ror_testapp_test
+    POSTGRES_HOST_AUTH_METHOD: "trust"
 <%
   builds = [
     ['2.4.6', 'rails_4'],
@@ -20,7 +29,8 @@
     ['2.5.5', 'rails_4'],
     ['2.5.5', 'rails_5'],
     ['2.5.5', 'rails_5_1'],
-    ['2.5.5', 'rails_5_2']
+    ['2.5.5', 'rails_5_2'],
+    ['2.6.5', 'rails_6']
   ]
 %>
 version: 2
@@ -29,9 +39,11 @@ jobs:
   build_<%= ruby %>_<%= variant %>:
     docker:
       - image: ruby:<%= ruby %>-alpine
+        <<: *common_ruby_environment
       - image: postgres:9.6-alpine
         environment:
           PGDATA: /dev/shm/pgdata
+          <<: *common_pg_environment_vars
       - image: redis:4-alpine
     steps:
       - checkout
diff --git a/Appraisals b/Appraisals
@@ -27,3 +27,11 @@ appraise 'rails-5-2' do
   gem 'pg', '~> 0.18'
   gem 'rake', '13.0.1'
 end
+
+appraise 'rails-6' do
+  gem 'rails', '~> 6.0.3'
+  gem 'bootsnap', '>= 1.1.0', require: false
+  gem 'sqlite3', '~> 1.4'
+  gem 'pg', '~> 0.18'
+  gem 'rake', '13.0.1'
+end
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# v2.1.0
+
+Features:
+
+- Rails 6 compatibility
+
 # v2.0.0-pre.2
 
 Features:
diff --git a/appraise b/appraise
@@ -5,7 +5,7 @@
 require 'yaml'
 
 
-RUBIES = ['2.4.5', '2.5.5']
+RUBIES = ['2.4.5', '2.5.5', '2.6.5']
 APPRAISALS = `appraisal list`.strip.split(/\s+/)
 
 # setup
diff --git a/gemfiles/rails_4.gemfile b/gemfiles/rails_4.gemfile
@@ -9,5 +9,7 @@ gem "webmock"
 gem "pg", "~> 0.11"
 gem "sqlite3", "~> 1.3.6"
 gem "rails", "~> 4.2"
+gem "sprockets", "~>3.0"
+gem "rake", "13.0.1"
 
 gemspec path: "../"
diff --git a/gemfiles/rails_5.gemfile b/gemfiles/rails_5.gemfile
@@ -9,5 +9,6 @@ gem "webmock"
 gem "pg", "~> 0.18"
 gem "sqlite3", "~> 1.3.6"
 gem "rails", "~> 5.0.0"
+gem "rake", "13.0.1"
 
 gemspec path: "../"
diff --git a/gemfiles/rails_5_1.gemfile b/gemfiles/rails_5_1.gemfile
@@ -7,7 +7,8 @@ gem "guard-rspec"
 gem "appraisal"
 gem "webmock"
 gem "pg", "~> 0.18"
-gem "sqlite3"
+gem "sqlite3", "~> 1.3.6"
 gem "rails", "~> 5.1.0"
+gem "rake", "13.0.1"
 
 gemspec path: "../"
diff --git a/gemfiles/rails_5_2.gemfile b/gemfiles/rails_5_2.gemfile
@@ -7,8 +7,9 @@ gem "guard-rspec"
 gem "appraisal"
 gem "webmock"
 gem "pg", "~> 0.18"
-gem "sqlite3"
+gem "sqlite3", "~> 1.3.6"
 gem "rails", "~> 5.2.0"
 gem "bootsnap", ">= 1.1.0", require: false
+gem "rake", "13.0.1"
 
 gemspec path: "../"
diff --git a/gemfiles/rails_6.gemfile b/gemfiles/rails_6.gemfile
@@ -0,0 +1,15 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "guard"
+gem "guard-rspec"
+gem "appraisal"
+gem "webmock"
+gem "pg", "~> 0.18"
+gem "sqlite3", "~> 1.4"
+gem "rails", "~> 6.0.3"
+gem "bootsnap", ">= 1.1.0", require: false
+gem "rake", "13.0.1"
+
+gemspec path: "../"
diff --git a/lib/roo_on_rails/version.rb b/lib/roo_on_rails/version.rb
@@ -1,3 +1,3 @@
 module RooOnRails
-  VERSION = '2.0.2'.freeze
+  VERSION = '2.1.0'.freeze
 end
diff --git a/roo_on_rails.gemspec b/roo_on_rails.gemspec
@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_runtime_dependency 'dotenv-rails', '~> 2.1'
-  spec.add_runtime_dependency 'rails', '>= 3.2.22', '< 5.3'
+  spec.add_runtime_dependency 'rails', '>= 3.2.22'
   spec.add_runtime_dependency 'sprockets', '~>3.0'
   spec.add_runtime_dependency 'platform-api', '~> 2.0'
   spec.add_runtime_dependency 'hashie', '~> 3.4'
diff --git a/spec/support/build_test_app.rb b/spec/support/build_test_app.rb
@@ -36,9 +36,14 @@ def ensure_scaffold
         scaffold_dir.rmtree if scaffold_dir.exist?
         TEST_DIR.mkpath
 
-        shell_run "rails new #{scaffold_dir} #{rails_new_options}"
-
         require 'rails'
+
+        if Rails::VERSION::MAJOR > 5
+          shell_run "rails new #{scaffold_dir} #{rails_new_options} --skip-javascript"
+        else
+          shell_run "rails new #{scaffold_dir} #{rails_new_options}"
+        end
+
         if Rails::VERSION::MAJOR < 4
           append_to_file scaffold_dir.join('Gemfile'), %{
             gem 'sidekiq', '< 5'
@@ -51,14 +56,15 @@ def ensure_scaffold
           }
         end
 
-        # There are compatibility problems with sqlite3 1.4.x and older Rails versions
-        gsub_file scaffold_dir.join('Gemfile'), /^\s*gem 'sqlite3'.*/, 'gem "sqlite3", "~> 1.3.6"'
+        if Rails::VERSION::MAJOR < 6
+          # There are compatibility problems with sqlite3 1.4.x and older Rails versions
+          gsub_file scaffold_dir.join('Gemfile'), /^\s*gem 'sqlite3'.*/, 'gem "sqlite3", "~> 1.3.6"'
+        end
 
         append_to_file scaffold_dir.join('Gemfile'), %{
           gem 'roo_on_rails', path: '#{ROOT}'
         }
 
-
         Bundler.with_clean_env do
           shell_run "cd #{scaffold_dir} && bundle install -j4 --retry=3 --path=#{BUNDLE_CACHE}"
         end
