ppackage 2.4.3 → 2.6.0

package/index.js

@@ -1,3 +1,4 @@
+#!/usr/bin/env node
 "use strict";
 
 const fs   = require('fs');
@@ -5,7 +6,8 @@ const path = require('path');
 const semver   = require('semver');
 const {spawn} = require('child_process');
 
-const args = require('nyks/process/parseArgs')();
+
+const {args} = require('nyks/process/parseArgs')();
 const passthru = require('nyks/child_process/passthru');
 const wait = require('nyks/child_process/wait');
 const trim = require('mout/string/trim');
@@ -149,7 +151,7 @@ class ppackage {
       if(line.repository) current_repository = line.repository;
     }
 
-    let target_repository = repository ||  args.args.shift() || current_repository;
+    let target_repository = repository ||  args.shift() || current_repository;
 
     if(!target_repository)
       throw `Invalid repository url`;
@@ -166,7 +168,6 @@ class ppackage {
   }
 
   async version(version = false, notag = false) {
-
     let repositories = [];
 
     let current_version;
@@ -180,7 +181,7 @@ class ppackage {
       throw `Inconsitant repository ${unique(repositories).join(',')} detected, use ppackage repository first`;
 
 
-    let target_version = version || args.args.shift();
+    let target_version = version || args.shift();
 
     let dirty = await wait(spawn('git', ["diff-index", "--quiet", "HEAD"])).catch(() => true);
     if(dirty && !notag)
@@ -218,7 +219,10 @@ class ppackage {
   }
 
 
-  async gitify() {
+  async gitify(branch = null) {
+
+    if(!branch)
+      branch = args.shift() || "master";
 
     if(fs.existsSync(GIT_FOLDER))
       throw `Cowardly aborting working with existing git project`;
@@ -230,12 +234,14 @@ class ppackage {
     await passthru("git", ["clone", ...cloneopts, repository_url, GIT_FOLDER]);
 
     await passthru("git", ["config", "--unset", "core.bare"]);
-    await passthru("git", ["reset", "HEAD", "--", "."]);
+    await passthru("git", ["reset", branch]);
+    await passthru("git", ["checkout", branch]);
 
-    for(let line of [GITIGNORE_PATH, DOCKERIGNORE_PATH, NPMIGNORE_PATH, NPMRC_PATH])
+    for(let line of [GITIGNORE_PATH, DOCKERIGNORE_PATH, NPMIGNORE_PATH])
       await passthru("git", ["checkout", "--", line]).catch(()=>{});
 
-    let restore = [];
+
+    let restore = [".git*", NPMRC_PATH];
     if(fs.existsSync(DOCKERIGNORE_PATH)) {
       let ignore = fs.readFileSync(DOCKERIGNORE_PATH, 'utf8');
       restore.push(...ignore.split("\n"));
@@ -275,9 +281,14 @@ class ppackage {
     return {repository_url};
   }
 
-
 }
 
 
+//ensure module is called directly, i.e. not required
+if(module.parent === null) {
+  let cmd = args.shift();
+  require('cnyks/lib/bundle')(ppackage, null, [`--ir://run=${cmd}`]); //start runner
+}
+
 module.exports = ppackage;
 

package/package.json

@@ -1,15 +1,14 @@
 {
   "name": "ppackage",
-  "version": "2.4.3",
+  "version": "2.6.0",
   "description": "",
   "main": "index.js",
   "bin": {
-    "ppackage": "./bin/ppackage",
-    "ddev": "./bin/ddev",
+    "ppackage": "index.js",
     "askpass": "./bin/askpass"
   },
   "dependencies": {
-    "cnyks": "^3.1.3",
+    "cnyks": "^3.2.1",
     "mout": "^1.0.0",
     "nyks": "^6.1.8",
     "semver": "^5.3.0",

package/bin/ddev

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

package/bin/ppackage

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