@leverege/build-tools 2.4.8 → 2.5.0-beta.39

package/package.json

@@ -1,26 +1,31 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.4.8",
+  "version": "2.5.0-beta.39",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "scripts": {
     "build": "npm run compile",
-    "compile": "rm -fr lib && npm run compile_server && npm run compile_web",
-    "compile_server": "NODE_ENV=server babel -d lib/server src/",
+    "clean": "rm -rf lib",
+    "compile": "npm run clean && npm run compile_server && npm run compile_web",
+    "compile_server": "NODE_ENV=server babel -d lib/server src/ && npm run repo_init_publisher",
     "compile_web": "NODE_ENV=web babel -d lib/web src/",
     "licenseCheck": "license-checker --summary --failOn GPL",
+    "npm-check-updates": "npm-check-updates -i",
+    "postinstall": "src/npm-scripts/postinstall.js",
     "prepublintOnly": "npm run lint && npm run build",
     "prepublishOnly": "npm run compile",
+    "repo_init_publisher": "src/repo-init/scripts/augment-npmpublish",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "bin": {
+    "build-tools": "src/build-tools.js",
     "circleate": "src/circleate",
     "decrypt-secrets": "src/decrypt-secrets",
     "dirty-git": "src/dirty-git",
     "dockreate": "src/dockreate",
     "encrypt-secrets": "src/encrypt-secrets",
-    "getfbcfg": "src/getfbcfg",
-    "getjson": "src/getjson",
+    "getfbcfg": "src/getfbcfg.js",
+    "getjson": "src/getjson.js",
     "git-tar": "src/git-tar",
     "helmdn": "src/helmdn",
     "helmify": "lib/server/helmify/index.js",
@@ -32,47 +37,43 @@
     "k8x": "src/k8x",
     "npm-link": "src/npm-link",
     "npm-unlink": "src/npm-unlink",
-    "overwhelm": "src/overwhelm",
-    "packleate": "lib/web/packleate/index.js",
+    "overwhelm": "src/overwhelm.js",
     "pkgck": "src/pkgck",
     "pkglint": "src/pkglint",
     "prune-git": "src/prune-git",
-    "pull-git": "src/pull-git"
+    "pull-git": "src/pull-git",
+    "repo-init": "lib/server/repo-init/index.js"
   },
   "author": "Leverege Devs",
   "license": "SEE LICENSE IN LICENSE.md",
   "dependencies": {
-    "async": "^3.2.0",
-    "chalk": "^3.0.0",
+    "chalk": "^4.1.0",
     "clear": "^0.1.0",
+    "clipboardy": "^2.3.0",
     "command-line-args": "^5.1.1",
     "command-line-usage": "^6.1.0",
-    "commander": "^2.20.3",
     "dotenv": "^8.2.0",
-    "execa": "^4.0.2",
-    "figlet": "^1.4.0",
-    "fs-extra": "^8.1.0",
+    "execa": "^4.0.3",
+    "figlet": "^1.5.0",
     "git-branch": "^2.0.1",
     "glob": "^7.1.6",
-    "inquirer": "^7.1.0",
+    "inquirer": "^7.3.3",
     "js-yaml": "^3.14.0",
-    "minimist": "^1.2.5",
-    "ora": "^3.4.0",
+    "ncp": "^2.0.0",
+    "npm-check-updates": "^7.0.2",
+    "npm-registry-fetch": "^8.1.3",
+    "open": "^7.1.0",
+    "ora": "^4.0.5",
     "parse-gitignore": "^1.0.1",
     "readline-sync": "^1.4.10",
-    "recursive-copy": "^2.0.10",
-    "regenerator-runtime": "^0.13.5",
-    "semver": "^6.3.0",
-    "tar": "^5.0.5"
+    "semver": "^7.3.2",
+    "simple-git": "^2.15.0"
   },
   "devDependencies": {
-    "@babel/cli": "^7.8.4",
-    "@babel/core": "^7.9.6",
-    "@babel/plugin-proposal-class-properties": "^7.8.3",
-    "@babel/plugin-proposal-optional-chaining": "^7.9.0",
-    "@babel/preset-env": "^7.9.6",
-    "@babel/register": "^7.9.0",
-    "@leverege/eslint-config-leverege": "^2.0.10",
-    "core-js": "^3.6.5"
+    "@babel/cli": "^7.10.5",
+    "@babel/core": "^7.10.5",
+    "@babel/node": "^7.10.5",
+    "@leverege/babel-preset-leverege-node": "^1.0.4",
+    "@leverege/eslint-config-leverege": "^2.0.10"
   }
 }

package/src/bash-funcs

@@ -0,0 +1,61 @@
+#!/bin/bash
+#
+# A collection of bash things that have traditionally been copied around from
+# script to script, which is a pain. These scripts reside in the # build-tools
+# and can now be easily added to a script via bash sourcing:
+#         . `build-tools --bashfun`
+
+# Simple ANSI color coded string generator.
+function color() {
+  local color=
+  case "$1" in
+    'g') color="92m" ;; # green
+    'c') color="96m" ;; # lt blue
+    'y') color="93m" ;; # yellow
+    'r') color="91m" ;; # red
+    'toast') color="1;3;7;91;103;5m" ;;
+  esac
+  printf "\e[$color$2\e[0m"
+}
+
+function clearlyWarn() {
+  [ -z "$1" ] && clear
+  cat<<CLEARWARN
+
+ `color y '*** WARNING *** WARNING *** WARNING *** WARNING *** WARNING *** WARNING ***'`
+
+CLEARWARN
+}
+
+function errorExit() {
+  cat <<ERREXIT
+
+  `color r ***ERROR:` $1
+
+ERREXIT
+  exit 1
+}
+
+function yesOrSkipToContinue() {
+  printf "\n Enter \"`color g yes`\" ${1}, \"`color y skip`\" to skip this step, or anything else to exit.\n\n"
+  read ANS
+  [ "$ANS" == 'yes'  ] && return 0
+  [ "$ANS" == 'skip' ] && return 2
+  exit 1
+}
+
+function yesToContinue() {
+  printf "\n Enter \"`color g yes`\" ${1}, or anything else to exit.\n\n"
+  read ANS
+  [ "$ANS" != 'yes'  ] && exit 1
+}
+
+function proceedOnEnter() {
+  printf " Hit `color g return` to proceed\n\n" && read ANS
+}
+
+function setOrUnset() {
+  local setting=`color toast "NEEDS TO BE SET"`
+  [ ! -z "$1" ] && setting=`color g $1`
+  echo "$setting"
+}

package/src/build-tools.js

@@ -0,0 +1,137 @@
+#!/usr/bin/env node
+
+const chalk = require( 'chalk' )
+const cliArgs = require( 'command-line-args' )
+const cliHelp = require( 'command-line-usage' )
+const fs = require( 'fs' )
+const npmRegistryFetch = require( 'npm-registry-fetch' )
+const path = require( 'path' )
+const semverLt = require( 'semver/functions/lt' )
+
+/* eslint-disable no-console */
+
+const optionList = [ // Use optionList to tie into the Usage statements
+  { name : 'root',
+    type : Boolean,
+    default : false,
+    description : 'returns the root of the build-tools installation',
+  },
+  { name : 'bashfun',
+    type : Boolean,
+    default : false,
+    descriptions : 'returns path to a script to source for common bash functions',
+  },
+  {
+    name : 'help',
+    type : Boolean,
+    default : false,
+    description : 'display this help screen',
+  },
+  { name : 'latest',
+    type : Boolean,
+    default : false,
+    description : 'verifies the latest build-tools are installed',
+  },
+  { name : 'version',
+    type : Boolean,
+    default : false,
+    description : 'returns the build-tools repo version',
+  },
+  { name : 'verbose',
+    alias : 'v',
+    type : Boolean,
+    default : false,
+    description : 'emit additional info at run time',
+  },
+]
+
+const sections = [
+  {
+    header : 'Something to go in the Header',
+    content : 'Generate something {italic very} important.',
+  },
+  { header : 'Options',
+    optionList,
+  },
+]
+const args = cliArgs( optionList, { partial : true } )
+const help = cliHelp( sections )
+
+const repoRoot = path.dirname( __dirname )
+const thisPackage = require( `${repoRoot}/package.json` )
+const thisVersion = thisPackage.version
+
+if ( args.root ) {
+  console.log( repoRoot )
+  process.exit( 0 )
+}
+
+if ( args.bashfun ) {
+  console.log( `${repoRoot}/src/bash-funcs` )
+  process.exit( 0 )
+}
+
+const checkForLatest = async ( pkg = '@leverege/build-tools' ) => {
+  const getToken = () => {
+    const tokenFile = `${process.env.HOME}/.npmrc`
+    if ( !fs.existsSync( tokenFile ) ) {
+      console.error( `Cannot find token file ${tokenFile}` )
+      process.exit( 1 )
+    }
+    try {
+      const tokenLine = fs.readFileSync( tokenFile ).toString()
+      const tokenRegX = new RegExp( '.*registry.npmjs.org\\/:\\w+=+(.*)' )
+      const tokenStr = tokenLine.match( tokenRegX )
+      if ( !tokenStr ) {
+        console.error( `\n***ERROR: malformed npm token in ${tokenFile}\n` )
+        process.exit( 1 )
+      }
+      return tokenLine.match( tokenRegX )[1]
+    } catch ( err ) {
+      console.error( err )
+    }
+  }
+
+  try {
+    const list = await npmRegistryFetch.json(
+      pkg, { '//registry.npmjs.org/:token': getToken() }
+    )
+    return list['dist-tags'].latest
+  } catch ( err ) {
+    console.log( err )
+  }
+}
+
+if ( args.latest ) {
+  checkForLatest()
+    .then( ( latestVersion ) => {
+      if ( semverLt( thisVersion, latestVersion ) ) {
+        console.log(chalk.white`
+  Update available ${chalk.grey( thisVersion )} \u2b62 ${chalk.green( latestVersion )}
+  Run ${chalk.cyan( 'npm i -g @leverege/build-tools' )} to update
+`
+        )
+        process.exit( 1 )
+      } else {
+        process.exit( 0 )
+      }
+    } )
+    .catch( ( err ) => {
+    } )
+}
+
+if ( args.version ) {
+  console.log( `build-tools version ${thisVersion}` )
+  process.exit( 0 )
+}
+
+if ( args.help ) {
+  console.log( help )
+  process.exit( 0 )
+}
+
+/* eslint-disable no-underscore-dangle */
+if ( args._unknown ) {
+  console.log( `Hey Bozo, WTF am I supposed to do with ${args._unknown}?` )
+  process.exit( 1 )
+}

package/src/{getfbcfg → getfbcfg.js}

@@ -3,21 +3,22 @@
 /**
  * This script parses a firebase config into something useful.
  */
-let stdbuf = []
+const stdbuf = []
 
+/* eslint-disable no-console */
 process.stdin
   .on( 'data', ( d ) => { stdbuf.push( d ) } )
   .on( 'end', () => {
     const rawCfg = stdbuf.join( '' ).replace( /["\n\r]/g, '' )
-    const keyVals = rawCfg.match(/\{(.*)\}/)[1].split(',')
+    const keyVals = rawCfg.match( /\{(.*)\}/ )[1].split( ',' )
 
     const lastLine = keyVals.length - 1
-    console.log( "{" )
-    for( let i = 0; i <= lastLine; i++ ) {
+    console.log( '{' )
+    for ( let i = 0; i <= lastLine; i++ ) {
       const kv = keyVals[i].trim().split( ' ' )
-      console.log( `  "${kv[0].replace( /:/, '')}": "${kv[1]}"${(i < lastLine ? ',' : '')}` )
+      console.log( `  "${kv[0].replace( /:/, '' )}": "${kv[1]}"${( i < lastLine ? ',' : '' )}` )
     }
-    console.log( "}" )
+    console.log( '}' )
 
   } )
   .setEncoding( 'utf8' )

package/src/getjson.js

@@ -0,0 +1,74 @@
+#!/usr/bin/env node
+
+/**
+ * This script will allow the user to grab a value from a JSON file and
+ * optionally apply a regular expression to it. Given this test.json file:
+ * 
+ * {
+ *   "name": "@leverege/packagename",
+ *   "main": "lib/index.js"
+ * }
+ *
+ * and invoking as:
+ *   ./getjson --file ./test.json --key name --regex "^@\w{3}"
+ *
+ * will yield an output of: @lev
+ */
+
+/**
+ * Get a command line switch parser.
+ */
+const fs = require( 'fs' )
+const cliArgs = require( 'command-line-args' )
+const cliHelp = require( 'command-line-usage' )
+
+/* eslint-disable no-console */
+const optionList = [ // Use optionList to tie into the Usage statements
+  { name : 'file',
+    type : String,
+    alias : 'f',
+    description : 'file to parse JSON from',
+  },
+  {
+    name : 'key',
+    type : String,
+    alias : 'k',
+    description : 'JSON key whose value to grab',
+  },
+  {
+    name : 'regex',
+    type : String,
+    alias : 'r',
+    description : 'regular expression to apply to the value',
+  },
+]
+
+const sections = [
+  {
+    header : 'JSON variable fetching script',
+    content : 
+`  This script is intended to give shell scripts a simple JSON
+  parsing capability.`,
+  },
+  { header : 'Options',
+    optionList,
+  },
+]
+const args = cliArgs( optionList, { partial : true } )
+const help = cliHelp( sections )
+
+if ( !args.file ) {
+  console.error( '\n***ERROR: Missing a --file param\n' )
+  console.log( help )
+  process.exit( 1 )
+}
+
+try {
+  const json = JSON.parse( fs.readFileSync( args.file, 'utf8' ) )
+  const value = json[args.key]
+  const match = new RegExp( args.regex || '.*' ).exec( value )
+
+  console.log( match ? match[match.length - 1] : '' )
+} catch ( e ) {
+  console.log( e )
+}

package/src/helmdn

@@ -102,7 +102,7 @@ NOGRESS
 
     [ "$SERVICE" == "elastic" ] && doNuking elasticsearch && continue
 
-    helm delete --purge $SERVICE
+    helm delete $SERVICE
   done
 }
 

package/src/helminit-dp

@@ -5,6 +5,7 @@ chartName=${dockerName//-/_}
 
 enableFirebase=$2
 enableBigQuery=$3
+protocol=$4
 
 if [ "$enableFirebase" = true ] ; then
   firebaseVolume="
@@ -125,6 +126,7 @@ spec:
         {{- if .Values.$chartName.port }}
         - name: api
           containerPort: {{ .Values.$chartName.port }}
+          protocol: $protocol
         {{- end }}
         - name: node-metrics
           containerPort: 5111

package/src/npm-scripts/postinstall.js

@@ -0,0 +1,17 @@
+#!/usr/bin/env node
+
+const execa = require( 'execa' )
+const fs = require( 'fs' )
+
+const untarConfigTarball = async ( subdir, tarball ) => {
+  if ( fs.existsSync( subdir ) ) {
+    process.chdir( subdir )
+    await execa( 'tar', [ 'xf', tarball ] )
+  }
+}
+
+const awaiter = async ( subdir, tarball) => {
+  await untarConfigTarball( subdir, tarball )
+}
+
+awaiter( 'lib/server/repo-init', 'config.tgz' )