Merge pull request #327 from nimblehq/release/5.0.0

Release/5.0.0

.bundle/config

@@ -0,0 +1,2 @@
+---
+BUNDLE_GEMFILE: ".template/Gemfile"

.github/workflows/test_production_build.yml

@@ -6,9 +6,9 @@ env:
   APP_NAME: rails_templates
   DOCKER_IMAGE: ${{ github.repository }}
   DOCKER_REGISTRY_HOST: ${{ secrets.DOCKER_REGISTRY_HOST }}
-  RUBY_VERSION: 2.7.2
-  NODE_VERSION: 14
-  RAILS_VERSION: 6.1.1
+  RUBY_VERSION: 3.0.1
+  NODE_VERSION: 16
+  RAILS_VERSION: 7.0.1
 
 jobs:
   build_production:
@@ -29,7 +29,7 @@ jobs:
         uses: nimblehq/[email protected]
 
       - name: Setup Ruby
-        uses: ruby/setup-ruby@v1.61.1
+        uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ env.RUBY_VERSION }}
           bundler-cache: true

.github/workflows/test_template.yml

@@ -0,0 +1,42 @@
+name: Test Template
+
+on: push
+
+env:
+  RUBY_VERSION: 3.0.1
+
+jobs:
+  test:
+    name: Test template
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Cancel previous runs
+        uses: styfle/[email protected]
+        with:
+          access_token: ${{ github.token }}
+
+      - name: Checkout Repository
+        uses: actions/[email protected]
+
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ env.RUBY_VERSION }}
+          bundler-cache: true
+
+      - name: Cache gems
+        uses: actions/cache@v2
+        with:
+          path: vendor/bundle
+          key: ${{ runner.os }}-template-${{ env.RUBY_VERSION }}-${{ hashFiles('**/Gemfile.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-template-${{ env.RUBY_VERSION }}-
+
+      - name: Install gems
+        run: |
+          bundle config path vendor/bundle
+          bundle install --jobs 4 --retry 3
+
+      - name: Run RuboCop
+        run: bundle exec rubocop --config .template/.rubocop.yml --parallel

.github/workflows/test_variants.yml

@@ -9,9 +9,9 @@ env:
   DOCKER_REGISTRY_HOST: ${{ secrets.DOCKER_REGISTRY_HOST }}
   DOCKER_REGISTRY_USERNAME: ${{ github.repository_owner }}
   DOCKER_REGISTRY_TOKEN: ${{ secrets.DOCKER_REGISTRY_TOKEN }}
-  RUBY_VERSION: 2.7.2
-  NODE_VERSION: 14
-  RAILS_VERSION: 6.1.1
+  RUBY_VERSION: 3.0.1
+  NODE_VERSION: 16
+  RAILS_VERSION: 7.0.1
 
 jobs:
   test:
@@ -32,7 +32,7 @@ jobs:
         uses: nimblehq/[email protected]
 
       - name: Setup Ruby
-        uses: ruby/setup-ruby@v1.61.1
+        uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ env.RUBY_VERSION }}
           bundler-cache: true
@@ -87,7 +87,7 @@ jobs:
         run: |
           export BRANCH_TAG=${{ env.BRANCH_TAG }}-${{ matrix.variant }}
           cd $APP_NAME
-          docker-compose pull test || true
+          docker compose pull test || true
 
       - name: Build docker image
         run: |
@@ -98,7 +98,7 @@ jobs:
         run: |
           export BRANCH_TAG=${{ env.BRANCH_TAG }}-${{ matrix.variant }}
           cd $APP_NAME
-          docker-compose push test
+          docker compose push test
 
       - name: Test template
         run: |

.gitignore.rb

@@ -1,15 +1,13 @@
-append_to_file '.gitignore' do
-  <<~EOT
+# frozen_string_literal: true
 
-      # Ignore i18n.js generated files
-      # If deploy to heroku with git, please remove this as it prevents the files to be committed
-      /app/javascript/translations/translations.js
+append_to_file '.gitignore' do
+  <<~IGNORE
 
-      # Ignore folder information and IDE-specific files
-      .DS_Store
-      .idea/*
+    # Ignore folder information and IDE-specific files
+    .DS_Store
+    .idea/*
 
-      # Ignore the test coverage results from SimpleCov
-      /coverage
-  EOT
+    # Ignore the test coverage results from SimpleCov
+    /coverage
+  IGNORE
 end

.rubocop.yml

@@ -1,4 +1,4 @@
-require: 
+require:
   - rubocop-rails
   - rubocop-rspec
   - rubocop-performance
@@ -15,7 +15,7 @@ AllCops:
     - 'node_modules/**/*'
     - 'config/**/*'
     - 'tmp/**/*'
-  TargetRubyVersion: 2.7
+  TargetRubyVersion: 3
   NewCops: enable
 
 Style/Documentation:

.template/.rubocop.yml

@@ -0,0 +1,46 @@
+AllCops:
+  NewCops: enable
+  TargetRubyVersion: 3
+  Exclude:
+    - 'vendor/**/*'
+
+Lint/NonDeterministicRequireOrder:
+  Exclude:
+    - '../spec/rails_helper.rb'
+
+Metrics/MethodLength:
+  Exclude:
+    - '../template.rb'
+    - '**/template.rb'
+    - 'hooks/**/*'
+
+Metrics/AbcSize:
+  Enabled: false
+
+Metrics/BlockLength:
+  Enabled: false
+
+Metrics/CyclomaticComplexity:
+  Exclude:
+    - '../template.rb'
+    - '**/template.rb'
+
+Metrics/PerceivedComplexity:
+  Exclude:
+    - '../template.rb'
+    - '**/template.rb'
+
+Naming/FileName:
+  Exclude:
+    - '**/.tool-versions.rb'
+    - '**/Dangerfile.rb'
+    - '**/Gemfile.rb'
+    - '**/Procfile.dev.rb'
+
+Style/Documentation:
+  Enabled: false
+
+Style/TrivialAccessors:
+  Exclude:
+    - '../template.rb'
+    - '**/template.rb'

.template/Gemfile

@@ -1,6 +1,9 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
+gem 'docker-api' # A lightweight Ruby client for the Docker Remote API
 gem 'rspec' # BDD for Ruby
 gem 'rspec-wait' # Wait for conditions in RSpec
+gem 'rubocop', require: false # A Ruby static code analyzer and formatter, based on the community Ruby style guide.
 gem 'serverspec' # RSpec tests for your servers
-gem 'docker-api' # A lightweight Ruby client for the Docker Remote API

.template/Gemfile.lock

@@ -1,16 +1,23 @@
 GEM
   remote: https://rubygems.org/
   specs:
+    ast (2.4.2)
     diff-lcs (1.4.4)
-    docker-api (1.34.2)
+    docker-api (2.2.0)
       excon (>= 0.47.0)
       multi_json
-    excon (0.75.0)
+    excon (0.90.0)
     multi_json (1.15.0)
     net-scp (3.0.0)
       net-ssh (>= 2.6.5, < 7.0.0)
     net-ssh (6.1.0)
     net-telnet (0.1.1)
+    parallel (1.21.0)
+    parser (3.1.0.0)
+      ast (~> 2.4.1)
+    rainbow (3.1.1)
+    regexp_parser (2.2.0)
+    rexml (3.2.5)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
@@ -29,6 +36,18 @@ GEM
     rspec-support (3.9.3)
     rspec-wait (0.0.9)
       rspec (>= 3, < 4)
+    rubocop (1.25.0)
+      parallel (~> 1.10)
+      parser (>= 3.1.0.0)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.15.1, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.15.1)
+      parser (>= 3.0.1.1)
+    ruby-progressbar (1.11.0)
     serverspec (2.41.5)
       multi_json
       rspec (~> 3.0)
@@ -40,6 +59,7 @@ GEM
       net-ssh (>= 2.7)
       net-telnet (= 0.1.1)
       sfl
+    unicode-display_width (2.1.0)
 
 PLATFORMS
   ruby
@@ -48,7 +68,8 @@ DEPENDENCIES
   docker-api
   rspec
   rspec-wait
+  rubocop
   serverspec
 
 BUNDLED WITH
-   2.1.4
+   2.3.3

.template/addons/bootstrap/application.js.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-insert_into_file 'app/javascript/packs/application.js', before: %r{import 'translations/translations'.+\n} do
+insert_into_file 'app/javascript/application.js', before: %r{import './translations/translations'.+\n} do
   <<~JAVASCRIPT
-    import 'vendor/bootstrap';
+    import './vendor/';
   JAVASCRIPT
 end

.template/addons/bootstrap/application.scss.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-insert_into_file 'app/assets/stylesheets/application.scss', after: /\/\/ Dependencies\n/ do
+insert_into_file 'app/assets/stylesheets/application.scss', after: %r{// Dependencies\n} do
   <<~SCSS
-    @import 'vendor/bootstrap/bootstrap';
+    @import './vendor';
   SCSS
 end

.template/addons/bootstrap/javascript/vendor/bootstrap/index.js

@@ -0,0 +1,27 @@
+import Alert from 'bootstrap/js/dist/alert';
+import Button from 'bootstrap/js/dist/button';
+import Carousel from 'bootstrap/js/dist/carousel';
+import Collapse from 'bootstrap/js/dist/collapse';
+import Dropdown from 'bootstrap/js/dist/dropdown';
+import Modal from 'bootstrap/js/dist/modal';
+import Offcanvas from 'bootstrap/js/dist/offcanvas';
+import Popover from 'bootstrap/js/dist/popover';
+import ScrollSpy from 'bootstrap/js/dist/scrollspy';
+import Tab from 'bootstrap/js/dist/tab';
+import Toast from 'bootstrap/js/dist/toast';
+import Tooltip from 'bootstrap/js/dist/tooltip';
+
+export default {
+  Alert,
+  Button,
+  Carousel,
+  Collapse,
+  Dropdown,
+  Modal,
+  Offcanvas,
+  Popover,
+  ScrollSpy,
+  Tab,
+  Toast,
+  Tooltip
+};

.template/addons/bootstrap/javascript/vendor/index.js

@@ -0,0 +1 @@
+import './bootstrap';

.template/addons/bootstrap/package.json.rb

@@ -1,8 +1,4 @@
 # frozen_string_literal: true
 
-insert_into_file 'package.json', after: /"i18n-js":.+\n/ do
-  <<~JSON
-    "bootstrap": "4.5.2",
-    "bootstrap.native": "3.0.13",
-  JSON
-end
+run 'yarn add [email protected]'
+run 'yarn add @popperjs/[email protected]'

.template/addons/bootstrap/stylesheets/bootstrap/bootstrap.scss.tt → .template/addons/bootstrap/stylesheets/vendor/_bootstrap.scss

@@ -3,34 +3,34 @@
 // pick what the project requires
 // and comment out the rest.
 
+// Configuration
 @import 'bootstrap/scss/functions';
 @import 'bootstrap/scss/variables';
 @import 'bootstrap/scss/mixins';
+@import 'bootstrap/scss/utilities';
+
+// Layout & components
 @import 'bootstrap/scss/root';
 @import 'bootstrap/scss/reboot';
 @import 'bootstrap/scss/type';
-@import 'bootstrap/scss/utilities';
 @import 'bootstrap/scss/images';
+@import 'bootstrap/scss/containers';
 @import 'bootstrap/scss/grid';
+@import 'bootstrap/scss/tables';
 @import 'bootstrap/scss/forms';
 @import 'bootstrap/scss/buttons';
-@import 'bootstrap/scss/tables';
-@import 'bootstrap/scss/code';
 @import 'bootstrap/scss/transitions';
 @import 'bootstrap/scss/dropdown';
 @import 'bootstrap/scss/button-group';
-@import 'bootstrap/scss/input-group';
-@import 'bootstrap/scss/custom-forms';
 @import 'bootstrap/scss/nav';
 @import 'bootstrap/scss/navbar';
 @import 'bootstrap/scss/card';
+@import 'bootstrap/scss/accordion';
 @import 'bootstrap/scss/breadcrumb';
 @import 'bootstrap/scss/pagination';
 @import 'bootstrap/scss/badge';
-@import 'bootstrap/scss/jumbotron';
 @import 'bootstrap/scss/alert';
 @import 'bootstrap/scss/progress';
-@import 'bootstrap/scss/media';
 @import 'bootstrap/scss/list-group';
 @import 'bootstrap/scss/close';
 @import 'bootstrap/scss/toasts';
@@ -39,4 +39,10 @@
 @import 'bootstrap/scss/popover';
 @import 'bootstrap/scss/carousel';
 @import 'bootstrap/scss/spinners';
-@import 'bootstrap/scss/print';
+@import 'bootstrap/scss/offcanvas';
+
+// Helpers
+@import 'bootstrap/scss/helpers';
+
+// Utilities
+@import 'bootstrap/scss/utilities/api';

.template/addons/bootstrap/stylesheets/vendor/index.scss

@@ -0,0 +1 @@
+@import './bootstrap';