Fix: error for missing package.json, warning for different version (#5)

* Fix: add new version of tagged-git-commits

* Chore: update dependencies

* Test: update tests

* Test: update test

* Style: remove console.log

* Refactor: update console.warn

* Fix: add error for missing package.json

Author: aichbauer

lib/cli.js

@@ -1,11 +1,12 @@
 #!/usr/bin/env node
 
+import chalk from 'chalk';
 import inquirer from 'inquirer';
 import isAdded from 'is-git-added';
 import isGit from 'is-git-repository';
 import getGitRemotes from 'get-git-remotes';
 import getCommitRange from 'git-commit-range';
-import taggedCommits from 'tagged-git-commit';
+import taggedCommits from 'tagged-git-commits';
 import updateNotifier from 'update-notifier';
 import yargs from 'yargs';
 
@@ -28,20 +29,22 @@ updateNotifier({ pkg }).notify();
 const cli = () => {
   const cwd = process.cwd();
   const latestTaggedCommits = taggedCommits({ path: cwd });
-  const latestTaggedCommit = latestTaggedCommits.length === 0 ? '' : latestTaggedCommits[0];
+  const latestTaggedCommit = latestTaggedCommits.length === 0 ? '' : latestTaggedCommits[0].commit;
   const commits = getCommitRange({ path: cwd, from: latestTaggedCommit });
   const latestVersion = getLatestVersion();
   const newVersions = generateVersions(latestVersion);
   const questionsList = questions(newVersions);
 
   if (!isGit(cwd)) {
-    return console.warn('Error: this is not a git repository... make sure you are in the right directory');
+    return console.warn(chalk.red('Error: this is not a git repository... make sure you are in the right directory'));
   } else if (!isAdded(cwd) && commits.length === 0) {
-    return console.warn('Error: no changes... try to git add <files>');
+    return console.warn(chalk.red('Error: no changes... try to git add <files>'));
   } else if (commits.length === 0) {
-    return console.warn('Error:  no commits yet... try to git commit -m <message>');
+    return console.warn(chalk.red('Error:  no commits yet... try to git commit -m <message>'));
   } else if (!getGitRemotes(cwd)) {
-    return console.warn('Error: it seems you do not have a remote repository set... try to git remote add origin <remote-url>');
+    return console.warn(chalk.red('Error: it seems you do not have a remote repository set... try to git remote add origin <remote-url>'));
+  } else if (latestVersion === '') {
+    return console.warn(chalk.red('Error: it seems you do not have a package.json... try npm init'));
   }
 
   return inquirer

lib/helpers/getLatestVersion.js

@@ -1,4 +1,5 @@
-import taggedCommits from 'tagged-git-commit';
+import chalk from 'chalk';
+import taggedCommits from 'tagged-git-commits';
 import path from 'path';
 import fs from 'fs-extra';
 
@@ -18,7 +19,7 @@ const getLatestVersion = () => {
   let latestTaggedVersion;
 
   if (latestTag[0]) {
-    latestTaggedVersion = latestTag[0].split('refs/tags/')[1];
+    latestTaggedVersion = latestTag[0].commit;
   } else {
     latestTaggedVersion = undefined;
   }
@@ -29,7 +30,12 @@ const getLatestVersion = () => {
   } else if (`v${latestPkgVersion}` === `${latestTaggedVersion}`) {
     latestVersion = `v${latestPkgVersion}`;
   } else {
-    latestVersion = '';
+    console.warn(
+      chalk.yellow('WARNING: the versions from package.json and the latest tag differ...\n'),
+      chalk.yellow('if you increase the version with `sgr`, it will write all commits since the last tag into the new version..\n'),
+      chalk.yellow('you might consider tagging your last verion before using `sgr`...\n'),
+    );
+    latestVersion = `v${latestPkgVersion}`;
   }
 
   return latestVersion;

package.json

@@ -66,6 +66,7 @@
     "nyc": "^10.1.2"
   },
   "dependencies": {
+    "chalk": "^2.0.1",
     "execa": "^0.6.3",
     "fs-extra": "^3.0.1",
     "get-git-remotes": "^1.0.1",
@@ -78,7 +79,7 @@
     "listr": "^0.12.0",
     "moment": "^2.18.1",
     "semver": "^5.3.0",
-    "tagged-git-commit": "^1.0.0",
+    "tagged-git-commits": "^1.0.0",
     "update-notifier": "^2.1.0",
     "yargs": "^8.0.1"
   }

test/lib-helpers/getLatestVersion.js

@@ -37,7 +37,7 @@ test.serial('LATEST VERSION | tagged version !== package.json version', async (t
 
   const latestVersion = await getLatestVersion();
 
-  t.is(latestVersion, '');
+  t.is(latestVersion, 'v0.0.1');
 
   await fs.unlinkSync(path.join(cwd, 'package.json'));
 

yarn.lock

@@ -103,6 +103,12 @@ ansi-styles@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
 
+ansi-styles@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.1.0.tgz#09c202d5c917ec23188caa5c9cb9179cd9547750"
+  dependencies:
+    color-convert "^1.0.0"
+
 ansi-styles@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-1.0.0.tgz#cb102df1c56f5123eab8b67cd7b98027a0279178"
@@ -992,6 +998,14 @@ chalk@^1.0.0, chalk@^1.1.0, chalk@^1.1.1, chalk@^1.1.3:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
+chalk@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.0.1.tgz#dbec49436d2ae15f536114e76d14656cdbc0f44d"
+  dependencies:
+    ansi-styles "^3.1.0"
+    escape-string-regexp "^1.0.5"
+    supports-color "^4.0.0"
+
 chokidar@^1.4.2, chokidar@^1.6.1:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468"
@@ -1094,6 +1108,16 @@ code-point-at@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
 
+color-convert@^1.0.0:
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.0.tgz#1accf97dd739b983bf994d56fec8f95853641b7a"
+  dependencies:
+    color-name "^1.1.1"
+
+color-name@^1.1.1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.2.tgz#5c8ab72b64bd2215d617ae9559ebb148475cf98d"
+
 combined-stream@^1.0.5, combined-stream@~1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.5.tgz#938370a57b4a51dea2c77c15d5c5fdf895164009"
@@ -3894,6 +3918,12 @@ supports-color@^3.1.2:
   dependencies:
     has-flag "^1.0.0"
 
+supports-color@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.1.0.tgz#92cc14bb3dad8928ca5656c33e19a19f20af5c7a"
+  dependencies:
+    has-flag "^2.0.0"
+
 symbol-observable@^0.2.2:
   version "0.2.4"
   resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-0.2.4.tgz#95a83db26186d6af7e7a18dbd9760a2f86d08f40"
@@ -3913,9 +3943,9 @@ table@^3.7.8:
     slice-ansi "0.0.4"
     string-width "^2.0.0"
 
-tagged-git-commit@^1.0.0:
+tagged-git-commits@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/tagged-git-commit/-/tagged-git-commit-1.0.0.tgz#01512638d0addc34364fa263329cec37f6cc8204"
+  resolved "https://registry.yarnpkg.com/tagged-git-commits/-/tagged-git-commits-1.0.0.tgz#481f2e13296d0ade56fa827d000fe66374694ab6"
   dependencies:
     execa "^0.6.1"
     fs-extra "^3.0.1"