zarro 1.92.0 → 1.94.2

package/gulp-tasks/dotnet-publish.js

@@ -1,23 +1,24 @@
-const { publish } = require("gulp-dotnet-cli"),
-  env = requireModule("env"),
-  gulp = requireModule("gulp");
-
-gulp.task(
-  "dotnet-publish",
-  "Performs `dotnet publish` on all non-test projects in the tree",
-  () => {
-    const publishOpts = {
-      configuration: env.resolve("DOTNET_PUBLISH_BUILD_CONFIGURATION", "BUILD_CONFIGURATION"),
-      runtime: env.resolve("DOTNET_PUBLISH_RUNTIMES"),
-      output: env.resolve("OUTPUT")
-    };
-
-    const testInclusionsInverted = env.resolveArray("TEST_INCLUDE")
-    .map(p => `!${p}.csproj`)
-    return gulp
-      .src(["**/*.csproj"].concat(testInclusionsInverted))
-      .pipe(
-        publish(publishOpts)
-      );
-  }
-);
+const
+  { publish } = require("gulp-dotnet-cli"),
+  env = requireModule("env"),
+  gulp = requireModule("gulp");
+
+gulp.task(
+  "dotnet-publish",
+  "Performs `dotnet publish` on all non-test projects in the tree",
+  () => {
+    const publishOpts = {
+      configuration: env.resolve("DOTNET_PUBLISH_BUILD_CONFIGURATION", "BUILD_CONFIGURATION"),
+      runtime: env.resolve("DOTNET_PUBLISH_RUNTIMES"),
+      output: env.resolve("OUTPUT"),
+    };
+
+    const testInclusionsInverted = env.resolveArray("TEST_INCLUDE")
+    .map(p => `!${p}.csproj`)
+    return gulp
+      .src(["**/*.csproj"].concat(testInclusionsInverted))
+      .pipe(
+        publish(publishOpts)
+      );
+  }
+);

package/gulp-tasks/modules/ensure-folder-exists.js

@@ -1,21 +1,28 @@
-const
-  fs = require("fs"),
-  debug = require("debug")("ensure-folder-exists")
-
-module.exports = function ensureFolderExists(folder) {
-  debug(`Ensuring existence of tools folder "${folder}"`);
-  return new Promise((resolve, reject) => {
-    try {
-      if (!fs.existsSync(folder)) {
-        fs.mkdirSync(folder);
-      }
-      debug(`${folder} exists!`);
-      resolve();
-    } catch (e) {
-      debug(`${folder} doesn't exist and not creatable`);
-      debug(e);
-      reject(e);
-    }
-  });
-}
-
+const
+  fs = require("fs"),
+  debug = require("debug")("ensure-folder-exists")
+
+function ensureFolderExists(folder) {
+  debug(`Ensuring existence of tools folder "${folder}"`);
+  return new Promise((resolve, reject) => {
+    try {
+      ensureFolderExistsSync(folder);
+      debug(`${folder} exists!`);
+      resolve();
+    } catch (e) {
+      debug(`${folder} doesn't exist and not creatable`);
+      debug(e);
+      reject(e);
+    }
+  });
+}
+
+function ensureFolderExistsSync(folder) {
+  if (!fs.existsSync(folder)) {
+    fs.mkdirSync(folder);
+  }
+}
+
+ensureFolderExists.sync = ensureFolderExistsSync;
+
+module.exports = ensureFolderExists;

package/gulp-tasks/modules/http-downloader.js

@@ -1,113 +1,113 @@
-var
-  fs = require('fs'),
-  path = require("path"),
-  ensureFolderExists = require("./ensure-folder-exists"),
-  request = require('request'),
-  debug = require('debug')('http-downloader');
-
-function HttpDownloader(infoLogFunction, debugLogFunction) {
-  this._info = infoLogFunction || console.log;
-  this._debug = debugLogFunction || debug;
-  this.assumeDownloadedIfExistsAndSizeMatches = true;
-}
-
-HttpDownloader.prototype = {
-  download: function (url, target) {
-    const partFile = `${target}.part`;
-    ensureFolderExists(path.dirname(partFile));
-    return new Promise((resolve, reject) => {
-      this._request = request.get(url, { timeout: 30000 })
-        .on("response", (response) => {
-          this._debug(`got response: ${JSON.stringify(response)}`);
-          this._downloadSize = parseInt(response.headers["content-length"]);
-          this._statusSuffix = '% of ' + this._humanSize(this._downloadSize);
-        })
-        .on("error", (e) => {
-          this._debug(`got error: ${e}`);
-          reject(e);
-        })
-        .on("data", (data) => {
-          this._debug(`got ${data.length} bytes`);
-          this._updateStatus(data);
-        })
-        .on("end", () => {
-          this._clear();
-          this._rename(resolve, reject, partFile, target);
-        }).pipe(fs.createWriteStream(partFile));
-    });
-  },
-  abort: function () {
-    if (this._request) {
-      self._errored = true;
-      this._request.abort();
-      this._clear();
-    }
-  },
-  _updateStatus: function (data) {
-    if (process.env.SUPPRESS_DOWNLOAD_PROGRESS || process.env.BUILD_NUMBER /* automatically disable at Jenkins CI */) {
-      return;
-    }
-    this._written = this._written || 0;
-    this._written += data.length;
-    var perc = Math.round((100 * this._written) / this._downloadSize);
-    if (perc != this._lastPerc) {
-      this._writeStatus(perc + this._statusSuffix);
-      this._lastPerc = perc;
-    }
-  },
-  _writeStatus: function (msg) {
-    this._clearStatus();
-    process.stdout.write(msg);
-  },
-  _rename: function (resolve, reject, src, dst, attempts) {
-    try {
-      this._debug('attempt rename of temp file');
-      fs.renameSync(src, dst)
-      this._clearStatus();
-      this._info(`-> ${dst} download complete!`);
-      resolve(dst)
-    } catch (e) {
-      this._debug('rename error:', e);
-      if (attempts > 99) {
-        reject(['Unable to rename "', src, '" to "', ds, '": ', e].join(''));
-      } else {
-        setTimeout(()=> {
-          this._rename(resolve, reject, src, dst, attempts++);
-        }, 100);
-      }
-    }
-  },
-  _clearStatus: function () {
-    process.stdout.write('\r               \r');
-  },
-  _humanSize: function (size) {
-    var suffixes = ['b', 'kb', 'mb', 'tb', 'pb'];
-    for (var i = 0; i < suffixes.length - 1; i++) {
-      if (size < 1024) {
-        return size.toFixed(2) + suffixes[i];
-      }
-      size /= 1024;
-    }
-    return size.toFixed(2) + suffixes[suffixes.length - 1];
-  },
-  _clear: function () {
-    var self = this;
-    ['_request', '_response', '_downloadSize', '_lastPerc',
-      '_resolveFunction', '_rejectFunction', '_lastData', '_statusSuffix'
-    ].forEach(function (prop) {
-      self[prop] = undefined;
-    });
-  },
-  _alreadyDownloaded: function () {
-    if (!this.assumeDownloadedIfExistsAndSizeMatches) {
-      return false;
-    }
-    if (!fs.existsSync(this._target)) {
-      return false;
-    }
-    var lstat = fs.lstatSync(this._target);
-    return lstat.size === this._downloadSize;
-  }
-}
-
-module.exports = HttpDownloader;
+const
+  fs = require('fs'),
+  path = require("path"),
+  ensureFolderExists = require("./ensure-folder-exists").sync,
+  request = require('request'),
+  debug = require('debug')('http-downloader');
+
+function HttpDownloader(infoLogFunction, debugLogFunction) {
+  this._info = infoLogFunction || console.log;
+  this._debug = debugLogFunction || debug;
+  this.assumeDownloadedIfExistsAndSizeMatches = true;
+}
+
+HttpDownloader.prototype = {
+  download: function (url, target) {
+    const partFile = `${target}.part`;
+    ensureFolderExists(path.dirname(partFile));
+    return new Promise((resolve, reject) => {
+      this._request = request.get(url, { timeout: 30000 })
+        .on("response", (response) => {
+          this._debug(`got response: ${JSON.stringify(response)}`);
+          this._downloadSize = parseInt(response.headers["content-length"]);
+          this._statusSuffix = '% of ' + this._humanSize(this._downloadSize);
+        })
+        .on("error", (e) => {
+          this._debug(`got error: ${e}`);
+          reject(e);
+        })
+        .on("data", (data) => {
+          this._debug(`got ${data.length} bytes`);
+          this._updateStatus(data);
+        })
+        .on("end", () => {
+          this._clear();
+          this._rename(resolve, reject, partFile, target);
+        }).pipe(fs.createWriteStream(partFile));
+    });
+  },
+  abort: function () {
+    if (this._request) {
+      self._errored = true;
+      this._request.abort();
+      this._clear();
+    }
+  },
+  _updateStatus: function (data) {
+    if (process.env.SUPPRESS_DOWNLOAD_PROGRESS || process.env.BUILD_NUMBER /* automatically disable at Jenkins CI */) {
+      return;
+    }
+    this._written = this._written || 0;
+    this._written += data.length;
+    var perc = Math.round((100 * this._written) / this._downloadSize);
+    if (perc != this._lastPerc) {
+      this._writeStatus(perc + this._statusSuffix);
+      this._lastPerc = perc;
+    }
+  },
+  _writeStatus: function (msg) {
+    this._clearStatus();
+    process.stdout.write(msg);
+  },
+  _rename: function (resolve, reject, src, dst, attempts) {
+    try {
+      this._debug('attempt rename of temp file');
+      fs.renameSync(src, dst)
+      this._clearStatus();
+      this._info(`-> ${dst} download complete!`);
+      resolve(dst)
+    } catch (e) {
+      this._debug('rename error:', e);
+      if (attempts > 99) {
+        reject(['Unable to rename "', src, '" to "', ds, '": ', e].join(''));
+      } else {
+        setTimeout(()=> {
+          this._rename(resolve, reject, src, dst, attempts++);
+        }, 100);
+      }
+    }
+  },
+  _clearStatus: function () {
+    process.stdout.write('\r               \r');
+  },
+  _humanSize: function (size) {
+    var suffixes = ['b', 'kb', 'mb', 'tb', 'pb'];
+    for (var i = 0; i < suffixes.length - 1; i++) {
+      if (size < 1024) {
+        return size.toFixed(2) + suffixes[i];
+      }
+      size /= 1024;
+    }
+    return size.toFixed(2) + suffixes[suffixes.length - 1];
+  },
+  _clear: function () {
+    var self = this;
+    ['_request', '_response', '_downloadSize', '_lastPerc',
+      '_resolveFunction', '_rejectFunction', '_lastData', '_statusSuffix'
+    ].forEach(function (prop) {
+      self[prop] = undefined;
+    });
+  },
+  _alreadyDownloaded: function () {
+    if (!this.assumeDownloadedIfExistsAndSizeMatches) {
+      return false;
+    }
+    if (!fs.existsSync(this._target)) {
+      return false;
+    }
+    var lstat = fs.lstatSync(this._target);
+    return lstat.size === this._downloadSize;
+  }
+}
+
+module.exports = HttpDownloader;

package/gulp-tasks/modules/nuget-push.js

@@ -17,7 +17,8 @@ function isDotnetCore(binaryPath) {
 async function nugetPush(
   packageFile,
   sourceName,
-  options) {
+  options
+) {
   options = options || {};
   options.suppressDuplicateError = options.suppressDuplicateError === undefined
     ? env.resolveFlag("NUGET_IGNORE_DUPLICATE_PACKAGES")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zarro",
-  "version": "1.92.0",
+  "version": "1.94.2",
   "description": "Some glue to make gulp easier, perhaps even zero- or close-to-zero-conf",
   "bin": {
     "zarro": "./index.js"
@@ -42,7 +42,7 @@
     "gulp-dotnet-cli": "^1.1.0",
     "gulp-edit-xml": "^3.1.1",
     "gulp-filter": "^6.0.0",
-    "gulp-msbuild": "^0.8.0",
+    "gulp-msbuild": "^0.9.0",
     "mkdirp": "^1.0.4",
     "nodemon": "^2.0.7",
     "npm-run-all": "^4.1.5",