Merge branch 'ErjanGavalji/add-sha-info'

ErjanGavalji · ErjanGavalji · commit dfcc820f2f11 · 2015-03-31T14:12:03.000+03:00
diff --git a/gruntfile.js b/gruntfile.js
@@ -23,6 +23,9 @@ module.exports = function(grunt) {
     var updateModulesPackageDef = function(content, srcPath) {
         return updatePackageDef(content, function(contentAsObject) {
             contentAsObject.version = localCfg.packageVersion;
+            if (localCfg.commitSHA) {
+                contentAsObject.repository.url += "/commit/" + localCfg.commitSHA;
+            }
         });
     };
 
@@ -33,6 +36,15 @@ module.exports = function(grunt) {
             contentAsObject.name = "tns-samples-" + currentAppName;
             contentAsObject.description = "Nativescript " + currentAppName + " sample application";
             contentAsObject.license = "BSD";
+            if (!contentAsObject.repository) {
+                contentAsObject.repository = {};
+            }
+            if (!contentAsObject.repository.url) {
+                contentAsObject.repository.url = localCfg.mainPackageContent.repository.url;
+            }
+            if (localCfg.commitSHA) {
+                contentAsObject.repository.url += "/commit/" + localCfg.commitSHA;
+            }
         });
     };
 
@@ -42,16 +54,32 @@ module.exports = function(grunt) {
             contentAsObject.name = "tns-definitions";
             contentAsObject.description = "NativeScript Module definitions";
             contentAsObject.license = "Apache-2.0";
+            if (localCfg.commitSHA) {
+                contentAsObject.repository.url += "/commit/" + localCfg.commitSHA;
+            }
         });
-    }
+    };
+
+    var getCommitSha = function() {
+        if (process.env.GIT_COMMIT) {
+            return process.env.GIT_COMMIT;
+        }
+        return "";
+    };
 
-    var getPackageVersion = function(packageFilePath) {
-        packageContent = grunt.file.readJSON(packageFilePath);
+    var assignGitSHA = function(err, stdout, stderr, cb) {
+        if (!localCfg.commitSHA) {
+            localCfg.commitSHA = stdout.replace("\n", "");
+        }
+        cb();
+    };
+
+    var getPackageVersion = function() {
         var buildVersion = process.env.PACKAGE_VERSION;
         if (!buildVersion) {
-            return packageContent.version;
+            return localCfg.mainPackageContent.version;
         }
-        return packageContent.version + "-" + buildVersion;
+        return localCfg.mainPackageContent.version + "-" + buildVersion;
     };
 
     var processAppFile = function(content, srcPath) {
@@ -88,7 +116,10 @@ module.exports = function(grunt) {
             "!./ui/slide-out/**/*.*"
         ]
     };
+
+    localCfg.mainPackageContent = grunt.file.readJSON(localCfg.packageJsonFilePath);
     localCfg.packageVersion = getPackageVersion(localCfg.packageJsonFilePath);
+    localCfg.commitSHA = getCommitSha();
     localCfg.defaultExcludes = [
             "!" + localCfg.outDir + "/**/*.*",
             "!./node_modules/**/*.*",
@@ -283,6 +314,14 @@ module.exports = function(grunt) {
                     return targetDirs;
                 }()
             }
+        },
+        shell: {
+            getGitSHA: {
+                command: "git rev-parse HEAD",
+                options: {
+                    callback: assignGitSHA
+                }
+            }
         }
     });
 
@@ -292,6 +331,7 @@ module.exports = function(grunt) {
     grunt.loadNpmTasks("grunt-exec");
     grunt.loadNpmTasks("grunt-tslint");
     grunt.loadNpmTasks("grunt-multi-dest");
+    grunt.loadNpmTasks("grunt-shell");
 
     var cloneTasks = function(originalTasks, taskNameSuffix)
     {
@@ -403,6 +443,7 @@ module.exports = function(grunt) {
 
     grunt.registerTask("default", ((typeof(grunt.option('runtslint')) != "undefined" && !grunt.option('runtslint')) ? [] : ["tslint:build"]).concat([
         "clean:build",
+        "shell:getGitSHA",
 
         "collect-apps-raw-files",
         "collect-definitions-raw-files",
diff --git a/package.json b/package.json
@@ -2,6 +2,10 @@
   "name": "tns-core",
   "description": "Telerik NativeScript Core",
   "version": "0.4.2",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/NativeScript/cross-platform-modules"
+  },
   "files": [
     "**/*.*",
     "**/*"
@@ -13,6 +17,7 @@
     "grunt-contrib-copy": "0.5.0",
     "grunt-exec": "0.4.5",
     "grunt-multi-dest": "1.0.0",
+    "grunt-shell": "1.1.2",
     "grunt-ts": "1.12.1",
     "grunt-tslint": "0.4.2",
     "typescript": "1.4.1"
