bankai 0.3.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2921c916a852ee9c6003f7d38879e8319ce1a6e931fc1b024dcea1dc8d524292
-  data.tar.gz: 43770cae83f6bc2ac2a9b1e46d75f4484f155d3a3d72c5dcf5ba927cd77b3593
+  metadata.gz: 76ebef80c3eb8a6faf9d274edcf9f63541809a1e956a84b6b7edb36bb795e965
+  data.tar.gz: 100d72179cd54567ad3cedf5f013607fcd0cadf8e81819c4315ae74eb468a42a
 SHA512:
-  metadata.gz: eec44c1174a94a5c0d8c340239deb91720430711cdd5209742817d73631a31eaf41faf05d8faba6ff547eba82bf19b42f1778d78a2bf5da091436b69dc7b3659
-  data.tar.gz: 46ed335a7fdc20574ac4701fa6fd400cb5cabee308989881deef1d7c505434b3508105aacd088a4aa1c80c52c1772c88cbc2b73b3c050dc3e63a49385adaeb8d
+  metadata.gz: ab0202a6a0e94db7aa81fa6276fbaa1e2df7715b85d9e8d6e363d05dae1170c039d56fe9c540baf160897966ebb161f501a96e50dedcbb54cf2599457b581b5d
+  data.tar.gz: 1dc831b5f8a5ee868debe64a0fb6e8cc9c35f19fb6488de52e64c6aade9dd451b1741adeec4c03fcf28b56169080b2f90ce30e99b59aa32a456c8839a1509ed0

data/.gitlab-ci.yml

@@ -1,4 +1,4 @@
-image: ruby:2.6.0
+image: ruby:2.6.6
 
 stages:
   - lint
@@ -9,20 +9,27 @@ 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 --format progress --format json --out rubocop.json
+  artifacts:
+    paths:
+      - rubocop.json
   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,21 +38,36 @@ bundler-audit:
 
 rspec:
   stage: test
-  before_script:
-    - gem install bundler -v 1.17.3
-    - bundle install --path vendor
   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/.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,13 +27,14 @@ 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 'simplecov'
+  spec.add_development_dependency 'rspec_junit_formatter'
+  spec.add_development_dependency 'rubocop', '~> 0.81.0'
+  spec.add_development_dependency 'simplecov', '~> 0.17.1'
 
   # TODO: Allow specify rails version
   spec.add_dependency 'rails', ">= #{Bankai::RAILS_VERSION}"

data/lib/bankai/builder.rb

@@ -25,17 +25,24 @@ module Bankai
       end
     end
 
+    def configure_puma_dev
+      application(nil, env: 'development') do
+        "config.hosts << '.test'"
+      end
+    end
+
     def configure_quiet_assets
-      config = <<-RUBY
-    config.assets.quiet = true
-      RUBY
+      return if options[:api]
 
-      inject_into_class 'config/application.rb', 'Application', config
+      application do
+        'config.assets.quiet = true'
+      end
     end
 
     # rubocop:disable Metrics/MethodLength
     def configure_generators
-      config = <<-RUBY
+      application do
+        <<-RUBY
     config.generators do |generate|
       generate.helper false
       generate.javascripts false
@@ -45,9 +52,8 @@ module Bankai
       generate.test_framework :rspec
       generate.view_specs false
     end
-      RUBY
-
-      inject_into_class 'config/application.rb', 'Application', config
+        RUBY
+      end
     end
 
     def setup_default_directories

data/lib/bankai/generator.rb

@@ -49,6 +49,7 @@ module Bankai
     def setup_development_environment
       say 'Setting up the development environment'
       build :configure_quiet_assets
+      build :configure_puma_dev
       build :configure_generators
       build :clear_seed_file
       # TODO: Add setup script

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/generators/lint_generator.rb

@@ -21,6 +21,10 @@ module Bankai
       def rubocop_autocorrect
         Bundler.with_clean_env { run 'bundle exec rubocop --auto-correct' }
       end
+
+      def rubocop_todo
+        Bundler.with_clean_env { run 'bundle exec rubocop --auto-gen-config' }
+      end
     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.6.0'
+  RUBY_VERSION = '2.6.6'
+  RAILS_VERSION = '6.0.3'
+  RUBOCOP_VERSION = '0.81.0'
+  CAPISTRANO_VERSION = '3.14.0'
 end

data/templates/Gemfile.erb

@@ -43,6 +43,7 @@ group :development, :test do
   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

@@ -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,14 +1,13 @@
 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
+  BUNDLER_VERSION: 2.1.4
 <%- if pg? -%>
   POSTGRES_DB: <%= app_name %>
-  DATABASE_URL: "postgresql://postgres:postgres@postgres:5432/$POSTGRES_DB"
+  POSTGRES_PASSWORD: postgres
+  DATABASE_URL: "postgresql://postgres:${POSTGRES_PASSWORD}@postgres:5432/$POSTGRES_DB"
 <%- end -%>
 <%- if mysql? -%>
   MYSQL_DATABASE: <%= app_name %>
@@ -18,36 +17,41 @@ variables:
   DATABASE_URL: "mysql2://$MYSQL_USER:$MYSQL_PASSWORD@mysql:3306/$MYSQL_DATABASE"
 <%- end -%>
 
+.install_ruby_gems: &install_ruby_gems
+  - gem install bundler -v ${BUNDLER_VERSION}
+  - 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
 
@@ -60,17 +64,23 @@ bundler-audit:
     - bundle audit
   allow_failure: true
 
+yarn-audit:
+  stage: lint
+  before_script:
+    - *install_nodejs
+  script:
+    - yarn audit
+  allow_failure: true
+
 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 +91,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

@@ -1,6 +1,7 @@
 require:
   - rubocop-performance
   - rubocop-rails
+  - rubocop-rspec
 AllCops:
   TargetRubyVersion: <%= RUBY_VERSION %>
   DisplayCopNames: true
@@ -30,9 +31,16 @@ Metrics/BlockLength:
   Exclude:
     - 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
@@ -42,3 +50,9 @@ Style/BlockComments:
     - spec/**/*
 Style/Documentation:
   Enabled: false
+Style/HashEachMethods:
+  Enabled: true
+Style/HashTransformKeys:
+  Enabled: true
+Style/HashTransformValues:
+  Enabled: true

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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bankai
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.6.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-06-03 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
@@ -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.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
     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: 5.2.4
+        version: 6.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.4
+        version: 6.0.3
 description: The tool to generate Rails template for 5xRuby
 email:
 - hi@5xruby.tw
@@ -186,14 +200,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