Merge branch 'master' into beta

lib/definitions/errors.js

@@ -29,14 +29,15 @@ Please make sure to add the \`repositoryUrl\` to the [semantic-release configura
     )}).`,
   }),
   EGITNOPERMISSION: ({options: {repositoryUrl}, branch: {name}}) => ({
-    message: 'The push permission to the Git repository is required.',
-    details: `**semantic-release** cannot push the version tag to the branch \`${name}\` on remote Git repository with URL \`${repositoryUrl}\`.
+    message: 'Cannot push to the Git repository.',
+    details: `**semantic-release** cannot push the version tag to the branch \`${name}\` on the remote Git repository with URL \`${repositoryUrl}\`.
 
-Please refer to the [authentication configuration documentation](${linkify(
-      'docs/usage/ci-configuration.md#authentication'
-    )}) to configure the Git credentials on your CI environment and make sure the [repositoryUrl](${linkify(
-      'docs/usage/configuration.md#repositoryurl'
-    )}) is configured with a [valid Git URL](https://git-scm.com/book/en/v2/Git-on-the-Server-The-Protocols).`,
+This can be caused by:
+ - a misconfiguration of the [repositoryUrl](${linkify('docs/usage/configuration.md#repositoryurl')}) option
+ - the repository being unavailable
+ - or missing push permission for the user configured via the [Git credentials on your CI environment](${linkify(
+   'docs/usage/ci-configuration.md#authentication'
+ )})`,
   }),
   EINVALIDTAGFORMAT: ({options: {tagFormat}}) => ({
     message: 'Invalid `tagFormat` option.',
@@ -183,7 +184,7 @@ Your configuration for the problematic branches is \`${stringify(branches)}\`.`,
     details: `A minimum of 1 and a maximum of 3 release branches are required in the [branches configuration](${linkify(
       'docs/usage/configuration.md#branches'
     )}).
-    
+
 This may occur if your repository does not have a release branch, such as \`master\`.
 
 Your configuration for the problematic branches is \`${stringify(branches)}\`.`,

lib/definitions/plugins.js

@@ -1,3 +1,5 @@
+/* eslint require-atomic-updates: off */
+
 const {isString, isPlainObject} = require('lodash');
 const {getGitHead} = require('../git');
 const hideSensitive = require('../hide-sensitive');

lib/get-config.js

@@ -93,6 +93,6 @@ module.exports = async (context, opts) => {
 };
 
 async function pkgRepoUrl(opts) {
-  const {package: pkg} = (await readPkgUp(opts)) || {};
-  return pkg && (isPlainObject(pkg.repository) ? pkg.repository.url : pkg.repository);
+  const {packageJson} = (await readPkgUp(opts)) || {};
+  return packageJson && (isPlainObject(packageJson.repository) ? packageJson.repository.url : packageJson.repository);
 }

lib/get-git-auth-url.js

@@ -41,16 +41,21 @@ module.exports = async ({cwd, env, branch, options: {repositoryUrl}}) => {
   // Test if push is allowed without transforming the URL (e.g. is ssh keys are set up)
   try {
     await verifyAuth(repositoryUrl, branch.name, {cwd, env});
-  } catch (error) {
+  } catch (_) {
     const envVar = Object.keys(GIT_TOKENS).find(envVar => !isNil(env[envVar]));
     const gitCredentials = `${GIT_TOKENS[envVar] || ''}${env[envVar] || ''}`;
 
     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) || [];
+      const {port, hostname, ...parsed} = parse(
+        match ? `ssh://${auth ? `${auth}@` : ''}${host}/${path}` : repositoryUrl
+      );
+
       return format({
-        ...parse(match ? `ssh://${auth ? `${auth}@` : ''}${host}/${path}` : repositoryUrl),
+        ...parsed,
         auth: gitCredentials,
+        host: `${hostname}${protocol === 'ssh:' ? '' : port ? `:${port}` : ''}`,
         protocol: protocol && /http[^s]/.test(protocol) ? 'http' : 'https',
       });
     }

lib/git.js

@@ -147,7 +147,7 @@ async function fetch(repositoryUrl, branch, execaOpts) {
       ],
       execaOpts
     );
-  } catch (error) {
+  } catch (_) {
     await execa(
       'git',
       [