@leverege/build-tools 2.4.0 → 2.4.2

package/lib/web/packleate/Packleator.js

@@ -6,16 +6,12 @@ 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");
 
 require("core-js/modules/es.object.get-own-property-descriptor");
 
-require("core-js/modules/es.object.get-own-property-descriptors");
-
 require("core-js/modules/es.object.keys");
 
 require("core-js/modules/es.object.to-string");
@@ -46,9 +42,7 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
 
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 
-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] : {}; var ownKeys = Object.keys(source); if (typeof Object.getOwnPropertySymbols === 'function') { ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function (sym) { return Object.getOwnPropertyDescriptor(source, sym).enumerable; })); } ownKeys.forEach(function (key) { _defineProperty(target, key, source[key]); }); } return target; }
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
@@ -74,13 +68,15 @@ var tar = require('tar');
 
 var semver = require('semver');
 
-var Packleator = /*#__PURE__*/function () {
+var Packleator =
+/*#__PURE__*/
+function () {
   function Packleator(options) {
     _classCallCheck(this, Packleator);
 
     var args = options.args;
     this.privatePackages = new Set();
-    this.args = args ? _objectSpread(_objectSpread({}, args), {}, {
+    this.args = args ? _objectSpread({}, args, {
       output: args.output.substr(-1) === '/' ? args.output.substr(0, args.output.length) : args.output
     }) : {}; // args || {}
 
@@ -97,7 +93,9 @@ var Packleator = /*#__PURE__*/function () {
   _createClass(Packleator, [{
     key: "run",
     value: function () {
-      var _run = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2() {
+      var _run = _asyncToGenerator(
+      /*#__PURE__*/
+      regeneratorRuntime.mark(function _callee2() {
         var _this = this;
 
         var deps;
@@ -147,8 +145,12 @@ var Packleator = /*#__PURE__*/function () {
                       callback();
                     });
                   });
-                }, /*#__PURE__*/function () {
-                  var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(err) {
+                },
+                /*#__PURE__*/
+                function () {
+                  var _ref = _asyncToGenerator(
+                  /*#__PURE__*/
+                  regeneratorRuntime.mark(function _callee(err) {
                     var _this$outputPackageJs, name, version, fileName;
 
                     return regeneratorRuntime.wrap(function _callee$(_context) {
@@ -233,7 +235,9 @@ var Packleator = /*#__PURE__*/function () {
   }, {
     key: "rebuildPackageJson",
     value: function () {
-      var _rebuildPackageJson = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee3() {
+      var _rebuildPackageJson = _asyncToGenerator(
+      /*#__PURE__*/
+      regeneratorRuntime.mark(function _callee3() {
         var _this2 = this;
 
         var packageJson, tarredPackages, _packageJson$dependen, dependencies, _packageJson$devDepen, devDependencies;
@@ -280,7 +284,9 @@ var Packleator = /*#__PURE__*/function () {
   }, {
     key: "rebuildPackageLockJson",
     value: function () {
-      var _rebuildPackageLockJson = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee4() {
+      var _rebuildPackageLockJson = _asyncToGenerator(
+      /*#__PURE__*/
+      regeneratorRuntime.mark(function _callee4() {
         var packageLockJson, tarredPackages, recurseDeps;
         return regeneratorRuntime.wrap(function _callee4$(_context4) {
           while (1) {
@@ -329,7 +335,9 @@ var Packleator = /*#__PURE__*/function () {
   }, {
     key: "copyFiles",
     value: function () {
-      var _copyFiles = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee5() {
+      var _copyFiles = _asyncToGenerator(
+      /*#__PURE__*/
+      regeneratorRuntime.mark(function _callee5() {
         var _this3 = this;
 
         var startsWith, endsWith;
@@ -389,7 +397,9 @@ var Packleator = /*#__PURE__*/function () {
   }, {
     key: "pack",
     value: function () {
-      var _pack = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee6(name, version, dir) {
+      var _pack = _asyncToGenerator(
+      /*#__PURE__*/
+      regeneratorRuntime.mark(function _callee6(name, version, dir) {
         var fileName;
         return regeneratorRuntime.wrap(function _callee6$(_context6) {
           while (1) {
@@ -440,7 +450,9 @@ var Packleator = /*#__PURE__*/function () {
   }, {
     key: "cleanup",
     value: function () {
-      var _cleanup = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee7() {
+      var _cleanup = _asyncToGenerator(
+      /*#__PURE__*/
+      regeneratorRuntime.mark(function _callee7() {
         return regeneratorRuntime.wrap(function _callee7$(_context7) {
           while (1) {
             switch (_context7.prev = _context7.next) {
@@ -472,7 +484,9 @@ var Packleator = /*#__PURE__*/function () {
   }, {
     key: "npmInstall",
     value: function () {
-      var _npmInstall = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee8() {
+      var _npmInstall = _asyncToGenerator(
+      /*#__PURE__*/
+      regeneratorRuntime.mark(function _callee8() {
         var _this4 = this;
 
         var dir,
@@ -526,7 +540,9 @@ var Packleator = /*#__PURE__*/function () {
   }, {
     key: "getPrivateDeps",
     value: function () {
-      var _getPrivateDeps = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee9(depth) {
+      var _getPrivateDeps = _asyncToGenerator(
+      /*#__PURE__*/
+      regeneratorRuntime.mark(function _callee9(depth) {
         var _this5 = this;
 
         return regeneratorRuntime.wrap(function _callee9$(_context9) {
@@ -571,7 +587,9 @@ var Packleator = /*#__PURE__*/function () {
   }, {
     key: "getPackageJson",
     value: function () {
-      var _getPackageJson = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee10() {
+      var _getPackageJson = _asyncToGenerator(
+      /*#__PURE__*/
+      regeneratorRuntime.mark(function _callee10() {
         var dir,
             lock,
             lockModifier,

package/lib/web/packleate/index.js

@@ -3,14 +3,12 @@
 
 require("core-js/modules/es.symbol");
 
-require("core-js/modules/es.array.filter");
+require("core-js/modules/es.array.concat");
 
-require("core-js/modules/es.array.for-each");
+require("core-js/modules/es.array.filter");
 
 require("core-js/modules/es.object.get-own-property-descriptor");
 
-require("core-js/modules/es.object.get-own-property-descriptors");
-
 require("core-js/modules/es.object.keys");
 
 require("core-js/modules/es.object.to-string");
@@ -21,9 +19,7 @@ require("core-js/modules/web.dom-collections.for-each");
 
 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] : {}; var ownKeys = Object.keys(source); if (typeof Object.getOwnPropertySymbols === 'function') { ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function (sym) { return Object.getOwnPropertyDescriptor(source, sym).enumerable; })); } ownKeys.forEach(function (key) { _defineProperty(target, key, 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; }
 
@@ -109,7 +105,9 @@ function main() {
 }
 
 function _main() {
-  _main = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
+  _main = _asyncToGenerator(
+  /*#__PURE__*/
+  regeneratorRuntime.mark(function _callee() {
     var packleator;
     return regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) {
@@ -125,7 +123,7 @@ function _main() {
             break;
 
           case 4:
-            packleator = new Packleator(_objectSpread(_objectSpread({}, defaultConfig), {}, {
+            packleator = new Packleator(_objectSpread({}, defaultConfig, {
               args: args
             }));
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.4.0",
+  "version": "2.4.2",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "scripts": {
@@ -28,7 +28,7 @@
     "helminit-dp": "src/helminit-dp",
     "helminit-scaler": "src/helminit-scaler",
     "helmup": "src/helmup",
-    "k8scale": "k8scale",
+    "k8scale": "src/k8scale",
     "k8x": "src/k8x",
     "npm-link": "src/npm-link",
     "npm-unlink": "src/npm-unlink",

package/src/dockreate

@@ -200,7 +200,21 @@ runuser=$(strip_undefined "`node -p \"require('../package.json').leverege.runuse
 container="`node -p \"require('../package.json').leverege.container\"`"
 if [ "$container" == "undefined" ];
 then
-  container=$(basename `git config --get remote.origin.url` .git)
+  gitremote=`git config --get remote.origin.url`
+  if [ -z $gitremote ];
+  then
+  cat<<NOCONTAINER
+
+  $(colorize 'red' '***ERROR: attempting to build an unnamed container')
+
+  You are attempting to create a docker image without a container name or
+  a git remote setup. Either define a $(colorize 'yellow' 'container') statement in the leverege
+  section of package.json, or add a $(colorize 'green' 'git remote') to this repository.
+
+NOCONTAINER
+  exit 1
+  fi
+  container=$(basename $gitremote .git)
 fi
 gcimage=gcr.io/$project/$container
 

package/src/husky-run

@@ -1,6 +0,0 @@
-#!/bin/bash
-
-printf "\n***** Running Husky Pre-Checks *****\n\n"
-
-sleep 3
-exit 1