ppackage 2.1.1 → 2.2.0

package/.eslintrc

@@ -0,0 +1,6 @@
+{
+  "root": true,
+  "extends": [
+    "plugin:ivs/node"
+  ]
+}

package/.npmignore

@@ -0,0 +1,7 @@
+/npm-debug.log
+/node_modules
+/coverage
+/test
+/disc
+/.git*
+

package/index.js

@@ -2,7 +2,6 @@
 
 const fs   = require('fs');
 const semver   = require('semver');
-const path = require('path');
 const {spawn} = require('child_process');
 
 const args = require('nyks/process/parseArgs')();
@@ -10,6 +9,14 @@ const passthru = require('nyks/child_process/passthru');
 const wait = require('nyks/child_process/wait');
 
 const Dockerfile = require('./lib/dockerfile');
+const {Parser, Composer} = require('yaml');
+
+
+const laxParser = function(body) {
+  const tokens = new Parser().parse(body);
+  const docs = new Composer({merge : true, uniqueKeys : false}).compose(tokens);
+  return docs.next().value;
+};
 
 
 class ppackage {
@@ -17,37 +24,86 @@ class ppackage {
   async version(version = false, notag = false) {
     let current_version;
 
+
+    const DOCKER_LABEL_VERSION = "org.opencontainers.image.version";
+    const GITLAB_PATH_VERSION  = ".version";
+
     let modes = {
-      composer  : { enabled : fs.existsSync('composer.json') },
-      docker    : { enabled : fs.existsSync('Dockerfile') },
-      npm       : { enabled : fs.existsSync('package.json') },
+      gitlab    : {
+        file    : '.gitlab-ci.yml',
+        analyze : function() {
+          const body = fs.readFileSync(this.file, 'utf-8');
+          this.meta = laxParser(body);
+          current_version = this.meta.get(GITLAB_PATH_VERSION);
+        },
+        commit : function({target_version, files}) {
+          let opts = {lineWidth : 0};
+          this.meta.set(GITLAB_PATH_VERSION, target_version);
+          fs.writeFileSync(this.file, this.meta.toString(opts));
+          files.push(this.file);
+        }
+
+      },
+      composer  : {
+        file : 'composer.json',
+        analyze : function() {
+          const body = fs.readFileSync(this.file, 'utf-8');
+          this.meta = JSON.parse(body);
+          current_version = this.meta.version;
+        },
+        commit : function({target_version, files}) {
+          this.meta.version =  target_version;
+          fs.writeFileSync(this.file, JSON.stringify(this.meta, null, 2));
+          files.push(this.file);
+        }
+      },
+      docker    : {
+        file : 'Dockerfile',
+        analyze : function () {
+          const body = fs.readFileSync(this.file, 'utf-8');
+          this.meta = Dockerfile.parse(body);
+          current_version = this.meta.labels[DOCKER_LABEL_VERSION];
+        },
+        commit : function(target_version) {
+          modes.docker.meta.setLabel(DOCKER_LABEL_VERSION, target_version);
+          fs.writeFileSync(this.file, this.meta.toString());
+          files.push(this.file);
+        }
+      },
+
+      npm       : {
+        file : 'package.json',
+        analyze : function () {
+          const body = fs.readFileSync(this.file, 'utf-8');
+          this.meta = JSON.parse(body);
+          current_version = this.meta.version;
+        },
+        commit : function({target_version, files}) {
+          this.meta.version =  target_version;
+          fs.writeFileSync(this.file, JSON.stringify(this.meta, null, 2));
+          files.push(this.file);
+        }
+
+      }
     };
 
-    const DOCKER_LABEL_VERSION = "org.opencontainers.image.version";
+    // prepare modes
+    for(let [mode_n, mode] of Object.entries(modes)) {
+      if(!fs.existsSync(mode.file)) {
+        delete modes[mode_n];
+        continue;
+      }
+      mode.analyze.call(mode);
+    }
+
+
 
     let target_version = version || args.args.shift();
 
-    let dirty = await wait(spawn('git', ["diff-index", "--quiet", "HEAD"])).catch(err => true);
+    let dirty = await wait(spawn('git', ["diff-index", "--quiet", "HEAD"])).catch(() => true);
     if(dirty && !notag)
       throw "Working directory not clean, aborting";
 
-    if(modes.composer.enabled) {
-      let body = fs.readFileSync('composer.json', 'utf-8');
-      modes.composer.meta = JSON.parse(body);
-      current_version = modes.composer.meta.version;
-    }
-
-    if(modes.npm.enabled) {
-      let body = fs.readFileSync('package.json', 'utf-8');
-      modes.npm.meta = JSON.parse(body);
-      current_version = modes.npm.meta.version;
-    }
-
-    if(modes.docker.enabled) {
-      let body = fs.readFileSync('Dockerfile', 'utf8');
-      modes.docker.meta = Dockerfile.parse(body);
-      current_version = modes.docker.meta.labels[DOCKER_LABEL_VERSION];
-    }
 
     if(!current_version)
       current_version =  "0.0.0";
@@ -58,32 +114,18 @@ class ppackage {
     if(!target_version)
       throw `Invalid semver range`;
 
-    if(modes.npm.enabled && !process.env['npm_package_version']) {
-      let version_hook = modes.npm.meta.scripts.version;
+    if(modes.npm && !process.env['npm_package_version']) {
+      let version_hook = modes.npm.meta.scripts && modes.npm.meta.scripts.version;
       if(version_hook) {
         console.log("Running version hook", version_hook);
         await passthru(version_hook, {shell : true, env : {npm_package_version : target_version}});
       }
     }
 
-    let files = [];
-    if(modes.docker.enabled) {
-      modes.docker.meta.setLabel(DOCKER_LABEL_VERSION, target_version);
-      fs.writeFileSync('Dockerfile', modes.docker.meta.toString());
-      files.push('Dockerfile');
-    }
-
-    if(modes.composer.enabled) {
-      modes.composer.meta.version =  target_version;
-      fs.writeFileSync('composer.json', JSON.stringify(modes.composer.meta, null, 2));
-      files.push('composer.json');
-    }
 
-    if(modes.npm.enabled) {
-      modes.npm.meta.version =  target_version;
-      fs.writeFileSync('package.json', JSON.stringify(modes.npm.meta, null, 2));
-      files.push('package.json');
-    }
+    let files = [];
+    for(let [, mode] of Object.entries(modes))
+      mode.commit.call(mode, {target_version, files});
 
     await passthru('git', ['add',  ...files]);
 

package/lib/dockerfile.js

@@ -1,14 +1,6 @@
 "use strict";
 
-const fs   = require('fs');
-const semver   = require('semver');
-const path = require('path');
-
-
-const args = require('nyks/process/parseArgs')();
-const passthru  = require('nyks/child_process/passthru');
 const escapeRegExp = require('mout/string/escapeRegExp');
-const splitArgs = require('nyks/process/splitArgs');
 
 const {tokenize} = require('./util');
 
@@ -20,7 +12,7 @@ const VERBS       = /^\s*(\w+)\s*(.*)/;
 class Dockerfile {
   static parse(body) {
     let lines = body.trim().split("\n");
-    
+
     let out = new Dockerfile();
 
     let lookingForDirectives = true;
@@ -30,7 +22,7 @@ class Dockerfile {
     var lineRaw = "";
 
     for(let line of lines) {
-      let multiline = new RegExp(`(.*)${escapeRegExp(out.escape)}\s*$`);
+      let multiline = new RegExp(`(.*)${escapeRegExp(out.escape)}\\s*$`);
 
       if(lookingForDirectives && INSTRUCTION.test(line)) {
         let [, instruction, value] = INSTRUCTION.exec(line);
@@ -45,7 +37,7 @@ class Dockerfile {
         continue;
       }
 
-      lookingForDirectives = false
+      lookingForDirectives = false;
 
       if(multiline.test(line)) {
         let raw = multiline.exec(line);
@@ -53,13 +45,13 @@ class Dockerfile {
         remainder_raw += raw[0] + "\n";
         continue;
       } else {
-        lineRaw =  remainder_raw + line ;
+        lineRaw =  remainder_raw + line;
         line = remainder + line;
         remainder = "";
         remainder_raw = "";
       }
 
-      let bloc = out.feedLine(line, lineRaw);
+      out.feedLine(line, lineRaw);
     }
     return out;
   }
@@ -73,8 +65,8 @@ class Dockerfile {
     let labels = {};
     for(let entry of this.raw) {
       if(entry.VERB == "LABEL")
-        for(let k in entry.labels)
-          Object.defineProperty(labels, k, {enumerable : true, value : entry.labels[k]});
+      {for(let k in entry.labels)
+        Object.defineProperty(labels, k, {enumerable : true, value : entry.labels[k]});}
     }
 
     Object.seal(labels);
@@ -93,7 +85,7 @@ class Dockerfile {
       toString : function() {
         return this.raw;
       }
-    }; 
+    };
 
     if(COMMENTS.test(line)) {
       let [, value] = COMMENTS.exec(line);
@@ -103,7 +95,7 @@ class Dockerfile {
         type : {value : "COMMENT"},
         _comment : {value, writable : true},
         comment : {
-          get : function() {return this._comment },
+          get : function() {return this._comment; },
           set : function(value) {
             this._comment = value;
             this.raw = `# ${this.comment}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ppackage",
-  "version": "2.1.1",
+  "version": "2.2.0",
   "description": "",
   "main": "index.js",
   "bin": {
@@ -9,10 +9,18 @@
   "dependencies": {
     "mout": "^1.0.0",
     "nyks": "^6.1.8",
-    "semver": "^5.3.0"
+    "semver": "^5.3.0",
+    "yaml": "^2.4.2"
+  },
+  "devDependencies": {
+    "eslint": "^8.57.0",
+    "eslint-plugin-ivs": "^4.0.0",
+    "expect.js": "^0.3.1",
+    "mocha": "^3.1.2",
+    "nyc": "^15.0.1"
   },
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "eslint": "eslint ."
   },
   "author": "",
   "license": "ISC"