fix: snyk --version

src/cli/commands/protect/wizard.ts

@@ -19,7 +19,7 @@ import * as _ from 'lodash';
 import { exec } from 'child_process';
 import { apiTokenExists } from '../../../lib/api-token';
 import * as auth from '../auth/is-authed';
-import { getVersion } from '../version';
+import getVersion = require('../version');
 import * as allPrompts from './prompts';
 import answersToTasks = require('./tasks');
 import * as snyk from '../../../lib/';

src/cli/commands/version.ts

@@ -1 +1,3 @@
-export * from '../../lib/version';
+import { getVersion } from '../../lib/version';
+
+export = getVersion;

src/lib/version.ts

@@ -26,7 +26,7 @@ async function getBranchCommitAndDirty(promises): Promise<string> {
     const branchName = res[0];
     const commitStr = res[1];
     const filesCount = res[2];
-    const dirtyCount = parseInt(filesCount, 10);
+    const dirtyCount = parseInt(filesCount, 10) || 0;
     let curr = branchName + ': ' + commitStr;
     if (dirtyCount !== 0) {
       curr += ' (' + dirtyCount + ' dirty files)';
@@ -41,8 +41,4 @@ async function getBranchCommitAndDirty(promises): Promise<string> {
 
 const commit = () => executeCommand('git rev-parse HEAD', root);
 const branch = () => executeCommand('git rev-parse --abbrev-ref HEAD', root);
-const dirty = () =>
-  executeCommand(
-    'expr $(git status --porcelain 2>/dev/null| ' + 'egrep "^(M| M)" | wc -l)',
-    root,
-  );
+const dirty = () => executeCommand('git diff --shortstat', root);

test/acceptance/cli-args.test.ts

@@ -1,8 +1,13 @@
 import { test } from 'tap';
 import { exec } from 'child_process';
 import { sep } from 'path';
+const osName = require('os-name');
 
 const main = './dist/cli/index.js'.replace(/\//g, sep);
+const iswindows =
+  osName()
+    .toLowerCase()
+    .indexOf('windows') === 0;
 
 // TODO(kyegupov): make these work in Windows
 test('snyk test command should fail when --file is not specified correctly', (t) => {
@@ -19,6 +24,24 @@ test('snyk test command should fail when --file is not specified correctly', (t)
   });
 });
 
+test(
+  'snyk version command should show cli version or sha',
+  { skip: iswindows },
+  (t) => {
+    t.plan(1);
+    exec(`node ${main} --version`, (err, stdout) => {
+      if (err) {
+        throw err;
+      }
+      t.match(
+        stdout.trim(),
+        ':', // can't guess branch or sha or dirty files, but we do always add `:`
+        'version is shown',
+      );
+    });
+  },
+);
+
 test('snyk test command should fail when --packageManager is not specified correctly', (t) => {
   t.plan(1);
   exec(`node ${main} test --packageManager=hello`, (err, stdout) => {