bankai 0.5.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a11d4b31e4fca6c13fd2b9a25aa0420af4e5a9e2222f078127d89355b9b4df4
-  data.tar.gz: 341d60cf3ae46cb37f55052b6f67f088da465b7008e9cc26281e7e976467f195
+  metadata.gz: aad487d097c2958de9a83c226cff767df8d91c4219bcc64df3dd7a772444296f
+  data.tar.gz: b007e0bb678daa8c633dd79abd8ab0c2bc3dee19639673a5db821019b90fdfd7
 SHA512:
-  metadata.gz: e19b66aa3487fd48fcae6d3f712e912e2d97b49c334a4398f47cb8f1b90966b2f3243d46c56173ee48c8a1c4abe6b74f018c944347045d7f5b965cdcf6d28d3d
-  data.tar.gz: 42f3c897f052aa5a10a9141df6d926db06b5c1e3bb70e72aa6572753b3a94e5982edd1e973895d2eef13267d316be1a92081d591f23e813a55fbf5471d24e42d
+  metadata.gz: e1a9582f2380c707733507c66b67a55d01f1d99b77c30bb6f18ae300a58e1564e4ec3bba0875f1f3cb3886dd9d337805584a460169834bb4870079e8a6435460
+  data.tar.gz: aa645568f5d0993d4f67060147b15965e39d510a4f21a5e002e61abb068608d8d0db22a64ec75e14dd22d46efc0275a988c962eca152ae19d81bccb6e9e07b9c

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/.rubocop.yml

@@ -0,0 +1,2 @@
+AllCops:
+  SuggestExtensions: false

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 'rubocop', '~> 0.81.0'
-  spec.add_development_dependency 'simplecov'
+  spec.add_development_dependency 'rspec_junit_formatter'
+  spec.add_development_dependency 'rubocop', '~> 1.8.1'
+  spec.add_development_dependency 'simplecov', '~> 0.17.1'
 
   # TODO: Allow specify rails version
   spec.add_dependency 'rails', ">= #{Bankai::RAILS_VERSION}"

data/exe/bankai

@@ -3,7 +3,7 @@
 
 require 'pathname'
 
-source_path = (Pathname.new(__FILE__).dirname + '../lib').expand_path
+source_path = File.expand_path("#{Pathname.new(__FILE__).dirname}../lib")
 $LOAD_PATH << source_path
 
 require 'bankai'

data/lib/bankai/builder.rb

@@ -71,7 +71,7 @@ module Bankai
     # rubocop:enable Metrics/MethodLength
 
     def clear_seed_file
-      File.write(destination_root + '/db/seeds.rb', '')
+      File.write("#{destination_root}/db/seeds.rb", '')
     end
 
     def setup_rack_mini_profiler

data/lib/bankai/generators/base.rb

@@ -15,7 +15,11 @@ module Bankai
       private
 
       def app_name
-        Rails.app_class.parent_name.demodulize.underscore.dasherize
+        if Rails::VERSION::MAJOR >= 6
+          Rails.app_class.module_parent_name.demodulize.underscore.dasherize
+        else
+          Rails.app_class.parent_name.demodulize.underscore.dasherize
+        end
       end
     end
   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
-        Bundler.with_clean_env { run 'bundle exec cap install' }
+        in_root { run 'bundle exec cap install' }
       end
 
       def configure_capfile

data/lib/bankai/generators/json_generator.rb

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

data/lib/bankai/generators/lint_generator.rb

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

data/lib/bankai/generators/sitemap_generator.rb

@@ -17,18 +17,18 @@ module Bankai
     class SitemapGenerator < Base
       def add_sitemap_generator
         gem 'sitemap_generator'
-        Bundler.with_clean_env { run 'bundle install' }
+        in_root { run 'bundle install' }
       end
 
       def init_sitemap
-        Bundler.with_clean_env { run 'bundle exec rake sitemap:install' }
+        in_root { run 'bundle exec rake sitemap:install' }
       end
 
       def generate_sitmap_config
         gsub_file 'config/sitemap.rb',
-                  %r{"http:\/\/www.example.com"},
+                  %r{"http://www.example.com"},
                   HOST_TEMPLATE
-        Bundler.with_clean_env do
+        in_root do
           run 'bundle exec rubocop -a config/sitemap.rb'
         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
-        Bundler.with_clean_env { run 'rubocop -a Gemfile' }
-        Bundler.with_clean_env { run 'bundle install' }
+        in_root { run 'rubocop -a Gemfile' }
+        in_root { run 'bundle install' }
       end
 
       def initialize_whenever
-        Bundler.with_clean_env { run "wheneverize #{destination_root}" }
+        in_root { run "wheneverize #{destination_root}" }
       end
 
       def initialize_capistrano

data/lib/bankai/helper.rb

@@ -20,7 +20,7 @@ module Bankai
     private
 
     def gemfile
-      @gemfile ||= File.read(destination_root + '/Gemfile')
+      @gemfile ||= File.read("#{destination_root}/Gemfile")
     end
   end
 end

data/lib/bankai/version.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
 module Bankai
-  VERSION = '0.5.1'
+  VERSION = '0.9.0'
   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.8.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,22 @@ 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:
+    key:
+      files:
+        - Gemfile.lock
+        - yarn.lock
+    paths:
+      - vendor/ruby
+      - node_modules
 
 rubocop:
+  extends: .common
   stage: lint
   script:
     - bundle exec rubocop
@@ -49,6 +55,7 @@ rubocop:
     - schedules
 
 brakeman:
+  extends: .common
   stage: lint
   script:
     - bundle exec brakeman
@@ -56,15 +63,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
+  SuggestExtensions: false
   Exclude:
     - bin/*
     - vendor/ruby/**/*
@@ -31,27 +34,5 @@ Metrics/BlockLength:
     - config/environments/*
     - lib/tasks/**/*
     - spec/**/*
-Lint/RaiseException:
-  Enabled: true
-Lint/StructNewOverride:
-  Enabled: true
-Layout:
-  Exclude:
-    - config/environments/*
-Layout/LineLength:
-  Max: 120
-Style:
-  Exclude:
-    - spec/*_helper.rb
-Style/BlockComments:
-  Exclude:
-    - config/**/*
-    - 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.1
+  version: 0.9.0
 platform: ruby
 authors:
 - 5xRuby
 - 蒼時弦也
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-05-21 00:00:00.000000000 Z
+date: 2021-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -81,48 +81,62 @@ 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
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.81.0
+        version: 1.8.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.81.0
+        version: 1.8.1
 - !ruby/object:Gem::Dependency
   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
@@ -136,6 +150,7 @@ files:
 - ".gitlab-ci.yml"
 - ".overcommit.yml"
 - ".rspec"
+- ".rubocop.yml"
 - ".ruby-version"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
@@ -178,7 +193,7 @@ files:
 homepage: https://github.com/5xRuby/bankai
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -194,7 +209,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: []