see #2137 improve reporting of version (#2138)

* see #2137  improve reporting of version

1. get version by git describe
2. fix display of version in jsPDF
3. fix display of version in index.html

* Update build.js

* Update jspdf.js

* Update build.js

* Update build.js

Author: bwl21

build.js

@@ -1,6 +1,5 @@
 'use strict'
 
-
 var fs = require('fs')
 const rollup = require('rollup');
 const rollupConfig = require('./rollup.config');
@@ -51,13 +50,12 @@ function bundle(options) {
     code = code.replace(
       /Permission\s+is\s+hereby\s+granted[\S\s]+?IN\s+THE\s+SOFTWARE\./,
       'Licensed under the MIT License'
-    )
+    );
     code = code.replace(
       /Permission\s+is\s+hereby\s+granted[\S\s]+?IN\s+THE\s+SOFTWARE\./g,
       ''
-    )
-	
-	code = renew(code);
+    );
+    code = renew(code);
     fs.writeFileSync(options.distFolder + '/' + options.filename + '.debug.js', code)
 
 	console.log('Finish Bundling ' + options.distFolder + '/' + options.filename + '.debug.js');
@@ -77,17 +75,19 @@ function bundle(options) {
 }
 
 function renew(code) {
-  var date = new Date().toISOString()
-  var version = require('./package.json').version
-  var whoami = execSync('whoami').toString().trim()
+  var date = new Date().toISOString();
+  var version = require('./package.json').version;
+  var whoami = 'anonymous';
   var commit = '00000000';
   try {
-    commit = execSync('git rev-parse --short=10 HEAD').toString().trim()
+    commit = execSync('git rev-parse --short=10 HEAD').toString().trim();
+    version = execSync('git describe').toString().trim();
+    version = version.substring(1, test.indexOf('-'));
+    whoami = execSync('whoami').toString().trim();
   } catch (e) {}
-  code = code.replace(/\$\{versionID\}/g, version)
-  code = code.replace(/\$\{builtOn\}/g, date)
-  code = code.replace('${commitID}', commit)
-  code = code.replace(/1\.0\.0-trunk/, version + ' ' + date + ':' + whoami)
-
+  code = code.replace(/jsPDF.version = '0.0.0'/g, "jsPDF.version = '" + version + "'");
+  code = code.replace(/\$\{builtOn\}/g, date);
+  code = code.replace('${commitID}', commit);
+  code = code.replace(/1\.0\.0-trunk/, version + ' ' + date + ':' + whoami);
   return code
 }

index.html

@@ -19,17 +19,19 @@
 		<div class="container">
 
 			<div class="masthead">
-				<div class="pull-right">
-					<div class="tweet-buttons">
+				<div class="pull-right" style="text-align: right;">
+					<span class="tweet-buttons">
 						<a href="https://twitter.com/share" class="twitter-share-button" data-via="MrRio" data-size="large">Tweet</a>
 						<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
 						<a href="https://twitter.com/MrRio" class="twitter-follow-button" data-show-count="false" data-size="large">Follow @MrRio</a>
-						<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
-					</div>
+                        <a class="btn btn-primary btn-sm" style="vertical-align:top;" href="https://github.com/MrRio/jsPDF">Download Now</a>
+					<br/><span class="muted" id="dversion"></span>
+					</span>
+					<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
+
 					<!--a class="btn btn-primary btn-large" href="http://jspdf.com/downloads/jsPDF-0.9.0rc2.zip">Download Now</a>
 					<p class="muted" style="text-align: right;">Version 0.9.0rc2</p-->
-					<a class="btn btn-primary btn-large" href="https://github.com/MrRio/jsPDF">Download Now</a>
-					<p class="muted" style="text-align: right;" id="dversion">Version 0.9.0rc2</p>
+
 				</div>
 				<h1 class="muted">jsPDF</h1>
 				<h4>HTML5 JavaScript PDF generation library from <a href="http://twitter.com/MrRio">@MrRio</a> at <a href="http://parall.ax">Parallax</a></h4>

src/jspdf.js

@@ -3300,10 +3300,10 @@ var jsPDF = (function (global) {
   /**
    * The version of jsPDF
    * @name version
-   * @type {number}
+   * @type {string}
    * @memberOf jsPDF
    */
-  jsPDF.version = ("${versionID}" === ("${vers" + "ionID}")) ? "0.0.0" : "${versionID}";
+  jsPDF.version = '0.0.0';
 
   if (typeof define === 'function' && define.amd) {
     define('jsPDF', function () {