jt_tools 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 572357ddd76795a8be4e63b9971170b929b88a13984bc19699cccb032360e6f0
-  data.tar.gz: 623a3189df117eaddd2b9e34a71133e258335db0c75fc21e229291c9a02c8110
+  metadata.gz: 001017d403c0730cb5c5af31dfb9dd95bed9de360e7205673c0dfddc43002d04
+  data.tar.gz: 43385b87bfd8cedd5fefaf544a07fd1c07276b580994c3b5be4f534fb6a552bb
 SHA512:
-  metadata.gz: 7c2dc7910b9bcf6c5b4581579ea39b2f8cf8f18f5eb908fa91eec5879836867931dd052aebe9804b565ca27c04955c237d9deb640cfe045637824d61fb7bb945
-  data.tar.gz: 31a9bf64622e847b3b29fba3294974a49775f4789441a2581ef8b60aba3f3708dc86f1646d9919fb57bf87815c624cf71fe4ce393845c82ec794e628e0e1984e
+  metadata.gz: a37e5ea96f886a3a34c9604b1f6f60a54bea85079f0d531fda8dc67055967ba94fd5c096434a371581cb0156c557bf506d323a38ea6ef001ddb088942ba2614e
+  data.tar.gz: c8d44d064d64cf528c0129ecc89a5f965e640e2511ba82f9fd77328e039814c207fae80534919bb253ff58b8dbb8ecc38305ee37bfc38cce6d998a562dfc0e47

data/bin/test

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-set -xeo pipefail
+set -eo pipefail
 
 echo "=> Yamllint:"
 yamllint --config-file lib/install/.yamllint.yml --strict .*/*.yml

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

@@ -61,9 +61,25 @@ 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
+          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:
           node-version: latest
       - node/install-packages:
@@ -143,9 +159,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 +198,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/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,9 +1,12 @@
 #!/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
 
 bundle update --jobs=4 --retry=3
 
-yarn check || yarn install
+bin/yarn check || bin/yarn install

data/lib/jt_tools/version.rb

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

data/template.rb

@@ -130,7 +130,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 +181,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('bundle check') || system!('bundle install')\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.9
 platform: ruby
 authors:
 - Paul Keen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-07 00:00:00.000000000 Z
+date: 2020-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties