Set status bar text to show the uncommitted time

- check that gtm is at least v1.0-beta.8
- did some more refactoring
- bumped to 0.0.3

Author: nexusuw

README.md

@@ -14,8 +14,8 @@ From [git-time-metric/gtm](https://github.com/git-time-metric/gtm)
 
 ## Requirements
 
-1. ```gtm``` must be installed locally and accessible on the ```$PATH``` ([installation instructions](https://github.com/git-time-metric/gtm#install-the-latest-gtm-release))
-2. In VSCode, open the command pallet, and type ```>ext install vscode-gtm```
+1. ```gtm``` must be installed locally, be at least 1.0.beta.8 and accessible on the ```$PATH``` ([installation instructions](https://github.com/git-time-metric/gtm#install-the-latest-gtm-release))
+2. In VSCode, open the command pallet, type ```>ext install``` and then search for ```vscode-gtm```
 
 ## Extension Settings
 
@@ -27,6 +27,10 @@ only tested on Ubuntu, so may not work on OSX, other Linuxs, and/or Windows
 
 ## Release Notes
 
+### 0.0.3
+
+Status bar now shows total uncommitted time
+
 ### 0.0.2
 
 Improved reporting logic to factor in changing current text file
@@ -35,7 +39,5 @@ Improved reporting logic to factor in changing current text file
 
 Initial release of vscode-gtm
 
-
-
 ### Notes
 Logo belongs to https://github.com/git-time-metric/gtm

package.json

@@ -1,36 +1,35 @@
 {
-    "name": "vscode-gtm",
-    "displayName": "vscode-gtm",
-    "description": "VSCode plugin to support Git Time Metrics",
-    "version": "0.0.2",
-    "publisher": "s3ramsay",
-    "license": "MIT",
-    "engines": {
-        "vscode": "^1.0.0"
-    },
-    "categories": [
-        "Other"
-    ],
-    "activationEvents": [
-      "*"
-    ],
-    "keywords":[
-      "gtm",
-      "git time metrics",
-      "time tracking"
-    ],
-    "icon":"GTMLogo-128.png",
-    "main": "./out/src/extension",
-    "contributes": {
-    },
-    "scripts": {
-        "vscode:prepublish": "node ./node_modules/vscode/bin/compile",
-        "compile": "node ./node_modules/vscode/bin/compile -watch -p ./",
-        "postinstall": "node ./node_modules/vscode/bin/install",
-        "test":"node ./node_modules/vscode/bin/compile"
-    },
-    "devDependencies": {
-        "typescript": "^1.8.5",
-        "vscode": "^0.11.0"
-    }
+  "name": "vscode-gtm",
+  "displayName": "vscode-gtm",
+  "description": "VSCode plugin to support Git Time Metrics",
+  "version": "0.0.3",
+  "publisher": "s3ramsay",
+  "license": "MIT",
+  "engines": {
+    "vscode": "^1.0.0"
+  },
+  "categories": [
+    "Other"
+  ],
+  "activationEvents": [
+    "*"
+  ],
+  "keywords": [
+    "gtm",
+    "git time metrics",
+    "time tracking"
+  ],
+  "icon": "GTMLogo-128.png",
+  "main": "./out/src/extension",
+  "contributes": {},
+  "scripts": {
+    "vscode:prepublish": "node ./node_modules/vscode/bin/compile",
+    "compile": "node ./node_modules/vscode/bin/compile -watch -p ./",
+    "postinstall": "node ./node_modules/vscode/bin/install",
+    "test":"node ./node_modules/vscode/bin/compile"
+  },
+  "devDependencies": {
+    "typescript": "^1.8.5",
+    "vscode": "^0.11.0"
+  }
 }

src/extension.ts

@@ -1,25 +1,40 @@
 'use strict';
+
 import * as vscode from 'vscode';
-var spawn = require('child_process').spawn;
-
-function run_cmd(cmd, args, callBack) {
-  var child = spawn(cmd, args);
-  var resp = "";
-  child.on('error', function (code) { console.error('error', resp); callBack(code) });
-  child.stdout.on('data', function (buffer) { resp += buffer.toString() });
-  child.on('close', function (code) {console.log(resp) ;callBack(code) });
+const spawn = require('child_process').spawn;
+
+interface Result {
+  code: number;
+  output: string;
+}
+
+function run_cmd(cmd: string, args: string[]): Promise<Result> {
+  const child = spawn(cmd, args);
+  let output = "";
+  return new Promise((resolve, reject) => {
+    child.on('error', (code: number) => {
+      console.error('error', output);
+      reject(<Result>{ code, output });
+    });
+    child.stdout.on('data', (buffer) => output += buffer.toString());
+    child.stderr.on('data', (buffer) => output += buffer.toString()); // since gtm -v outputs to stderr on ubuntu....
+    child.on('close', (code: number) => resolve(<Result>{ code, output }));
+  });
 }
 
 export function activate(context: vscode.ExtensionContext) {
   // check if gtm is installed + avaliable
-  run_cmd('gtm', [], (res) => {
-    if (res < 0) {
-      vscode.window.showErrorMessage('gtm is not avaliable on your $PATH. please install it first');
-    }
-  });
+  run_cmd('gtm', ['-v'])
+    .then((res: Result) => {
+      if(res.output < 'v1.0-beta.8'){
+         vscode.window.showWarningMessage('Installed gtm version is below v1.0-beta.8. Please update your gtm installation.');
+       }
+    }, (res: Result) => {
+      if (res.code < 0) {
+        vscode.window.showErrorMessage('gtm is not avaliable on your $PATH. please install it first');
+      }
+    });
   let subscriptions: vscode.Disposable[] = [];
-
-
   let lastUpdated: Date = new Date();
   let lastSavedFileName: string;
   const MIN_UPDATE_FREQUENCE_MS = 30000; // 30 seconds
@@ -28,7 +43,8 @@ export function activate(context: vscode.ExtensionContext) {
     const now = new Date();
     // if a new file is being saved OR it have been at least MIN_UPDATE_FREQUENCE_MS, record it
     if (fileName !== lastSavedFileName || (now.getTime() - lastUpdated.getTime()) >= MIN_UPDATE_FREQUENCE_MS) {
-      run_cmd('gtm', ['record', lastSavedFileName], () => { });
+      run_cmd('gtm', ['record', '--status', lastSavedFileName])
+        .then((res: Result) => vscode.window.setStatusBarMessage(res.output));
       lastSavedFileName = fileName;
       lastUpdated = now;
     }
@@ -44,4 +60,4 @@ export function activate(context: vscode.ExtensionContext) {
   vscode.window.onDidChangeActiveTextEditor((e:vscode.TextEditor) => handleUpdateEvent(e.document.fileName), this, subscriptions);
 }
 
-// always active, so no need to deactivate
+// always active, so no need to deactivate