jt_tools 0.0.10 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15859809ddca0429ae3711dd7ef6d6284af2cf89cd79b3ec7c42b7ed360856c2
-  data.tar.gz: 034d908682932f3bfa5ae314fa2547f50bbad2cbd8ec2d22f91b37585ea46800
+  metadata.gz: 546f1c903d3ee920591bf6c3fd5d622f9a38714762148f05fbf1c221862b34fd
+  data.tar.gz: d719294b0c1573c574622ee66612650c7d93d270c83ceb1e9565e7a9f7a00945
 SHA512:
-  metadata.gz: 54e8202ef39e94a60a54801567c05c3d3d0ada201336f8c592a8b32901c2caa896b58d0fc29865bd688e5026f55132d9d1b1178aaa019d79cf139e9cf73feda0
-  data.tar.gz: c5f0c683579a0a927e39874d753283a1d51874bea645323ae7baff5988e1224ebff1a9aaa06a4cc908ef78cc4a84c2d5c43ea95af0fae47c2bac9911c0846b2a
+  metadata.gz: 0feb0f9ef79b73f11d91c3c043935cc2f68de2a6c992f0c85228d78ee429fabf85347bf6bd3c05b65371a4b3e4eae53036d4643174558e80651cd68f492eae8f
+  data.tar.gz: 4652b8b1f95a35011ea21085cd34bea3a39bd466ec4974f7292acf3cd16ed2b4f5ad5c1ce8abb2a3c761e56db6ee027e884cc6bb591c9273e638090eb340c314

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,22 +24,15 @@ jobs:
             - rails-v2-{{ arch }}-
             - rails-v2-
 
-      - run: gem install rails -N --update-sources
-
-      - 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"
-
       - 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
 
@@ -55,4 +50,8 @@ workflows:
               only:
                 - master
     jobs:
-      - test
+      - hold:
+          type: approval
+      - test:
+          requires:
+            - hold

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,84 @@
+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-latest' ]
+      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:
+      - 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: Disable Linuxbrew
+        run: |
+          [[ $(uname -s) == "Linux"* ]] && sudo rm -rf $(which brew)
+
+      - name: Run Tests
+        run: bin/ci-test

data/.rubocop.yml

@@ -0,0 +1,11 @@
+---
+inherit_from: lib/install/.rubocop.yml
+
+AllCops:
+  NewCops: enable
+  TargetRubyVersion: 3.0
+
+  Exclude:
+    - 'bin/**/*'
+    - 'template.rb'
+    - 'vendor/**/*'

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,14 @@
-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 '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

@@ -20,10 +20,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,10 @@
+#!/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
+
+bundle exec rubocop -P

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

@@ -3,11 +3,8 @@
 set -eo pipefail
 
 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
 
 mkdir -p tmp/
 
@@ -15,15 +12,17 @@ cd tmp
 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"
 else
+  echo "Generate app with template"
   rails new test_tmpl --template ../template.rb --quiet --database postgresql
   cd test_tmpl
   bin/setup
@@ -67,3 +66,9 @@ 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,25 @@
 # 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'
 
   # 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 +27,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

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

@@ -7,8 +7,9 @@
 version: 2.1
 
 orbs:
-  ruby: circleci/ruby@1.0.5
-  node: circleci/node@3.0.1
+  browser-tools: circleci/browser-tools@1.1.1
+  node: circleci/node@4
+  ruby: circleci/ruby@1
 
 workflows:
   version: 2
@@ -38,7 +39,7 @@ jobs:
   test:
     docker:
       # specify the version you desire here
-      - image: circleci/ruby:2.7-node-browsers
+      - image: cimg/ruby:3.0-browsers
         environment:
           BUNDLE_GEMFILE: Gemfile
           BUNDLE_PATH: vendor/bundle
@@ -61,6 +62,8 @@ jobs:
 
     steps:
       - checkout
+      - browser-tools/install-chrome
+      - browser-tools/install-chromedriver
 
       - restore_cache:
           name: Restore Bundler Cache between Branches
@@ -74,10 +77,14 @@ jobs:
           with-cache: false
           path: './vendor/bundle'
 
+      - run: bundle exec bootsnap precompile --gemfile app/ lib/
+      - run: gem install spring
+
       - save_cache:
           name: Save Bundler Cache between Branches
           paths:
-            - ./vendor/bundle
+            - vendor/bundle
+            - tmp/cache/bootsnap-compile-cache
           key: v1-dependencies-{{ checksum "Gemfile.lock" }}
 
       - node/install-packages:
@@ -106,43 +113,45 @@ jobs:
             - tmp/cache/assets
             - tmp/cache/webpacker
 
-      - restore_cache:
-          name: Restore Jest Cache
-          keys:
-            - jest-cache-v1-{{ arch }}-{{ .Branch }}-{{ .Environment.CIRCLE_SHA1 }}
-            - jest-cache-v1-{{ arch }}-{{ .Branch }}-
-            - jest-cache-v1-
-
-      - run:
-          name: JavaScript Unit Tests
-          command: |
-            bin/yarn test --ci --no-watchman \
-              --coverage --coverageDirectory coverage/jest \
-              --coverageReporters text-summary --coverageReporters html \
-              --reporters=jest-junit
-          environment:
-            JEST_JUNIT_OUTPUT_DIR: tmp/reports/jest-results
-
-      - save_cache:
-          name: Save Jest Cache
-          key: jest-cache-v1-{{ arch }}-{{ .Branch }}-{{ .Environment.CIRCLE_SHA1 }}
-          paths:
-            - tmp/cache/jest
-
-      - run: bin/rails db:schema:load
-      # rails test
-
-      # collect reports
+      # Run JS Tests
+      # - restore_cache:
+      #     name: Restore Jest Cache
+      #     keys:
+      #       - jest-cache-v1-{{ arch }}-{{ .Branch }}-{{ .Environment.CIRCLE_SHA1 }}
+      #       - jest-cache-v1-{{ arch }}-{{ .Branch }}-
+      #       - jest-cache-v1-
+      #
+      # - run:
+      #     name: JavaScript Unit Tests
+      #     command: |
+      #       bin/yarn test --ci --no-watchman \
+      #         --coverage --coverageDirectory coverage/jest \
+      #         --coverageReporters text-summary --coverageReporters html \
+      #         --reporters=jest-junit
+      #     environment:
+      #       JEST_JUNIT_OUTPUT_DIR: tmp/reports/jest-results
+      #
+      # - save_cache:
+      #     name: Save Jest Cache
+      #     key: jest-cache-v1-{{ arch }}-{{ .Branch }}-{{ .Environment.CIRCLE_SHA1 }}
+      #     paths:
+      #       - tmp/cache/jest
+
+      - run: bin/rails db:test:prepare
+      - run: bin/rails test "test/**/*_test.rb"
+
+      # Collect reports
       - store_test_results:
           path: ./tmp/reports/
       - store_artifacts:
           path: ./coverage
   lint:
     docker:
-      - image: cimg/ruby:2.7-node
+      - image: cimg/ruby:3.0-node
         environment:
           DISABLE_SPRING: 1
           BUNDLE_GEMFILE: Gemfile.tools
+          BUNDLE_PATH: vendor/bundle-tools
           BUNDLE_JOBS: 4
           BUNDLE_RETRY: 3
 
@@ -162,7 +171,7 @@ jobs:
 
       - run:
           name: Install Bundle Dependencies
-          command: bin/bundle check --path vendor/bundle-tools || bin/bundle install --path vendor/bundle-tools
+          command: bin/bundle check || bin/bundle install
 
       - run:
           name: Install Node Packages
@@ -178,7 +187,7 @@ jobs:
 
   upgrade_tools:
     docker:
-      - image: cimg/ruby:2.7-node
+      - image: cimg/ruby:3.0-node
         environment:
           DISABLE_SPRING: 1
           BUNDLE_GEMFILE: Gemfile.tools