jt_tools 0.0.15 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 546f1c903d3ee920591bf6c3fd5d622f9a38714762148f05fbf1c221862b34fd
-  data.tar.gz: d719294b0c1573c574622ee66612650c7d93d270c83ceb1e9565e7a9f7a00945
+  metadata.gz: bdb04a85894fdfe373769904f9a777fba74b09603f12f742fc97790be268745d
+  data.tar.gz: 3c87268fa42ec2ed6f54cc56ca9a256c4d2e9f11da2a23a61ea5f00625de435c
 SHA512:
-  metadata.gz: 0feb0f9ef79b73f11d91c3c043935cc2f68de2a6c992f0c85228d78ee429fabf85347bf6bd3c05b65371a4b3e4eae53036d4643174558e80651cd68f492eae8f
-  data.tar.gz: 4652b8b1f95a35011ea21085cd34bea3a39bd466ec4974f7292acf3cd16ed2b4f5ad5c1ce8abb2a3c761e56db6ee027e884cc6bb591c9273e638090eb340c314
+  metadata.gz: e96e1914b767646c4e1dfa10a32d645f2012ae7902bceefa1b66c70fa1ef8f902ded3f282522e892e34da8be72d9d7c8fb9abca69866efb0b7e3e40117447fb9
+  data.tar.gz: 6aba8cac6cf26bd2cc19eeeb317bbf0770cb08c6c244381e3c01096d2fabccd2928c4a1854a1ea60246211936f8b10dc1485c4b926202b39baae0db2cd7c8ad1

data/.circleci/config.yml

@@ -24,6 +24,16 @@ jobs:
             - rails-v2-{{ arch }}-
             - rails-v2-
 
+      - ruby/install-deps:
+          key: v1-dependencies
+          with-cache: false
+          path: /home/circleci/project/vendor/bundle
+
+      - node/install-packages:
+          app-dir: .
+          pkg-manager: yarn
+          cache-version: v1
+
       - run: |
           [[ $CIRCLE_NODE_INDEX == "0" ]] || bin/ci-test
       - run: |
@@ -36,10 +46,29 @@ jobs:
             - /home/circleci/.rubygems
             - /home/circleci/.cache
 
+orbs:
+  node: circleci/node@4
+  ruby: circleci/ruby@1
+
 workflows:
-  test:
+  commit:
     jobs:
-      - test
+      - hold:
+          type: approval
+          filters:
+            branches:
+              ignore:
+                - master
+      - test:
+          requires:
+            - hold
+  merge:
+    jobs:
+      - test:
+          filters:
+            branches:
+              only:
+                - master
 
   daily:
     triggers:
@@ -50,8 +79,4 @@ workflows:
               only:
                 - master
     jobs:
-      - hold:
-          type: approval
-      - test:
-          requires:
-            - hold
+      - test

data/.github/workflows/test.yml

@@ -38,7 +38,7 @@ jobs:
 
     strategy:
       matrix:
-        os-version: [ 'ubuntu-20.04', 'ubuntu-latest' ]
+        os-version: [ 'ubuntu-20.04', 'ubuntu-18.04' ]
       fail-fast: true
 
     runs-on: ${{ matrix.os-version }}
@@ -59,6 +59,7 @@ jobs:
           --health-retries 5
 
     steps:
+      - run: pwd
       - name: Checkout code
         uses: actions/checkout@v2
 
@@ -76,6 +77,21 @@ jobs:
         with:
           node-version: 14
 
+      - name: Get yarn cache directory path
+        id: yarn-cache-dir-path
+        run: echo "::set-output name=dir::$(yarn cache dir)"
+
+      - uses: actions/cache@v2
+        with:
+          path: |
+            **/node_modules
+            ${{ steps.yarn-cache-dir-path.outputs.dir }}
+          key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-modules-
+
+      - run: yarn install
+
       - name: Disable Linuxbrew
         run: |
           [[ $(uname -s) == "Linux"* ]] && sudo rm -rf $(which brew)

data/.gitignore

@@ -27,7 +27,7 @@ config/master.key
 ## Environment normalization:
 */bin/bundle
 .bundle
-*/vendor/bundle
+vendor/bundle
 
 # Ignore Byebug command history file.
 .byebug_history

data/.rubocop.yml

@@ -2,10 +2,8 @@
 inherit_from: lib/install/.rubocop.yml
 
 AllCops:
-  NewCops: enable
-  TargetRubyVersion: 3.0
-
   Exclude:
     - 'bin/**/*'
     - 'template.rb'
     - 'vendor/**/*'
+    - 'tmp/**/*'

data/Gemfile

@@ -7,7 +7,6 @@ ruby '3.0.0'
 # Specify your gem's dependencies in jt_tools.gemspec
 gemspec
 
-gem 'bump'
 gem 'rubocop-minitest', require: false
 gem 'rubocop-performance', require: false
 gem 'rubocop-rails', require: false

data/README.md

@@ -1,3 +1,4 @@
+[![GitHub Actions](https://github.com/jetthoughts/jt_tools/workflows/Test/badge.svg?branch=master)](https://github.com/jetthoughts/jt_tools/actions?query=workflow%3ATest)
 [![CircleCI](https://circleci.com/gh/jetthoughts/jt_tools.svg?style=svg)](https://circleci.com/gh/jetthoughts/jt_tools)
 [![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fjetthoughts%2Fjt_tools.svg?type=shield)](https://app.fossa.io/projects/git%2Bgithub.com%2Fjetthoughts%2Fjt_tools?ref=badge_shield)
 [![Gem Version](https://badge.fury.io/rb/jt_tools.svg)](https://badge.fury.io/rb/jt_tools)

data/bin/lint

@@ -7,4 +7,6 @@ yamllint --config-file lib/install/.yamllint.yml --strict ./*.yml
 yamllint --config-file lib/install/.yamllint.yml --strict lib/**/.*.yml
 yamllint --config-file lib/install/.yamllint.yml --strict ./**/.*/*.yml
 
-bundle exec rubocop -P
+node_modules/.bin/eslint --config lib/install/.eslintrc.js --quiet --no-color lib/**/.*.js
+
+bundle exec rubocop --debug --extra-details --display-style-guide --parallel

data/bin/test

@@ -2,13 +2,22 @@
 
 set -eo pipefail
 
+export BUNDLE_PATH="$(pwd)/vendor/bundle"
+mkdir -p "$BUNDLE_PATH"
+
+bundle check || bundle install
+yarn check || yarn install
+
 echo ""
 echo "== Lint: =="
 bin/lint
 
-mkdir -p tmp/
+target_dir=${1:-$(mktemp -d)}
+template_path="$(pwd)/template.rb"
 
-cd tmp
+mkdir -p "$target_dir"
+
+cd "$target_dir"
 rm -rf test_tmpl
 
 # Test installation of missed gems on applying template
@@ -20,10 +29,10 @@ then
   rails new test_tmpl --quiet --database postgresql
   cd test_tmpl
   bin/setup
-  bin/rails app:template LOCATION="../../template.rb"
+  bin/rails app:template LOCATION="${template_path}"
 else
   echo "Generate app with template"
-  rails new test_tmpl --template ../template.rb --quiet --database postgresql
+  rails new test_tmpl --template "${template_path}" --quiet --database postgresql
   cd test_tmpl
   bin/setup
 fi
@@ -54,8 +63,6 @@ git commit -m 'Adds sample_for_linters'
 bin/rubocop --fail-level F sample_for_linters.rb
 bin/pronto run -c HEAD~1 --no-exit-code
 BUNDLE_GEMFILE=Gemfile.tools bin/bundle exec rails_best_practices --without-color --silent --test .
-# FIXME: https://github.com/Shopify/erb-lint/issues/162
-# BUNDLE_GEMFILE=Gemfile.tools bin/bundle exec erblint --config ../../lib/install/.erb-lint.yml --autocorrect .
 
 CIRCLECI=false bin/lint-pr -f text
 
@@ -64,9 +71,6 @@ echo "== Run git hooks verifications =="
 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
-
 # For local run only
 if [[ -z "$CIRCLECI" ]]
 then

data/jt_tools.gemspec

@@ -20,6 +20,7 @@
   spec.metadata['changelog_uri'] = 'https://github.com/jetthoughts/jt-tools/'
 
   spec.add_dependency 'railties', '>= 4.2'
+  spec.add_development_dependency 'bump'
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.

data/lib/jt_tools/version.rb

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

data/package.json

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jt_tools
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
 platform: ruby
 authors:
 - Paul Keen
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
+- !ruby/object:Gem::Dependency
+  name: bump
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Helpful scripts to run linters locally and on CI
 email:
 - pftg@users.noreply.github.com
@@ -42,6 +56,7 @@ files:
 - ".rubocop.yml"
 - ".standard.yml"
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - LICENSE.txt
 - README.md
@@ -84,9 +99,11 @@ files:
 - lib/jt_tools/railtie.rb
 - lib/jt_tools/version.rb
 - lib/tasks/install.rake
+- package.json
 - rejuvenation.rb
 - shipit.rubygems.yml
 - template.rb
+- yarn.lock
 homepage: https://jtway.co
 licenses:
 - MIT