bankai 0.7.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6ae152202fc1035211da5eeb7e7351799e8d56e8f136f7f09dcc1269a0e647e
-  data.tar.gz: 0b0d39e8b111f7e3e22a60dba1209910b33c73df22dc556d4d44aedcb58d5d6e
+  metadata.gz: c68c970fcca0732e832adbd4b50572fd41e54efecd0da08e3383fabf15ac59ea
+  data.tar.gz: 38c9dd0a931186e1b85036765deca0278894c8d8663e79f13fc65af8b93bcac2
 SHA512:
-  metadata.gz: dadcccf32107bc95e5c0665c5605b10ce117b587e44e8ffb2112825eff2ac4236736786b9c7db49664b8272ab4646af53c853731cea1019a4358972415b7666d
-  data.tar.gz: 6ac4850e192204202e363f59d43b2c3ad4c4be100ea248b6549fdeca8b2c2bae154eb3947debed74f173e768eac35aff02437fe48948d4765c4039f2bc1699b7
+  metadata.gz: c3924d02fd970cd1475f0db294a84142ca8dbb59be8ec5f923987d430751157b4cef549293fd33c01333b4159de85b6aabfe28725413df3371158cac1086b476
+  data.tar.gz: 77dca64ed181349491fe3e08836481ae7184297f543b8570d8c63befea63445271e53f5d24b2f33658bc30a001fd46f7da802d7dc3169dd46ee6fdb62e4832d3

data/.rubocop.yml

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

data/bankai.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |spec|
   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 'rubocop', '~> 1.8.1'
   spec.add_development_dependency 'simplecov', '~> 0.17.1'
 
   # TODO: Allow specify 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/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'
 
@@ -72,7 +72,7 @@ module Bankai
       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/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' }
+        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'
-        Bundler.with_clean_env { 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
-        Bundler.with_clean_env { run 'bundle exec overcommit --install' }
+        execute_command :bundle, 'exec overcommit --install'
       end
 
       def rubocop_autocorrect
-        Bundler.with_clean_env { run 'bundle exec rubocop --auto-correct' }
+        execute_command :bundle, 'exec rubocop --auto-correct-all'
       end
 
       def rubocop_todo
-        Bundler.with_clean_env { run 'bundle exec rubocop --auto-gen-config' }
+        execute_command :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' }
+        execute_command :bundle, 'exec rubocop -a Gemfile'
+        execute_command :bundle, 'install'
       end
 
       def initialize_whenever
-        Bundler.with_clean_env { run "wheneverize #{destination_root}" }
+        execute_command :bundle, "exec 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.7.0'
-  RUBY_VERSION = '2.6.6'
-  RAILS_VERSION = '6.0.3'
-  RUBOCOP_VERSION = '0.81.0'
-  CAPISTRANO_VERSION = '3.14.0'
+  VERSION = '0.10.0'
+  RUBY_VERSION = '2.6.7'
+  RAILS_VERSION = '5.2.0'
+  RUBOCOP_VERSION = '1.8.1'
+  CAPISTRANO_VERSION = '3.14.1'
 end

data/templates/Gemfile.erb

@@ -39,7 +39,7 @@ 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
@@ -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

@@ -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,23 +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
@@ -91,3 +122,6 @@ rspec:
     - bundle exec rspec
   except:
     - schedules
+  artifacts:
+    reports:
+      cobertura: coverage/coverage.xml

data/templates/rubocop.yml.erb

@@ -2,9 +2,11 @@ require:
   - rubocop-performance
   - rubocop-rails
   - rubocop-rspec
+
 AllCops:
   TargetRubyVersion: <%= RUBY_VERSION %>
   DisplayCopNames: true
+  SuggestExtensions: false
   Exclude:
     - bin/*
     - vendor/ruby/**/*
@@ -32,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_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.7.0
+  version: 0.10.0
 platform: ruby
 authors:
 - 5xRuby
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-09-09 00:00:00.000000000 Z
+date: 2021-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -101,14 +101,14 @@ dependencies:
     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
@@ -129,14 +129,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.3
+        version: 5.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.3
+        version: 5.2.0
 description: The tool to generate Rails template for 5xRuby
 email:
 - hi@5xruby.tw
@@ -150,6 +150,7 @@ files:
 - ".gitlab-ci.yml"
 - ".overcommit.yml"
 - ".rspec"
+- ".rubocop.yml"
 - ".ruby-version"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
@@ -200,7 +201,7 @@ 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:
   - - ">="