ppackage 2.3.4 → 2.3.6

package/index.js

@@ -10,7 +10,9 @@ const passthru = require('nyks/child_process/passthru');
 const wait = require('nyks/child_process/wait');
 const trim = require('mout/string/trim');
 
-const Dockerfile = require('./lib/dockerfile');
+const Dockerfile     = require('./lib/dockerfile');
+const {git_to_https} = require('./lib/util');
+
 const {Parser, Composer} = require('yaml');
 
 
@@ -19,6 +21,7 @@ const GIT_FOLDER = ".git";
 const NPM_PACKAGE_PATH = 'package.json';
 const DOCKERIGNORE_PATH = ".dockerignore";
 const NPMIGNORE_PATH    = ".npmignore";
+const NPMRC_PATH        = ".npmrc"; //default ignored by npm
 const GITIGNORE_PATH    = ".gitignore";
 
 
@@ -154,16 +157,16 @@ class ppackage {
     if(fs.existsSync(GIT_FOLDER))
       throw `Cowardly aborting working with existing git project`;
 
-    await passthru("git", ["config", "--global", "core.askPass", path.join(__dirname, "bin/askpass")]);
     let {repository_url} = await this._find_repo();
 
-    let cloneargs = ["clone", "--bare", repository_url, GIT_FOLDER];
-    await passthru("git", cloneargs);
+
+    let cloneopts = ["--bare", "--config", `core.askPass=${path.join(__dirname, "bin/askpass")}`];
+    await passthru("git", ["clone", ...cloneopts, repository_url, GIT_FOLDER]);
 
     await passthru("git", ["config", "--unset", "core.bare"]);
     await passthru("git", ["reset", "HEAD", "--", "."]);
 
-    for(let line of [GITIGNORE_PATH, DOCKERIGNORE_PATH, NPMIGNORE_PATH])
+    for(let line of [GITIGNORE_PATH, DOCKERIGNORE_PATH, NPMIGNORE_PATH, NPMRC_PATH])
       await passthru("git", ["checkout", "--", line]).catch(()=>{});
 
     let restore = [];
@@ -185,19 +188,6 @@ class ppackage {
   // git config --global url."https://git.ivsdev.net/".insteadOf "git@git.ivsdev.net:"
   // yet, this is broader
 
-  static _git_to_https(repository_url) {
-
-    const SSH_MASK = new RegExp("^git@([^:]+):(.*)");
-    if(SSH_MASK.test(repository_url))
-      return repository_url.replace(SSH_MASK, "https://$1/$2");
-
-    // git+ssh://git@github.com/131/ppackage.git
-    const GIT_SSH_MASK = new RegExp("^git\\+ssh://git@([^/]+)/(.*)");
-    if(GIT_SSH_MASK.test(repository_url))
-      return repository_url.replace(GIT_SSH_MASK, "https://$1/$2");
-
-    return repository_url;
-  }
 
   async _find_repo() {
     let repository_url;
@@ -208,7 +198,9 @@ class ppackage {
         repository_url = body.repository.url;
     }
 
-    repository_url = ppackage._git_to_https(repository_url);
+    if(!process.env.SSH_AUTH_SOCK)
+      repository_url = git_to_https(repository_url);
+
     return {repository_url};
   }
 

package/lib/util.js

@@ -28,6 +28,23 @@ const tokenize = function(str) {
 
 };
 
+const git_to_https = function(repository_url) {
+  const GIT_PREFIX = new RegExp("^git\\+");
+  if(GIT_PREFIX.test(repository_url))
+    repository_url = repository_url.replace(GIT_PREFIX, "");
 
-module.exports = {tokenize};
+  const SSH_MASK = new RegExp("^git@([^:]+):(.*)");
+  if(SSH_MASK.test(repository_url))
+    return repository_url.replace(SSH_MASK, "https://$1/$2");
+
+  // git+ssh://git@github.com/131/ppackage.git
+  const GIT_SSH_MASK = new RegExp("^ssh://git@([^/]+)/(.*)");
+  if(GIT_SSH_MASK.test(repository_url))
+    return repository_url.replace(GIT_SSH_MASK, "https://$1/$2");
+
+  return repository_url;
+};
+
+
+module.exports = {tokenize, git_to_https};
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ppackage",
-  "version": "2.3.4",
+  "version": "2.3.6",
   "description": "",
   "main": "index.js",
   "bin": {