zarro 1.165.6 → 1.165.12

package/gulp-tasks/default-report-generator.js

@@ -1,6 +1,6 @@
 "use strict";
 (function () {
-    const gulp = requireModule("gulp"), path = require("path"), findTool = requireModule("testutil-finder").findTool, system = requireModule("system"), quoteIfRequired = requireModule("quote-if-required"), { rm, mkdir, exists } = require("yafs"), env = requireModule("env");
+    const gulp = requireModule("gulp"), path = require("path"), findTool = requireModule("test-util-finder").findTool, system = requireModule("system"), quoteIfRequired = requireModule("quote-if-required"), { rm, mkdir, exists } = require("yafs"), env = requireModule("env");
     env.associate(["COVERAGE_XML", "COVERAGE_REPORTING_EXCLUDE"], "cover-dotnet");
     gulp.task("default-report-generator", `Generates HTML reports from existing coverage XML reports`, async () => {
         const reportGenerator = findTool("ReportGenerator.exe");

package/gulp-tasks/modules/fetch-github-release.js

@@ -8,7 +8,7 @@
     // refuses to pack them, and I haven't figured out
     // why; so another process should create dist-copy
     // specifically for packing purposes
-    search = ["src", "dist", "dist-copy"];
+    search = ["dist-copy", "src"];
     for (const item of search) {
         const seek = path.join(__dirname, "fetch-github-release", item);
         if (folderExistsSync(seek)) {

package/gulp-tasks/modules/gulp-dotnetcover.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 (function () {
-    const gutil = requireModule("gulp-util"), env = requireModule("env"), es = require("event-stream"), path = require("path"), testUtilFinder = requireModule("testutil-finder"), getToolsFolder = requireModule("get-tools-folder"), system = requireModule("system"), coverageTarget = process.env.COVERAGE_TARGET || "Debug", debug = requireModule("debug")(__filename), log = requireModule("log"), { mkdirSync, fileExistsSync } = require("yafs");
+    const gutil = requireModule("gulp-util"), env = requireModule("env"), es = require("event-stream"), path = require("path"), testUtilFinder = requireModule("test-util-finder"), getToolsFolder = requireModule("get-tools-folder"), system = requireModule("system"), coverageTarget = process.env.COVERAGE_TARGET || "Debug", debug = requireModule("debug")(__filename), log = requireModule("log"), { mkdirSync, fileExistsSync } = require("yafs");
     const PLUGIN_NAME = "gulp-dotnetcover";
     function projectPathFor(p) {
         return path.resolve(p);

package/gulp-tasks/modules/test-dotnet-logic.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 (function () {
-    const QUACKERS_LOG_PREFIX = ":quackers_log:", QUACKERS_SUMMARY_START_MARKER = `::start_summary::`, QUACKERS_SUMMARY_COMPLETE_MARKER = `::summary_complete::`, QUACKERS_FAILURE_START_MARKER = `::start_failures::`, QUACKERS_FAILURE_INDEX_PLACEHOLDER = "::[#]::", QUACKERS_SLOW_INDEX_PLACEHOLDER = "::[-]::", QUACKERS_SLOW_SUMMARY_START_MARKER = "::slow_summary_start::", QUACKERS_SLOW_SUMMARY_COMPLETE_MARKER = "::slow_summary_complete::", QUACKERS_SHOW_SUMMARY = "true", QUACKERS_SUMMARY_TOTALS_START_MARKER = "::totals_summary_start::", QUACKERS_SUMMARY_TOTALS_COMPLETE_MARKER = "::totals_summary_complete::", QUACKERS_OUTPUT_FAILURES_INLINE = "true", quackersLogPrefixLength = QUACKERS_LOG_PREFIX.length, quackersFullSummaryStartMarker = `${QUACKERS_LOG_PREFIX}${QUACKERS_SUMMARY_START_MARKER}`, quackersFullSummaryCompleteMarker = `${QUACKERS_LOG_PREFIX}${QUACKERS_SUMMARY_COMPLETE_MARKER}`, { rm, ls, FsEntities, readTextFile, mkdir } = require("yafs"), gulp = requireModule("gulp"), log = requireModule("log"), path = require("path"), gulpDebug = require("gulp-debug"), debug = requireModule("debug")(__filename), filter = require("gulp-filter"), ansiColors = requireModule("ansi-colors"), promisifyStream = requireModule("promisify-stream"), nunitRunner = requireModule("gulp-nunit-runner"), testUtilFinder = requireModule("testutil-finder"), env = requireModule("env"), resolveTestMasks = requireModule("resolve-test-masks"), logConfig = requireModule("log-config"), gatherPaths = requireModule("gather-paths"), { test } = requireModule("dotnet-cli"), { resolveTestPrefixFor } = requireModule("test-utils"), buildReportFolder = path.dirname(env.resolve("BUILD_REPORT_XML")), Version = requireModule("version"), quote = requireModule("quote-if-required"), netFrameworkTestAssemblyFilter = requireModule("netfx-test-assembly-filter"), { baseName, chopExtension } = requireModule("path-utils");
+    const QUACKERS_LOG_PREFIX = ":quackers_log:", QUACKERS_SUMMARY_START_MARKER = `::start_summary::`, QUACKERS_SUMMARY_COMPLETE_MARKER = `::summary_complete::`, QUACKERS_FAILURE_START_MARKER = `::start_failures::`, QUACKERS_FAILURE_INDEX_PLACEHOLDER = "::[#]::", QUACKERS_SLOW_INDEX_PLACEHOLDER = "::[-]::", QUACKERS_SLOW_SUMMARY_START_MARKER = "::slow_summary_start::", QUACKERS_SLOW_SUMMARY_COMPLETE_MARKER = "::slow_summary_complete::", QUACKERS_SHOW_SUMMARY = "true", QUACKERS_SUMMARY_TOTALS_START_MARKER = "::totals_summary_start::", QUACKERS_SUMMARY_TOTALS_COMPLETE_MARKER = "::totals_summary_complete::", QUACKERS_OUTPUT_FAILURES_INLINE = "true", quackersLogPrefixLength = QUACKERS_LOG_PREFIX.length, quackersFullSummaryStartMarker = `${QUACKERS_LOG_PREFIX}${QUACKERS_SUMMARY_START_MARKER}`, quackersFullSummaryCompleteMarker = `${QUACKERS_LOG_PREFIX}${QUACKERS_SUMMARY_COMPLETE_MARKER}`, { rm, ls, FsEntities, readTextFile, mkdir } = require("yafs"), gulp = requireModule("gulp"), log = requireModule("log"), path = require("path"), gulpDebug = require("gulp-debug"), debug = requireModule("debug")(__filename), filter = require("gulp-filter"), ansiColors = requireModule("ansi-colors"), promisifyStream = requireModule("promisify-stream"), nunitRunner = requireModule("gulp-nunit-runner"), testUtilFinder = requireModule("test-util-finder"), env = requireModule("env"), resolveTestMasks = requireModule("resolve-test-masks"), logConfig = requireModule("log-config"), gatherPaths = requireModule("gather-paths"), { test } = requireModule("dotnet-cli"), { resolveTestPrefixFor } = requireModule("test-utils"), buildReportFolder = path.dirname(env.resolve("BUILD_REPORT_XML")), Version = requireModule("version"), quote = requireModule("quote-if-required"), netFrameworkTestAssemblyFilter = requireModule("netfx-test-assembly-filter"), { baseName, chopExtension } = requireModule("path-utils");
     async function runTests() {
         await mkdir(buildReportFolder);
         const dotNetCore = env.resolveFlag("DOTNET_CORE");

package/gulp-tasks/modules/test-util-finder.js

@@ -0,0 +1,172 @@
+"use strict";
+(function () {
+    "use strict";
+    const Version = requireModule("version"), log = requireModule("log"), fs = require("fs"), path = require("path"), debug = requireModule("debug")(__filename), { lsSync, FsEntities } = require("yafs"), programFilesFolder = process.env["ProgramFiles(x86)"]
+        || process.env["ProgramFiles"], getToolsFolder = requireModule("get-tools-folder"), ZarroError = requireModule("zarro-error"), which = requireModule("which"), localAppDataFolder = process.env["LOCALAPPDATA"];
+    function isUnstable(folderName) {
+        return folderName.indexOf("alpha") > -1 ||
+            folderName.indexOf("beta") > -1;
+    }
+    function finder(searchBaseFolders, searchBaseSubFolder, searchFolderPrefix, searchBin, options) {
+        const ignoreBetas = options.ignoreBetas === undefined ? true : options.ignoreBetas, lprefix = searchFolderPrefix.toLowerCase();
+        if (!Array.isArray(searchBaseFolders)) {
+            searchBaseFolders = [searchBaseFolders];
+        }
+        const runner = searchBaseFolders
+            .filter(f => !!f)
+            .map(f => {
+            return searchBaseSubFolder
+                ? path.join(f, searchBaseSubFolder)
+                : f;
+        })
+            .filter(checkExists)
+            .reduce((possibles, baseFolder) => {
+            debug("Searching: " + baseFolder);
+            return fs.readdirSync(baseFolder)
+                .reduce((acc, cur) => {
+                const folder = path.join(baseFolder, cur);
+                const lcur = cur.toLowerCase();
+                if (lcur.indexOf(lprefix) === 0) {
+                    if (ignoreBetas && isUnstable(lcur)) {
+                        log.notice("Ignoring unstable tool at: " + folder);
+                        return acc;
+                    }
+                    const match = cur.match(/\d+/g);
+                    if (!match) {
+                        return acc;
+                    }
+                    const version = match.map(Number);
+                    debug(`Adding possible: ${folder} = version ${version}`);
+                    acc.push({
+                        folder: folder,
+                        version: version
+                    });
+                }
+                return acc;
+            }, possibles);
+        }, [])
+            .sort((x, y) => compareVersionArrays(x.version, y.version))
+            .map((possible) => path.join(possible.folder, searchBin))
+            .find(checkExists);
+        if (runner) {
+            log.debug("Using " + runner);
+        }
+        return runner;
+    }
+    function compareVersionArrays(x, y) {
+        const left = new Version(x), right = new Version(y);
+        const result = left.compareWith(right);
+        // Version::compareWith should compare in natural order (ascending)
+        // and we want descending so we can pick the first one as the top
+        // - but, on the other hand, -0 is a thing :/
+        return result === 0
+            ? 0
+            : -result;
+    }
+    function findWrapper(func, name) {
+        const found = func();
+        if (!found) {
+            debug(`Can't find any installed ${name}`);
+        }
+        return found;
+    }
+    function findInstalledNUnit3() {
+        if (!programFilesFolder) {
+            return null;
+        }
+        const search = path.join(programFilesFolder, "NUnit.org", "nunit-console", "nunit3-console.exe");
+        if (!search) {
+            return null;
+        }
+        return fs.existsSync(search) ? search : null;
+    }
+    function checkExists(somePath) {
+        debug(`Checking if file exists: ${somePath}`);
+        return fs.existsSync(somePath) ? somePath : undefined;
+    }
+    function tryToFindNUnit(options) {
+        return initialToolSearch("nunit3-console.exe", "NUNIT") || searchForSystemNUnit(options);
+    }
+    function latestNUnit(options) {
+        const result = tryToFindNUnit(options);
+        debug(`Using nunit runner: ${result || "NOT FOUND"}`);
+        return result;
+    }
+    function nunit2Finder(searchBin, options) {
+        if (!programFilesFolder) {
+            return undefined;
+        }
+        return finder([programFilesFolder], undefined, "NUnit", searchBin, options);
+    }
+    function searchForSystemNUnit(options) {
+        options = options || {};
+        const isX86 = (options.x86 || ((options.platform || options.architecture) === "x86"));
+        const runner = isX86 ? "/bin/nunit-console-x86.exe" : "/bin/nunit-console.exe";
+        return findWrapper(function () {
+            return findInstalledNUnit3() || nunit2Finder(runner, options);
+        }, "nunit-console runner");
+    }
+    // FIXME: should ignore, eg, foo.csproj, to find foo.exe|bat|com on windows
+    // FIXME: when not on windows, should always do exact match
+    function findTool(exeName, underFolder) {
+        const { chopExtension } = requireModule("path-utils"), withoutExtension = chopExtension(exeName), exeHasExtension = exeName !== withoutExtension;
+        const allResults = lsSync(underFolder || getToolsFolder(), {
+            recurse: true,
+            entities: FsEntities.files,
+            fullPaths: true
+        })
+            .filter((p) => {
+            const thisFileExtension = path.extname(p), parts = p.split(/[\\\/]/g), filename = parts[parts.length - 1];
+            if (thisFileExtension) {
+                if (exeHasExtension) {
+                    return filename.toLowerCase() === exeName.toLowerCase();
+                }
+                else {
+                    const chopped = chopExtension(filename);
+                    return chopped.toLowerCase() === withoutExtension.toLowerCase();
+                }
+            }
+            else {
+                return filename.toLowerCase() === withoutExtension.toLowerCase();
+            }
+        })
+            .sort();
+        return allResults[0] || which(exeName);
+    }
+    function locateDotCover(options) {
+        options = options || {};
+        return initialToolSearch("dotCover.exe", "DOTCOVER") ||
+            findWrapper(function () {
+                return finder([programFilesFolder, localAppDataFolder], "JetBrains/Installations", "dotCover", "dotCover.exe", options)
+                    || finder([programFilesFolder], "JetBrains/dotCover", "v", "Bin/dotCover.exe", options);
+            }, "dotCover");
+    }
+    function latestDotCover(options) {
+        const result = locateDotCover(options);
+        debug(`Using dotCover: ${result || "NOT FOUND"}`);
+        return result;
+    }
+    function initialToolSearch(toolExe, environmentVariable) {
+        const fromEnvironment = process.env[environmentVariable];
+        if (fromEnvironment) {
+            if (!fs.existsSync(fromEnvironment)) {
+                throw new ZarroError(`${fromEnvironment} specified in environment variable ${environmentVariable} not found`);
+            }
+            return fromEnvironment;
+        }
+        return findTool(toolExe);
+    }
+    function latestOpenCover() {
+        const result = initialToolSearch("OpenCover.Console.exe", "OPENCOVER");
+        debug(`Using opencover: ${result || "NOT FOUND"}`);
+        return result;
+    }
+    module.exports = {
+        latestNUnit: latestNUnit,
+        latestDotCover: latestDotCover,
+        latestOpenCover: latestOpenCover,
+        findTool: findTool,
+        nunit2Finder: nunit2Finder,
+        compareVersionArrays: compareVersionArrays
+    };
+})();

package/gulp-tasks/modules/testutil-finder.js

@@ -1,172 +1,5 @@
 "use strict";
 (function () {
-    "use strict";
-    const Version = requireModule("version"), log = requireModule("log"), fs = require("fs"), path = require("path"), debug = requireModule("debug")(__filename), { lsSync, FsEntities } = require("yafs"), programFilesFolder = process.env["ProgramFiles(x86)"]
-        || process.env["ProgramFiles"], getToolsFolder = requireModule("get-tools-folder"), ZarroError = requireModule("zarro-error"), which = requireModule("which"), localAppDataFolder = process.env["LOCALAPPDATA"];
-    function isUnstable(folderName) {
-        return folderName.indexOf("alpha") > -1 ||
-            folderName.indexOf("beta") > -1;
-    }
-    function finder(searchBaseFolders, searchBaseSubFolder, searchFolderPrefix, searchBin, options) {
-        const ignoreBetas = options.ignoreBetas === undefined ? true : options.ignoreBetas, lprefix = searchFolderPrefix.toLowerCase();
-        if (!Array.isArray(searchBaseFolders)) {
-            searchBaseFolders = [searchBaseFolders];
-        }
-        const runner = searchBaseFolders
-            .filter(f => !!f)
-            .map(f => {
-            return searchBaseSubFolder
-                ? path.join(f, searchBaseSubFolder)
-                : f;
-        })
-            .filter(checkExists)
-            .reduce((possibles, baseFolder) => {
-            debug("Searching: " + baseFolder);
-            return fs.readdirSync(baseFolder)
-                .reduce((acc, cur) => {
-                const folder = path.join(baseFolder, cur);
-                const lcur = cur.toLowerCase();
-                if (lcur.indexOf(lprefix) === 0) {
-                    if (ignoreBetas && isUnstable(lcur)) {
-                        log.notice("Ignoring unstable tool at: " + folder);
-                        return acc;
-                    }
-                    const match = cur.match(/\d+/g);
-                    if (!match) {
-                        return acc;
-                    }
-                    const version = match.map(Number);
-                    debug(`Adding possible: ${folder} = version ${version}`);
-                    acc.push({
-                        folder: folder,
-                        version: version
-                    });
-                }
-                return acc;
-            }, possibles);
-        }, [])
-            .sort((x, y) => compareVersionArrays(x.version, y.version))
-            .map((possible) => path.join(possible.folder, searchBin))
-            .find(checkExists);
-        if (runner) {
-            log.debug("Using " + runner);
-        }
-        return runner;
-    }
-    function compareVersionArrays(x, y) {
-        const left = new Version(x), right = new Version(y);
-        const result = left.compareWith(right);
-        // Version::compareWith should compare in natural order (ascending)
-        // and we want descending so we can pick the first one as the top
-        // - but, on the other hand, -0 is a thing :/
-        return result === 0
-            ? 0
-            : -result;
-    }
-    function findWrapper(func, name) {
-        const found = func();
-        if (!found) {
-            debug(`Can't find any installed ${name}`);
-        }
-        return found;
-    }
-    function findInstalledNUnit3() {
-        if (!programFilesFolder) {
-            return null;
-        }
-        const search = path.join(programFilesFolder, "NUnit.org", "nunit-console", "nunit3-console.exe");
-        if (!search) {
-            return null;
-        }
-        return fs.existsSync(search) ? search : null;
-    }
-    function checkExists(somePath) {
-        debug(`Checking if file exists: ${somePath}`);
-        return fs.existsSync(somePath) ? somePath : undefined;
-    }
-    function tryToFindNUnit(options) {
-        return initialToolSearch("nunit3-console.exe", "NUNIT") || searchForSystemNUnit(options);
-    }
-    function latestNUnit(options) {
-        const result = tryToFindNUnit(options);
-        debug(`Using nunit runner: ${result || "NOT FOUND"}`);
-        return result;
-    }
-    function nunit2Finder(searchBin, options) {
-        if (!programFilesFolder) {
-            return undefined;
-        }
-        return finder([programFilesFolder], undefined, "NUnit", searchBin, options);
-    }
-    function searchForSystemNUnit(options) {
-        options = options || {};
-        const isX86 = (options.x86 || ((options.platform || options.architecture) === "x86"));
-        const runner = isX86 ? "/bin/nunit-console-x86.exe" : "/bin/nunit-console.exe";
-        return findWrapper(function () {
-            return findInstalledNUnit3() || nunit2Finder(runner, options);
-        }, "nunit-console runner");
-    }
-    // FIXME: should ignore, eg, foo.csproj, to find foo.exe|bat|com on windows
-    // FIXME: when not on windows, should always do exact match
-    function findTool(exeName, underFolder) {
-        const { chopExtension } = requireModule("path-utils"), withoutExtension = chopExtension(exeName), exeHasExtension = exeName !== withoutExtension;
-        const allResults = lsSync(underFolder || getToolsFolder(), {
-            recurse: true,
-            entities: FsEntities.files,
-            fullPaths: true
-        })
-            .filter((p) => {
-            const thisFileExtension = path.extname(p), parts = p.split(/[\\\/]/g), filename = parts[parts.length - 1];
-            if (thisFileExtension) {
-                if (exeHasExtension) {
-                    return filename.toLowerCase() === exeName.toLowerCase();
-                }
-                else {
-                    const chopped = chopExtension(filename);
-                    return chopped.toLowerCase() === withoutExtension.toLowerCase();
-                }
-            }
-            else {
-                return filename.toLowerCase() === withoutExtension.toLowerCase();
-            }
-        })
-            .sort();
-        return allResults[0] || which(exeName);
-    }
-    function locateDotCover(options) {
-        options = options || {};
-        return initialToolSearch("dotCover.exe", "DOTCOVER") ||
-            findWrapper(function () {
-                return finder([programFilesFolder, localAppDataFolder], "JetBrains/Installations", "dotCover", "dotCover.exe", options)
-                    || finder([programFilesFolder], "JetBrains/dotCover", "v", "Bin/dotCover.exe", options);
-            }, "dotCover");
-    }
-    function latestDotCover(options) {
-        const result = locateDotCover(options);
-        debug(`Using dotCover: ${result || "NOT FOUND"}`);
-        return result;
-    }
-    function initialToolSearch(toolExe, environmentVariable) {
-        const fromEnvironment = process.env[environmentVariable];
-        if (fromEnvironment) {
-            if (!fs.existsSync(fromEnvironment)) {
-                throw new ZarroError(`${fromEnvironment} specified in environment variable ${environmentVariable} not found`);
-            }
-            return fromEnvironment;
-        }
-        return findTool(toolExe);
-    }
-    function latestOpenCover() {
-        const result = initialToolSearch("OpenCover.Console.exe", "OPENCOVER");
-        debug(`Using opencover: ${result || "NOT FOUND"}`);
-        return result;
-    }
-    module.exports = {
-        latestNUnit: latestNUnit,
-        latestDotCover: latestDotCover,
-        latestOpenCover: latestOpenCover,
-        findTool: findTool,
-        nunit2Finder: nunit2Finder,
-        compareVersionArrays: compareVersionArrays
-    };
+    console.warn("testutil-finder has been renamed to test-util-finder");
+    return require("./test-util-finder");
 })();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zarro",
-  "version": "1.165.6",
+  "version": "1.165.12",
   "description": "Some glue to make gulp easier, perhaps even zero- or close-to-zero-conf",
   "bin": {
     "zarro": "./index.js"