jt_tools 0.0.2 → 0.0.7

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,17 +12,12 @@ if [[ $reflog_message =~ "merge" ]]; then
 fi
 
 if [[ $branch_name == "master" ]]; then
-  bin/update
-  bin/rake db:reset
+  bin/spring stop; pkill "spring";
+  rm -rf tmp/cache
+
+  bin/setup
 
-# For crystalball gem usage
-#  file=tmp/crystalball_data.yml
-#  find $file -mtime +5 -exec rm {} \;
-#
-#  if [ ! -f "$file" ]; then
-#    echo "Generete crystall ball index"
-#    DISABLE_SPRING=1 CRYSTALBALL=true bin/rspec
-#  fi
+  bin/rake db:reset
 
   echo "Removing merged branches..."
   git branch --merged master | grep -v "\*" | grep -v master | xargs -n 1 git branch -d

data/lib/install/bin/git-hooks/{pre-push.sample → pre-push}

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

data/lib/install/bin/heroku-postdeploy

@@ -1,10 +1,4 @@
 #!/usr/bin/env bash
 
 echo "== Preparing database =="
-bin/rails db:migrate
-
-if [ "$DB_SEED_ON_DEPLOY" = "true" ]; then
-  echo "Seeding ..."
-  bin/rails db:seed
-  echo "Seeding has been done!"
-fi
+bin/rails db:prepare

data/lib/install/bin/heroku-release

@@ -1 +1,4 @@
-bin/rake db:migrate
+#!/usr/bin/env bash
+
+echo "== Update Database =="
+bin/rake db:prepare

data/lib/install/bin/tools-setup

@@ -6,4 +6,4 @@ export BUNDLE_GEMFILE=Gemfile.tools
 
 bundle check || bundle install --jobs=4 --retry=3
 
-yarn install --link-duplicates --non-interactive
+yarn check || yarn install

data/lib/install/bin/tools-upgrade

@@ -5,3 +5,5 @@ set -e
 export BUNDLE_GEMFILE=Gemfile.tools
 
 bundle update --jobs=4 --retry=3
+
+yarn check || yarn install

data/lib/install/codecov.yml

@@ -1,8 +1,9 @@
+---
 codecov:
   notify:
-    require_ci_to_pass: yes
+    require_ci_to_pass: true
 
 comment:
-  layout: diff, flags, files
-  behavior: once
-  require_changes: no
+  layout: 'diff, flags, files'
+  behavior: 'once'
+  require_changes: false

data/lib/install/config/rails_best_practices.yml

@@ -0,0 +1,43 @@
+---
+AddModelVirtualAttributeCheck:
+AlwaysAddDbIndexCheck: {}
+# CheckSaveReturnValueCheck: {}
+# CheckDestroyReturnValueCheck: {}
+DefaultScopeIsEvilCheck: {}
+DryBundlerInCapistranoCheck: {}
+# HashSyntaxCheck: {}
+IsolateSeedDataCheck: {}
+KeepFindersOnTheirOwnModelCheck: {}
+LawOfDemeterCheck: {}
+# LongLineCheck: { max_line_length: 80 }
+MoveCodeIntoControllerCheck: {}
+MoveCodeIntoHelperCheck: { array_count: 10 }
+MoveCodeIntoModelCheck: { use_count: 10 }
+MoveFinderToNamedScopeCheck: {}
+MoveModelLogicIntoModelCheck: { use_count: 10 }
+NeedlessDeepNestingCheck: { nested_count: 5 }
+NotRescueExceptionCheck: {}
+NotUseDefaultRouteCheck: {}
+NotUseTimeAgoInWordsCheck: {}
+OveruseRouteCustomizationsCheck: { customize_count: 3 }
+ProtectMassAssignmentCheck: {}
+RemoveEmptyHelpersCheck: {}
+# RemoveTabCheck: {}
+RemoveTrailingWhitespaceCheck: {}
+# RemoveUnusedMethodsInControllersCheck: { except_methods: [] }
+# RemoveUnusedMethodsInHelpersCheck: { except_methods: [] }
+# RemoveUnusedMethodsInModelsCheck: { except_methods: [] }
+ReplaceComplexCreationWithFactoryMethodCheck: { attribute_assignment_count: 5 }
+ReplaceInstanceVariableWithLocalVariableCheck: {}
+RestrictAutoGeneratedRoutesCheck: {}
+SimplifyRenderInControllersCheck: {}
+SimplifyRenderInViewsCheck: {}
+# UseBeforeFilterCheck: { customize_count: 2 }
+UseModelAssociationCheck: {}
+UseMultipartAlternativeAsContentTypeOfEmailCheck: {}
+# UseParenthesesInMethodDefCheck: {}
+UseObserverCheck: {}
+UseQueryAttributeCheck: {}
+UseSayWithTimeInMigrationsCheck: {}
+UseScopeAccessCheck: {}
+UseTurboSprocketsRails3Check: {}

data/lib/jt_tools.rb

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

data/lib/jt_tools/railtie.rb

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

data/lib/{version.rb → jt_tools/version.rb}

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

data/lib/tasks/install.rake

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

data/template.rb

@@ -7,17 +7,17 @@
 # In that case, use `git clone` to download them to a local temporary dir.
 def add_template_repository_to_source_path
   if __FILE__.match?(%r{\Ahttps?://})
-    require 'shellwords'
-    require 'tmpdir'
+    require "shellwords"
+    require "tmpdir"
 
-    source_paths.unshift(temp_dir = Dir.mktmpdir('jt_tools-'))
+    source_paths.unshift(temp_dir = Dir.mktmpdir("jt_tools-"))
     at_exit { FileUtils.remove_entry(temp_dir) }
     git clone: [
-      '--quiet',
-      'https://github.com/jetthoughts/jt_tools.git',
+      "--quiet",
+      "https://github.com/jetthoughts/jt_tools.git",
       temp_dir
     ].map { |args| Shellwords.escape(args) }
-      .join(' ')
+      .join(" ")
 
     if (branch = __FILE__[%r{jt_tools/(.+)/template.rb}, 1])
       Dir.chdir(temp_dir) { git checkout: branch }
@@ -29,101 +29,171 @@ end
 
 add_template_repository_to_source_path
 
-say '=> Copying binstubs'
-directory 'lib/install/bin', 'bin'
+say "=> Copying binstubs"
+directory "lib/install/bin", "bin"
 
-chmod 'bin', 0o755 & ~File.umask, verbose: false
+chmod "bin", 0o755 & ~File.umask, verbose: false
 
-say '=> Copying tools gemfile'
-copy_file 'lib/install/Gemfile.tools', 'Gemfile.tools'
+say "=> Copying tools gemfile"
+copy_file "lib/install/Gemfile.tools", "Gemfile.tools"
 
-run 'yarn add -D eslint eslint-config-airbnb-base \
-  eslint-config-prettier eslint-plugin-import eslint-plugin-prettier prettier'
+run "yarn add -D eslint jest-junit"
 
-say 'Copying lint configurations'
-copy_file 'lib/install/.better-html.yml', '.better-html.yml'
-copy_file 'lib/install/.erb-lint.yml', '.erb-lint.yml'
-copy_file 'lib/install/.eslintrc.js', '.eslintrc.js'
-copy_file 'lib/install/.prettierrc.js', '.prettierrc.js'
-copy_file 'lib/install/.pronto.yml', '.pronto.yml'
-copy_file 'lib/install/.pronto_eslint_npm.yml', '.pronto_eslint_npm.yml'
-copy_file 'lib/install/.rubocop.yml', '.rubocop.yml'
-copy_file 'lib/install/.yamllint', '.yamllint'
-copy_file 'lib/install/.reek.yml', '.reek.yml'
+say "Copying lint configurations"
+copy_file "lib/install/.better-html.yml", ".better-html.yml"
+copy_file "lib/install/.erb-lint.yml", ".erb-lint.yml"
+copy_file "lib/install/.eslintrc.js", ".eslintrc.js"
+copy_file "lib/install/.pronto.yml", ".pronto.yml"
+copy_file "lib/install/.pronto_eslint_npm.yml", ".pronto_eslint_npm.yml"
+copy_file "lib/install/.rubocop.yml", ".rubocop.yml"
+copy_file "lib/install/.yamllint.yml", ".yamllint.yml"
+copy_file "lib/install/.reek.yml", ".reek.yml"
+copy_file "lib/install/config/rails_best_practices.yml", "config/rails_best_practices.yml"
+copy_file "lib/install/.editorconfig", ".editorconfig"
 
-say '=> Copying services configuration'
-gem 'simplecov', require: false, group: :test
+say "=> Copying services configuration"
+copy_file "lib/install/.simplecov", ".simplecov"
+copy_file "lib/install/codecov.yml", "codecov.yml"
 
-copy_file 'lib/install/codecov.yml', 'codecov.yml'
-gem 'codecov', require: false, group: :test
+say "=> Adds service client API gems"
 
-directory 'lib/install/.circleci', '.circleci'
+gem_group :test do
+  gem "simplecov", require: false, group: :test
+  gem "codecov", require: false, group: :test
+end
+
+gem "oj"
 
-# Add helpers to setup Simplecov and codecov loading for tests
-directory 'lib/install/lib/test', 'lib/test'
+gem_group :production, :staging do
+  gem "dalli"
+  gem "r7insight"
+  gem "rollbar"
+end
 
-if File.read('Gemfile').include? 'rspec'
-  gem 'rspec_junit_formatter', require: false, group: :test
+directory "lib/install/.circleci", ".circleci"
+
+if File.read("Gemfile").include? "rspec"
+  gem "rspec_junit_formatter", require: false, group: :test
   insert_into_file(
-    'spec/spec_helper.rb',
-    "require 'test/coverage'\n",
+    "spec/spec_helper.rb",
+    "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
+  gem "minitest-ci", require: false, group: :test
   insert_into_file(
-    'test/test_helper.rb',
-    "require 'test/coverage'\n",
+    "test/test_helper.rb",
+    "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"
+  )
+
+  gsub_file "test/test_helper.rb",
+    "parallelize(workers: :number_of_processors)",
+    "parallelize(workers: :number_of_processors) unless ENV['COVERAGE']"
 end
 
-directory 'lib/install/.dependabot', '.dependabot'
+directory "lib/install/.dependabot", ".dependabot"
 
-say '=> Copying heroku configuration'
-copy_file 'lib/install/app.json', 'app.json'
-copy_file 'lib/install/Procfile', 'Procfile'
+say "=> Copying heroku configuration"
+copy_file "lib/install/app.json", "app.json"
+copy_file "lib/install/Procfile", "Procfile"
 
-say '=> Install Brew dependencies'
-copy_file 'lib/install/Brewfile', 'Brewfile'
+say "=> Install Brew dependencies"
+copy_file "lib/install/Brewfile", "Brewfile"
 
-say 'Setup git hooks'
-directory 'lib/install/bin/git-hooks', 'bin/git-hooks'
+say "Setup git hooks"
+directory "lib/install/bin/git-hooks", "bin/git-hooks"
 
-require 'bundler'
+require "bundler"
 Bundler.with_original_env do
-  say '=> Install tools'
-  run 'bin/tools-setup'
+  say "=> Install tools"
+  run "bin/tools-setup"
 
-  say '=> Generate binstubs for linters'
-  run 'BUNDLE_GEMFILE=Gemfile.tools bundle binstub pronto'
-  run 'BUNDLE_GEMFILE=Gemfile.tools bundle binstub rubocop'
+  say "=> Generate binstubs for linters"
+  run "BUNDLE_GEMFILE=Gemfile.tools bundle binstub --force pronto"
+  run "BUNDLE_GEMFILE=Gemfile.tools bundle binstub --force rubocop"
 end
 
-say '=> Set git hooks'
-run 'git config core.hooksPath ./bin/git-hooks'
+say "=> Set git hooks"
+run "git config core.hooksPath ./bin/git-hooks"
+say "=> Install all new dependencies"
 
-say '=> Install all new dependencies'
 run <<~BREW_INSTALL
   hash brew 2> /dev/null \
   && (brew bundle check || brew bundle install) \
   || echo "Please install Homebrew: https://brew.sh/"
 BREW_INSTALL
 
-after_bundle do
-  say '=> Setup default bundle config'
-  run 'bundle config jobs 4'
-  run 'bundle config retry 3'
+say "=> Update development config"
+uncomment_lines "config/environments/development.rb", /config\.file_watcher = ActiveSupport::EventedFileUpdateChecker/
+
+say "=> Set up R7Insight"
+r7insight_config = <<-CODE
+  if ENV['R7INSIGHT_TOKEN'].present?
+    Rails.logger = R7Insight.new(ENV['R7INSIGHT_TOKEN'], ENV['R7INSIGHT_REGION'])
+  end
+CODE
+insert_into_file "config/environments/production.rb",
+  "require 'r7_insight.rb'" + "\n\n",
+  before: "Rails.application.configure do"
+environment(r7insight_config, env: "production")
+if File.exist?("config/environments/staging.rb")
+  insert_into_file "config/environments/staging.rb",
+    "require 'r7_insight.rb'" + "\n\n",
+    before: "Rails.application.configure do"
+  environment(r7insight_config, env: "staging")
+end
+
+gem "connection_pool"
+
+say "=> Set up Memcachier"
+memcachier_config = <<-CODE
+  if ENV["MEMCACHIER_SERVERS"]
+    config.cache_store = :mem_cache_store,
+      ENV["MEMCACHIER_SERVERS"].split(","), {
+        username: ENV["MEMCACHIER_USERNAME"], password: ENV["MEMCACHIER_PASSWORD"],
+        failover: true, socket_timeout: 1.5, socket_failure_delay: 0.2, down_retry_delay: 60,
+        pool_size: ENV.fetch("RAILS_MAX_THREADS") { 5 },
+      }
+  end
+
+CODE
+environment(memcachier_config, env: "production")
+if File.exist?("config/environments/staging.rb")
+  environment(memcachier_config, env: "staging")
+end
+
+Bundler.with_original_env do
+  say "=> Setup default bundle config"
+  run "bundle config jobs 4"
+  run "bundle config retry 3"
+
+  run "bundle"
 end
 
-say '**************************************************************************'
-say '**************************************************************************'
-say ''
-say 'For code coverage report aggregator, running code static analysis'
-say 'and auto-update of the tools.'
-say ''
-say 'Please, set CODECOV_TOKEN, GITHUB_TOKEN and PRONTO_GITHUB_ACCESS_TOKEN'
-say 'environment variables in CircleCI and your local env'
-say ''
-say '**************************************************************************'
-say '**************************************************************************'
+say "**************************************************************************"
+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 "$ `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"
+say ""
+say "   For code coverage report aggregator, running code static analysis"
+say "and auto-update of the tools."
+say ""
+say "**************************************************************************"
+say "**************************************************************************"