Merge pull request #85 from vrockai/HAWKULAR-53_1

HAWKULAR-53: Added the git sha info about Hawkular to the title
hawkular · Apr 21, 2015 · 5ba344e · 5ba344e
2 parents 2bb7cec + 9092373
commit 5ba344e
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/ui/console/src/main/scripts/gulpfile.js b/ui/console/src/main/scripts/gulpfile.js
@@ -72,6 +72,17 @@ gulp.task('clean-defs', function () {
     del(['defs.d.ts/**']);
 });
 
+gulp.task('git-sha', function(cb) {
+  plugins.git.exec({args : 'log -n 1 --oneline'}, function (err, stdout) {
+    if (err) throw err;
+    var versionFile = 'version.js';
+    var gitSha = stdout.slice(0, -1);
+    var jsString = 'var HawkularVersion = \'' + gitSha + '\';';
+    fs.writeFileSync(versionFile, jsString);
+    cb();
+  });
+});
+
 gulp.task('tsc', ['clean-defs'], function () {
     var cwd = process.cwd();
     var tsResult = gulp.src(config.ts)
@@ -123,10 +134,10 @@ gulp.task('template', ['tsc'], function () {
         .pipe(gulp.dest('.'));
 });
 
-gulp.task('concat', ['template'], function () {
+gulp.task('concat', ['template', 'git-sha'], function () {
     var gZipSize = size(gZippedSizeOptions);
 
-    return gulp.src(['compiled.js', 'templates.js'])
+    return gulp.src(['compiled.js', 'templates.js', 'version.js'])
         .pipe(plugins.concat(config.js))
         .pipe(gulp.dest(config.dist))
         .pipe(size(normalSizeOptions))

diff --git a/ui/console/src/main/scripts/package.json b/ui/console/src/main/scripts/package.json
@@ -10,6 +10,7 @@
     "gulp-angular-templatecache": "^1.5.0",
     "gulp-concat": "^2.4.2",
     "gulp-connect": "^2.2.0",
+    "gulp-git": "1.1.0",
     "gulp-load-plugins": "^0.8.0",
     "gulp-notify": "^2.1.0",
     "gulp-replace": "0.5.3",

diff --git a/ui/console/src/main/webapp/index.html b/ui/console/src/main/webapp/index.html
@@ -75,7 +75,8 @@
     <!-- add any scripts under dist/ here -->
     <script src="dist/hawkular-console.js"></script>
     <script>
-      document.getElementById("hawkularLogo").title = HawkularComponentsVersions[0].version;
+      var title = 'HAWKULAR: ' + HawkularVersion + ',&#013;UI-COMP: ' + HawkularComponentsVersions[0].version;
+      document.getElementById("hawkularLogo").title = title;
       var comment = document.createComment(JSON.stringify(HawkularComponentsVersions));
       document.getElementsByTagName('body')[0].appendChild(comment);
     </script>