jt_tools 0.0.14 → 0.0.19

data/lib/install/Gemfile.tools

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 source 'https://rubygems.org'
 
 git_source(:github) do |repo_name|
@@ -10,19 +8,21 @@ end
 gem 'oj'
 
 group :tools do
-  gem 'pronto'
+  gem 'pronto', require: false
   gem 'pronto-blacklist', require: false
   gem 'pronto-erb_lint', require: false
-  gem 'pronto-eslint_npm', require: false
+  gem 'pronto-eslint', require: false
   gem 'pronto-fasterer', require: false
   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-minitest', require: false
+  gem 'rubocop-performance', require: false
   gem 'rubocop-rails', require: false
-  # gem 'rubocop-rspec', require: false
+  gem 'rubocop-minitest', require: false
+
   gem 'standard', '>= 0.4.7', require: false
+  # gem 'pronto-standardrb', require: false
+  # gem 'rubocop-rspec', require: false
 end

data/lib/install/app.json

@@ -48,5 +48,5 @@
       "url": "heroku/ruby"
     }
   ],
-  "stack": "heroku-18"
+  "stack": "heroku-20"
 }

data/lib/install/bin/lint-pr

@@ -6,7 +6,7 @@ reporters_opt=""
 
 if [[ -n "$PRONTO_GITHUB_ACCESS_TOKEN" && "$CIRCLECI" == "true" ]]
 then
-  git fetch origin master
+  git fetch origin master --depth 1
   reporters_opt="-f github_status github_pr_review"
 fi
 

data/lib/install/bin/tools-setup

@@ -7,6 +7,8 @@ set -eo pipefail
 
 export BUNDLE_GEMFILE=Gemfile.tools
 
+[[ (-z "$(command -v bundle)") ]] && gem install --conservative bundler
+
 bundle check || bundle install --jobs=4 --retry=3
 
-yarn check || yarn install
+bin/yarn check || bin/yarn install

data/lib/install/bin/tools-upgrade

@@ -7,6 +7,6 @@ set -eo pipefail
 
 export BUNDLE_GEMFILE=Gemfile.tools
 
-bundle update --jobs=4 --retry=3
+bundle update --jobs=4 --retry=3 --all
 
-yarn check || yarn install
+yarn check || yarn upgrade

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.14"
+  VERSION = '0.0.19'
 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/package.json

@@ -0,0 +1,5 @@
+{
+  "devDependencies": {
+    "eslint": "^7.20.0"
+  }
+}

data/rejuvenation.rb

@@ -1,17 +1,19 @@
-require "json"
+# frozen_string_literal: true
+
+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,107 +29,112 @@ def add_template_repository_to_source_path
 
 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 jest-junit"
+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/.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 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"
-copy_file "lib/install/.simplecov", ".simplecov"
-copy_file "lib/install/codecov.yml", "codecov.yml"
+say '=> Copying services configuration'
+copy_file 'lib/install/.simplecov', '.simplecov'
+copy_file 'lib/install/codecov.yml', 'codecov.yml'
 
-say "=> Adds service client API gems"
+say '=> Adds service client API gems'
 
 gem_group :test do
-  gem "simplecov", require: false, group: :test
-  gem "codecov", require: false, group: :test
+  gem 'simplecov', require: false, group: :test
+  gem 'codecov', require: false, group: :test
+  gem 'rexml', require: false, group: :test # for hot fix of webdrivers and ruby 3
 end
 
-gem "oj"
+gem 'oj'
 
 gem_group :production, :staging do
-  gem "dalli"
-  gem "r7insight"
-  gem "rollbar"
+  gem 'dalli'
+  gem 'r7insight'
+  gem 'rollbar'
 end
 
-directory "lib/install/.circleci", ".circleci"
+directory 'lib/install/.circleci', '.circleci'
 
-if File.read("Gemfile").include? "rspec"
-  gem "rspec_junit_formatter", require: false, group: :test
+if File.read('Gemfile').include? 'rspec'
+  gem 'rspec_junit_formatter', require: false, group: :test
   insert_into_file(
-    "spec/spec_helper.rb",
+    '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",
+    '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)",
+  gsub_file 'test/test_helper.rb',
+    'parallelize(workers: :number_of_processors)',
     "parallelize(workers: :number_of_processors) unless ENV['COVERAGE']"
 end
 
-say "=> Copying git configuration"
-directory "lib/install/.github", ".github"
-copy_file "lib/install/.gitattributes", ".gitattributes"
+say '=> Copying git configuration'
+directory 'lib/install/.github', '.github'
+if Gem::Version.new(Rails.version) >= Gem::Version.new('6.1.0')
+  gitattributes = <<~GITATTRIBUTES
+    *.gemspec diff=ruby
+    *.rake    diff=ruby
+    *.rb      diff=ruby
+    *.js      diff=javascript
+  
+    db/schema.rb merge=ours diff=ruby
+    yarn.lock merge=ours
+    Gemfile.lock merge=ours linguist-generated
+  GITATTRIBUTES
+  insert_into_file '.gitattributes', gitattributes
+else
+  copy_file 'lib/install/.gitattributes', '.gitattributes'
+end
 
-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 "=> Generate binstubs for linters"
-  run "BUNDLE_GEMFILE=Gemfile.tools bundle binstub --force pronto"
-  run "BUNDLE_GEMFILE=Gemfile.tools bundle binstub --force rubocop"
-  run "BUNDLE_GEMFILE=Gemfile.tools bundle binstub --force standard"
+  say '=> Install tools'
+  run 'bin/tools-setup'
+  run 'BUNDLE_GEMFILE=Gemfile.tools bundle lock --add-platform x86_64-linux'
+
+  say '=> Generate binstubs for linters'
+  run 'BUNDLE_GEMFILE=Gemfile.tools bundle binstub --force pronto'
+  run 'BUNDLE_GEMFILE=Gemfile.tools bundle binstub --force rubocop'
+  run 'BUNDLE_GEMFILE=Gemfile.tools bundle binstub --force standard'
 end
 
-say "=> Set git hooks"
-run "git config core.hooksPath ./bin/git-hooks"
-say "=> Install all new dependencies"
+say '=> Set git hooks'
+run 'git config core.hooksPath ./bin/git-hooks'
+say '=> Install all new dependencies'
 
 run <<~BREW_INSTALL
   hash brew 2> /dev/null \
@@ -137,29 +142,32 @@ def add_template_repository_to_source_path
   || echo "Please install Homebrew: https://brew.sh/"
 BREW_INSTALL
 
-say "=> Update development config"
-uncomment_lines "config/environments/development.rb", /config\.file_watcher = ActiveSupport::EventedFileUpdateChecker/
+say '=> Update development config'
+uncomment_lines(
+  'config/environments/development.rb',
+  /config\.file_watcher = ActiveSupport::EventedFileUpdateChecker/
+)
 
-say "=> Set up R7Insight"
+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",
+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",
+  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")
+    before: 'Rails.application.configure do'
+  environment(r7insight_config, env: 'staging')
 end
 
-gem "connection_pool"
+gem 'connection_pool'
 
-say "=> Set up Memcachier"
+say '=> Set up Memcachier'
 memcachier_config = <<-CODE
   if ENV["MEMCACHIER_SERVERS"]
     config.cache_store = :mem_cache_store,
@@ -171,40 +179,42 @@ def add_template_repository_to_source_path
   end
 
 CODE
-environment(memcachier_config, env: "production")
-if File.exist?("config/environments/staging.rb")
-  environment(memcachier_config, env: "staging")
+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"
+  say '=> Setup default bundle config'
+  run 'bundle config jobs 4'
+  run 'bundle config retry 3'
+
+  run 'bundle'
 
-  run "bundle"
+  run 'bundle lock --add-platform x86_64-linux'
 end
 
-uncomment_lines "bin/setup", /system\(.*?\\byarn\b/
+uncomment_lines 'bin/setup', /system\(.*?\\byarn\b/
 
 insert_into_file(
-  "bin/setup",
-  "system!('bin/tools-setup')\n",
-  after: "system!('bin/yarn')\n"
+  'bin/setup',
+  "system! 'bin/tools-setup'\n",
+  after: "system! 'gem install bundler --conservative'\n"
 )
 
-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 "**************************************************************************"
+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 '**************************************************************************'