2.1.0

keymetrics · Apr 12, 2020 · 62c5101 · 62c5101
1 parent 1df3780
commit 62c5101
Show file tree

Hide file tree

Showing 4 changed files with 74 additions and 66 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,8 +3,7 @@ branches:
     - master
     - development
 node_js:
-   - "4"
-   - "6"
    - "8"
-   - "9"
    - "10"
+   - "12"
+   - "13"
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,11 @@
 
+## 2.1.0
+
+- Upgrade async
+- Upgrade ini
+- Merge PR security fix https://github.com/keymetrics/vizion/pull/27
+- Fixed bug in SVN parsing https://github.com/keymetrics/vizion/pull/23
+
 ## 2.0.2 ( Fri Jul 20 2018 10:26:40 GMT+0200 (CEST) )
 
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vizion",
-  "version": "2.0.2",
+  "version": "2.1.0",
   "engines": {
     "node": ">=4.0"
   },
@@ -30,9 +30,9 @@
     "test": "mocha"
   },
   "dependencies": {
-    "async": "2.6.1",
+    "async": "^2.6.3",
     "git-node-fs": "^1.0.0",
-    "ini": "^1.3.4",
+    "ini": "^1.3.5",
     "js-git": "^0.7.8",
     "lodash.findindex": "^4.6.0",
     "lodash.foreach": "^4.5.0",

diff --git a/test/functional/git.test.js b/test/functional/git.test.js
@@ -9,20 +9,77 @@ describe('Functional: Git', function () {
   var testRepoPath = '';
   var tmp_meta = {};
 
-  before(function () {
+  before(function (done) {
     shell.cd('test/fixtures');
 
     shell.rm('-rf', 'angular-bridge');
-    shell.exec('git clone https://github.com/Unitech/angular-bridge.git');
+    shell.exec('git clone https://github.com/Unitech/angular-bridge.git', () => {
+      testRepoPath = p.join(shell.pwd().toString(), 'angular-bridge');
+      done()
+    });
+  });
 
-    testRepoPath = p.join(shell.pwd().toString(), 'angular-bridge');
+  after(function () {
+    shell.rm('-rf', 'angular-bridge');
+    shell.cd('../..'); // go back to root
   });
 
+  it('should recursively downgrade to first commit', function (done) {
+    var callback = function (err, meta) {
+      if (err) {
+        return done(err);
+      }
+
+      if (meta.success === true) {
+        vizion.prev({folder: testRepoPath}, callback);
+      }
+      else {
+        expect(meta.success).to.eq(false);
+        vizion.analyze({folder: testRepoPath}, function (err, meta) {
+          if (err) {
+            return done(err);
+          }
+
+          expect(meta.prev_rev).to.eq(null);
+          expect(meta.revision).to.eq('445c0b78e447e87eaec2140d32f67652108b434e');
+          done();
+        });
+      }
+    };
+
+    vizion.prev({folder: testRepoPath}, callback);
+  });
+
+  it('should recursively upgrade to most recent commit', function (done) {
+    var callback = function (err, meta) {
+      if (err) {
+        return done(err);
+      }
+
+      if (meta.success === true) {
+        vizion.next({folder: testRepoPath}, callback);
+      }
+      else {
+        expect(meta.success).to.eq(false);
+        vizion.analyze({folder: testRepoPath}, function (err, meta) {
+          if (err) {
+            return done(err);
+          }
+          expect(meta.next_rev).to.eq(null);
+          expect(meta.revision).to.eq('d1dee188a0d82f21c05a398704ac3237f5523ca7');
+          done();
+        });
+      }
+    };
+
+    vizion.next({folder: testRepoPath}, callback);
+  });
 
-  context('at head', function () {
+  describe('at head', function () {
 
     describe('analyze', function () {
       it('ok', function (done) {
+        console.log('start')
         vizion.analyze({folder: testRepoPath}, function (err, meta) {
           if (err) {
             return done(err);
@@ -66,7 +123,7 @@ describe('Functional: Git', function () {
 
   });
 
-  context('previous commit', function () {
+  describe('previous commit', function () {
     before(function beforeTest(done) {
       vizion.revertTo({
         folder: testRepoPath,
@@ -146,60 +203,5 @@ describe('Functional: Git', function () {
     });
   });
 
-  it('should recursively downgrade to first commit', function (done) {
-    var callback = function (err, meta) {
-      if (err) {
-        return done(err);
-      }
-
-      if (meta.success === true) {
-        vizion.prev({folder: testRepoPath}, callback);
-      }
-      else {
-        expect(meta.success).to.eq(false);
-        vizion.analyze({folder: testRepoPath}, function (err, meta) {
-          if (err) {
-            return done(err);
-          }
-
-          expect(meta.prev_rev).to.eq(null);
-          expect(meta.revision).to.eq('445c0b78e447e87eaec2140d32f67652108b434e');
-          done();
-        });
-      }
-    };
-    vizion.prev({folder: testRepoPath}, callback);
-  });
-
-  it('should recursively upgrade to most recent commit', function (done) {
-    var callback = function (err, meta) {
-      if (err) {
-        return done(err);
-      }
-
-      if (meta.success === true) {
-        vizion.next({folder: testRepoPath}, callback);
-      }
-      else {
-        expect(meta.success).to.eq(false);
-        vizion.analyze({folder: testRepoPath}, function (err, meta) {
-          if (err) {
-            return done(err);
-          }
-          expect(meta.next_rev).to.eq(null);
-          expect(meta.revision).to.eq('d1dee188a0d82f21c05a398704ac3237f5523ca7');
-          done();
-        });
-      }
-    };
-
-    vizion.next({folder: testRepoPath}, callback);
-  });
-
-  after(function () {
-    shell.rm('-rf', 'angular-bridge');
-    shell.cd('../..'); // go back to root
-  });
-
 
 });