@leverege/build-tools 2.0.1 → 2.0.3

package/lib/server/circleate

@@ -119,9 +119,7 @@ jobs:
 
       - run: 
           name: Check for vulnerabilities
-          command: |
-            sudo npm install -g npm@latest
-            npm audit --production
+          command: npm audit --production
 
       - run:
           name: Check for LICENSE and README files
@@ -309,9 +307,7 @@ jobs:
 
       - run: 
           name: Check for vulnerabilities
-          command: |
-            sudo npm install -g npm@latest
-            npm audit --production
+          command: npm audit --production
 
       - run:
           name: Check for LICENSE and README files
@@ -561,3 +557,6 @@ EOCIRCLE
 
 check_circle_config
 create_circle_config
+
+## TODO: tag docker image with
+## CIRCLE_USERNAME

package/lib/server/dockreate

@@ -312,7 +312,12 @@ echo "Creating Docker Image for $gcimage:$version"
 echo "   Building the workspace"
 
 # use kaniko to cache builds
-[ "$USE_KANIKO" == "yes" ] && gcloud config set builds/use_kaniko True
+if [ "$USE_KANIKO" == "yes" ];
+then
+  gcloud config set builds/use_kaniko True
+else
+  gcloud config unset builds/use_kaniko
+fi
 
 # submit the build request to gcloud
 gcloud builds submit --tag $gcimage:$version .

package/lib/server/pkglint

@@ -0,0 +1,35 @@
+#!/bin/bash
+
+C_off='\e[0m'
+C_yellow='\e[93m'
+
+good() {
+  printf "\e[32m✔${C_off}"
+}
+
+bad() {
+  printf "\e[31m✘${C_off}"
+}
+
+check_file() {
+  local C_stat=$(bad)
+  local filename=$1
+
+  if [ -f $filename ]; then
+    C_stat=$(good)
+    printf "$C_stat $filename\n"
+  else
+    printf "$C_stat $filename is missing\n\n"
+    printf "${C_yellow}  Please create $filename before pushing to prod\n\n"
+    exit 1
+  fi
+}
+
+printf "\nChecking repo for markdown files\n\n"
+
+files=( README.md LICENSE.md )
+for file in ${files[@]}; do
+  check_file $file
+done
+
+printf "\nAll required files exist\n\n"

package/lib/web/dnsify/index.js

@@ -5,8 +5,6 @@ require("core-js/modules/es.symbol");
 
 require("core-js/modules/es.array.filter");
 
-require("core-js/modules/es.array.for-each");
-
 require("core-js/modules/es.object.get-own-property-descriptor");
 
 require("core-js/modules/es.object.get-own-property-descriptors");
@@ -23,7 +21,7 @@ require("regenerator-runtime/runtime");
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(source, true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(source).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 

package/lib/web/packleate/Packleator.js

@@ -6,8 +6,6 @@ require("core-js/modules/es.array.concat");
 
 require("core-js/modules/es.array.filter");
 
-require("core-js/modules/es.array.for-each");
-
 require("core-js/modules/es.array.index-of");
 
 require("core-js/modules/es.array.iterator");
@@ -48,7 +46,7 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(source, true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(source).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 

package/lib/web/packleate/index.js

@@ -5,8 +5,6 @@ require("core-js/modules/es.symbol");
 
 require("core-js/modules/es.array.filter");
 
-require("core-js/modules/es.array.for-each");
-
 require("core-js/modules/es.object.get-own-property-descriptor");
 
 require("core-js/modules/es.object.get-own-property-descriptors");
@@ -23,7 +21,7 @@ require("regenerator-runtime/runtime");
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(source, true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(source).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.0.1",
+  "version": "2.0.3",
   "description": "A package for development build tools.",
   "main": "index.js",
   "scripts": {
@@ -28,7 +28,7 @@
     "overwhelm": "src/overwhelm",
     "packleate": "lib/web/packleate/index.js",
     "pkgck": "src/pkgck",
-    "pkglint": "lib/server/pkglint/index.js"
+    "pkglint": "src/pkglint"
   },
   "author": "Leverege Devs",
   "license": "SEE LICENSE IN LICENSE.md",

package/src/circleate

@@ -119,9 +119,7 @@ jobs:
 
       - run: 
           name: Check for vulnerabilities
-          command: |
-            sudo npm install -g npm@latest
-            npm audit --production
+          command: npm audit --production
 
       - run:
           name: Check for LICENSE and README files
@@ -309,9 +307,7 @@ jobs:
 
       - run: 
           name: Check for vulnerabilities
-          command: |
-            sudo npm install -g npm@latest
-            npm audit --production
+          command: npm audit --production
 
       - run:
           name: Check for LICENSE and README files
@@ -561,3 +557,6 @@ EOCIRCLE
 
 check_circle_config
 create_circle_config
+
+## TODO: tag docker image with
+## CIRCLE_USERNAME

package/src/dockreate

@@ -312,7 +312,12 @@ echo "Creating Docker Image for $gcimage:$version"
 echo "   Building the workspace"
 
 # use kaniko to cache builds
-[ "$USE_KANIKO" == "yes" ] && gcloud config set builds/use_kaniko True
+if [ "$USE_KANIKO" == "yes" ];
+then
+  gcloud config set builds/use_kaniko True
+else
+  gcloud config unset builds/use_kaniko
+fi
 
 # submit the build request to gcloud
 gcloud builds submit --tag $gcimage:$version .

package/src/pkglint

@@ -0,0 +1,35 @@
+#!/bin/bash
+
+C_off='\e[0m'
+C_yellow='\e[93m'
+
+good() {
+  printf "\e[32m✔${C_off}"
+}
+
+bad() {
+  printf "\e[31m✘${C_off}"
+}
+
+check_file() {
+  local C_stat=$(bad)
+  local filename=$1
+
+  if [ -f $filename ]; then
+    C_stat=$(good)
+    printf "$C_stat $filename\n"
+  else
+    printf "$C_stat $filename is missing\n\n"
+    printf "${C_yellow}  Please create $filename before pushing to prod\n\n"
+    exit 1
+  fi
+}
+
+printf "\nChecking repo for markdown files\n\n"
+
+files=( README.md LICENSE.md )
+for file in ${files[@]}; do
+  check_file $file
+done
+
+printf "\nAll required files exist\n\n"

package/lib/server/pkglint/index.js

@@ -1,22 +0,0 @@
-#!/usr/bin/env node
-"use strict";
-
-const glob = require('glob');
-
-const filesToCheck = ['README.md', 'LICENSE.md'];
-const mdFiles = glob.sync('*.md'); // from https://github.com/lodash/lodash/issues/1743
-
-function arrayContainsArray(superset, subset) {
-  if (subset.length === 0) {
-    return false;
-  }
-
-  return subset.every(value => {
-    return superset.indexOf(value) >= 0;
-  });
-}
-
-if (!arrayContainsArray(mdFiles, filesToCheck)) {
-  console.log('Cannot find README.md or LICENSE.md');
-  process.exit(1);
-}

package/lib/web/pkglint/index.js

@@ -1,26 +0,0 @@
-#!/usr/bin/env node
-"use strict";
-
-require("core-js/modules/es.array.every");
-
-require("core-js/modules/es.array.index-of");
-
-var glob = require('glob');
-
-var filesToCheck = ['README.md', 'LICENSE.md'];
-var mdFiles = glob.sync('*.md'); // from https://github.com/lodash/lodash/issues/1743
-
-function arrayContainsArray(superset, subset) {
-  if (subset.length === 0) {
-    return false;
-  }
-
-  return subset.every(function (value) {
-    return superset.indexOf(value) >= 0;
-  });
-}
-
-if (!arrayContainsArray(mdFiles, filesToCheck)) {
-  console.log('Cannot find README.md or LICENSE.md');
-  process.exit(1);
-}

package/src/pkglint/index.js

@@ -1,22 +0,0 @@
-#!/usr/bin/env node
-
-const glob = require( 'glob' )
-
-const filesToCheck = [ 'README.md', 'LICENSE.md' ]
-
-const mdFiles = glob.sync( '*.md' )
-
-// from https://github.com/lodash/lodash/issues/1743
-function arrayContainsArray( superset, subset ) {
-  if ( subset.length === 0 ) {
-    return false
-  }
-  return subset.every( ( value ) => {
-    return ( superset.indexOf( value ) >= 0 )
-  } )
-}
-
-if ( !arrayContainsArray( mdFiles, filesToCheck ) ) {
-  console.log( 'Cannot find README.md or LICENSE.md' )
-  process.exit( 1 )
-}