bankai 0.5.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de1f5e79e40cef44fee0a0a76dffa9c27f1d9750f6bd018f042d5bf524ede1b8
-  data.tar.gz: 0e1f10d7ea7ed90c65206a359108c8eeb55581986b54c2d1327c975e0fe66061
+  metadata.gz: 8c6fb2e4f3d38c9bd01954b6fb9d959734eb7625312645010bc4b9c448d386c6
+  data.tar.gz: 8869b5224386a33c5d6291df2bb12c9a697bbdd8c453206ec5f6bd88a277c0c0
 SHA512:
-  metadata.gz: a1e14a00e301ee4d23d5a6ce60092e60da92237026db13796c0e8d936807094d24391e3d73e754c48b9bb9eafcefe24f37a7ebc96e7dc9da6934c2dbd9036e49
-  data.tar.gz: f04f920bf53782353d9ca3c238c022bb7544b05854db2663f243b628e263f3d05b6e6b9bc164ae783781e53d0eaf869ad17f82d4be84050e1908986cc5840990
+  metadata.gz: d2cb8924707b8ee99b8646fd87aafe2f4ff7071008a4674d9aba8dfaf289004b983825cfc23f7d78d10fb0cb77db8caad0faa93c7fcce93616f1d3e831db69b1
+  data.tar.gz: '0680b97dad35acecf32f129e064fab0c43872355ba9b07c4d63719b4e7f8c3b2c5163ebdb4c93c09728768ba6c91fc92be3e8012c3c3e8ceb487a355eba7f7fa'

data/.gitlab-ci.yml

@@ -19,7 +19,10 @@ before_script:
 rubocop:
   stage: lint
   script:
-    - bundle exec rubocop
+    - bundle exec rubocop --format progress --format json --out rubocop.json
+  artifacts:
+    paths:
+      - rubocop.json
   except:
     - schedules
 
@@ -36,18 +39,35 @@ bundler-audit:
 rspec:
   stage: test
   script:
-    - bundle exec rspec
+    - bundle exec rspec --format progress --format RspecJunitFormatter --out rspec.xml
+  artifacts:
+    paths:
+      - rspec.xml
+      - coverage
+    reports:
+      junit: rspec.xml
   except:
     - schedules
 
 sonarqube:
   stage: analysis
-  image: registry.5xruby.tw/docker/sonar-scanner:4.0.0
+  image:
+    name: sonarsource/sonar-scanner-cli
+    entrypoint: [""]
+  variables:
+    GIT_DEPTH: 0
   before_script: []
   script:
     - sonar-scanner
-      -D"sonar.projectKey=5xruby-bankai"
-      -D"sonar.projectBaseDir=${CI_PROJECT_DIR}"
-      -D"sonar.host.url=https://sonar.5xruby.tw"
-      -D"sonar.login=${SONARQUBE_TOKEN}"
-      -D"sonar.projectVersion=${CI_COMMIT_SHORT_SHA}"
+      -Dsonar.projectKey=Bankai
+      -Dsonar.sourceEncoding=UTF-8
+      -Dsonar.qualitygate.wait=true
+      -Dsonar.ruby.rubocop.reportPaths=rubocop.json
+      -Dsonar.ruby.coverage.reportPaths=coverage/.resultset.json
+      -Dsonar.exclusions=vendor/ruby/**/*
+      -Dsonar.coverage.exclusions=spec/**/*
+      -Dsonar.projectVersion=$CI_COMMIT_SHORT_SHA
+      -Dsonar.sources=.
+  allow_failure: true
+  only:
+    - master

data/bankai.gemspec

@@ -32,8 +32,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'overcommit'
   spec.add_development_dependency 'rake', '~> 12.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'rspec_junit_formatter'
   spec.add_development_dependency 'rubocop', '~> 0.81.0'
-  spec.add_development_dependency 'simplecov'
+  spec.add_development_dependency 'simplecov', '~> 0.17.1'
 
   # TODO: Allow specify rails version
   spec.add_dependency 'rails', ">= #{Bankai::RAILS_VERSION}"

data/lib/bankai/generators/json_generator.rb

@@ -9,6 +9,11 @@ module Bankai
       def add_oj
         gem 'oj'
         Bundler.with_clean_env { run 'bundle install' }
+
+        initializer 'oj.rb' do
+          "# frozen_string_literal: true\n\n" \
+            'Oj.optimize_rails'
+        end
       end
     end
   end

data/lib/bankai/version.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
 module Bankai
-  VERSION = '0.5.0'
+  VERSION = '0.8.1'
   RUBY_VERSION = '2.6.6'
-  RAILS_VERSION = '6.0.2'
-  RUBOCOP_VERSION = '0.81.0'
-  CAPISTRANO_VERSION = '3.13.0'
+  RAILS_VERSION = '5.2.0'
+  RUBOCOP_VERSION = '1.5.1'
+  CAPISTRANO_VERSION = '3.14.1'
 end

data/templates/Gemfile.erb

@@ -39,10 +39,11 @@ group :development, :test do
   gem 'byebug', platforms: %i[mri mingw x64_mingw]
 
   gem 'brakeman', require: false
-  gem 'bundler-audit', '~> 0.6.0', require: false
+  gem 'bundler-audit', require: false
   gem 'rubocop', '~> <%= Bankai::RUBOCOP_VERSION %>', require: false
   gem 'rubocop-performance', require: false
   gem 'rubocop-rails', require: false
+  gem 'rubocop-rspec', require: false
 
 <%- unless options[:skip_rspec] -%>
   gem 'database_rewinder'

data/templates/deploy.rb.erb

@@ -11,7 +11,7 @@ set :repo_url, '<%= repo_url || 'git@example.com:me/my_repo.git' %>'
 ask :branch, :master
 
 # Default deploy_to directory is /var/www/my_app_name
-set :deploy_to, '/src/app'
+set :deploy_to, '/srv/app'
 
 # Default value for :format is :airbrussh.
 # set :format, :airbrussh

data/templates/gitlab-ci.yml.erb

@@ -1,4 +1,10 @@
-image: ruby:<%= RUBY_VERSION %>
+default:
+  image: ruby:<%= RUBY_VERSION %>
+
+stages:
+  - lint
+  - test
+  - deploy
 
 variables:
   RAILS_ENV: test
@@ -26,22 +32,18 @@ variables:
   - curl -o- -L https://yarnpkg.com/install.sh | bash
   - export PATH=$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$PATH
 
-stages:
-  - lint
-  - test
-  - deploy
-
-cache:
-  paths:
-    - vendor/ruby
-    - node_modules
-
-before_script:
-  - export LANG=C.UTF-8
-  - export LC_ALL=C.UTF-8
-  - *install_ruby_gems
+.common:
+  before_script:
+    - export LANG=C.UTF-8
+    - export LC_ALL=C.UTF-8
+    - *install_ruby_gems
+  cache:
+    paths:
+      - vendor/ruby
+      - node_modules
 
 rubocop:
+  extends: .common
   stage: lint
   script:
     - bundle exec rubocop
@@ -49,6 +51,7 @@ rubocop:
     - schedules
 
 brakeman:
+  extends: .common
   stage: lint
   script:
     - bundle exec brakeman
@@ -56,15 +59,47 @@ brakeman:
     - schedules
 
 bundler-audit:
+  extends: .common
   stage: lint
-  before_script:
+  script:
     - gem install bundler-audit
     - bundle audit --update
-  script:
     - bundle audit
+  only:
+    changes:
+      - Gemfile
+      - Gemfile.lock
+  allow_failure: true
+
+bundler-leak:
+  extends: .common
+  stage: lint
+  script:
+    - gem install bundler-leak
+    - bundle leak check --update
+    - bundle leak
+  only:
+    changes:
+      - Gemfile
+      - Gemfile.lock
+  allow_failure: true
+
+yarn-audit:
+  extends: .common
+  stage: lint
+  before_script:
+    - *install_nodejs
+  script:
+    - yarn audit
+  only:
+    changes:
+      - package.json
+      - package-lock.json
+      - yarn.lock
   allow_failure: true
 
 rspec:
+  extends: .common
   stage: test
   before_script:
     - *install_nodejs

data/templates/rubocop.yml.erb

@@ -1,9 +1,12 @@
 require:
   - rubocop-performance
   - rubocop-rails
+  - rubocop-rspec
+
 AllCops:
   TargetRubyVersion: <%= RUBY_VERSION %>
   DisplayCopNames: true
+  NewCops: enable
   Exclude:
     - bin/*
     - vendor/ruby/**/*
@@ -30,13 +33,9 @@ Metrics/BlockLength:
   Exclude:
     - config/environments/*
     - lib/tasks/**/*
-Lint/RaiseException:
-  Enabled: true
-Lint/StructNewOverride:
-  Enabled: true
-Layout:
-  Exclude:
-    - config/environments/*
+    - spec/**/*
+Layout/LineLength:
+  Max: 120
 Style:
   Exclude:
     - spec/*_helper.rb
@@ -46,9 +45,3 @@ Style/BlockComments:
     - spec/**/*
 Style/Documentation:
   Enabled: false
-Style/HashEachMethods:
-  Enabled: true
-Style/HashTransformKeys:
-  Enabled: true
-Style/HashTransformValues:
-  Enabled: true

data/templates/spec/database_rewinder.rb

@@ -5,7 +5,7 @@ RSpec.configure do |config|
     DatabaseRewinder.clean_all
   end
 
-  config.after(:each) do
+  config.after do
     DatabaseRewinder.clean
   end
 end

data/templates/spec_helper.rb

@@ -17,4 +17,8 @@ RSpec.configure do |config|
   end
 
   config.shared_context_metadata_behavior = :apply_to_host_groups
+
+  config.expect_with :rspec do |c|
+    c.syntax = :expect
+  end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: bankai
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.8.1
 platform: ruby
 authors:
 - 5xRuby
 - 蒼時弦也
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-05-13 00:00:00.000000000 Z
+date: 2020-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -81,6 +81,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rspec_junit_formatter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -99,30 +113,30 @@ dependencies:
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.17.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.17.1
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.2
+        version: 5.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.2
+        version: 5.2.0
 description: The tool to generate Rails template for 5xRuby
 email:
 - hi@5xruby.tw
@@ -178,7 +192,7 @@ files:
 homepage: https://github.com/5xRuby/bankai
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -194,7 +208,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: The Rails template for 5xRuby
 test_files: []