bankai 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2921c916a852ee9c6003f7d38879e8319ce1a6e931fc1b024dcea1dc8d524292
-  data.tar.gz: 43770cae83f6bc2ac2a9b1e46d75f4484f155d3a3d72c5dcf5ba927cd77b3593
+  metadata.gz: bd1b206e5efc0376acd011667d50e997ccd8ed81d18673056f95007166b198ea
+  data.tar.gz: c04e04dfca974e26fd015494e238910d93a03cabbd974db01479fd6c58d63b47
 SHA512:
-  metadata.gz: eec44c1174a94a5c0d8c340239deb91720430711cdd5209742817d73631a31eaf41faf05d8faba6ff547eba82bf19b42f1778d78a2bf5da091436b69dc7b3659
-  data.tar.gz: 46ed335a7fdc20574ac4701fa6fd400cb5cabee308989881deef1d7c505434b3508105aacd088a4aa1c80c52c1772c88cbc2b73b3c050dc3e63a49385adaeb8d
+  metadata.gz: d7bd93f6e4816f93fb97b3be8890b8bd9a514ba1a447d25dcf1343d9401b6a546cc41469ce3c5eeebca28d0bd9ec3b002eeee9b1e12af518fe9e08d27304ac9f
+  data.tar.gz: 964c0e46b4333ce589b18fac16d175da7ac7720083cdcf419461d3c956d80ca4a2dc6f2c4d94aa2eb5ecd97920759dc514a3327a50a3a12b49265bcc0611c2c0

data/.gitlab-ci.yml

@@ -1,4 +1,4 @@
-image: ruby:2.6.0
+image: ruby:2.6.6
 
 stages:
   - lint
@@ -9,20 +9,24 @@ cache:
   paths:
     - vendor/ruby
 
+.install_ruby_gems: &install_ruby_gems
+  - gem install bundler -v 2.1.4
+  - bundle install --path vendor
+
+before_script:
+  - *install_ruby_gems
+
 rubocop:
   stage: lint
-  before_script:
-    - gem install rubocop -v 0.71.0
   script:
-    - rubocop
+    - bundle exec rubocop
   except:
     - schedules
 
 bundler-audit:
   stage: lint
   before_script:
-    - gem install bundler -v 1.17.3
-    - bundle install --path vendor
+    - *install_ruby_gems
     - gem install bundler-audit
     - bundle audit --update
   script:
@@ -31,9 +35,6 @@ bundler-audit:
 
 rspec:
   stage: test
-  before_script:
-    - gem install bundler -v 1.17.3
-    - bundle install --path vendor
   script:
     - bundle exec rspec
   except:
@@ -42,6 +43,7 @@ rspec:
 sonarqube:
   stage: analysis
   image: registry.5xruby.tw/docker/sonar-scanner:4.0.0
+  before_script: []
   script:
     - sonar-scanner
       -D"sonar.projectKey=5xruby-bankai"

data/.ruby-version

@@ -1 +1 @@
-2.6.0
+2.6.6

data/.travis.yml

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

data/bankai.gemspec

@@ -27,12 +27,12 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 1.17.3'
+  spec.add_development_dependency 'bundler', '~> 2.1.4'
   spec.add_development_dependency 'bundler-audit'
   spec.add_development_dependency 'overcommit'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rake', '~> 12.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'rubocop', '~> 0.71.0'
+  spec.add_development_dependency 'rubocop', '~> 0.81.0'
   spec.add_development_dependency 'simplecov'
 
   # TODO: Allow specify rails version

data/lib/bankai/builder.rb

@@ -26,6 +26,8 @@ module Bankai
     end
 
     def configure_quiet_assets
+      return if options[:api]
+
       config = <<-RUBY
     config.assets.quiet = true
       RUBY

data/lib/bankai/generators/deploy_generator.rb

@@ -6,6 +6,8 @@ module Bankai
   module Generators
     # :nodoc:
     class DeployGenerator < Base
+      DEFAULT_REPO = 'git@example.com:me/my_repo.git'
+
       def install_capistrano
         Bundler.with_clean_env { run 'bundle exec cap install' }
       end
@@ -25,8 +27,10 @@ module Bankai
       protected
 
       def repo_url
+        return DEFAULT_REPO unless Dir.exist?('.git')
+
         res = `git remote get-url origin`
-        return 'git@example.com:me/my_repo.git' if res.blank?
+        return DEFAULT_REPO if res.blank?
 
         res
       end
@@ -34,11 +38,11 @@ module Bankai
       private
 
       def capistrano_plugins
-        <<-RUBY
-  require "capistrano/bundler"
-  require "capistrano/rails/assets"
-  require "capistrano/rails/migrations"
-        RUBY
+        plugins = []
+        plugins << 'require "capistrano/bundler"'
+        plugins << 'require "capistrano/rails/assets"' unless options[:api]
+        plugins << 'require "capistrano/rails/migrations"'
+        plugins.join("\n")
       end
     end
   end

data/lib/bankai/version.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
 module Bankai
-  VERSION = '0.3.1'
-  RUBY_VERSION = '2.6.0'
-  RAILS_VERSION = '5.2.4'
-  RUBOCOP_VERSION = '0.71.0'
-  CAPISTRANO_VERSION = '3.11.0'
+  VERSION = '0.4.0'
+  RUBY_VERSION = '2.6.6'
+  RAILS_VERSION = '6.0.2'
+  RUBOCOP_VERSION = '0.81.0'
+  CAPISTRANO_VERSION = '3.13.0'
 end

data/templates/deploy.rb.erb

@@ -27,8 +27,8 @@ set :deploy_to, '/src/app'
 append :linked_files, 'config/database.yml', 'config/master.key'
 
 # Default value for linked_dirs is []
-append :linked_dirs, 'log', 'tmp/pids', 'tmp/cache', 'tmp/sockets', 'public/system', '.bundle',
-                     'public/uploads', 'node_modules'
+append :linked_dirs, 'log', 'tmp/pids', 'tmp/cache', 'tmp/sockets', 'public/system',
+       '.bundle', 'public/uploads', 'node_modules'
 
 # Default value for default_env is {}
 set :default_env, { path: '/usr/local/ruby-<%= RUBY_VERSION %>/bin:$PATH' }

data/templates/gitlab-ci.yml.erb

@@ -1,11 +1,8 @@
 image: ruby:<%= RUBY_VERSION %>
 
-include:
-  template: Verify/Browser-Performance.gitlab-ci.yml
-
 variables:
   RAILS_ENV: test
-  NODE_VERSION: 11.0.0
+  NODE_VERSION: 12.13.1
 <%- if pg? -%>
   POSTGRES_DB: <%= app_name %>
   DATABASE_URL: "postgresql://postgres:postgres@postgres:5432/$POSTGRES_DB"
@@ -18,36 +15,40 @@ variables:
   DATABASE_URL: "mysql2://$MYSQL_USER:$MYSQL_PASSWORD@mysql:3306/$MYSQL_DATABASE"
 <%- end -%>
 
+.install_ruby_gems: &install_ruby_gems
+  - bundle install --path vendor
+
+.install_nodejs: &install_nodejs
+  - curl -SLO https://nodejs.org/dist/v$NODE_VERSION/node-v${NODE_VERSION}-linux-x64.tar.xz && tar -xJf node-v${NODE_VERSION}-linux-x64.tar.xz -C /usr/local --strip-components=1;
+  - 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
-  - measure
 
 cache:
   paths:
     - vendor/ruby
     - node_modules
 
+before_script:
+  - export LANG=C.UTF-8
+  - export LC_ALL=C.UTF-8
+  - *install_ruby_gems
+
 rubocop:
   stage: lint
-  before_script:
-    - gem install rubocop -v <%= Bankai::RUBOCOP_VERSION %>
-    - gem install rubocop-performance
-    - gem install rubocop-rails
   script:
-    - rubocop
+    - bundle exec rubocop
   except:
     - schedules
 
 brakeman:
   stage: lint
-  before_script:
-    - export LANG=C.UTF-8
-    - export LC_ALL=C.UTF-8
-    - gem install brakeman
   script:
-    - brakeman
+    - bundle exec brakeman
   except:
     - schedules
 
@@ -63,14 +64,12 @@ bundler-audit:
 rspec:
   stage: test
   before_script:
-    - curl -SLO https://nodejs.org/dist/v$NODE_VERSION/node-v${NODE_VERSION}-linux-x64.tar.xz && tar -xJf node-v${NODE_VERSION}-linux-x64.tar.xz -C /usr/local --strip-components=1;
-    - curl -o- -L https://yarnpkg.com/install.sh | bash
-    - export PATH=$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$PATH
-    - bundle install --without development --path vendor
+    - *install_nodejs
+    - *install_ruby_gems
     - yarn install
   services:
 <%- if pg? -%>
-    - postgres:9.6
+    - postgres:12-alpine
 <%- end -%>
 <%- if mysql? -%>
     - name: mysql:5.7
@@ -81,25 +80,3 @@ rspec:
     - bundle exec rspec
   except:
     - schedules
-
-# staging:deploy:
-#   stage: deploy
-#   before_script:
-#     - which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )
-#     - eval $(ssh-agent -s)
-#     - ssh-add <(echo -e "$SSH_PRIVATE_KEY")
-#     - bundle install --path vendor
-#   script:
-#     - bundle exec cap staging deploy
-#   only:
-#     - master
-#   except:
-#     - schedules
-
-# NOTE: Ensure GitLab version > 12.0
-# performance:
-#   stage: measure
-#   variables:
-#     URL: STAGING_SITE_URL
-#     SITESPEED_VERSION: 10.3.2-plus1
-#     SITESPEED_OPTIONS: '--plugins.add /lighthouse'

data/templates/rails_helper.rb

@@ -12,7 +12,7 @@ require 'shoulda/matchers'
 require 'faker'
 require 'factory_bot'
 
-Dir[Rails.root.join('spec', 'support', '**', '*.rb')].each { |f| require f }
+Dir[Rails.root.join('spec/support/**/*.rb')].sort.each { |f| require f }
 
 begin
   ActiveRecord::Migration.maintain_test_schema!

data/templates/rubocop.yml.erb

@@ -30,6 +30,10 @@ Metrics/BlockLength:
   Exclude:
     - config/environments/*
     - lib/tasks/**/*
+Lint/RaiseException:
+  Enabled: true
+Lint/StructNewOverride:
+  Enabled: true
 Layout:
   Exclude:
     - config/environments/*
@@ -42,3 +46,9 @@ Style/BlockComments:
     - spec/**/*
 Style/Documentation:
   Enabled: false
+Style/HashEachMethods:
+  Enabled: true
+Style/HashTransformKeys:
+  Enabled: true
+Style/HashTransformValues:
+  Enabled: true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bankai
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - 5xRuby
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-30 00:00:00.000000000 Z
+date: 2020-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.17.3
+        version: 2.1.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.17.3
+        version: 2.1.4
 - !ruby/object:Gem::Dependency
   name: bundler-audit
   requirement: !ruby/object:Gem::Requirement
@@ -59,14 +59,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -87,14 +87,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.71.0
+        version: 0.81.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.71.0
+        version: 0.81.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -115,14 +115,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.4
+        version: 6.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.4
+        version: 6.0.2
 description: The tool to generate Rails template for 5xRuby
 email:
 - hi@5xruby.tw
@@ -186,14 +186,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 2.6.6
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: The Rails template for 5xRuby