Fixing versioning.

ui/.gitignore

@@ -32,6 +32,7 @@
 npm-debug.log
 testem.log
 /typings
+/src/environments/versions.ts
 
 # e2e
 /e2e/*.js

ui/git.version.ts

@@ -25,16 +25,31 @@ const branch = new Observable<string>(s => {
     });
 });
 
-combineLatest(revision, branch)
-  .subscribe(([revision, branch]) => {
-    console.log(`version: '${process.env.npm_package_version}', revision: '${revision}', branch: '${branch}'`);
+const tag = new Observable<string>(s => {
+  exec('git describe --abbrev=0 --tags',
+    function (error: Error, stdout: Buffer, stderr: Buffer) {
+      if (error !== null) {
+        console.log('git error: ' + error + stderr);
+      }
+      s.next(stdout.toString().trim());
+      s.complete();
+    });
+});
 
-    const content = '// this file is automatically generated by git.version.ts script\n' +
-      `export const versions = {version: '${process.env.npm_package_version}', revision: '${revision}', branch: '${branch}'};`;
+combineLatest(revision, branch, tag)
+  .subscribe(([revision, branch, tag]) => {
+    console.log(`version: '${process.env.npm_package_version}', revision: '${revision}', branch: '${branch}', tag: '${tag}'`);
 
+    const content = '// this file is automatically generated by git.version.ts script\n' +
+      `export const versions = {
+       version: '${process.env.npm_package_version}', 
+       revision: '${revision}', 
+       branch: '${branch}', 
+       tag: '${tag}'};`;
+
     fs.writeFileSync(
       'src/environments/versions.ts',
       content,
       { encoding: 'utf8' }
     );
-  });
+  });