jt_tools 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79f6a271c87b4eca2f49f215466e6c2973d9c205b146b4c9f80e2d1967ea15ac
-  data.tar.gz: 53ff1177b284378248aeefc76863a190fdf9621c98c15650cef5e238414ba9d5
+  metadata.gz: 4927652633d2fd267f1f2406edc65c94f2dce1f5df0f5114d6a535a50a24cd43
+  data.tar.gz: 4cdfbc258f01edf7c8c68b6d9e8dc8afe08e83927e1100077bbec7944d99a444
 SHA512:
-  metadata.gz: 58a52a3c2c8a4b6f2e3cbf2edde9494354196e23d76ce93f00a93b5587c7b349cf000734f6a9977dcd579820336601a2e6718b1a94ad59f4a0775e5ee9c5d88e
-  data.tar.gz: 64d6138dff8145ed8415713fee0e42e68c833f7798c6455e41420df25a30e73e6f98197ef36c09d03b58ea5cf3977f5216ad114a367299b9c010739ee4008bcf
+  metadata.gz: 7ba9a726ab53e969414f0005f8ccf42fe682f127958a4a39047444830020f481015131cd3b5bbe63d99da13581fb77174ae894f92b54e8d2e932a1e3805adabb
+  data.tar.gz: 67679d017e44950d99ab4bc819edef9983088de1ebb3483e825dc69108fe6b6bbdb403f76f750ab9a98e0dc15c18a8d5b9689965112d943acfdeff4a4a567901

data/.circleci/config.yml

@@ -3,7 +3,7 @@ version: 2.1
 jobs:
   test:
     docker:
-      - image: circleci/ruby:2.6-node
+      - image: cimg/ruby:2.7-node
         environment:
           DATABASE_URL: postgresql://ubuntu@127.0.0.1/db_test
           BUNDLE_JOBS: 4
@@ -13,15 +13,33 @@ jobs:
         environment:
           POSTGRES_USER: ubuntu
           POSTGRES_DB: db_test
-    parallelism: 1
+    parallelism: 2
     steps:
       - checkout
+      - restore_cache:
+          keys:
+            - rails-v2-{{ arch }}-{{ .Revision }}
+            - rails-v2-{{ arch }}-
+            - rails-v2-
+
       - run: gem install rails -N --update-sources
-      - run: sudo apt-get install cmake curl yamllint python3-setuptools python3-pkg-resources
-      - run: curl -fLSs https://circle.ci/cli | sudo bash
+
+      - run: sudo apt-get update -qq && sudo apt-get install -yq --no-install-recommends
+             cmake curl yamllint python3-setuptools python3-pkg-resources pkg-config
+      - run: curl -fLSs https://raw.githubusercontent.com/CircleCI-Public/circleci-cli/master/install.sh |
+             sudo bash
       - run: git config --global user.email "you@example.com" && git config --global user.name "Your Name"
-      - run: bin/test
-      - run: TEST_APP_TEMPLATE=true bin/test
+
+      - run: |
+          [[ $CIRCLE_NODE_INDEX == "0" ]] || bin/test
+      - run: |
+          [[ $CIRCLE_NODE_INDEX == "1" ]] || TEST_APP_TEMPLATE=true bin/test
+
+      - save_cache:
+          key: rails-v2-{{ arch }}-{{ .Revision }}
+          paths:
+            - /home/circleci/.rubygems
+            - /home/circleci/.cache
 
 workflows:
   test:

data/bin/test

@@ -18,7 +18,7 @@ gem uninstall oj || true
 
 if [[ "TEST_APP_TEMPLATE" == "true" ]]
 then
-  rails new test_tmpl --quiet
+  rails new test_tmpl --quiet --database postgresql
   cd test_tmpl
   rails app:template LOCATION=../template.rb
 else
@@ -55,8 +55,8 @@ BUNDLE_GEMFILE=Gemfile.tools bin/bundle exec erblint --config ../../lib/install/
 CIRCLECI=false bin/lint-pr -f text
 
 echo " => Run git hooks verifications"
-bin/git-hooks/post-merge.sample
-CIRCLECI=false bin/git-hooks/pre-push.sample
+bin/git-hooks/post-merge
+CIRCLECI=false bin/git-hooks/pre-push
 
 bin/rubocop --config ../../lib/install/.rubocop.yml --debug --extra-details --display-style-guide --parallel ../../lib
 node_modules/.bin/eslint --config ../../lib/install/.eslintrc.js --quiet --no-color ../../lib/**/.*.js

data/lib/install/.circleci/config.yml

@@ -64,6 +64,8 @@ jobs:
       - ruby/install-deps:
           bundler-version: '`cat Gemfile.lock | tail -1 | tr -d " "`'
           key: v1-dependencies
+      - node/install:
+          node-version: latest
       - node/install-packages:
           app-dir: .
           pkg-manager: yarn
@@ -114,11 +116,8 @@ jobs:
           paths:
             - tmp/cache/jest
 
-      - run:
-          name: RSpec Tests
-          command: |
-            bin/rails db:schema:load
-            bin/rspec --format RspecJunitFormatter --out tmp/reports/rspec-results.xml --format progress
+      - run: bin/rails db:schema:load
+      # rails test
 
       # collect reports
       - store_test_results:
@@ -127,7 +126,7 @@ jobs:
           path: ./coverage
   lint:
     docker:
-      - image: circleci/ruby:2.7-stretch-node
+      - image: cimg/ruby:2.7-node
         environment:
           DISABLE_SPRING: 1
           BUNDLE_GEMFILE: Gemfile.tools
@@ -144,7 +143,9 @@ jobs:
 
       - run:
           name: Install cmake for building pronto dependencies
-          command: sudo apt-get update  && sudo apt-get install cmake yamllint python3-setuptools python3-pkg-resources
+          command: sudo apt-get update -qq &&
+                   sudo apt-get install -yq --no-install-recommends
+                     cmake yamllint python3-setuptools python3-pkg-resources pkg-config
 
       - run:
           name: Install Bundle Dependencies
@@ -164,7 +165,7 @@ jobs:
 
   upgrade_tools:
     docker:
-      - image: circleci/ruby:2.7-stretch-node
+      - image: cimg/ruby:2.7-node
         environment:
           DISABLE_SPRING: 1
           BUNDLE_GEMFILE: Gemfile.tools

data/lib/install/.reek.yml

@@ -2,26 +2,21 @@
 detectors:
   IrresponsibleModule:
     enabled: false
+  DuplicateMethodCall:
+    max_calls: 4
+  FeatureEnvy:
+    enabled: false
   UncommunicativeVariableName:
     accept:
       - e
+      - i
+      - v
   UnusedPrivateMethod:
     enabled: false
-  DuplicateMethodCall:
-    max_calls: 4
+  UtilityFunction:
+    enabled: false
 
 directories:
   "**/app/controllers/**":
     InstanceVariableAssumption:
       enabled: false
-    UtilityFunction:
-      enabled: false
-  "**/app/jobs/**":
-    UtilityFunction:
-      enabled: false
-  "**/app/helpers/**":
-    UtilityFunction:
-      enabled: false
-  "**/spec/**":
-    UtilityFunction:
-      enabled: false

data/lib/install/.rubocop.yml

@@ -4,7 +4,7 @@ require:
   - rubocop-rails
 
 AllCops:
-  TargetRubyVersion: 2.6
+  TargetRubyVersion: 2.7
   Exclude:
     - 'db/migrate/**/*'
     - 'db/schema.rb'
@@ -48,6 +48,9 @@ Layout/SpaceAroundMethodCallOperator:
 Layout/SpaceInLambdaLiteral:
   EnforcedStyle: require_space
 
+Lint/DeprecatedOpenSSLConstant:
+  Enabled: true
+
 Lint/RaiseException:
   Enabled: true
 

data/lib/install/.simplecov

@@ -10,8 +10,8 @@ else
     maximum_coverage_drop 0.5
   end
 
-  # if ENV['CODECOV_TOKEN']
-  #   require 'codecov'
-  #   SimpleCov.formatter = SimpleCov::Formatter::Codecov
-  # end
+  if ENV['CODECOV_TOKEN']
+    require 'codecov'
+    SimpleCov.formatter = SimpleCov::Formatter::Codecov
+  end
 end

data/lib/install/Brewfile

@@ -5,12 +5,13 @@ cask_args appdir: '/Applications'
 
 tap 'heroku/brew'
 
-# brew 'circleci'
-brew 'graphicsmagick'
+brew 'circleci'
+brew 'graphicsmagick' # For ActiveStorage
 brew 'heroku'
-brew 'hub'
+brew 'hub' # For creating Pull Request from CLI
+brew 'postgresql'
 brew 'rbenv'
 brew 'ruby-build'
-brew 'vips'
-brew 'yamllint'
+brew 'vips' # For ActiveStorage
+brew 'yamllint' # For Linters
 brew 'yarn'

data/lib/install/Gemfile.tools

@@ -22,5 +22,4 @@ group :tools do
 
   gem 'rubocop-performance', require: false
   gem 'rubocop-rails', require: false
-  gem 'better_html', '< 1.0.15'
 end

data/lib/install/app.json

@@ -4,18 +4,6 @@
     "postdeploy": "bin/heroku-postdeploy"
   },
   "env": {
-    "RAILS_MASTER_KEY": {
-      "required": true
-    },
-    "ROLLBAR_ACCESS_TOKEN": {
-      "required": true
-    },
-    "ROLLBAR_ENDPOINT": {
-      "required": true
-    },
-    "SECRET_KEY_BASE": {
-      "generator": "secret"
-    },
     "BUNDLE_WITHOUT": "development:test:production",
     "DISABLE_DATABASE_ENVIRONMENT_CHECK": "1",
     "LANG": "en_US.UTF-8",
@@ -24,10 +12,22 @@
     "RACK_ENV": "staging",
     "RAILS_ENV": "staging",
     "RAILS_LOG_TO_STDOUT": "enabled",
+    "RAILS_MASTER_KEY": {
+      "required": true
+    },
     "RAILS_MAX_THREADS": "5",
     "RAILS_SERVE_STATIC_FILES": "enabled",
     "REDIS_PROVIDER": "REDISTOGO_URL",
+    "ROLLBAR_ACCESS_TOKEN": {
+      "required": true
+    },
+    "ROLLBAR_ENDPOINT": {
+      "required": true
+    },
     "ROLLBAR_ENV": "staging",
+    "SECRET_KEY_BASE": {
+      "generator": "secret"
+    },
     "SIDEKIQ_CONCURRENCY": "5",
     "WEB_CONCURRENCY": "2"
   },
@@ -38,6 +38,9 @@
     "redistogo:nano"
   ],
   "buildpacks": [
+    {
+      "url": "heroku/nodejs"
+    },
     {
       "url": "heroku/ruby"
     }

data/lib/install/bin/circleci-auto_upgrade_tools

@@ -4,7 +4,7 @@ set -e
 
 echo "-----Create and switch to new branch-----"
 
-current_date=`date +"%Y%m%d%H%M"`
+current_date=$(date +"%Y%m%d%H%M")
 new_branch_name="auto-upgrade-tools-dependencies-${current_date}"
 git checkout -b $new_branch_name
 
@@ -17,11 +17,11 @@ if bin/tools-upgrade; then
   git config user.email "circleci.bot@example.com"
 
   git commit -am "Upgrades Gemfile.tools dependencies"
-  git push https://$GITHUB_TOKEN@github.com/$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME.git -f
+  git push "https://$GITHUB_TOKEN@github.com/$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME.git" -f
 
   curl -X POST                                                                                                  \
     -H "Authorization: token ${GITHUB_TOKEN}"                                                                   \
-    -d '{"title":"Upgrade tools dependencies","base":"master","head":"'$CIRCLE_PROJECT_USERNAME':'$new_branch_name'"}' \
+    -d '{"title":"Upgrades tools dependencies","base":"master","head":"'$CIRCLE_PROJECT_USERNAME':'$new_branch_name'"}' \
     https://api.github.com/repos/$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME/pulls
   exit 0
 else

data/lib/install/bin/git-hooks/{post-merge.sample → post-merge}

@@ -12,7 +12,11 @@ if [[ $reflog_message =~ "merge" ]]; then
 fi
 
 if [[ $branch_name == "master" ]]; then
-  bin/update
+  bin/spring stop; pkill "spring";
+  rm -rf tmp/cache
+
+  bin/setup
+
   bin/rake db:reset
 
   echo "Removing merged branches..."

data/lib/install/bin/heroku-postdeploy

@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 
 echo "== Preparing database =="
-bin/rails db:prepare db:seed
+bin/rails db:prepare

data/lib/install/config/rails_best_practices.yml

@@ -11,11 +11,11 @@ KeepFindersOnTheirOwnModelCheck: {}
 LawOfDemeterCheck: {}
 # LongLineCheck: { max_line_length: 80 }
 MoveCodeIntoControllerCheck: {}
-MoveCodeIntoHelperCheck: { array_count: 3 }
-MoveCodeIntoModelCheck: { use_count: 2 }
+MoveCodeIntoHelperCheck: { array_count: 10 }
+MoveCodeIntoModelCheck: { use_count: 10 }
 MoveFinderToNamedScopeCheck: {}
-MoveModelLogicIntoModelCheck: { use_count: 4 }
-NeedlessDeepNestingCheck: { nested_count: 2 }
+MoveModelLogicIntoModelCheck: { use_count: 10 }
+NeedlessDeepNestingCheck: { nested_count: 5 }
 NotRescueExceptionCheck: {}
 NotUseDefaultRouteCheck: {}
 NotUseTimeAgoInWordsCheck: {}
@@ -27,7 +27,7 @@ RemoveTrailingWhitespaceCheck: {}
 # RemoveUnusedMethodsInControllersCheck: { except_methods: [] }
 # RemoveUnusedMethodsInHelpersCheck: { except_methods: [] }
 # RemoveUnusedMethodsInModelsCheck: { except_methods: [] }
-ReplaceComplexCreationWithFactoryMethodCheck: { attribute_assignment_count: 2 }
+ReplaceComplexCreationWithFactoryMethodCheck: { attribute_assignment_count: 5 }
 ReplaceInstanceVariableWithLocalVariableCheck: {}
 RestrictAutoGeneratedRoutesCheck: {}
 SimplifyRenderInControllersCheck: {}

data/lib/jt_tools/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module JtTools
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

data/template.rb

@@ -37,7 +37,7 @@ chmod 'bin', 0o755 & ~File.umask, verbose: false
 say '=> Copying tools gemfile'
 copy_file 'lib/install/Gemfile.tools', 'Gemfile.tools'
 
-run 'yarn add -D eslint'
+run 'yarn add -D eslint jest-junit'
 
 say 'Copying lint configurations'
 copy_file 'lib/install/.better-html.yml', '.better-html.yml'
@@ -80,6 +80,11 @@ if File.read('Gemfile').include? 'rspec'
     "require 'simplecov' if ENV['COVERAGE']\n",
     after: /\A/
   )
+  insert_into_file(
+    '.circleci/config.yml',
+    "\n" + '      - run: bin/rspec --format RspecJunitFormatter --out tmp/reports/rspec-results.xml --format progress',
+    after: '# rails test'
+  )
 else
   gem 'minitest-ci', require: false, group: :test
   insert_into_file(
@@ -87,6 +92,11 @@ else
     "require 'simplecov' if ENV['COVERAGE']\n",
     after: /\A/
   )
+  insert_into_file(
+    '.circleci/config.yml',
+    "\n" + '      - run: bin/rails test "test/**/*_test.rb"',
+    after: '# rails test'
+  )
 end
 
 directory 'lib/install/.dependabot', '.dependabot'
@@ -141,6 +151,8 @@ if File.exist?('config/environments/staging.rb')
   environment(r7insight_config, env: 'staging')
 end
 
+gem 'connection_pool'
+
 say '=> Set up Memcachier'
 memcachier_config = <<-CODE
   if ENV["MEMCACHIER_SERVERS"]
@@ -154,7 +166,9 @@ memcachier_config = <<-CODE
 
 CODE
 environment(memcachier_config, env: 'production')
-environment(memcachier_config, env: 'staging') if File.exist?('config/environments/staging.rb')
+if File.exist?('config/environments/staging.rb')
+  environment(memcachier_config, env: 'staging')
+end
 
 
 after_bundle do
@@ -168,9 +182,8 @@ say '**************************************************************************'
 say ''
 say '1. Recommended Heroku Addons: Mailtrap, Rollbar, Cloudinary'
 say ''
-say '2. Setup Git Hooks to auto-check code and cleanup staled branches'
-say '$ `cp bin/git-hooks/pre-push.sample bin/git-hooks/pre-push`'
-say '$ `cp bin/git-hooks/post-merge.sample bin/git-hooks/post-merge`'
+say '2. Setup Git Hooks to auto-check code and cleanup staled branches:'
+say '$ `git config core.hooksPath bin/git-hooks`'
 say ''
 say '3. Please, set CODECOV_TOKEN, GITHUB_TOKEN and PRONTO_GITHUB_ACCESS_TOKEN'
 say 'environment variables in CircleCI and your local env'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jt_tools
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Paul Keen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-21 00:00:00.000000000 Z
+date: 2020-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -62,8 +62,8 @@ files:
 - lib/install/Procfile
 - lib/install/app.json
 - lib/install/bin/circleci-auto_upgrade_tools
-- lib/install/bin/git-hooks/post-merge.sample
-- lib/install/bin/git-hooks/pre-push.sample
+- lib/install/bin/git-hooks/post-merge
+- lib/install/bin/git-hooks/pre-push
 - lib/install/bin/heroku-postdeploy
 - lib/install/bin/heroku-release
 - lib/install/bin/lint-pr