ppackage 2.3.6 → 2.4.1

package/bin/askpass

@@ -1,11 +1,25 @@
 #!/usr/bin/env node
 
+const url = require('url');
 let response, [,, what] = process.argv;
-if(/Username/.test(what))
-  response = process.env.GIT_USER_LOGIN;
-if(/Password/.test(what))
-  response = process.env.GIT_USER_PASSWORD;
+
+const question = new RegExp("^(Username|Password) for '(https://.*?)':");
+
+if(!question.test(what))
+  process.exit(1);
+
+
+let [, field, repository_url] = question.exec(what);
+
+let domain = url.parse(repository_url).hostname;
+let DOMAIN = domain.toUpperCase().replace(/\./g, '_');
+
+if(field == "Username")
+  response = process.env[`GIT_USER_${DOMAIN}_LOGIN`] || process.env.GIT_USER_LOGIN;
+if(field == "Password")
+  response =  process.env[`GIT_USER_${DOMAIN}_PASSWORD`] || process.env.GIT_USER_PASSWORD;
 if(!response)
   process.exit(1);
+
 process.stdout.write(response);
 

package/index.js

@@ -9,6 +9,8 @@ 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');
+const set = require('mout/object/set');
+const drain = require('nyks/stream/drain');
 
 const Dockerfile     = require('./lib/dockerfile');
 const {git_to_https} = require('./lib/util');
@@ -23,6 +25,7 @@ const DOCKERIGNORE_PATH = ".dockerignore";
 const NPMIGNORE_PATH    = ".npmignore";
 const NPMRC_PATH        = ".npmrc"; //default ignored by npm
 const GITIGNORE_PATH    = ".gitignore";
+const COMPOSER_PATH     = "composer.json";
 
 
 
@@ -33,83 +36,148 @@ const laxParser = function(body) {
 };
 
 
+
+const DOCKER_LABEL_VERSION    = "org.opencontainers.image.version";
+const DOCKER_LABEL_REPOSITORY = "org.opencontainers.image.source";
+
+const GITLAB_PATH_VERSION     = ".version";
+const GITLAB_PATH_REPOSITORY  = ".repository";
+
+let modes = {
+  gitlab    : {
+    file    : '.gitlab-ci.yml',
+    analyze : function() {
+      const body = fs.readFileSync(this.file, 'utf-8');
+      this.meta = laxParser(body);
+      let version = this.meta.get(GITLAB_PATH_VERSION);
+      let repository = this.meta.get(GITLAB_PATH_REPOSITORY);
+      return {version, repository};
+    },
+
+    commit : function({version, repository, files}) {
+      let opts = {lineWidth : 0};
+      if(version)
+        this.meta.set(GITLAB_PATH_VERSION, version);
+      if(repository)
+        this.meta.set(GITLAB_PATH_REPOSITORY, repository);
+
+      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);
+      let {version, extra :  { repository : { url : repository} } = {repository : {}}} = this.meta;
+      return {version, repository};
+    },
+    commit : function({version, repository, files}) {
+      if(version)
+        this.meta.version =  version;
+      if(repository)
+        set(this.meta, "extra.repository", {type : "git", url : repository});
+
+      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);
+      let {DOCKER_LABEL_VERSION : version, DOCKER_LABEL_REPOSITORY : repository}  = this.meta.labels;
+      return {version, repository};
+    },
+    commit : function({version, repository, files}) {
+      if(version)
+        this.meta.setLabel(DOCKER_LABEL_VERSION, version);
+      if(repository)
+        this.meta.setLabel(DOCKER_LABEL_REPOSITORY, repository);
+      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);
+      let {version, repository : { url : repository} = {}} = this.meta;
+      return {version, repository};
+    },
+    commit : function({version, repository, files}) {
+      if(version)
+        this.meta.version =  version;
+      if(repository)
+        this.meta.repository = {type : "git", url : repository};
+
+      fs.writeFileSync(this.file, JSON.stringify(this.meta, null, 2));
+      files.push(this.file);
+    }
+
+  }
+};
+
+for(let [mode_n, mode] of Object.entries(modes)) {
+  if(!fs.existsSync(mode.file))
+    delete modes[mode_n];
+}
+
 class ppackage {
 
-  async version(version = false, notag = false) {
-    let current_version;
 
+  async repository(repository = false) {
 
-    const DOCKER_LABEL_VERSION = "org.opencontainers.image.version";
-    const GITLAB_PATH_VERSION  = ".version";
-
-    let modes = {
-      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, files}) {
-          this.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);
-        }
+    let current_repository;
 
-      }
-    };
+    try {
+      let child = spawn('git', ['config', '--get', 'remote.origin.url']);
+      current_repository = String(await drain(child.stdout)).trim();
+    } catch(err) {} //best effort
 
-    // 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);
+
+    for(let [, mode] of Object.entries(modes)) {
+      let line = mode.analyze.call(mode);
+      if(line.repository) current_repository = line.repository;
     }
 
+    let target_repository = repository ||  args.args.shift() || current_repository;
+
+    if(!target_repository)
+      throw `Invalid repository url`;
+
+
+    let files = [];
+    for(let [, mode] of Object.entries(modes))
+      mode.commit.call(mode, {files, repository : target_repository});
+
+    await passthru('git', ['add',  ...files]);
+    await passthru('git', ['commit', '-m', `Uniform repository declaration`]);
+
+    return target_repository;
+  }
+
+  async version(version = false, notag = false) {
+
+    let current_repository, inconsistant_repo = false;
+
+    let current_version;
+    for(let [, mode] of Object.entries(modes)) {
+      let line = mode.analyze.call(mode);
+      if(line.version) current_version = line.version;
+      if(!current_repository)
+        current_repository = line.repository;
+
+      inconsistant_repo |= line.repository != current_repository;
+    }
+
+    if(inconsistant_repo)
+      throw `Inconsitant repository detected, use ppackage repository first`;
 
 
     let target_version = version || args.args.shift();
@@ -118,7 +186,6 @@ class ppackage {
     if(dirty && !notag)
       throw "Working directory not clean, aborting";
 
-
     if(!current_version)
       current_version =  "0.0.0";
 
@@ -136,10 +203,9 @@ class ppackage {
       }
     }
 
-
     let files = [];
     for(let [, mode] of Object.entries(modes))
-      mode.commit.call(mode, {target_version, files});
+      mode.commit.call(mode, {version : target_version, files});
 
     await passthru('git', ['add',  ...files]);
 
@@ -198,9 +264,14 @@ class ppackage {
         repository_url = body.repository.url;
     }
 
-    if(!process.env.SSH_AUTH_SOCK)
-      repository_url = git_to_https(repository_url);
+    if(fs.existsSync(COMPOSER_PATH)) {
+      let body = JSON.parse(fs.readFileSync(COMPOSER_PATH));
+      if(body.extra && body.extra.repository && body.extra.repository.type == "git")
+        repository_url = body.extra.repository.url;
+    }
+
 
+    repository_url = git_to_https(repository_url);
     return {repository_url};
   }
 

package/lib/util.js

@@ -33,6 +33,10 @@ const git_to_https = function(repository_url) {
   if(GIT_PREFIX.test(repository_url))
     repository_url = repository_url.replace(GIT_PREFIX, "");
 
+
+  if(process.env.SSH_AUTH_SOCK)
+    return repository_url;
+
   const SSH_MASK = new RegExp("^git@([^:]+):(.*)");
   if(SSH_MASK.test(repository_url))
     return repository_url.replace(SSH_MASK, "https://$1/$2");

package/package.json

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