bankai 0.8.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d98599354503901a56b51a8c54539df4b6796a3a6d5c90076c6fab21ad1081a4
-  data.tar.gz: eaa2045c558c0a4d5eb2906b76581c0ff4cd1349e37865f094bc7ac642c52a95
+  metadata.gz: 670d9606db641d179a5b39a32f1666ab9c6efd9b05bfa2577bc2785055d77f7b
+  data.tar.gz: 5c1cc38b00f7f741dce564a7e92277de544e2eb74442e09346b9b8808a1a399c
 SHA512:
-  metadata.gz: 0cf3a771c075b784e512c985422bbbc91aa3d02c2b0e7de555358e9569a80b91948b5a31604eefc22efca9d179ce4f443cf76cd2831ff05278b265bb136a03e0
-  data.tar.gz: 3979379abd45c68d43c13cd98b99215271566b735b4984964800c72ed2bd1c90eebe567c533b05d43384d8207b13ec603afe85930482927ba5c8a50ecb72b2d1
+  metadata.gz: efd3192adbc75c8e228bd5e33187e77a7aab915d7bec210fe7698210c3929393b3cf8dc3128724095b4a6545905847c0e25a5365c99a39cb38051110734285d1
+  data.tar.gz: 9207ebce21584d07e8905f52e4cfad84ecbe1415a90d52e08b8d64ce620c8c73eb72a60e41bc20aee9467b6a17c20c26154caedf166c6a9b59bf7fd217ff9d11

data/.gitlab-ci.yml

@@ -1,4 +1,4 @@
-image: ruby:2.6.6
+image: ruby:2.6.7
 
 stages:
   - lint

data/.rubocop.yml

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

data/.ruby-version

@@ -1 +1 @@
-2.6.6
+2.6.7

data/.travis.yml

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

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.8.0'
-  RUBY_VERSION = '2.6.6'
-  RAILS_VERSION = '6.0.3'
-  RUBOCOP_VERSION = '1.5.1'
+  VERSION = '0.11.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

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

@@ -38,6 +38,10 @@ variables:
     - export LC_ALL=C.UTF-8
     - *install_ruby_gems
   cache:
+    key:
+      files:
+        - Gemfile.lock
+        - yarn.lock
     paths:
       - vendor/ruby
       - node_modules
@@ -51,10 +55,14 @@ rubocop:
     - schedules
 
 brakeman:
-  extends: .common
+  image: registry.gitlab.com/gitlab-org/security-products/analyzers/brakeman:2
   stage: lint
+  allow_failure: true
   script:
-    - bundle exec brakeman
+    - /analyzer run
+  artifacts:
+    reports:
+      sast: gl-sast-report.json
   except:
     - schedules
 
@@ -118,3 +126,6 @@ rspec:
     - bundle exec rspec
   except:
     - schedules
+  artifacts:
+    reports:
+      cobertura: coverage/coverage.xml

data/templates/rubocop.yml.erb

@@ -6,7 +6,7 @@ require:
 AllCops:
   TargetRubyVersion: <%= RUBY_VERSION %>
   DisplayCopNames: true
-  NewCops: enable
+  SuggestExtensions: false
   Exclude:
     - bin/*
     - vendor/ruby/**/*
@@ -34,14 +34,5 @@ Metrics/BlockLength:
     - config/environments/*
     - lib/tasks/**/*
     - spec/**/*
-Layout/LineLength:
-  Max: 120
-Style:
-  Exclude:
-    - spec/*_helper.rb
-Style/BlockComments:
-  Exclude:
-    - config/**/*
-    - spec/**/*
 Style/Documentation:
   Enabled: false

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.8.0
+  version: 0.11.0
 platform: ruby
 authors:
 - 5xRuby
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-12-03 00:00:00.000000000 Z
+date: 2021-05-13 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,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.0.3.1
 signing_key:
 specification_version: 4
 summary: The Rails template for 5xRuby