jt_tools 0.0.5 → 0.0.10

data/lib/install/.erb-lint.yml

@@ -10,17 +10,17 @@ linters:
         - .rubocop.yml
       Layout/InitialIndentation:
         Enabled: false
+      Layout/LineLength:
+        Enabled: false
       Layout/TrailingEmptyLines:
         Enabled: false
       Layout/TrailingWhitespace:
         Enabled: false
-      Naming/FileName:
-        Enabled: false
-      Style/FrozenStringLiteralComment:
-        Enabled: false
-      Layout/LineLength:
-        Enabled: false
       Lint/UselessAssignment:
         Enabled: false
+      Naming/FileName:
+        Enabled: false
       Rails/OutputSafety:
         Enabled: false
+      Style/FrozenStringLiteralComment:
+        Enabled: false

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

@@ -1,28 +1,29 @@
 ---
 require:
-  - rubocop-performance
+  - standard
   - rubocop-rails
 
+inherit_gem:
+  standard: config/base.yml
+
 AllCops:
-  TargetRubyVersion: 2.6
+  TargetRubyVersion: 2.7
+
   Exclude:
     - 'db/migrate/**/*'
     - 'db/schema.rb'
+    - 'vendor/**/*'
 
-Layout/EmptyLinesAroundAttributeAccessor:
+Bundler/InsecureProtocolSource:
   Enabled: true
+  Include:
+    - '**/*.gemfile'
+    - '**/Gemfile'
+    - '**/Gemfile.tools'
+    - '**/gems.rb'
 
-Layout/EmptyLinesAroundBlockBody:
-  Exclude:
-    - 'db/schema.rb'
-
-Layout/FirstHashElementIndentation:
-  EnforcedStyle: consistent
-
-Layout/HashAlignment:
-  EnforcedHashRocketStyle: table
-  EnforcedColonStyle: table
-  EnforcedLastArgumentHashStyle: always_inspect
+Layout/EmptyLinesAroundAttributeAccessor:
+  Enabled: true
 
 Layout/LineLength:
   Max: 113
@@ -30,27 +31,9 @@ Layout/LineLength:
 Layout/MultilineMethodArgumentLineBreaks:
   Enabled: true
 
-Layout/MultilineMethodCallBraceLayout:
-  EnforcedStyle: symmetrical
-
-Layout/MultilineMethodCallIndentation:
-  EnforcedStyle: indented
-
-Layout/MultilineOperationIndentation:
-  EnforcedStyle: indented
-
-Layout/ParameterAlignment:
-  EnforcedStyle: with_fixed_indentation
-
-Layout/SpaceAroundMethodCallOperator:
-  Enabled: true
-
 Layout/SpaceInLambdaLiteral:
   EnforcedStyle: require_space
 
-Lint/RaiseException:
-  Enabled: true
-
 Lint/StructNewOverride:
   Enabled: true
 
@@ -102,22 +85,9 @@ Style/HashTransformKeys:
 Style/HashTransformValues:
   Enabled: true
 
-Style/SafeNavigation:
-  Enabled: false
-
 Style/SlicingWithRange:
   Enabled: true
 
-Style/StabbyLambdaParentheses:
-  EnforcedStyle: require_no_parentheses
-
-Style/StringLiterals:
-  Exclude:
-    - 'db/schema.rb'
-
-Style/TrailingCommaInHashLiteral:
-  EnforcedStyleForMultiline: consistent_comma
-
 # Rails
 
 Rails:

data/lib/install/.simplecov

@@ -1,17 +1,17 @@
 # frozen_string_literal: true
 
-if defined?(Spring) && ENV['DISABLE_SPRING'].nil?
-  puts '**** NO COVERAGE FOR YOU! ****'
-  puts 'Please disable Spring to get COVERAGE by `DISABLE_SPRING=1 COVERAGE=1 bin/rspec`'
+if defined?(Spring) && ENV["DISABLE_SPRING"].nil?
+  puts "**** NO COVERAGE FOR YOU! ****"
+  puts "Please disable Spring to get COVERAGE by `DISABLE_SPRING=1 COVERAGE=1 bin/rspec`"
 else
-  SimpleCov.start 'rails' do
+  SimpleCov.start "rails" do
     add_filter %w[app/views bin spec test]
 
     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

@@ -1,16 +1,14 @@
 # frozen_string_literal: true
 
-tap 'caskroom/cask'
-cask_args appdir: '/Applications'
+tap "heroku/brew"
 
-tap 'heroku/brew'
-
-# brew 'circleci'
-brew 'graphicsmagick'
-brew 'heroku'
-brew 'hub'
-brew 'rbenv'
-brew 'ruby-build'
-brew 'vips'
-brew 'yamllint'
-brew 'yarn'
+brew "circleci"
+brew "graphicsmagick" # For ActiveStorage
+brew "heroku"
+brew "hub" # For creating Pull Request from CLI
+brew "postgresql"
+brew "rbenv"
+brew "ruby-build"
+brew "vips" # For ActiveStorage
+brew "yamllint" # For Linters
+brew "yarn"

data/lib/install/Gemfile.tools

@@ -18,9 +18,11 @@ group :tools do
   gem 'pronto-rails_best_practices', require: false
   gem 'pronto-reek', require: false
   gem 'pronto-rubocop', require: false
+  # gem 'pronto-standardrb', require: false
   gem 'pronto-yamllint', require: false
 
-  gem 'rubocop-performance', require: false
+  # gem 'rubocop-minitest', require: false
   gem 'rubocop-rails', require: false
-  gem 'better_html', '< 1.0.15'
+  # gem 'rubocop-rspec', require: false
+  gem 'standard', '>= 0.4.7', require: false
 end

data/lib/install/app.json

@@ -1,33 +1,33 @@
 {
-  "name": "APP NAME",
   "scripts": {
     "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",
+    "JEMALLOC_ENABLED": "true",
     "LANG": "en_US.UTF-8",
     "MALLOC_ARENA_MAX": "2",
     "NODE_ENV": "production",
     "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,12 @@
     "redistogo:nano"
   ],
   "buildpacks": [
+    {
+      "url": "https://github.com/gaffneyc/heroku-buildpack-jemalloc.git"
+    },
+    {
+      "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/git-hooks/{pre-push.sample → pre-push}

@@ -2,7 +2,7 @@
 
 set -eo pipefail
 
-bin/lint-pr
+bin/lint-pr --no-staged
 
 # bin/rspec --tag critical
 # bin/rails test

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/bin/lint-pr

@@ -4,7 +4,7 @@ set -eo pipefail
 
 reporters_opt=""
 
-if [[ "$CIRCLECI" == "true" ]]
+if [[ -n "$PRONTO_GITHUB_ACCESS_TOKEN" && "$CIRCLECI" == "true" ]]
 then
   git fetch origin master
   reporters_opt="-f github_status github_pr_review"

data/lib/install/bin/tools-setup

@@ -1,6 +1,9 @@
 #!/usr/bin/env bash
 
-set -e
+set -eo pipefail
+
+([[ (-x "$(command -v brew)") ]] && brew bundle check || brew bundle --no-lock) \
+  || (echo "*** Please install manually system dependencies: ***" && cat Brewfile)
 
 export BUNDLE_GEMFILE=Gemfile.tools
 

data/lib/install/bin/tools-upgrade

@@ -1,6 +1,9 @@
 #!/usr/bin/env bash
 
-set -e
+set -eo pipefail
+
+([[ (-x "$(command -v brew)") ]] && brew bundle check || brew bundle --no-lock) \
+  || (echo "*** Please upgrade manually system dependencies: ***" && cat Brewfile)
 
 export BUNDLE_GEMFILE=Gemfile.tools
 

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.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
-require 'jt_tools/version'
+require "jt_tools/version"
 
-require 'jt_tools/railtie' if defined?(Rails)
+require "jt_tools/railtie" if defined?(Rails)

data/lib/jt_tools/railtie.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require 'rails/railtie'
+require "rails/railtie"
 
 class JtToolsRailtie < Rails::Railtie
   rake_tasks do
-    load 'tasks/install.rake'
+    load "tasks/install.rake"
   end
 end

data/lib/jt_tools/version.rb

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

data/lib/tasks/install.rake

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-install_template_path = File.expand_path('../../template.rb', __dir__).freeze
-bin_path = ENV['BUNDLE_BIN'] || './bin'
+install_template_path = File.expand_path("../../template.rb", __dir__).freeze
+bin_path = ENV["BUNDLE_BIN"] || "./bin"
 
 namespace :jt_tools do
-  desc 'Install jt-tools in this application'
+  desc "Install jt-tools in this application"
   task install: :environment do
     exec "#{RbConfig.ruby} #{bin_path}/rails app:template LOCATION=#{install_template_path}"
   end

data/rejuvenation.rb

@@ -1,18 +1,17 @@
-
-require 'json'
+require "json"
 
 EXTRACT_DEPENDENCY_NAME = /"?(.+?)@.+?"?(?:,\s+|\Z)/.freeze
 EXTRACT_DEPENDENCY_DETAILS = /(^((?!= ).*?):\n.*?(?:\n\n|\Z))/m.freeze
 
 def direct_dependencies_names
-  package_json = JSON.parse(File.open('package.json').read)
-  direct_dependencies = package_json.fetch_values('dependencies', 'devDependencies', 'peerDependencies') { }
+  package_json = JSON.parse(File.open("package.json").read)
+  direct_dependencies = package_json.fetch_values("dependencies", "devDependencies", "peerDependencies") {}
   direct_dependencies.compact.inject([]) { |memo, v| memo.concat(v.keys) }
 end
 
 @dependencies = direct_dependencies_names
 
-yarn_lock_content = File.open('yarn.lock').read
+yarn_lock_content = File.open("yarn.lock").read
 yarn_lock_content.scan(EXTRACT_DEPENDENCY_DETAILS).each do |dependency_block|
   direct_dep = @dependencies.include?(dependency_block[1].match(EXTRACT_DEPENDENCY_NAME).to_a[1])
   puts dependency_block[0] if direct_dep