zarro 1.183.3 → 1.183.5

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.
@@ -37,13 +37,28 @@ const exec_step_1 = require("exec-step");
37
37
  }
38
38
  if (system.isResult(result)) {
39
39
  const res = result;
40
- const io = res.stderr.concat(res.stdout);
41
- const isConflict = io.find(s => s.includes("409"));
42
- if (isConflict) {
40
+ if (looksLikeNugetConflict(res)) {
43
41
  throw new exec_step_1.ExecStepOverrideMessage(`${path.basename(file)} NOT pushed: this version already exists at the registry.`, new Error('dummy'), false);
44
42
  }
45
43
  }
46
44
  });
47
45
  }
48
46
  });
47
+ const conflictMarkers = [
48
+ "409",
49
+ "already been pushed",
50
+ "conflict http"
51
+ ];
52
+ function looksLikeNugetConflict(result) {
53
+ const io = result.stderr
54
+ .concat(result.stdout)
55
+ .map(line => line.toLowerCase());
56
+ for (const line of io) {
57
+ const current = conflictMarkers.reduce((acc, cur) => acc || line.includes(cur), false);
58
+ if (current) {
59
+ return true;
60
+ }
61
+ }
62
+ return false;
63
+ }
49
64
  })();
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "zarro",
3
- "version": "1.183.3",
3
+ "version": "1.183.5",
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"
@@ -61,7 +61,7 @@
61
61
  "decompress": "^4.2.1",
62
62
  "del": "^5.1.0",
63
63
  "event-stream": "^4.0.1",
64
- "exec-step": "^0.15.0",
64
+ "exec-step": "^0.16.0",
65
65
  "fancy-log": "^1.3.3",
66
66
  "gulp": "^5.0.0",
67
67
  "gulp-debug": "^4.0.0",