Merge pull request #166 from RobertReaves/rework-scripts

Fixed scripts running at incorrect times during workflow

Author: elijahmanor

README.md

@@ -316,13 +316,13 @@ The following will create `pre` and `post` script hooks for the `start` command
 
 ```
 "tag-release": {
-   "preStart": node ./preStart.js,
-   "postStart": node ./postStart.js
+   "prestart": "node ./preStart.js",
+   "poststart": "node ./postStart.js"
 }
 ```
 
-As you can see from the example your script name will need to be `pre` followed by the `tag-release` command capitalized. For example, if I wanted to hook into the `dev` command
-my script names would be `preDev` and `postDev`.
+As you can see from the example your script name will need to be `pre` followed by the `tag-release` command. For example, if I wanted to hook into the `dev` command
+my script names would be `predev` and `postdev`.
 
 Here is a chart of all the commands `tag-release` offers:
 ```
@@ -335,7 +335,7 @@ qa
 reset
 ```
 
-> **Note**: You will need to use the full name of the command, not just an alias. For instance, you couldn't do `prePro`. Instead, it would be `prePromote`.
+> **Note**: You will need to use the full name of the command, not just an alias. For instance, you couldn't do `prepro`. Instead, it would be `prepromote`.
 
 
 ## Release Workflow

bin/tag-release-continue.js

@@ -8,6 +8,7 @@ const utils = require("../src/utils.js");
 const filterFlowBasedOnDevelopBranch = require("../src/helpers/filterFlowBasedOnDevelopBranch");
 const getCurrentBranch = require("../src/helpers/getCurrentBranch");
 const runWorkflow = require("../src/helpers/runWorkflow");
+const { runPostScript } = require("../src/workflows/steps/index.js");
 
 utils.applyCommanderOptions(commander);
 
@@ -24,11 +25,21 @@ const callback = async options => {
 	if (options.branch.includes("promote-release")) {
 		flow = filterFlowBasedOnDevelopBranch(options, promoteContinue);
 
+		options.scripts = utils.getScripts("promote");
+		options.command = "promote";
+		if (options.scripts.postpromote) {
+			flow.push(runPostScript);
+		}
 		return runWorkflow(flow, options);
 	}
 
 	flow = filterFlowBasedOnDevelopBranch(options, prContinue);
 
+	options.scripts = utils.getScripts("pr");
+	options.command = "pr";
+	if (options.scripts.postpr) {
+		flow.push(runPostScript);
+	}
 	return runWorkflow(flow, options);
 };
 

bin/tag-release-pr.js

@@ -10,6 +10,7 @@ const {
 const utils = require("../src/utils.js");
 const filterFlowBasedOnDevelopBranch = require("../src/helpers/filterFlowBasedOnDevelopBranch");
 const runWorkflow = require("../src/helpers/runWorkflow");
+const { runPostScript } = require("../src/workflows/steps/index.js");
 
 utils.applyCommanderOptions(commander);
 
@@ -23,11 +24,17 @@ const callback = options => {
 	if (options.conflict) {
 		flow = filterFlowBasedOnDevelopBranch(options, prRebaseConflict);
 
+		if (options.scripts[`post${options.command}`]) {
+			flow.push(runPostScript);
+		}
 		return runWorkflow(flow, options);
 	}
 
 	flow = filterFlowBasedOnDevelopBranch(options, prRebaseSuccess);
 
+	if (options.scripts[`post${options.command}`]) {
+		flow.push(runPostScript);
+	}
 	return runWorkflow(flow, options);
 };
 

bin/tag-release-qa.js

@@ -9,6 +9,7 @@ const {
 const utils = require("../src/utils.js");
 const filterFlowBasedOnDevelopBranch = require("../src/helpers/filterFlowBasedOnDevelopBranch");
 const runWorkflow = require("../src/helpers/runWorkflow");
+const { runPostScript } = require("../src/workflows/steps/index.js");
 
 utils.applyCommanderOptions(commander);
 
@@ -23,11 +24,17 @@ const callback = options => {
 	if (options.packages.length && onFeatureBranch) {
 		flow = filterFlowBasedOnDevelopBranch(options, qaUpdate);
 
+		if (options.scripts[`post${options.command}`]) {
+			flow.push(runPostScript);
+		}
 		return runWorkflow(flow, options);
 	}
 
 	flow = filterFlowBasedOnDevelopBranch(options, qaDefault);
 
+	if (options.scripts[`post${options.command}`]) {
+		flow.push(runPostScript);
+	}
 	return runWorkflow(flow, options);
 };
 

src/helpers/setup.js

@@ -8,10 +8,6 @@ const filterFlowBasedOnDevelopBranch = require("./filterFlowBasedOnDevelopBranch
 const utils = require("../utils");
 
 const setup = async options => {
-	if (!options.callback) {
-		/* istanbul ignore next */
-		options.callback = () => console.log("Finished"); // eslint-disable-line no-console
-	}
 	options.configPath = options.config || "./package.json";
 	options.version = await utils.getCurrentVersion();
 
@@ -25,12 +21,23 @@ const setup = async options => {
 		options.workflow
 	);
 
-	options.scripts = await utils.getScripts(options.command);
-	if (options.scripts[`pre${options.command}`]) {
+	options.scripts = utils.getScripts(options.command);
+	if (
+		options.command !== "continue" &&
+		options.scripts[`pre${options.command}`]
+	) {
 		options.workflow.unshift(runPreScript);
 	}
-	if (options.scripts[`post${options.command}`]) {
-		options.workflow.push(runPostScript);
+
+	if (!options.callback) {
+		/* istanbul ignore next */
+		options.callback = () => console.log("Finished"); // eslint-disable-line no-console
+		if (
+			options.command !== "continue" &&
+			options.scripts[`post${options.command}`]
+		) {
+			options.workflow.push(runPostScript);
+		}
 	}
 
 	if (!utils.fileExists(options.configPath) && options.command !== "l10n") {