bankai 0.4.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd1b206e5efc0376acd011667d50e997ccd8ed81d18673056f95007166b198ea
-  data.tar.gz: c04e04dfca974e26fd015494e238910d93a03cabbd974db01479fd6c58d63b47
+  metadata.gz: a6ae152202fc1035211da5eeb7e7351799e8d56e8f136f7f09dcc1269a0e647e
+  data.tar.gz: 0b0d39e8b111f7e3e22a60dba1209910b33c73df22dc556d4d44aedcb58d5d6e
 SHA512:
-  metadata.gz: d7bd93f6e4816f93fb97b3be8890b8bd9a514ba1a447d25dcf1343d9401b6a546cc41469ce3c5eeebca28d0bd9ec3b002eeee9b1e12af518fe9e08d27304ac9f
-  data.tar.gz: 964c0e46b4333ce589b18fac16d175da7ac7720083cdcf419461d3c956d80ca4a2dc6f2c4d94aa2eb5ecd97920759dc514a3327a50a3a12b49265bcc0611c2c0
+  metadata.gz: dadcccf32107bc95e5c0665c5605b10ce117b587e44e8ffb2112825eff2ac4236736786b9c7db49664b8272ab4646af53c853731cea1019a4358972415b7666d
+  data.tar.gz: 6ac4850e192204202e363f59d43b2c3ad4c4be100ea248b6549fdeca8b2c2bae154eb3947debed74f173e768eac35aff02437fe48948d4765c4039f2bc1699b7

data/.gitlab-ci.yml

@@ -19,7 +19,10 @@ before_script:
 rubocop:
   stage: lint
   script:
-    - bundle exec rubocop
+    - bundle exec rubocop --format progress --format json --out rubocop.json
+  artifacts:
+    paths:
+      - rubocop.json
   except:
     - schedules
 
@@ -36,18 +39,35 @@ bundler-audit:
 rspec:
   stage: test
   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/bankai.gemspec

@@ -32,8 +32,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'overcommit'
   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 'simplecov'
+  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,19 +25,24 @@ module Bankai
       end
     end
 
+    def configure_puma_dev
+      application(nil, env: 'development') do
+        "config.hosts << '.test'"
+      end
+    end
+
     def configure_quiet_assets
       return if options[:api]
 
-      config = <<-RUBY
-    config.assets.quiet = true
-      RUBY
-
-      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
@@ -47,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/json_generator.rb

@@ -9,6 +9,11 @@ module Bankai
       def add_oj
         gem 'oj'
         Bundler.with_clean_env { run '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

@@ -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.4.0'
+  VERSION = '0.7.0'
   RUBY_VERSION = '2.6.6'
-  RAILS_VERSION = '6.0.2'
+  RAILS_VERSION = '6.0.3'
   RUBOCOP_VERSION = '0.81.0'
-  CAPISTRANO_VERSION = '3.13.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

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

@@ -3,9 +3,11 @@ image: ruby:<%= RUBY_VERSION %>
 variables:
   RAILS_ENV: test
   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 %>
@@ -16,6 +18,7 @@ variables:
 <%- end -%>
 
 .install_ruby_gems: &install_ruby_gems
+  - gem install bundler -v ${BUNDLER_VERSION}
   - bundle install --path vendor
 
 .install_nodejs: &install_nodejs
@@ -61,6 +64,14 @@ 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:

data/templates/rubocop.yml.erb

@@ -1,6 +1,7 @@
 require:
   - rubocop-performance
   - rubocop-rails
+  - rubocop-rspec
 AllCops:
   TargetRubyVersion: <%= RUBY_VERSION %>
   DisplayCopNames: true
@@ -30,6 +31,7 @@ Metrics/BlockLength:
   Exclude:
     - config/environments/*
     - lib/tasks/**/*
+    - spec/**/*
 Lint/RaiseException:
   Enabled: true
 Lint/StructNewOverride:
@@ -37,6 +39,8 @@ Lint/StructNewOverride:
 Layout:
   Exclude:
     - config/environments/*
+Layout/LineLength:
+  Max: 120
 Style:
   Exclude:
     - spec/*_helper.rb

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

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,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: bankai
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.7.0
 platform: ruby
 authors:
 - 5xRuby
 - 蒼時弦也
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-04-17 00:00:00.000000000 Z
+date: 2020-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -81,6 +81,20 @@ 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
@@ -99,30 +113,30 @@ dependencies:
   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: 6.0.2
+        version: 6.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.2
+        version: 6.0.3
 description: The tool to generate Rails template for 5xRuby
 email:
 - hi@5xruby.tw
@@ -178,7 +192,7 @@ files:
 homepage: https://github.com/5xRuby/bankai
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -194,7 +208,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: []