WIP just debugging nevermind me

bin/semantic-release.js

@@ -21,8 +21,9 @@ See https://github.com/semantic-release/semantic-release/blob/master/docs/suppor
   process.exit(1);
 }
 
-execa('git', ['--version'])
-  .then(({stdout}) => {
+execa
+  .stdout('git', ['--version'])
+  .then(stdout => {
     var gitVersion = findVersions(stdout)[0];
     if (semver.lt(gitVersion, MIN_GIT_VERSION)) {
       console.error(`[semantic-release]: Git version ${MIN_GIT_VERSION} is required. Found ${gitVersion}.`);

docs/usage/plugins.md

@@ -44,8 +44,6 @@ Each plugin must be configured with the [`plugins` options](./configuration.md#p
 }
 ```
 
-**Note:** If the `plugins` option is defined, it overrides the default plugin list, rather than merging with it.
-
 ## Plugin ordering
 
 For each [release step](../../README.md#release-steps) the plugins that implement that step will be executed in the order in which the are defined.

index.js

@@ -46,7 +46,9 @@ async function run(context, plugins) {
 
   if (ciBranch !== options.branch) {
     logger.log(
-      `This test run was triggered on the branch ${ciBranch}, while semantic-release is configured to only publish from ${options.branch}, therefore a new version won’t be published.`
+      `This test run was triggered on the branch ${ciBranch}, while semantic-release is configured to only publish from ${
+        options.branch
+      }, therefore a new version won’t be published.`
     );
     return false;
   }

lib/get-git-auth-url.js

@@ -45,6 +45,13 @@ module.exports = async ({cwd, env, options: {repositoryUrl, branch}}) => {
     const envVar = Object.keys(GIT_TOKENS).find(envVar => !isNil(env[envVar]));
     const gitCredentials = `${GIT_TOKENS[envVar] || ''}${env[envVar] || ''}`;
 
+    console.log(`-------- envVar -------- `);
+    console.log(envVar);
+    console.log(`-------- GIT_TOKENS[envVar] -------- `);
+    console.log(GIT_TOKENS[envVar]);
+    console.log(`-------- env[envVar].substr(5) -------- `);
+    console.log((env[envVar] || '').substr(5));
+
     if (gitCredentials) {
       // If credentials are set via environment variables, convert the URL to http/https and add basic auth, otherwise return `repositoryUrl` as is
       const [match, auth, host, path] = /^(?!.+:\/\/)(?:(.*)@)?(.*?):(.*)$/.exec(repositoryUrl) || [];

lib/git.js

@@ -11,7 +11,7 @@ const debug = require('debug')('semantic-release:git');
  */
 async function getTagHead(tagName, execaOpts) {
   try {
-    return (await execa('git', ['rev-list', '-1', tagName], execaOpts)).stdout;
+    return await execa.stdout('git', ['rev-list', '-1', tagName], execaOpts);
   } catch (error) {
     debug(error);
   }
@@ -26,7 +26,7 @@ async function getTagHead(tagName, execaOpts) {
  * @throws {Error} If the `git` command fails.
  */
 async function getTags(execaOpts) {
-  return (await execa('git', ['tag'], execaOpts)).stdout
+  return (await execa.stdout('git', ['tag'], execaOpts))
     .split('\n')
     .map(tag => tag.trim())
     .filter(Boolean);
@@ -75,8 +75,8 @@ async function fetch(repositoryUrl, execaOpts) {
  *
  * @return {String} the sha of the HEAD commit.
  */
-async function getGitHead(execaOpts) {
-  return (await execa('git', ['rev-parse', 'HEAD'], execaOpts)).stdout;
+function getGitHead(execaOpts) {
+  return execa.stdout('git', ['rev-parse', 'HEAD'], execaOpts);
 }
 
 /**
@@ -88,7 +88,7 @@ async function getGitHead(execaOpts) {
  */
 async function repoUrl(execaOpts) {
   try {
-    return (await execa('git', ['config', '--get', 'remote.origin.url'], execaOpts)).stdout;
+    return await execa.stdout('git', ['config', '--get', 'remote.origin.url'], execaOpts);
   } catch (error) {
     debug(error);
   }
@@ -176,7 +176,7 @@ async function verifyTagName(tagName, execaOpts) {
  * @return {Boolean} `true` is the HEAD of the current local branch is the same as the HEAD of the remote branch, falsy otherwise.
  */
 async function isBranchUpToDate(branch, execaOpts) {
-  const {stdout: remoteHead} = await execa('git', ['ls-remote', '--heads', 'origin', branch], execaOpts);
+  const remoteHead = await execa.stdout('git', ['ls-remote', '--heads', 'origin', branch], execaOpts);
   try {
     return await isRefInHistory(remoteHead.match(/^(\w+)?/)[1], execaOpts);
   } catch (error) {

package.json

@@ -3,14 +3,6 @@
   "description": "Automated semver compliant package publishing",
   "version": "0.0.0-development",
   "author": "Stephan Bönnemann <stephan@boennemann.me> (http://boennemann.me)",
-  "ava": {
-    "files": [
-      "test/**/*.test.js"
-    ],
-    "helpers": [
-      "test/helpers/**/*"
-    ]
-  },
   "bin": {
     "semantic-release": "bin/semantic-release.js"
   },
@@ -35,7 +27,7 @@
     "aggregate-error": "^3.0.0",
     "cosmiconfig": "^5.0.1",
     "debug": "^4.0.0",
-    "env-ci": "^4.0.0",
+    "env-ci": "^3.0.0",
     "execa": "^1.0.0",
     "figures": "^3.0.0",
     "find-versions": "^3.0.0",
@@ -55,7 +47,7 @@
     "yargs": "^13.1.0"
   },
   "devDependencies": {
-    "ava": "^2.0.0",
+    "ava": "^1.3.1",
     "clear-module": "^3.0.0",
     "codecov": "^3.0.0",
     "commitizen": "^3.0.0",

test/cli.test.js

@@ -66,7 +66,7 @@ test.serial('Pass options to semantic-release API', async t => {
   ];
   const cli = requireNoCache('../cli', {'.': run, process: {...process, argv}});
 
-  const code = await cli();
+  const exitCode = await cli();
 
   t.is(run.args[0][0].branch, 'master');
   t.is(run.args[0][0].repositoryUrl, 'https://github/com/owner/repo.git');
@@ -84,7 +84,7 @@ test.serial('Pass options to semantic-release API', async t => {
   t.is(run.args[0][0].debug, true);
   t.is(run.args[0][0].dryRun, true);
 
-  t.is(code, 0);
+  t.is(exitCode, 0);
 });
 
 test.serial('Pass options to semantic-release API with alias arguments', async t => {
@@ -108,7 +108,7 @@ test.serial('Pass options to semantic-release API with alias arguments', async t
   ];
   const cli = requireNoCache('../cli', {'.': run, process: {...process, argv}});
 
-  const code = await cli();
+  const exitCode = await cli();
 
   t.is(run.args[0][0].branch, 'master');
   t.is(run.args[0][0].repositoryUrl, 'https://github/com/owner/repo.git');
@@ -117,7 +117,7 @@ test.serial('Pass options to semantic-release API with alias arguments', async t
   t.deepEqual(run.args[0][0].extends, ['config1', 'config2']);
   t.is(run.args[0][0].dryRun, true);
 
-  t.is(code, 0);
+  t.is(exitCode, 0);
 });
 
 test.serial('Pass unknown options to semantic-release API', async t => {
@@ -125,13 +125,13 @@ test.serial('Pass unknown options to semantic-release API', async t => {
   const argv = ['', '', '--bool', '--first-option', 'value1', '--second-option', 'value2', '--second-option', 'value3'];
   const cli = requireNoCache('../cli', {'.': run, process: {...process, argv}});
 
-  const code = await cli();
+  const exitCode = await cli();
 
   t.is(run.args[0][0].bool, true);
   t.is(run.args[0][0].firstOption, 'value1');
   t.deepEqual(run.args[0][0].secondOption, ['value2', 'value3']);
 
-  t.is(code, 0);
+  t.is(exitCode, 0);
 });
 
 test.serial('Pass empty Array to semantic-release API for list option set to "false"', async t => {
@@ -139,11 +139,11 @@ test.serial('Pass empty Array to semantic-release API for list option set to "fa
   const argv = ['', '', '--publish', 'false'];
   const cli = requireNoCache('../cli', {'.': run, process: {...process, argv}});
 
-  const code = await cli();
+  const exitCode = await cli();
 
   t.deepEqual(run.args[0][0].publish, []);
 
-  t.is(code, 0);
+  t.is(exitCode, 0);
 });
 
 test.serial('Do not set properties in option for which arg is not in command line', async t => {
@@ -168,10 +168,10 @@ test.serial('Display help', async t => {
   const argv = ['', '', '--help'];
   const cli = requireNoCache('../cli', {'.': run, process: {...process, argv}});
 
-  const code = await cli();
+  const exitCode = await cli();
 
   t.regex(t.context.logs, /Run automated package publishing/);
-  t.is(code, 0);
+  t.is(exitCode, 0);
 });
 
 test.serial('Return error code and prints help if called with a command', async t => {
@@ -179,11 +179,11 @@ test.serial('Return error code and prints help if called with a command', async
   const argv = ['', '', 'pre'];
   const cli = requireNoCache('../cli', {'.': run, process: {...process, argv}});
 
-  const code = await cli();
+  const exitCode = await cli();
 
   t.regex(t.context.errors, /Run automated package publishing/);
   t.regex(t.context.errors, /Too many non-option arguments/);
-  t.is(code, 1);
+  t.is(exitCode, 1);
 });
 
 test.serial('Return error code if multiple plugin are set for single plugin', async t => {
@@ -191,11 +191,11 @@ test.serial('Return error code if multiple plugin are set for single plugin', as
   const argv = ['', '', '--analyze-commits', 'analyze1', 'analyze2'];
   const cli = requireNoCache('../cli', {'.': run, process: {...process, argv}});
 
-  const code = await cli();
+  const exitCode = await cli();
 
   t.regex(t.context.errors, /Run automated package publishing/);
   t.regex(t.context.errors, /Too many non-option arguments/);
-  t.is(code, 1);
+  t.is(exitCode, 1);
 });
 
 test.serial('Return error code if semantic-release throw error', async t => {
@@ -203,10 +203,10 @@ test.serial('Return error code if semantic-release throw error', async t => {
   const argv = ['', ''];
   const cli = requireNoCache('../cli', {'.': run, process: {...process, argv}});
 
-  const code = await cli();
+  const exitCode = await cli();
 
   t.regex(t.context.errors, /semantic-release error/);
-  t.is(code, 1);
+  t.is(exitCode, 1);
 });
 
 test.serial('Hide sensitive environment variable values from the logs', async t => {
@@ -215,8 +215,8 @@ test.serial('Hide sensitive environment variable values from the logs', async t
   const argv = ['', ''];
   const cli = requireNoCache('../cli', {'.': run, process: {...process, argv, env: {...process.env, ...env}}});
 
-  const code = await cli();
+  const exitCode = await cli();
 
   t.regex(t.context.errors, new RegExp(`Throw error: Exposing token ${escapeRegExp(SECRET_REPLACEMENT)}`));
-  t.is(code, 1);
+  t.is(exitCode, 1);
 });

test/get-config.test.js

@@ -482,6 +482,6 @@ test('Throw an Error if one of the shareable config cannot be found', async t =>
 
   const error = await t.throwsAsync(t.context.getConfig({cwd}), Error);
 
-  t.regex(error.message, /Cannot find module 'non-existing-path'/);
+  t.is(error.message, "Cannot find module 'non-existing-path'");
   t.is(error.code, 'MODULE_NOT_FOUND');
 });

test/helpers/git-utils.js

@@ -69,10 +69,8 @@ export async function initBareRepo(repositoryUrl, branch = 'master') {
  * @returns {Array<Commit>} The created commits, in reverse order (to match `git log` order).
  */
 export async function gitCommits(messages, execaOpts) {
-  await pReduce(
-    messages,
-    async (_, message) =>
-      (await execa('git', ['commit', '-m', message, '--allow-empty', '--no-gpg-sign'], execaOpts)).stdout
+  await pReduce(messages, (_, message) =>
+    execa.stdout('git', ['commit', '-m', message, '--allow-empty', '--no-gpg-sign'], execaOpts)
   );
   return (await gitGetCommits(undefined, execaOpts)).slice(0, messages.length);
 }
@@ -114,8 +112,8 @@ export async function gitCheckout(branch, create = true, execaOpts) {
  *
  * @return {String} The sha of the head commit in the current git repository.
  */
-export async function gitHead(execaOpts) {
-  return (await execa('git', ['rev-parse', 'HEAD'], execaOpts)).stdout;
+export function gitHead(execaOpts) {
+  return execa.stdout('git', ['rev-parse', 'HEAD'], execaOpts);
 }
 
 /**
@@ -183,8 +181,8 @@ export async function gitAddConfig(name, value, execaOpts) {
  *
  * @return {String} The sha of the commit associated with `tagName` on the local repository.
  */
-export async function gitTagHead(tagName, execaOpts) {
-  return (await execa('git', ['rev-list', '-1', tagName], execaOpts)).stdout;
+export function gitTagHead(tagName, execaOpts) {
+  return execa.stdout('git', ['rev-list', '-1', tagName], execaOpts);
 }
 
 /**
@@ -197,7 +195,7 @@ export async function gitTagHead(tagName, execaOpts) {
  * @return {String} The sha of the commit associated with `tagName` on the remote repository.
  */
 export async function gitRemoteTagHead(repositoryUrl, tagName, execaOpts) {
-  return (await execa('git', ['ls-remote', '--tags', repositoryUrl, tagName], execaOpts)).stdout
+  return (await execa.stdout('git', ['ls-remote', '--tags', repositoryUrl, tagName], execaOpts))
     .split('\n')
     .filter(tag => Boolean(tag))
     .map(tag => tag.match(/^(\S+)/)[1])[0];
@@ -211,8 +209,8 @@ export async function gitRemoteTagHead(repositoryUrl, tagName, execaOpts) {
  *
  * @return {String} The tag associatedwith the sha in parameter or `null`.
  */
-export async function gitCommitTag(gitHead, execaOpts) {
-  return (await execa('git', ['describe', '--tags', '--exact-match', gitHead], execaOpts)).stdout;
+export function gitCommitTag(gitHead, execaOpts) {
+  return execa.stdout('git', ['describe', '--tags', '--exact-match', gitHead], execaOpts);
 }
 
 /**

test/plugins/normalize.test.js

@@ -255,6 +255,6 @@ test('Throws an error if the plugin is not found', t => {
     Error
   );
 
-  t.regex(error.message, /Cannot find module 'non-existing-path'/);
+  t.is(error.message, "Cannot find module 'non-existing-path'");
   t.is(error.code, 'MODULE_NOT_FOUND');
 });