ppackage 1.0.3 → 2.0.2

package/bin/ppackage

@@ -0,0 +1 @@
+cnyks ppackage --ir://run=$*

package/bin/ppackage.cmd

@@ -0,0 +1 @@
+@cnyks ppackage --ir://run=%*

package/index.js

@@ -12,49 +12,84 @@ const wait = require('nyks/child_process/wait');
 const Dockerfile = require('./lib/dockerfile');
 
 
-class ddocker {
+class ppackage {
 
-  async version(version = false, notag = false, nonpm = false) {
-    let target_version = version || args.args.shift();
+  async version(version = false, notag = false) {
+    let current_version;
+
+    let modes = {
+      composer  : { enabled : fs.existsSync('composer.json') },
+      docker    : { enabled : fs.existsSync('Dockerfile') },
+      npm       : { enabled : fs.existsSync('package.json') },
+    };
 
-    if(!nonpm && fs.existsSync('package.json') && process.env['npm_lifecycle_event'] != "version")
-      throw `Please change version using \`npm version ${target_version}\``;
+    const DOCKER_LABEL_VERSION = "org.opencontainers.image.version";
+
+    let target_version = version || args.args.shift();
 
     let dirty = await wait(spawn('git', ["diff", "--quiet"])).catch(err => 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;
+    }
 
-    const LABEL_VERSION = "org.opencontainers.image.version";
-    let body = this._read();
-    let current = body.labels[LABEL_VERSION] || "0.0.0";
+    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(!semver.valid(target_version))
-      target_version = semver.inc(current, target_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";
+
+    if(!semver.valid(target_version))
+      target_version = semver.inc(current_version, target_version);
 
     if(!target_version)
       throw `Invalid semver range`;
 
-    body.setLabel(LABEL_VERSION, target_version);
-    fs.writeFileSync('Dockerfile', body.toString());
+    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');
+    }
+
+    await passthru('git', ['add',  ...files]);
 
-    await passthru('git', ['add', 'Dockerfile']);
     if(!notag) {
-      await passthru('git', ['commit', '-m', `v${target_version}`, 'Dockerfile']);
+      await passthru('git', ['commit', '-m', `v${target_version}`, ...files]);
       await passthru('git', ['tag', `v${target_version}`]);
     }
+
     return target_version;
   }
 
-  _read() {
-    let body = fs.readFileSync('Dockerfile', 'utf8');
-    let foo = Dockerfile.parse(body);
-    return foo;
-  }
 }
 
 
-module.exports = ddocker;
+module.exports = ppackage;
 

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "ppackage",
-  "version": "1.0.3",
+  "version": "2.0.2",
   "description": "",
   "main": "index.js",
   "bin": {
-    "ddocker": "./bin/ddocker"
+    "ppackage": "./bin/ppackage"
   },
   "dependencies": {
     "mout": "^1.0.0",
@@ -16,4 +16,4 @@
   },
   "author": "",
   "license": "ISC"
-}
+}

package/bin/ddocker

@@ -1 +0,0 @@
-cnyks ddocker --ir://run=$*

package/bin/ddocker.cmd

@@ -1 +0,0 @@
-@cnyks ddocker --ir://run=%*