Merge pull request #119 from salesforce/inline-version

Inline version

lib/cookie.js

@@ -36,7 +36,7 @@ var pubsuffix = require('./pubsuffix-psl');
 var Store = require('./store').Store;
 var MemoryCookieStore = require('./memstore').MemoryCookieStore;
 var pathMatch = require('./pathMatch').pathMatch;
-var VERSION = require('../package.json').version;
+var VERSION = require('./version');
 
 var punycode;
 try {
@@ -1420,6 +1420,7 @@ CAN_BE_SYNC.forEach(function(method) {
   CookieJar.prototype[method+'Sync'] = syncWrap(method);
 });
 
+exports.version = VERSION;
 exports.CookieJar = CookieJar;
 exports.Cookie = Cookie;
 exports.Store = Store;

lib/version.js

@@ -0,0 +1,2 @@
+// generated by genversion
+module.exports = '2.4.4-1'

package.json

@@ -43,7 +43,7 @@
     "RFC6265",
     "RFC2965"
   ],
-  "version": "2.4.3",
+  "version": "2.4.4-1",
   "homepage": "https://github.com/salesforce/tough-cookie",
   "repository": {
     "type": "git",
@@ -57,6 +57,7 @@
     "lib"
   ],
   "scripts": {
+    "version": "genversion lib/version.js && git add lib/version.js",
     "test": "vows test/*_test.js",
     "cover": "nyc --reporter=lcov --reporter=html vows test/*_test.js"
   },
@@ -65,6 +66,7 @@
   },
   "devDependencies": {
     "async": "^1.4.2",
+    "genversion": "^2.1.0",
     "nyc": "^11.6.0",
     "string.prototype.repeat": "^0.2.0",
     "vows": "^0.8.2"

test/api_test.js

@@ -51,6 +51,11 @@ vows
       assert.ok(CookieJar);
     }
   })
+  .addBatch({
+    "Version": function () {
+      assert.equal(tough.version, require('../package.json').version);
+    }
+  })
   .addBatch({
     "Constructor": {
       topic: function () {

test/jar_serialization_test.js

@@ -37,7 +37,6 @@ var Cookie = tough.Cookie;
 var CookieJar = tough.CookieJar;
 var Store = tough.Store;
 var MemoryCookieStore = tough.MemoryCookieStore;
-var VERSION = require('../package.json').version;
 
 var domains = ['example.com','www.example.com','example.net'];
 var paths = ['/','/foo','/foo/bar'];
@@ -102,7 +101,7 @@ function setUp(context) {
 function checkMetadata(serialized) {
   assert.notEqual(serialized, null);
   assert.isObject(serialized);
-  assert.equal(serialized.version, 'tough-cookie@'+VERSION);
+  assert.equal(serialized.version, 'tough-cookie@'+tough.version);
   assert.equal(serialized.storeType, 'MemoryCookieStore');
   assert.typeOf(serialized.rejectPublicSuffixes, 'boolean');
   assert.isArray(serialized.cookies);
@@ -332,7 +331,7 @@ vows
       },
       "has expected metadata": function(err,jsonObj) {
         assert.isNull(err);
-        assert.equal(jsonObj.version, 'tough-cookie@'+VERSION);
+        assert.equal(jsonObj.version, 'tough-cookie@'+tough.version);
         assert.isTrue(jsonObj.rejectPublicSuffixes);
         assert.equal(jsonObj.storeType, 'MemoryCookieStore');
       },