jt_tools 0.0.11 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca58ce62c8051fef7f2111b3bdf395730e856c1f9eac7e5a1fa3bd6cb02cfd32
-  data.tar.gz: 711f84e4d89e020b559c4ab1314f8b694ca241c214cc0f90045a3bfea3aa6e4a
+  metadata.gz: bdb04a85894fdfe373769904f9a777fba74b09603f12f742fc97790be268745d
+  data.tar.gz: 3c87268fa42ec2ed6f54cc56ca9a256c4d2e9f11da2a23a61ea5f00625de435c
 SHA512:
-  metadata.gz: 7e65608ea2fafe9d5801be68214282b649452f50c8b3f058ec87aa0d04c8e86f0b43c1e9ee7631f9a962de383fa59b5396a6f776e43ee2edd8e3bfc2a95b90c0
-  data.tar.gz: 68079b100b0be3eddf935aedeb994d62a5f852c7a706590bd4a08968749bcad05de69f95cdf225d2365df6e6b430ba6be711eed5d718ce1e6fed9187c89896b8
+  metadata.gz: e96e1914b767646c4e1dfa10a32d645f2012ae7902bceefa1b66c70fa1ef8f902ded3f282522e892e34da8be72d9d7c8fb9abca69866efb0b7e3e40117447fb9
+  data.tar.gz: 6aba8cac6cf26bd2cc19eeeb317bbf0770cb08c6c244381e3c01096d2fabccd2928c4a1854a1ea60246211936f8b10dc1485c4b926202b39baae0db2cd7c8ad1

data/.circleci/config.yml

@@ -3,11 +3,13 @@ version: 2.1
 jobs:
   test:
     docker:
-      - image: cimg/ruby:2.7-node
+      - image: cimg/ruby:3.0-node
         environment:
           DATABASE_URL: postgresql://ubuntu@127.0.0.1/db_test
+          BUNDLE_PATH: /home/circleci/project/vendor/bundle
           BUNDLE_JOBS: 4
           BUNDLE_RETRY: 3
+          DEBIAN_FRONTEND: noninteractive
 
       - image: circleci/postgres:alpine-ram
         environment:
@@ -22,29 +24,51 @@ jobs:
             - rails-v2-{{ arch }}-
             - rails-v2-
 
-      - run: gem install rails -N --update-sources
+      - ruby/install-deps:
+          key: v1-dependencies
+          with-cache: false
+          path: /home/circleci/project/vendor/bundle
 
-      - run: sudo apt-get update -qq && sudo apt-get install -yq --no-install-recommends
-             cmake curl yamllint python3-setuptools python3-pkg-resources pkg-config
-      - run: curl -fLSs https://raw.githubusercontent.com/CircleCI-Public/circleci-cli/master/install.sh |
-             sudo bash
-      - run: git config --global user.email "you@example.com" && git config --global user.name "Your Name"
+      - node/install-packages:
+          app-dir: .
+          pkg-manager: yarn
+          cache-version: v1
 
       - run: |
-          [[ $CIRCLE_NODE_INDEX == "0" ]] || bin/test
+          [[ $CIRCLE_NODE_INDEX == "0" ]] || bin/ci-test
       - run: |
-          [[ $CIRCLE_NODE_INDEX == "1" ]] || TEST_APP_TEMPLATE=true bin/test
+          [[ $CIRCLE_NODE_INDEX == "1" ]] || TEST_APP_TEMPLATE=true bin/ci-test
 
       - save_cache:
           key: rails-v2-{{ arch }}-{{ .Revision }}
           paths:
+            - /home/circleci/project/vendor/bundle
             - /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:

data/.gitattributes

@@ -0,0 +1,11 @@
+*.gemspec diff=ruby
+*.rake    diff=ruby
+*.rb      diff=ruby
+*.js      diff=javascript
+
+db/schema.rb merge=ours diff=ruby linguist-generated
+yarn.lock merge=ours linguist-generated
+Gemfile.lock merge=ours linguist-generated
+
+vendor/*  linguist-vendored
+bin/* linguist-generated

data/.github/workflows/test.yml

@@ -0,0 +1,100 @@
+name: Test
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+  pull_request_target:
+    branches:
+      - master
+
+env:
+  DEBIAN_FRONTEND: noninteractive
+  CIRCLECI: true
+
+jobs:
+  lint:
+    name: Lint
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '3.0'
+          bundler-cache: true
+
+      - name: Run standard Ruby linter
+        run: bundle exec rubocop -P -c ./.rubocop.yml ./
+
+  test:
+    name: Functional testing
+    env:
+      DATABASE_URL: postgresql://postgres_user:postgres@localhost:5432/postgres_db
+
+    strategy:
+      matrix:
+        os-version: [ 'ubuntu-20.04', 'ubuntu-18.04' ]
+      fail-fast: true
+
+    runs-on: ${{ matrix.os-version }}
+
+    services:
+      postgres:
+        image: postgres # circleci/postgres:alpine-ram
+        env:
+          POSTGRES_DB: postgres_db
+          POSTGRES_USER: postgres_user
+          POSTGRES_PASSWORD: postgres
+        ports:
+          - 5432:5432
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+
+    steps:
+      - run: pwd
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Install PostgreSQL client
+        run: sudo apt-get -yqq install libpq-dev
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '3.0'
+          bundler-cache: true
+
+      - name: Use Node.js
+        uses: actions/setup-node@v1
+        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)
+
+      - name: Run Tests
+        run: bin/ci-test

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

@@ -0,0 +1,9 @@
+---
+inherit_from: lib/install/.rubocop.yml
+
+AllCops:
+  Exclude:
+    - 'bin/**/*'
+    - 'template.rb'
+    - 'vendor/**/*'
+    - 'tmp/**/*'

data/.standard.yml

@@ -2,9 +2,13 @@ default_ignores: false
 #fix: true
 format: progress
 parallel: true
-ruby_version: 2.7.1
+ruby_version: 3.0
 
 ignore:
+  - '**/*':
+      - Standard/SemanticBlocks
+  - 'db/schema.rb'
   - 'test/**/*':
       - Layout/AlignHash
   - 'tmp/**/*'
+  - 'vendor/**/*'

data/Gemfile

@@ -1,7 +1,13 @@
-source "https://rubygems.org"
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+ruby '3.0.0'
 
 # Specify your gem's dependencies in jt_tools.gemspec
 gemspec
 
-gem "standard"
-gem "bump"
+gem 'rubocop-minitest', require: false
+gem 'rubocop-performance', require: false
+gem 'rubocop-rails', require: false
+gem 'standard', '>= 0.4.7', 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)
@@ -20,10 +21,10 @@ Pre-setup for service
 
 * [GitHub](https://github.com)
 * [Heroku](https://jtway.co/make-master-stable-again-b15c9ff3b129) (Heroku Reviews Apps)
+  * [MemCachier](https://www.memcachier.com/)
 * [CircleCI](https://circleci.com/)
 * [Codecov](https://codecov.io/) and [Simplecov](https://github.com/colszowka/simplecov)
 * [Dependabot](https://dependabot.com/)
-* [MemCachier](https://www.memcachier.com/)
 * Code Styles:
   * [Pronto](https://jtway.co/effortless-code-review-for-pull-request-changes-241206b1cb04)
   * [Rubocop](https://github.com/rubocop-hq/rubocop)

data/Rakefile

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require "bundler/gem_tasks"
-require "rake/testtask"
+require 'bundler/gem_tasks'
+require 'rake/testtask'
 
 Rake::TestTask.new(:test) do |t|
-  t.libs << "test"
-  t.libs << "lib"
-  t.test_files = FileList["test/**/*_test.rb"]
+  t.libs << 'test'
+  t.libs << 'lib'
+  t.test_files = FileList['test/**/*_test.rb']
 end
 
 task default: :test

data/bin/ci-test

@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+
+set -eo pipefail
+
+gem install rails -N --update-sources
+
+sudo apt-get update -qq && \
+sudo apt-get install -yq --no-install-recommends \
+  cmake curl yamllint python3-setuptools python3-pkg-resources pkg-config
+curl -fLSs https://raw.githubusercontent.com/CircleCI-Public/circleci-cli/master/install.sh | sudo bash
+git config --global user.email "you@example.com" && git config --global user.name "Your Name"
+
+bin/test

data/bin/lint

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+set -eo pipefail
+
+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
+yamllint --config-file lib/install/.yamllint.yml --strict ./**/.*/*.yml
+
+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/rubocop

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'rubocop' 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', __dir__)
+
+if File.file?(bundle_binstub)
+  if /This file was generated by Bundler/.match?(File.read(bundle_binstub, 300))
+    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('rubocop', 'rubocop')

data/bin/test

@@ -2,29 +2,37 @@
 
 set -eo pipefail
 
+export BUNDLE_PATH="$(pwd)/vendor/bundle"
+mkdir -p "$BUNDLE_PATH"
+
+bundle check || bundle install
+yarn check || yarn install
+
 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
-yamllint --config-file lib/install/.yamllint.yml --strict **/.*/*.yml
+echo "== Lint: =="
+bin/lint
+
+target_dir=${1:-$(mktemp -d)}
+template_path="$(pwd)/template.rb"
 
-mkdir -p tmp/
+mkdir -p "$target_dir"
 
-cd tmp
+cd "$target_dir"
 rm -rf test_tmpl
 
 # Test installation of missed gems on applying template
-gem uninstall oj || true
+gem uninstall --force --silent oj || true
 
 if [[ "$TEST_APP_TEMPLATE" == "true" ]]
 then
+  echo "Adds template to existed app"
   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
-  rails new test_tmpl --template ../template.rb --quiet --database postgresql
+  echo "Generate app with template"
+  rails new test_tmpl --template "${template_path}" --quiet --database postgresql
   cd test_tmpl
   bin/setup
 fi
@@ -55,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
 
@@ -65,5 +71,8 @@ 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
+  circleci local execute --job test --config .circleci/config.yml
+fi

data/jt_tools.gemspec

@@ -1,25 +1,26 @@
 # frozen_string_literal: true
 
-lib = File.expand_path("lib", __dir__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "jt_tools/version"
+require 'jt_tools/version'
 
 Gem::Specification.new do |spec|
-  spec.name = "jt_tools"
+  spec.name = 'jt_tools'
   spec.version = JtTools::VERSION
-  spec.authors = ["Paul Keen"]
-  spec.email = ["pftg@users.noreply.github.com"]
+  spec.authors = ['Paul Keen']
+  spec.email = ['pftg@users.noreply.github.com']
 
-  spec.summary = "Setup development scripts to manage code base effectively"
-  spec.description = "Helpful scripts to run linters locally and on CI"
-  spec.homepage = "https://jtway.co"
-  spec.license = "MIT"
+  spec.summary = 'Setup development scripts to manage code base effectively'
+  spec.description = 'Helpful scripts to run linters locally and on CI'
+  spec.homepage = 'https://jtway.co'
+  spec.license = 'MIT'
 
-  spec.metadata["homepage_uri"] = spec.homepage
-  spec.metadata["source_code_uri"] = "https://github.com/jetthoughts/jt-tools/"
-  spec.metadata["changelog_uri"] = "https://github.com/jetthoughts/jt-tools/"
+  spec.metadata['homepage_uri'] = spec.homepage
+  spec.metadata['source_code_uri'] = 'https://github.com/jetthoughts/jt-tools/'
+  spec.metadata['changelog_uri'] = 'https://github.com/jetthoughts/jt-tools/'
 
-  spec.add_dependency "railties", ">= 4.2"
+  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.
@@ -27,5 +28,5 @@
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
 
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 end