jt_tools 0.0.8 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 572357ddd76795a8be4e63b9971170b929b88a13984bc19699cccb032360e6f0
-  data.tar.gz: 623a3189df117eaddd2b9e34a71133e258335db0c75fc21e229291c9a02c8110
+  metadata.gz: 35b89b5f4bb94c741c42e3767ce71862ecefd2ad3e3e2069b2aa5424b91e05e9
+  data.tar.gz: 9674eb842146e02e3600910336e6dc6f164acea13d68f7b99029de7f91c734a2
 SHA512:
-  metadata.gz: 7c2dc7910b9bcf6c5b4581579ea39b2f8cf8f18f5eb908fa91eec5879836867931dd052aebe9804b565ca27c04955c237d9deb640cfe045637824d61fb7bb945
-  data.tar.gz: 31a9bf64622e847b3b29fba3294974a49775f4789441a2581ef8b60aba3f3708dc86f1646d9919fb57bf87815c624cf71fe4ce393845c82ec794e628e0e1984e
+  metadata.gz: 7343f239a4942a31e03d0e68517594669b2bb68eea02dbc330f9b957625b5df358d04a25e786312556e161e2947ded2a2770c1260e06f9f2fff01f8a7191d0df
+  data.tar.gz: 54ebce2bf0be9160c92fd50526f8e1520686f4e63696bebee61f0384b0541711405a0340bc2aad780acd7f2061a34f0a8e353462b4907f1fcaa65a804da1540a

data/.gitignore

@@ -39,3 +39,4 @@ pkg
 
 # Temp files
 /tmp/
+.rubocop-*

data/Gemfile

@@ -4,3 +4,4 @@ source "https://rubygems.org"
 gemspec
 
 gem "standard"
+gem "bump"

data/bin/standardrb

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'standardrb' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+bundle_binstub = File.expand_path("../bundle", __FILE__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("standard", "standardrb")

data/bin/test

@@ -1,8 +1,9 @@
 #!/usr/bin/env bash
 
-set -xeo pipefail
+set -eo pipefail
 
-echo "=> Yamllint:"
+echo ""
+echo "== Yamllint: =="
 yamllint --config-file lib/install/.yamllint.yml --strict .*/*.yml
 yamllint --config-file lib/install/.yamllint.yml --strict *.yml
 yamllint --config-file lib/install/.yamllint.yml --strict lib/**/.*.yml
@@ -18,23 +19,27 @@ gem uninstall oj || true
 
 if [[ "$TEST_APP_TEMPLATE" == "true" ]]
 then
-  rails new test_tmpl --quiet --database postgresql
+  rails new test_tmpl --quiet --database postgresql --skip-webpack-install
   cd test_tmpl
-  rails app:template LOCATION=../../template.rb
+  bin/setup
+  bin/rails app:template LOCATION="../../template.rb"
 else
-  rails new test_tmpl --template ../template.rb --quiet --database postgresql
+  rails new test_tmpl --template ../template.rb --quiet --database postgresql --skip-webpack-install
   cd test_tmpl
-  DISABLE_SPRING=1 bin/setup
+  bin/setup
 fi
 
-echo " => Verify CircleCI config:"
+echo ""
+echo "== Verify CircleCI config =="
 circleci config validate
 
-echo " => Verify installation scripts:"
+echo ""
+echo "== Verify installation scripts =="
 bin/tools-setup
 bin/tools-upgrade
 
-echo " => Verify linters setup:"
+echo ""
+echo "== Verify linters setup =="
 
 git add .
 git commit -m 'Initial Commit'
@@ -55,7 +60,8 @@ BUNDLE_GEMFILE=Gemfile.tools bin/bundle exec rails_best_practices --without-colo
 
 CIRCLECI=false bin/lint-pr -f text
 
-echo " => Run git hooks verifications"
+echo ""
+echo "== Run git hooks verifications =="
 bin/git-hooks/post-merge
 CIRCLECI=false bin/git-hooks/pre-push
 

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

@@ -7,8 +7,8 @@
 version: 2.1
 
 orbs:
-  ruby: circleci/ruby@1.0.0
-  node: circleci/node@2.1.1
+  ruby: circleci/ruby@1.0.5
+  node: circleci/node@3.0.1
 
 workflows:
   version: 2
@@ -61,15 +61,28 @@ jobs:
 
     steps:
       - checkout
+
+      - restore_cache:
+          name: Restore Bundler Cache between Branches
+          keys:
+            - v1-dependencies-{{ checksum "Gemfile.lock" }}
+            - v1-dependencies-
+
       - ruby/install-deps:
           bundler-version: '`cat Gemfile.lock | tail -1 | tr -d " "`'
           key: v1-dependencies
-      - node/install:
-          node-version: latest
+          with-cache: false
+          path: './vendor/bundle'
+
+      - save_cache:
+          name: Save Bundler Cache between Branches
+          paths:
+            - ./vendor/bundle
+          key: v1-dependencies-{{ checksum "Gemfile.lock" }}
+
       - node/install-packages:
           app-dir: .
           pkg-manager: yarn
-          cache-key: yarn.lock
           cache-version: v1
 
       - restore_cache:
@@ -77,7 +90,7 @@ jobs:
             - asset-cache-v1-{{ arch }}-{{ .Branch }}-{{ checksum "yarn.lock" }}-{{ .Environment.CIRCLE_SHA1 }}
             - asset-cache-v1-{{ arch }}-{{ .Branch }}-{{ checksum "yarn.lock" }}-
             - asset-cache-v1-{{ arch }}-{{ .Branch }}-
-            - asset-cache-v1-
+            - asset-cache-v1-{{ arch }}-master-
 
       - run:
           name: Precompile Assets
@@ -143,9 +156,9 @@ jobs:
 
       - run:
           name: Install cmake for building pronto dependencies
-          command: sudo apt-get update -qq &&
-                   sudo apt-get install -yq --no-install-recommends
-                     cmake yamllint python3-setuptools python3-pkg-resources pkg-config
+          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
@@ -182,9 +195,11 @@ jobs:
             source $BASH_ENV
             gem install bundler:$BUNDLER_VERSION
 
-      - run: sudo apt-get update && sudo apt-get install cmake yamllint python3-setuptools python3-pkg-resources pkg-config
+      - run:
+          name: Install System Dependencies
+          command: sudo apt-get update
+            && sudo apt-get install cmake yamllint python3-setuptools python3-pkg-resources pkg-config
 
       - run:
           name: Run Gemfile tools update in separate branch
-          command: |
-            ./bin/circleci-auto_upgrade_tools
+          command: ./bin/circleci-auto_upgrade_tools

data/lib/install/.fasterer.yml

@@ -0,0 +1,3 @@
+---
+speedups:
+  fetch_with_argument_vs_block: false

data/lib/install/.github/config.yml

@@ -0,0 +1,21 @@
+---
+version: 2
+updates:
+  - package-ecosystem: bundler
+    directory: "/"
+    schedule:
+      interval: weekly
+      time: "10:00"
+    open-pull-requests-limit: 3
+    versioning-strategy: lockfile-only
+    allow:
+      - dependency-type: all
+  - package-ecosystem: npm
+    directory: "/"
+    schedule:
+      interval: weekly
+      time: "10:00"
+    open-pull-requests-limit: 3
+    versioning-strategy: lockfile-only
+    allow:
+      - dependency-type: all

data/lib/install/.rubocop.yml

@@ -1,63 +1,39 @@
 ---
 require:
-  - rubocop-performance
+  - standard
   - rubocop-rails
 
+inherit_gem:
+  standard: config/base.yml
+
 AllCops:
   TargetRubyVersion: 2.7
+
   Exclude:
     - 'db/migrate/**/*'
     - 'db/schema.rb'
+    - 'vendor/**/*'
 
-Layout/DotPosition:
+Bundler/InsecureProtocolSource:
   Enabled: true
-  EnforcedStyle: leading
+  Include:
+    - '**/*.gemfile'
+    - '**/Gemfile'
+    - '**/Gemfile.tools'
+    - '**/gems.rb'
 
 Layout/EmptyLinesAroundAttributeAccessor:
   Enabled: true
 
-Layout/EmptyLinesAroundBlockBody:
-  Exclude:
-    - 'db/schema.rb'
-
-Layout/FirstHashElementIndentation:
-  EnforcedStyle: consistent
-
-Layout/HashAlignment:
-  EnforcedHashRocketStyle: table
-  EnforcedColonStyle: table
-  EnforcedLastArgumentHashStyle: always_inspect
-
 Layout/LineLength:
   Max: 113
 
 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/DeprecatedOpenSSLConstant:
-  Enabled: true
-
-Lint/RaiseException:
-  Enabled: true
-
 Lint/StructNewOverride:
   Enabled: true
 
@@ -109,31 +85,16 @@ Style/HashTransformKeys:
 Style/HashTransformValues:
   Enabled: true
 
-Style/SafeNavigation:
-  Enabled: false
-
 Style/SlicingWithRange:
   Enabled: true
 
-Style/StabbyLambdaParentheses:
-  EnforcedStyle: require_no_parentheses
-
-Style/StringLiterals:
-  Enabled: true
-  EnforcedStyle: double_quotes
-  Exclude:
-    - 'db/schema.rb'
-
-Style/TrailingCommaInHashLiteral:
-  EnforcedStyleForMultiline: consistent_comma
-
 # Rails
 
 Rails:
   Enabled: true
 
 Rails/SkipsModelValidations:
-  Blacklist: []
+  Enabled: false
 
 Rails/UnknownEnv:
   Environments:

data/lib/install/Brewfile

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-tap "caskroom/cask"
-cask_args appdir: "/Applications"
-
 tap "heroku/brew"
 
 brew "circleci"

data/lib/install/Gemfile.tools

@@ -18,10 +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-minitest', require: false
-  gem 'rubocop-performance', require: false
   gem 'rubocop-rails', require: false
   # gem 'rubocop-rspec', require: false
+  gem 'standard', '>= 0.4.7', require: false
 end

data/lib/install/bin/git-hooks/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/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/jt_tools/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module JtTools
-  VERSION = "0.0.8"
+  VERSION = "0.0.13"
 end

data/shipit.rubygems.yml

@@ -0,0 +1 @@
+# use defaults

data/template.rb

@@ -102,7 +102,7 @@ else
     "parallelize(workers: :number_of_processors) unless ENV['COVERAGE']"
 end
 
-directory "lib/install/.dependabot", ".dependabot"
+directory "lib/install/.github", ".github"
 
 say "=> Copying heroku configuration"
 copy_file "lib/install/app.json", "app.json"
@@ -122,6 +122,7 @@ Bundler.with_original_env do
   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"
@@ -130,7 +131,7 @@ say "=> Install all new dependencies"
 
 run <<~BREW_INSTALL
   hash brew 2> /dev/null \
-  && (brew bundle check || brew bundle install) \
+  && (brew bundle check || brew bundle install --no-lock) \
   || echo "Please install Homebrew: https://brew.sh/"
 BREW_INSTALL
 
@@ -181,6 +182,14 @@ Bundler.with_original_env do
   run "bundle"
 end
 
+uncomment_lines "bin/setup", /system\(.*?\\byarn\b/
+
+insert_into_file(
+  "bin/setup",
+  "system!('bin/tools-setup')\n",
+  after: "system!('bin/yarn')\n"
+)
+
 say "**************************************************************************"
 say "**************************************************************************"
 say ""

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jt_tools
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.13
 platform: ruby
 authors:
 - Paul Keen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-07 00:00:00.000000000 Z
+date: 2020-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -44,14 +44,16 @@ files:
 - README.md
 - Rakefile
 - _config.yml
+- bin/standardrb
 - bin/test
 - jt_tools.gemspec
 - lib/install/.better-html.yml
 - lib/install/.circleci/config.yml
-- lib/install/.dependabot/config.yml
 - lib/install/.editorconfig
 - lib/install/.erb-lint.yml
 - lib/install/.eslintrc.js
+- lib/install/.fasterer.yml
+- lib/install/.github/config.yml
 - lib/install/.pronto.yml
 - lib/install/.pronto_eslint_npm.yml
 - lib/install/.reek.yml
@@ -77,6 +79,7 @@ files:
 - lib/jt_tools/version.rb
 - lib/tasks/install.rake
 - rejuvenation.rb
+- shipit.rubygems.yml
 - template.rb
 homepage: https://jtway.co
 licenses:

data/lib/install/.dependabot/config.yml

@@ -1,32 +0,0 @@
----
-version: 1
-update_configs:
-  # Keep package.json (& lockfiles) up to date as soon as
-  # new versions are published to the npm registry
-  - package_manager: javascript
-    directory: /
-    update_schedule: weekly
-    allowed_updates:
-      - match:
-          dependency_type: development
-          update_type: all
-      - match:
-          dependency_type: production
-          update_type: security
-    version_requirement_updates: 'off'
-  - package_manager: ruby:bundler
-    directory: /
-    update_schedule: weekly
-    allowed_updates:
-      - match:
-          dependency_type: all
-          update_type: all
-    automerged_updates:
-      - match:
-          dependency_name: puma
-          update_type: semver:minor
-      - match:
-          dependency_name: rspec*
-      - match:
-          dependency_name: capybara*
-    version_requirement_updates: 'off'