bankai 0.10.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c68c970fcca0732e832adbd4b50572fd41e54efecd0da08e3383fabf15ac59ea
-  data.tar.gz: 38c9dd0a931186e1b85036765deca0278894c8d8663e79f13fc65af8b93bcac2
+  metadata.gz: 1d0da7ded777600e85a5db17f10531070903d05eb40c0e89237886e640f587ed
+  data.tar.gz: d802dc97d4210e38dfcd5bd56968d45883fc8c3df4a54b56d788515581d7329b
 SHA512:
-  metadata.gz: c3924d02fd970cd1475f0db294a84142ca8dbb59be8ec5f923987d430751157b4cef549293fd33c01333b4159de85b6aabfe28725413df3371158cac1086b476
-  data.tar.gz: 77dca64ed181349491fe3e08836481ae7184297f543b8570d8c63befea63445271e53f5d24b2f33658bc30a001fd46f7da802d7dc3169dd46ee6fdb62e4832d3
+  metadata.gz: a16b8787787d64fd10f9724684adb551780f9ed22523dcb567d97cddd28ac5dbb6423307b0a529452c6970213aae025c55181d5d91b57f97c6b72a2a8896afa3
+  data.tar.gz: 80b26408614d15d0c6fff58f591abb5c6506b09c07d34290ad1a15aa1d332d126c5e17bf166e5b4ba82d7d28b8e053ee50f048afb0b6d13c42c0f26619eed74e

data/.gitlab-ci.yml

@@ -1,4 +1,4 @@
-image: ruby:2.6.6
+image: ruby:2.7.4
 
 stages:
   - lint
@@ -10,7 +10,7 @@ cache:
     - vendor/ruby
 
 .install_ruby_gems: &install_ruby_gems
-  - gem install bundler -v 2.1.4
+  - gem install bundler -v 2.2.26
   - bundle install --path vendor
 
 before_script:

data/.ruby-version

@@ -1 +1 @@
-2.6.6
+2.7.4

data/.travis.yml

@@ -3,5 +3,5 @@ sudo: false
 language: ruby
 cache: bundler
 rvm:
-  - 2.6.6
-before_install: gem install bundler -v 2.1.4
+  - 2.7.4
+before_install: gem install bundler -v 2.2.26

data/README.md

@@ -17,6 +17,11 @@ The bootstrap your rails project
 bankai projectname
 ```
 
+## Requirement
+
+* `~> 0.13` required `rails >= 7.0`
+* `<= 0.12` required `rails >= 5.2`
+
 ## Gemfile
 
 * [Oj](http://www.ohler.com/oj/)

data/bankai.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 2.1.4'
+  spec.add_development_dependency 'bundler', '~> 2.2.26'
   spec.add_development_dependency 'bundler-audit'
   spec.add_development_dependency 'overcommit'
   spec.add_development_dependency 'rake', '~> 12.0'

data/lib/bankai/generator.rb

@@ -68,7 +68,7 @@ module Bankai
     def generate_default
       run('spring stop')
       generate('bankai:testing') unless options[:skip_rspec]
-      generate('bankai:ci')
+      generate('bankai:ci', options.api? ? '--api' : '')
       generate('bankai:json')
       generate('bankai:db_optimizations')
       generate('bankai:mailer')

data/lib/bankai/generators/ci_generator.rb

@@ -6,6 +6,8 @@ module Bankai
   module Generators
     # :nodoc:
     class CiGenerator < Base
+      class_option :api, type: :boolean, default: false
+
       def configure_ci
         template 'gitlab-ci.yml.erb', '.gitlab-ci.yml'
       end

data/lib/bankai/generators/db_optimizations_generator.rb

@@ -10,8 +10,7 @@ module Bankai
         inject_into_file(
           'config/environments/development.rb',
           configuration,
-          after: 'config.file_watcher = ' \
-                 "ActiveSupport::EventedFileUpdateChecker\n"
+          after: '# config.action_cable.disable_request_forgery_protection = true'
         )
       end
 

data/lib/bankai/generators/mailer_generator.rb

@@ -10,8 +10,7 @@ module Bankai
         inject_into_file(
           'config/environments/development.rb',
           configuration,
-          after: 'config.file_watcher = ' \
-          "ActiveSupport::EventedFileUpdateChecker\n"
+          after: '# config.action_cable.disable_request_forgery_protection = true'
         )
       end
 

data/lib/bankai/version.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
 module Bankai
-  VERSION = '0.10.0'
+  VERSION = '0.13.0'
   RUBY_VERSION = '2.6.7'
-  RAILS_VERSION = '5.2.0'
-  RUBOCOP_VERSION = '1.8.1'
-  CAPISTRANO_VERSION = '3.14.1'
+  RAILS_VERSION = '7.0.0'
+  RUBOCOP_VERSION = '1.24.1'
+  CAPISTRANO_VERSION = '3.16.0'
 end

data/templates/Gemfile.erb

@@ -2,41 +2,46 @@ source 'https://rubygems.org'
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
 ruby '<%= RUBY_VERSION -%>'
-<% gemfile_entries.each do |gem| -%>
-<% if gem.comment -%>
 
-# <%= gem.comment %>
-<% end -%>
-<%= gem.commented_out ? '# ' : '' %>gem '<%= gem.name %>'<%= %(, '#{gem.version}') if gem.version -%>
-<% if gem.options.any? -%>
-, <%= gem.options.map { |k,v|
-  "#{k}: #{v.inspect}" }.join(', ') %>
-<% end -%>
+<% gemfile_entries.each do |gemfile_entry| %>
+<%= gemfile_entry %>
 <% end -%>
+<% unless options.minimal? -%>
 
-# Use ActiveModel has_secure_password
-# gem 'bcrypt', '~> 3.1.7'
-<% unless skip_active_storage? -%>
+# Use Kredis to get higher-level data types in Redis [https://github.com/rails/kredis]
+# gem "kredis"
 
-# Use ActiveStorage variant
-# gem 'mini_magick', '~> 4.8'
+# Use Active Model has_secure_password [https://guides.rubyonrails.org/active_model_basics.html#securepassword]
+# gem "bcrypt", "~> 3.1.7"
 <% end -%>
 
+# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
+gem "tzinfo-data", platforms: %i[ mingw mswin x64_mingw jruby ]
 <% if depend_on_bootsnap? -%>
+
 # Reduces boot times through caching; required in config/boot.rb
-gem 'bootsnap', '>= 1.1.0', require: false
+gem "bootsnap", require: false
+<% end -%>
+<% unless skip_sprockets? || options.minimal? -%>
 
-<%- end -%>
+# Use Sass to process CSS
+# gem "sassc-rails"
+<% end -%>
+<% unless skip_active_storage? -%>
+
+# Use Active Storage variants [https://guides.rubyonrails.org/active_storage_overview.html#transforming-images]
+# gem "image_processing", "~> 1.2"
+<% end -%>
 <%- if options.api? -%>
-# Use Rack CORS for handling Cross-Origin Resource Sharing (CORS), making cross-origin AJAX possible
-# gem 'rack-cors'
 
+# Use Rack CORS for handling Cross-Origin Resource Sharing (CORS), making cross-origin AJAX possible
+# gem "rack-cors"
 <%- end -%>
-<% if RUBY_ENGINE == 'ruby' -%>
+<% if RUBY_ENGINE == "ruby" -%>
+
 group :development, :test do
-  # Call 'byebug' anywhere in the code to
-  # stop execution and get a debugger console
-  gem 'byebug', platforms: %i[mri mingw x64_mingw]
+  # See https://guides.rubyonrails.org/debugging_rails_applications.html#debugging-with-the-debug-gem
+  gem "debug", platforms: %i[ mri mingw x64_mingw ]
 
   gem 'brakeman', require: false
   gem 'bundler-audit', require: false
@@ -59,28 +64,19 @@ group :development, :test do
 
   gem 'bankai'
 end
+<% end -%>
 
 group :development do
-<% if depend_on_listen? -%>
-  gem 'listen', '>= 3.0.5', '< 3.2'
-<% end -%>
-<%- unless options.api? -%>
-  # Access an interactive console on exception pages or
-  # by calling 'console' anywhere in the code.
-  <%- if options.dev? || options.edge? -%>
-  gem 'web-console', github: 'rails/web-console'
-  <%- else -%>
-  gem 'web-console', '>= 3.3.0'
-  <%- end -%>
+<%- unless options.api? || options.skip_dev_gems? -%>
+  # Use console on exceptions pages [https://github.com/rails/web-console]
+  gem "web-console"
+
+  # Add speed badges [https://github.com/MiniProfiler/rack-mini-profiler]
+  # gem "rack-mini-profiler"
+
 <%- end -%>
-<% if spring_install? -%>
-  # Spring speeds up development by keeping your application running in
-  # the background. Read more: https://github.com/rails/spring
-  gem 'spring'
-<% if depend_on_listen? -%>
-  gem 'spring-watcher-listen', '~> 2.0.0'
-<% end -%>
-<% end -%>
+  # Speed up commands on slow machines / big apps [https://github.com/rails/spring]
+  # gem "spring"
 
 <% if options[:capistrano] -%>
   gem 'capistrano', '<%= Bankai::CAPISTRANO_VERSION %>'
@@ -90,7 +86,7 @@ group :development do
   # gem 'capistrano-passenger'
 <% end -%>
 
-  gem 'annotate', require: false
+  gem 'annotate'
   gem 'bullet'
   gem 'dotenv-rails'
   gem 'letter_opener'
@@ -101,13 +97,9 @@ end
 
 <%- if depends_on_system_test? -%>
 group :test do
-  # Adds support for Capybara system testing and selenium driver
-  gem 'capybara', '>= 2.15'
-  gem 'selenium-webdriver'
-  gem 'webdrivers'
+  # Use system testing [https://guides.rubyonrails.org/testing.html#system-testing]
+  gem "capybara"
+  gem "selenium-webdriver"
+  gem "webdrivers"
 end
 <%- end -%>
-<% end -%>
-
-# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
-gem 'tzinfo-data', platforms: %i[mingw mswin x64_mingw jruby]

data/templates/gitlab-ci.yml.erb

@@ -8,8 +8,10 @@ stages:
 
 variables:
   RAILS_ENV: test
+<%- unless options.api? -%>
   NODE_VERSION: 12.13.1
-  BUNDLER_VERSION: 2.1.4
+<%- end -%>
+  BUNDLER_VERSION: 2.2.26
 <%- if pg? -%>
   POSTGRES_DB: <%= app_name %>
   POSTGRES_PASSWORD: postgres
@@ -26,11 +28,12 @@ variables:
 .install_ruby_gems: &install_ruby_gems
   - gem install bundler -v ${BUNDLER_VERSION}
   - bundle install --path vendor
-
+<% unless options.api? %>
 .install_nodejs: &install_nodejs
   - curl -SLO https://nodejs.org/dist/v$NODE_VERSION/node-v${NODE_VERSION}-linux-x64.tar.xz && tar -xJf node-v${NODE_VERSION}-linux-x64.tar.xz -C /usr/local --strip-components=1;
   - curl -o- -L https://yarnpkg.com/install.sh | bash
   - export PATH=$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$PATH
+<% end -%>
 
 .common:
   before_script:
@@ -41,26 +44,34 @@ variables:
     key:
       files:
         - Gemfile.lock
+<%- unless options.api? -%>
         - yarn.lock
+<%- end -%>
     paths:
       - vendor/ruby
+<% unless options.api? %>
       - node_modules
+<% end -%>
 
 rubocop:
   extends: .common
   stage: lint
   script:
     - bundle exec rubocop
-  except:
-    - schedules
+  rules:
+    - if: $CI_MERGE_REQUEST_ID
 
 brakeman:
-  extends: .common
+  image: registry.gitlab.com/gitlab-org/security-products/analyzers/brakeman:2
   stage: lint
+  allow_failure: true
   script:
-    - bundle exec brakeman
-  except:
-    - schedules
+    - /analyzer run
+  artifacts:
+    reports:
+      sast: gl-sast-report.json
+  rules:
+    - if: $CI_MERGE_REQUEST_ID
 
 bundler-audit:
   extends: .common
@@ -69,10 +80,9 @@ bundler-audit:
     - gem install bundler-audit
     - bundle audit --update
     - bundle audit
-  only:
-    changes:
-      - Gemfile
-      - Gemfile.lock
+  rules:
+    - if: $CI_MERGE_REQUEST_ID
+    - if: $CI_PIPELINE_SOURCE == 'schedule'
   allow_failure: true
 
 bundler-leak:
@@ -82,12 +92,10 @@ bundler-leak:
     - gem install bundler-leak
     - bundle leak check --update
     - bundle leak
-  only:
-    changes:
-      - Gemfile
-      - Gemfile.lock
-  allow_failure: true
-
+  rules:
+    - if: $CI_MERGE_REQUEST_ID
+    - if: $CI_PIPELINE_SOURCE == 'schedule'
+<% unless options.api? %>
 yarn-audit:
   extends: .common
   stage: lint
@@ -95,20 +103,21 @@ yarn-audit:
     - *install_nodejs
   script:
     - yarn audit
-  only:
-    changes:
-      - package.json
-      - package-lock.json
-      - yarn.lock
+  rules:
+    - if: $CI_MERGE_REQUEST_ID
+    - if: $CI_PIPELINE_SOURCE == 'schedule'
   allow_failure: true
+<% end -%>
 
 rspec:
   extends: .common
   stage: test
   before_script:
-    - *install_nodejs
     - *install_ruby_gems
+<%- unless options.api? -%>
+    - *install_nodejs
     - yarn install
+<%- end -%>
   services:
 <%- if pg? -%>
     - postgres:12-alpine
@@ -120,8 +129,9 @@ rspec:
   script:
     - bundle exec rake db:migrate
     - bundle exec rspec
-  except:
-    - schedules
+  rules:
+    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+    - if: $CI_MERGE_REQUEST_ID
   artifacts:
     reports:
       cobertura: coverage/coverage.xml

data/templates/rubocop.yml.erb

@@ -3,34 +3,24 @@ require:
   - rubocop-rails
   - rubocop-rspec
 
+inherit_mode:
+  merge:
+    - Exclude
+
 AllCops:
+  NewCops: enable
   TargetRubyVersion: <%= RUBY_VERSION %>
   DisplayCopNames: true
   SuggestExtensions: false
   Exclude:
-    - bin/*
     - vendor/ruby/**/*
     - node_modules/**/*
-    - db/schema.rb
     - .licenses/**/*
 Rails:
   Enabled: true
-Rails/UnknownEnv:
-  Environments:
-    - production
-    - staging
-    - development
-    - test
-Metrics:
-  Exclude:
-    - db/migrate/*
-    - Rakefile
-    - Gemfile
-    - config/**/*
-    - spec/**/*
-    - lib/tasks/**/*
 Metrics/BlockLength:
   Exclude:
+    - db/migrate/*
     - config/environments/*
     - lib/tasks/**/*
     - spec/**/*

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bankai
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.13.0
 platform: ruby
 authors:
 - 5xRuby
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-04-09 00:00:00.000000000 Z
+date: 2022-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.4
+        version: 2.2.26
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.4
+        version: 2.2.26
 - !ruby/object:Gem::Dependency
   name: bundler-audit
   requirement: !ruby/object:Gem::Requirement
@@ -129,14 +129,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 7.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 7.0.0
 description: The tool to generate Rails template for 5xRuby
 email:
 - hi@5xruby.tw
@@ -208,7 +208,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.26
 signing_key:
 specification_version: 4
 summary: The Rails template for 5xRuby