ppackage 2.5.0 → 2.7.1

package/index.js

@@ -13,6 +13,7 @@ const wait = require('nyks/child_process/wait');
 const trim = require('mout/string/trim');
 const unique = require('mout/array/unique');
 
+const get = require('mout/object/get');
 const set = require('mout/object/set');
 const drain = require('nyks/stream/drain');
 
@@ -33,6 +34,8 @@ const COMPOSER_PATH     = "composer.json";
 
 
 
+
+
 const laxParser = function(body) {
   const tokens = new Parser().parse(body);
   const docs = new Composer({merge : true, uniqueKeys : false}).compose(tokens);
@@ -47,7 +50,35 @@ const DOCKER_LABEL_REPOSITORY = "org.opencontainers.image.source";
 const GITLAB_PATH_VERSION     = ".version";
 const GITLAB_PATH_REPOSITORY  = ".repository";
 
+//https://developer.hashicorp.com/terraform/registry/providers/publishing
+const TF_PROVIDER_PATH  = "terraform-registry-manifest.json";
+const TF_PROVIDER_METADATA_VERSION = "metadata.version";
+const TF_PROVIDER_METADATA_REPOSITORY = "metadata.repository";
+
+
 let modes = {
+
+  tf_provider    : {
+    file    : TF_PROVIDER_PATH,
+    analyze : function() {
+      const body = fs.readFileSync(this.file, 'utf-8');
+      this.meta = JSON.parse(body);
+      let version = get(this.meta, TF_PROVIDER_METADATA_VERSION);
+      let repository = get(this.meta, TF_PROVIDER_METADATA_REPOSITORY);
+      return {version, repository};
+    },
+
+    commit : function({version, repository, files}) {
+      if(version)
+        set(this.meta, TF_PROVIDER_METADATA_VERSION, version);
+      if(repository)
+        set(this.meta, TF_PROVIDER_METADATA_REPOSITORY, {type : "git", url : repository});
+
+      fs.writeFileSync(this.file, JSON.stringify(this.meta, null, 2) + "\n");
+      files.push(this.file);
+    }
+  },
+
   gitlab    : {
     file    : '.gitlab-ci.yml',
     analyze : function() {
@@ -70,6 +101,8 @@ let modes = {
     }
 
   },
+
+
   composer  : {
     file : 'composer.json',
     analyze : function() {
@@ -182,7 +215,7 @@ class ppackage {
 
 
     let target_version = version || args.shift();
-
+    await passthru("git", ["status"]);
     let dirty = await wait(spawn('git', ["diff-index", "--quiet", "HEAD"])).catch(() => true);
     if(dirty && !notag)
       throw "Working directory not clean, aborting";
@@ -219,24 +252,29 @@ class ppackage {
   }
 
 
-  async gitify() {
+  async gitify(repository_url = null, branch = "master") {
+    if(!repository_url)
+      repository_url = args.shift();
+
+    if(!repository_url)
+      ({repository_url} = await this._find_repo());
 
     if(fs.existsSync(GIT_FOLDER))
       throw `Cowardly aborting working with existing git project`;
 
-    let {repository_url} = await this._find_repo();
-
 
     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", "--", "."]);
+    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"));

package/package.json

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