release-it 7.5.0 → 7.6.2

package/README.md

@@ -327,9 +327,10 @@ releaseIt(options).then(output => {
 
 * [StevenBlack/hosts](https://github.com/StevenBlack/hosts)
 * [infor-design/enterprise](https://github.com/infor-design/enterprise)
-* [nomadreservations/ngx-codemirror](https://github.com/nomadreservations/ngx-codemirror)
 * [InCuca/vue-standalone-component](https://github.com/InCuca/vue-standalone-component)
 * [parsable/react-truncate-markup](https://github.com/parsable/react-truncate-markup)
+* [tsqllint/tsqllint](https://github.com/tsqllint/tsqllint)
+* [adr/madr](https://github.com/adr/madr)
 * GitHub search for [projects with .release-it.json](https://github.com/search?o=desc&q=in%3Apath+.release-it.json&s=indexed&type=Code)
 
 ## 📚 Resources

package/conf/release-it.json

@@ -21,7 +21,7 @@
     "tagAnnotation": "Release %s",
     "push": true,
     "pushArgs": "",
-    "pushRepo": null,
+    "pushRepo": "origin",
     "beforeStartCommand": false,
     "afterReleaseCommand": false,
     "addUntrackedFiles": false
@@ -41,8 +41,9 @@
     "draft": false,
     "tokenRef": "GITHUB_TOKEN",
     "assets": null,
-	"host": null,
-	"timeout": 0
+    "host": null,
+    "timeout": 0,
+    "proxy": false
   },
   "dist": {
     "repo": false,

package/lib/git.js

@@ -18,7 +18,10 @@ const getBranchName = () => run('git rev-parse --abbrev-ref HEAD', { isReadOnly:
 const tagExists = tag =>
   run(`git show-ref --tags --quiet --verify -- "refs/tags/${tag}"`, { isReadOnly: true }).then(() => true, () => false);
 
-const getRemoteUrl = () => run('git config --get remote.origin.url', { isReadOnly: true }).catch(() => null);
+const getRemoteUrl = (remoteUrlOrName = 'origin') =>
+  remoteUrlOrName.includes('/')
+    ? Promise.resolve(remoteUrlOrName)
+    : run(`git config --get remote.${remoteUrlOrName}.url`, { isReadOnly: true }).catch(() => null);
 
 const isWorkingDirClean = () =>
   run('git diff-index --name-only HEAD --exit-code', { isReadOnly: true }).then(() => true, () => false);
@@ -83,10 +86,9 @@ const getLatestTag = () =>
     () => null
   );
 
-const push = async ({ pushUrl, hasUpstreamBranch, args = '' } = {}) => {
-  const repository = pushUrl || '';
+const push = async ({ pushRepo = '', hasUpstreamBranch, args = '' } = {}) => {
   const setUpstream = hasUpstreamBranch === false ? `--set-upstream origin ${await getBranchName()}` : '';
-  return run(`git push --follow-tags ${args} ${repository} ${setUpstream}`);
+  return run(`git push --follow-tags ${args} ${pushRepo} ${setUpstream}`);
 };
 
 const runChangelogCommand = command =>

package/lib/github-client.js

@@ -19,16 +19,24 @@ const githubClients = {};
 
 const { github } = config.options;
 
-const getGithubClient = ({ host, token }) => {
+const getGithubClient = ({ host, token, proxy }) => {
   if (!githubClients[host]) {
-    const client = new GitHubApi({
+    const isGitHub = host === 'github.com';
+    const baseUrl = `https://${isGitHub ? 'api.github.com' : host}${isGitHub ? '' : '/api/v3'}`;
+    const options = {
       version: '3.0.0',
-      baseUrl: `https://${host === 'github.com' ? 'api.github.com' : host}${host === 'github.com' ? '' : '/api/v3'}`,
+      baseUrl,
       timeout: github.timeout,
       headers: {
         'user-agent': 'webpro/release-it'
       }
-    });
+    };
+
+    if (proxy) {
+      options.proxy = proxy;
+    }
+
+    const client = new GitHubApi(options);
 
     client.authenticate({
       type: 'oauth',
@@ -61,12 +69,12 @@ const release = ({ version, tagName, repo, changelog = '', github }) => {
     return noop;
   }
 
-  const { preRelease: prerelease, draft, token } = github;
+  const { preRelease: prerelease, draft, token, proxy } = github;
   const { owner, project } = repo;
   const host = github.host || repo.host;
   const tag_name = format(tagName, version);
   const name = format(github.releaseName, version);
-  const githubClient = getGithubClient({ host, token });
+  const githubClient = getGithubClient({ host, token, proxy });
 
   return retry(
     async bail =>

package/lib/tasks.js

@@ -21,13 +21,13 @@ const {
 } = require('./errors');
 
 const validateRepoState = async options => {
-  const { requireCleanWorkingDir, requireUpstream, github, dist } = options;
+  const { requireCleanWorkingDir, requireUpstream, github, src, dist } = options;
 
   if (!(await git.isGitRepo())) {
     throw new GitRepoError();
   }
 
-  const remoteUrl = await git.getRemoteUrl();
+  const remoteUrl = await git.getRemoteUrl(src.pushRepo);
   if (!remoteUrl) {
     throw new GitRemoteUrlError();
   }
@@ -150,7 +150,7 @@ module.exports = async options => {
     const tag = () => git.tag(version, tagName, tagAnnotation);
     const push = () =>
       git.push({
-        pushUrl: src.pushRepo,
+        pushRepo: remoteUrl,
         hasUpstreamBranch: hasUpstream,
         args: src.pushArgs
       });
@@ -193,7 +193,7 @@ module.exports = async options => {
       const remoteUrl = await git.getRemoteUrl();
       const distRepo = repoPathParse(remoteUrl);
       const isSameRepo = git.isSameRepo(repo, distRepo);
-      const shouldTag = (dist.tag && !isSameRepo) || (isSameRepo && tagName !== src.tagName);
+      const shouldTag = (dist.tag && !isSameRepo) || (isSameRepo && tagName !== src.tagName) || (dist.tag && !src.tag);
 
       _.defaults(github, options.github);
       _.defaults(npm, options.npm);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "release-it",
-  "version": "7.5.0",
+  "version": "7.6.2",
   "description": "CLI release tool for Git repos and npm packages.",
   "keywords": [
     "build",
@@ -46,43 +46,43 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@octokit/rest": "15.9.5",
-    "async-retry": "1.2.1",
+    "@octokit/rest": "15.13.1",
+    "async-retry": "1.2.3",
     "babel-preset-env": "1.7.0",
     "babel-register": "6.26.0",
     "bump-file": "1.0.0",
     "chalk": "2.4.1",
-    "conventional-changelog": "2.0.1",
-    "conventional-recommended-bump": "4.0.0",
+    "conventional-changelog": "2.0.3",
+    "conventional-recommended-bump": "4.0.1",
     "cpy": "7.0.1",
-    "debug": "3.1.0",
+    "debug": "4.1.0",
     "globby": "8.0.1",
     "got": "8.3.2",
-    "inquirer": "6.0.0",
-    "is-ci": "1.1.0",
-    "lodash": "4.17.10",
-    "mime-types": "2.1.19",
+    "inquirer": "6.2.0",
+    "is-ci": "1.2.1",
+    "lodash": "4.17.11",
+    "mime-types": "2.1.20",
     "ora": "3.0.0",
     "os-name": "2.0.1",
     "parse-repo": "1.0.4",
-    "semver": "5.5.0",
+    "semver": "5.6.0",
     "shelljs": "0.8.2",
-    "supports-color": "5.4.0",
+    "supports-color": "5.5.0",
     "tmp-promise": "1.0.5",
     "update-notifier": "2.5.0",
     "uuid": "3.3.2",
     "window-size": "1.1.1",
-    "yargs-parser": "10.1.0"
+    "yargs-parser": "11.0.0"
   },
   "devDependencies": {
-    "eslint": "5.3.0",
-    "eslint-config-prettier": "2.9.0",
-    "eslint-plugin-prettier": "2.6.2",
+    "eslint": "5.7.0",
+    "eslint-config-prettier": "3.1.0",
+    "eslint-plugin-prettier": "3.0.0",
     "mock-stdio": "1.0.3",
-    "nyc": "12.0.2",
-    "prettier": "1.14.0",
-    "proxyquire": "2.0.1",
-    "sinon": "6.1.4",
+    "nyc": "13.1.0",
+    "prettier": "1.14.3",
+    "proxyquire": "2.1.0",
+    "sinon": "7.0.0",
     "tape": "4.9.1"
   },
   "engines": {