jt_tools 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c63801c8e8fcffc02beb0dbe676efd7299b92dd6fda606ec8f34399defe1c77
-  data.tar.gz: a89b329f0d055f5c664115b1f8cdaf18074650ce566c3507291fa70da79d3a56
+  metadata.gz: 79f6a271c87b4eca2f49f215466e6c2973d9c205b146b4c9f80e2d1967ea15ac
+  data.tar.gz: 53ff1177b284378248aeefc76863a190fdf9621c98c15650cef5e238414ba9d5
 SHA512:
-  metadata.gz: 589c5368d864f56acd70e1128feb81b21864a806c592ffef62da0070194063911f9c67beaad4ce98f2606f1056c9dd0fec2e315a38189e30990c14e104d01ea1
-  data.tar.gz: 2f7721a86dd0a52e40ee9d20eed1dfcd5f10da41ba89144eb5ccaabcd106b459235a4aa1e90b0b5e976be7e9f5e63d1acb78c3d9e0e3bc8afd520dcc1cbdca46
+  metadata.gz: 58a52a3c2c8a4b6f2e3cbf2edde9494354196e23d76ce93f00a93b5587c7b349cf000734f6a9977dcd579820336601a2e6718b1a94ad59f4a0775e5ee9c5d88e
+  data.tar.gz: 64d6138dff8145ed8415713fee0e42e68c833f7798c6455e41420df25a30e73e6f98197ef36c09d03b58ea5cf3977f5216ad114a367299b9c010739ee4008bcf

data/README.md

@@ -22,6 +22,7 @@ Pre-setup for service
 * [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)
@@ -39,7 +40,7 @@ rails app:template LOCATION=https://raw.githubusercontent.com/jetthoughts/jt_too
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'jt_tools', groups: [:development]
+gem 'jt_tools', groups: [:development], github: 'jetthoughts/jt_tools'
 ```
 
 And then execute:

data/bin/test

@@ -24,7 +24,7 @@ then
 else
   rails new test_tmpl --template ../template.rb --quiet --database postgresql
   cd test_tmpl
-  bin/setup
+  DISABLE_SPRING=1 bin/setup
 fi
 
 echo " => Verify CircleCI config:"

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

@@ -6,6 +6,10 @@
 
 version: 2.1
 
+orbs:
+  ruby: circleci/ruby@1.0.0
+  node: circleci/node@2.1.1
+
 workflows:
   version: 2
   test:
@@ -34,7 +38,7 @@ jobs:
   test:
     docker:
       # specify the version you desire here
-      - image: circleci/ruby:2.6-node-browsers
+      - image: circleci/ruby:2.7-node-browsers
         environment:
           BUNDLE_GEMFILE: Gemfile
           BUNDLE_PATH: vendor/bundle
@@ -57,46 +61,14 @@ jobs:
 
     steps:
       - checkout
-
-      - run:
-          name: Install Bundler
-          command: |
-            echo 'export BUNDLER_VERSION=$(cat Gemfile.lock | tail -1 | tr -d " ")' >> $BASH_ENV
-            source $BASH_ENV
-            gem install bundler:$BUNDLER_VERSION
-
-      # Download and cache dependencies
-      - restore_cache:
-          name: Restore Bundler Cache
-          keys:
-            - v1-dependencies-{{ checksum "Gemfile.lock" }}
-            - v1-dependencies-
-
-      - run:
-          name: Install Bundler Dependencies
-          command: bin/bundle check --path vendor/bundle || bin/bundle install --deployment
-
-      - save_cache:
-          name: Save Bundler Cache
-          paths:
-            - ./vendor/bundle
-          key: v1-dependencies-{{ checksum "Gemfile.lock" }}
-
-      - restore_cache:
-          name: Restore Yarn Cache
-          keys:
-            - v1-yarn-dependencies-{{ checksum "yarn.lock" }}
-            - v1-yarn-dependencies-
-
-      - run:
-          name: Install Yarn Dependencies
-          command: bin/yarn check || bin/yarn install
-
-      - save_cache:
-          name: Save Yarn Cache
-          paths:
-            - ./node_modules
-          key: v1-yarn-dependencies-{{ checksum "yarn.lock" }}
+      - ruby/install-deps:
+          bundler-version: '`cat Gemfile.lock | tail -1 | tr -d " "`'
+          key: v1-dependencies
+      - node/install-packages:
+          app-dir: .
+          pkg-manager: yarn
+          cache-key: yarn.lock
+          cache-version: v1
 
       - restore_cache:
           keys:
@@ -155,7 +127,7 @@ jobs:
           path: ./coverage
   lint:
     docker:
-      - image: circleci/ruby:2.6-stretch-node
+      - image: circleci/ruby:2.7-stretch-node
         environment:
           DISABLE_SPRING: 1
           BUNDLE_GEMFILE: Gemfile.tools
@@ -192,7 +164,7 @@ jobs:
 
   upgrade_tools:
     docker:
-      - image: circleci/ruby:2.6-stretch-node
+      - image: circleci/ruby:2.7-stretch-node
         environment:
           DISABLE_SPRING: 1
           BUNDLE_GEMFILE: Gemfile.tools
@@ -209,7 +181,7 @@ 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
+      - run: sudo apt-get update && sudo apt-get install cmake yamllint python3-setuptools python3-pkg-resources
 
       - run:
           name: Run Gemfile tools update in separate branch

data/lib/install/.rubocop.yml

@@ -9,6 +9,9 @@ AllCops:
     - 'db/migrate/**/*'
     - 'db/schema.rb'
 
+Layout/EmptyLinesAroundAttributeAccessor:
+  Enabled: true
+
 Layout/EmptyLinesAroundBlockBody:
   Exclude:
     - 'db/schema.rb'
@@ -39,9 +42,18 @@ Layout/MultilineOperationIndentation:
 Layout/ParameterAlignment:
   EnforcedStyle: with_fixed_indentation
 
+Layout/SpaceAroundMethodCallOperator:
+  Enabled: true
+
 Layout/SpaceInLambdaLiteral:
   EnforcedStyle: require_space
 
+Lint/RaiseException:
+  Enabled: true
+
+Lint/StructNewOverride:
+  Enabled: true
+
 Metrics/AbcSize:
   Exclude:
     - 'test/**/*.rb'
@@ -75,12 +87,27 @@ Style/ClassAndModuleChildren:
 Style/Documentation:
   Enabled: false
 
+Style/ExponentialNotation:
+  Enabled: true
+
 Style/FrozenStringLiteralComment:
   Enabled: true
 
+Style/HashEachMethods:
+  Enabled: true
+
+Style/HashTransformKeys:
+  Enabled: true
+
+Style/HashTransformValues:
+  Enabled: true
+
 Style/SafeNavigation:
   Enabled: false
 
+Style/SlicingWithRange:
+  Enabled: true
+
 Style/StabbyLambdaParentheses:
   EnforcedStyle: require_no_parentheses
 

data/lib/install/Gemfile.tools

@@ -22,4 +22,5 @@ group :tools do
 
   gem 'rubocop-performance', require: false
   gem 'rubocop-rails', require: false
+  gem 'better_html', '< 1.0.15'
 end

data/lib/jt_tools/version.rb

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

data/template.rb

@@ -66,8 +66,9 @@ end
 gem 'oj'
 
 gem_group :production, :staging do
+  gem 'dalli'
+  gem 'r7insight'
   gem 'rollbar'
-  gem 'le'
 end
 
 directory 'lib/install/.circleci', '.circleci'
@@ -123,6 +124,39 @@ BREW_INSTALL
 say '=> Update development config'
 uncomment_lines 'config/environments/development.rb', /config\.file_watcher = ActiveSupport::EventedFileUpdateChecker/
 
+say '=> Set up R7Insight'
+r7insight_config = <<-CODE
+  if ENV['R7INSIGHT_TOKEN'].present?
+    Rails.logger = R7Insight.new(ENV['R7INSIGHT_TOKEN'], ENV['R7INSIGHT_REGION'])
+  end
+CODE
+insert_into_file 'config/environments/production.rb',
+                 "require 'r7_insight.rb'" + "\n\n",
+                 before: 'Rails.application.configure do'
+environment(r7insight_config, env: 'production')
+if File.exist?('config/environments/staging.rb')
+  insert_into_file 'config/environments/staging.rb',
+                   "require 'r7_insight.rb'" + "\n\n",
+                   before: 'Rails.application.configure do'
+  environment(r7insight_config, env: 'staging')
+end
+
+say '=> Set up Memcachier'
+memcachier_config = <<-CODE
+  if ENV["MEMCACHIER_SERVERS"]
+    config.cache_store = :mem_cache_store,
+      ENV["MEMCACHIER_SERVERS"].split(","), {
+        username: ENV["MEMCACHIER_USERNAME"], password: ENV["MEMCACHIER_PASSWORD"],
+        failover: true, socket_timeout: 1.5, socket_failure_delay: 0.2, down_retry_delay: 60,
+        pool_size: ENV.fetch("RAILS_MAX_THREADS") { 5 },
+      }
+  end
+
+CODE
+environment(memcachier_config, env: 'production')
+environment(memcachier_config, env: 'staging') if File.exist?('config/environments/staging.rb')
+
+
 after_bundle do
   say '=> Setup default bundle config'
   run 'bundle config jobs 4'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jt_tools
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Paul Keen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-19 00:00:00.000000000 Z
+date: 2020-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties