bankai 0.9.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aad487d097c2958de9a83c226cff767df8d91c4219bcc64df3dd7a772444296f
-  data.tar.gz: b007e0bb678daa8c633dd79abd8ab0c2bc3dee19639673a5db821019b90fdfd7
+  metadata.gz: 0b6fed9ca466f370a660ab68887fd86ed521deee23993b3bf16034216bf0a963
+  data.tar.gz: 6a386b4f1147032589f722aa02abf440d6e8c586eef47a055172ba750fe306e2
 SHA512:
-  metadata.gz: e1a9582f2380c707733507c66b67a55d01f1d99b77c30bb6f18ae300a58e1564e4ec3bba0875f1f3cb3886dd9d337805584a460169834bb4870079e8a6435460
-  data.tar.gz: aa645568f5d0993d4f67060147b15965e39d510a4f21a5e002e61abb068608d8d0db22a64ec75e14dd22d46efc0275a988c962eca152ae19d81bccb6e9e07b9c
+  metadata.gz: f4da905cbcbc1ee8d8b88515aa02070f10b5868fade35639644110cb7d7571922ce8b3d5bf089f1d4f6fc218e0f0af3c7d307d5b284f480e4a7d90b448cd79dd
+  data.tar.gz: 2884f5f5b6da3057e4e28df69db47a5e346d0f2bf7b83ded9a611b4fc7a248ee1a271b8736057678eeb80c4c670edc7d5cf8f07cff430b387f5689dd3107b4b8

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/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

@@ -12,15 +12,15 @@ module Bankai
                             desc: 'Configure for selected database ' \
                                   "(options: #{DATABASES.join('/')})"
 
+    class_option :capistrano, type: :boolean, default: false,
+                              desc: 'Use Capistrano'
+
     class_option :skip_test, type: :boolean, default: true,
                              desc: 'Skip test files'
 
     class_option :skip_coffee, type: :boolean, default: true,
                                desc: "Don't use CoffeeScript"
 
-    class_option :skip_capistrano, type: :boolean, default: false,
-                                   desc: "Don't use Capistrano"
-
     class_option :skip_rspec, type: :boolean, default: false,
                               desc: 'Skip rspec files'
 
@@ -68,11 +68,11 @@ 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')
-      generate('bankai:deploy') unless options[:skip_capistrano]
+      generate('bankai:deploy') if options[:capistrano]
       generate('annotate:install')
       generate('bankai:lint')
     end

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/deploy_generator.rb

@@ -9,7 +9,7 @@ module Bankai
       DEFAULT_REPO = 'git@example.com:me/my_repo.git'
 
       def install_capistrano
-        in_root { run 'bundle exec cap install' }
+        execute_command :bundle, 'exec cap install'
       end
 
       def configure_capfile

data/lib/bankai/generators/json_generator.rb

@@ -8,7 +8,7 @@ module Bankai
     class JsonGenerator < Base
       def add_oj
         gem 'oj'
-        in_root { run 'bundle install' }
+        execute_command :bundle, 'install'
 
         initializer 'oj.rb' do
           "# frozen_string_literal: true\n\n" \

data/lib/bankai/generators/lint_generator.rb

@@ -15,15 +15,15 @@ module Bankai
       end
 
       def install_overcommit
-        in_root { run 'bundle exec overcommit --install' }
+        execute_command :bundle, 'exec overcommit --install'
       end
 
       def rubocop_autocorrect
-        in_root { run 'bundle exec rubocop --auto-correct-all' }
+        execute_command :bundle, 'exec rubocop --auto-correct-all'
       end
 
       def rubocop_todo
-        in_root { run 'bundle exec rubocop --auto-gen-config' }
+        execute_command :bundle, 'exec rubocop --auto-gen-config'
       end
     end
   end

data/lib/bankai/generators/whenever_generator.rb

@@ -8,12 +8,12 @@ module Bankai
     class WheneverGenerator < Base
       def add_whenever
         gem 'whenever', require: false
-        in_root { run 'rubocop -a Gemfile' }
-        in_root { run 'bundle install' }
+        execute_command :bundle, 'exec rubocop -a Gemfile'
+        execute_command :bundle, 'install'
       end
 
       def initialize_whenever
-        in_root { run "wheneverize #{destination_root}" }
+        execute_command :bundle, "exec wheneverize #{destination_root}"
       end
 
       def initialize_capistrano

data/lib/bankai/version.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
 module Bankai
-  VERSION = '0.9.0'
-  RUBY_VERSION = '2.6.6'
+  VERSION = '0.12.0'
+  RUBY_VERSION = '2.6.7'
   RAILS_VERSION = '5.2.0'
-  RUBOCOP_VERSION = '1.8.1'
-  CAPISTRANO_VERSION = '3.14.1'
+  RUBOCOP_VERSION = '1.9.1'
+  CAPISTRANO_VERSION = '3.16.0'
 end

data/templates/Gemfile.erb

@@ -54,6 +54,7 @@ group :development, :test do
   gem 'shoulda', require: false
   gem 'shoulda-matchers', require: false
   gem 'simplecov', require: false
+  gem 'simplecov-cobertura', require: false
 <%- end -%>
 
   gem 'bankai'
@@ -81,7 +82,7 @@ group :development do
 <% end -%>
 <% end -%>
 
-<% unless options[:skip_capistrano] -%>
+<% if options[:capistrano] -%>
   gem 'capistrano', '<%= Bankai::CAPISTRANO_VERSION %>'
   gem 'capistrano-bundler'
   gem 'capistrano-rails'

data/templates/README.md.erb

@@ -206,7 +206,7 @@ bundle exec brakeman
 cp .env.example .env
 ```
 
-<%- unless options[:skip_capistrano] -%>
+<%- if options[:capistrano] -%>
 ## 部署
 
 這個專案使用 Capistrano 進行部署，請先確定有權限透過 `deployer` 帳號 SSH 到伺服器上。

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,5 +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/**/*

data/templates/spec_helper.rb

@@ -2,6 +2,10 @@
 
 if ENV.fetch('COVERAGE', false) || ENV.fetch('CI', false)
   require 'simplecov'
+  require 'simplecov-cobertura'
+
+  SimpleCov.formatter = SimpleCov::Formatter::CoberturaFormatter if ENV.fetch('GITLAB_CI', false)
+
   SimpleCov.start 'rails' do
     add_filter 'vendor'
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bankai
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.12.0
 platform: ruby
 authors:
 - 5xRuby
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-02-09 00:00:00.000000000 Z
+date: 2021-08-30 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
@@ -201,14 +201,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.6
+      version: 2.6.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !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