zarro 1.153.2 → 1.153.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -3,7 +3,7 @@
3
3
  const debug = requireModule("debug")(__filename), gulp = requireModule("gulp"), env = requireModule("env"), nugetSourceName = process.env.NUGET_SOURCE || "nuget.org", installLocalTools = requireModule("install-local-tools"), isDotnetCore = env.resolveFlag("DOTNET_CORE"), tools = isDotnetCore
4
4
  ? [] // currently, only dotnet targets are used for dotnet test/build
5
5
  : [
6
- `${nugetSourceName}/nunit.console`,
6
+ `${nugetSourceName}/nunit.consolerunner`,
7
7
  `${nugetSourceName}/opencover`,
8
8
  `${nugetSourceName}/Jetbrains.dotCover.CommandLineTools`,
9
9
  `${nugetSourceName}/reportgenerator`
@@ -98,14 +98,16 @@
98
98
  }
99
99
  }
100
100
  async function doInstallViaNodeNugetClient(toolsFolder, requiredTools) {
101
- const { NugetClient } = require("node-nuget-client");
101
+ const { ExecStepContext } = require("exec-step"), ctx = new ExecStepContext(), { NugetClient } = require("node-nuget-client");
102
102
  for (const tool of requiredTools) {
103
- const spec = tool.includes("/")
104
- ? tool
105
- : `nuget.org/${tool}`, parts = spec.split("/"), [source, packageId] = parts, client = new NugetClient(source);
106
- await client.downloadPackage({
107
- packageId,
108
- output: toolsFolder
103
+ await ctx.exec(`Installing local tool: ${tool}`, async () => {
104
+ const spec = tool.includes("/")
105
+ ? tool
106
+ : `nuget.org/${tool}`, parts = spec.split("/"), [source, packageId] = parts, client = new NugetClient(source);
107
+ await client.downloadPackage({
108
+ packageId,
109
+ output: toolsFolder
110
+ });
109
111
  });
110
112
  }
111
113
  }
@@ -85,8 +85,7 @@
85
85
  return fs.existsSync(somePath) ? somePath : undefined;
86
86
  }
87
87
  function tryToFindNUnit(options) {
88
- return initialToolSearch("nunit3-console.exe", "NUNIT") ||
89
- searchForNunit(options);
88
+ return initialToolSearch("nunit3-console.exe", "NUNIT") || searchForSystemNUnit(options);
90
89
  }
91
90
  function latestNUnit(options) {
92
91
  const result = tryToFindNUnit(options);
@@ -99,7 +98,7 @@
99
98
  }
100
99
  return finder([programFilesFolder], undefined, "NUnit", searchBin, options);
101
100
  }
102
- function searchForNunit(options) {
101
+ function searchForSystemNUnit(options) {
103
102
  options = options || {};
104
103
  const isX86 = (options.x86 || ((options.platform || options.architecture) === "x86"));
105
104
  const runner = isX86 ? "/bin/nunit-console-x86.exe" : "/bin/nunit-console.exe";
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "zarro",
3
- "version": "1.153.2",
3
+ "version": "1.153.4",
4
4
  "description": "Some glue to make gulp easier, perhaps even zero- or close-to-zero-conf",
5
5
  "bin": {
6
6
  "zarro": "./index.js"