bankai 0.6.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76ebef80c3eb8a6faf9d274edcf9f63541809a1e956a84b6b7edb36bb795e965
-  data.tar.gz: 100d72179cd54567ad3cedf5f013607fcd0cadf8e81819c4315ae74eb468a42a
+  metadata.gz: 87925a6dda0432c79ccf3b194df09dca2b10db120c6164461e77b159d454784c
+  data.tar.gz: 77adaf8ff0730f116145570b382a9a79cc4b70e23db2b2964e19b5fd06df5428
 SHA512:
-  metadata.gz: ab0202a6a0e94db7aa81fa6276fbaa1e2df7715b85d9e8d6e363d05dae1170c039d56fe9c540baf160897966ebb161f501a96e50dedcbb54cf2599457b581b5d
-  data.tar.gz: 1dc831b5f8a5ee868debe64a0fb6e8cc9c35f19fb6488de52e64c6aade9dd451b1741adeec4c03fcf28b56169080b2f90ce30e99b59aa32a456c8839a1509ed0
+  metadata.gz: fa0c5b971be83b6b8ba3aa23fbf79b573acdffd62597d228871975515db2e537ce22c858ffa143530e969e767acc978224c9fba3422f49b4ae9e2626b4c5101b
+  data.tar.gz: 7645a98ae959327151ce7f6e3cf68f566da6898a21c07160982b218e5dd0532db4d6530c2442571a1d632a8c812acf3b71b9b8d0e9d9b3c5d4776fac6d0a8055

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/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,12 @@ 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" \
+            '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' }
+        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.6.0'
+  VERSION = '0.9.1'
   RUBY_VERSION = '2.6.6'
-  RAILS_VERSION = '6.0.3'
-  RUBOCOP_VERSION = '0.81.0'
-  CAPISTRANO_VERSION = '3.14.0'
+  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

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

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

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: bankai
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.9.1
 platform: ruby
 authors:
 - 5xRuby
 - 蒼時弦也
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-06-03 00:00:00.000000000 Z
+date: 2021-03-20 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
@@ -192,7 +193,7 @@ files:
 homepage: https://github.com/5xRuby/bankai
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -208,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: []