From 0b5c99a516f7a5a4fe350850bbd2ffde4a730462 Mon Sep 17 00:00:00 2001
From: Phil Kunz <github@philkunz.com>
Date: Sun, 19 Jun 2016 02:30:50 +0200
Subject: [PATCH] now looking for project level config

---
 dist/npmci.env.d.ts |  2 +-
 dist/npmci.env.js   | 28 ++++++++++++++++++++--------
 ts/npmci.env.ts     | 17 +++++++++++++++--
 3 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/dist/npmci.env.d.ts b/dist/npmci.env.d.ts
index 63c62a7..2731a2d 100644
--- a/dist/npmci.env.d.ts
+++ b/dist/npmci.env.d.ts
@@ -6,5 +6,5 @@ export declare let buildStage: string;
 export declare let dockerRegistry: any;
 export declare let dockerFilesBuilt: Dockerfile[];
 export declare let dockerFiles: Dockerfile[];
+export declare let config: any;
 export declare let configStore: () => void;
-export declare let configLoad: () => void;
diff --git a/dist/npmci.env.js b/dist/npmci.env.js
index 59bb73a..efaa4d8 100644
--- a/dist/npmci.env.js
+++ b/dist/npmci.env.js
@@ -19,19 +19,31 @@ exports.configStore = function () {
         filePath: paths.NpmciPackageRoot
     });
 };
-exports.configLoad = function () {
-    var config;
+var configLoad = function () {
+    // internal config to transfer information in between npmci shell calls
     try {
-        config = plugins.smartfile.local.toObjectSync(paths.NpmciPackageConfig, "json");
+        exports.config = plugins.smartfile.local.toObjectSync(paths.NpmciPackageConfig, "json");
     }
     catch (err) {
-        config = {};
+        exports.config = {};
         exports.configStore();
         plugins.beautylog.log("config initialized!");
     }
-    config.dockerRegistry ? exports.dockerRegistry = config.dockerRegistry : void (0);
-    config.dockerFilesBuilt ? exports.dockerFilesBuilt = config.dockerFilesBuilt : void (0);
+    // project config
+    try {
+        if (!exports.config.project) {
+            exports.config.project = plugins.smartfile.local.toObjectSync(paths.NpmciProjectDir, "npmci.json");
+            plugins.beautylog.ok("project config found!");
+        }
+        ;
+    }
+    catch (err) {
+        exports.config.project = {};
+        plugins.beautylog.log("no project config found, so proceeding with default behaviour!");
+    }
+    exports.config.dockerRegistry ? exports.dockerRegistry = exports.config.dockerRegistry : void (0);
+    exports.config.dockerFilesBuilt ? exports.dockerFilesBuilt = exports.config.dockerFilesBuilt : void (0);
 };
-exports.configLoad();
+configLoad();
 
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm5wbWNpLmVudi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsUUFBTyxnQkFBZ0IsQ0FBQyxDQUFBO0FBQ3hCLElBQVksT0FBTyxXQUFNLGlCQUFpQixDQUFDLENBQUE7QUFDM0MsSUFBWSxLQUFLLFdBQU0sZUFBZSxDQUFDLENBQUE7QUFDdkMsNEJBQXNCLGFBQWEsQ0FBQyxDQUFBO0FBSXBDLEVBQUUsQ0FBQSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsYUFBYSxDQUFDO0lBQUMsWUFBSSxHQUFHLElBQUkscUJBQU8sQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLGFBQWEsQ0FBQyxDQUFDO0FBRWpFLGtCQUFVLEdBQVUsT0FBTyxDQUFDLEdBQUcsQ0FBQyxjQUFjLENBQUM7QUFJL0Msd0JBQWdCLEdBQWdCLEVBQUUsQ0FBQztBQUNuQyxtQkFBVyxHQUFnQixFQUFFLENBQUM7QUFFOUIsbUJBQVcsR0FBRztJQUNyQixJQUFJLE1BQU0sR0FBRztRQUNULGNBQWMsRUFBRSxzQkFBYztRQUM5QixnQkFBZ0IsRUFBRSx3QkFBZ0I7UUFDbEMsV0FBVyxFQUFFLG1CQUFXO0tBQzNCLENBQUE7SUFDRCxPQUFPLENBQUMsU0FBUyxDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQzdCLElBQUksQ0FBQyxTQUFTLENBQUMsTUFBTSxDQUFDLEVBQ3RCO1FBQ0ksUUFBUSxFQUFDLGFBQWE7UUFDdEIsUUFBUSxFQUFDLEtBQUssQ0FBQyxnQkFBZ0I7S0FDbEMsQ0FDSixDQUFDO0FBQ04sQ0FBQyxDQUFBO0FBRVUsa0JBQVUsR0FBRztJQUNwQixJQUFJLE1BQU0sQ0FBQztJQUNYLElBQUksQ0FBQztRQUNELE1BQU0sR0FBRyxPQUFPLENBQUMsU0FBUyxDQUFDLEtBQUssQ0FBQyxZQUFZLENBQUMsS0FBSyxDQUFDLGtCQUFrQixFQUFDLE1BQU0sQ0FBQyxDQUFDO0lBQ25GLENBQ0E7SUFBQSxLQUFLLENBQUEsQ0FBQyxHQUFHLENBQUMsQ0FBQSxDQUFDO1FBQ1AsTUFBTSxHQUFHLEVBQUUsQ0FBQztRQUNaLG1CQUFXLEVBQUUsQ0FBQztRQUNkLE9BQU8sQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDLHFCQUFxQixDQUFDLENBQUM7SUFDakQsQ0FBQztJQUVELE1BQU0sQ0FBQyxjQUFjLEdBQUcsc0JBQWMsR0FBRyxNQUFNLENBQUMsY0FBYyxHQUFHLEtBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUN6RSxNQUFNLENBQUMsZ0JBQWdCLEdBQUcsd0JBQWdCLEdBQUcsTUFBTSxDQUFDLGdCQUFnQixHQUFHLEtBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQztBQUNuRixDQUFDLENBQUE7QUFDRCxrQkFBVSxFQUFFLENBQUMiLCJmaWxlIjoibnBtY2kuZW52LmpzIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IFwidHlwaW5ncy1nbG9iYWxcIjtcbmltcG9ydCAqIGFzIHBsdWdpbnMgZnJvbSBcIi4vbnBtY2kucGx1Z2luc1wiO1xuaW1wb3J0ICogYXMgcGF0aHMgZnJvbSBcIi4vbnBtY2kucGF0aHNcIjtcbmltcG9ydCB7R2l0UmVwb30gZnJvbSBcInNtYXJ0c3RyaW5nXCI7XG5pbXBvcnQge0RvY2tlcmZpbGV9IGZyb20gXCIuL25wbWNpLmJ1aWxkLmRvY2tlclwiXG5cbmV4cG9ydCBsZXQgcmVwbzpHaXRSZXBvO1xuaWYocHJvY2Vzcy5lbnYuQ0lfQlVJTERfUkVQTykgcmVwbyA9IG5ldyBHaXRSZXBvKHByb2Nlc3MuZW52LkNJX0JVSUxEX1JFUE8pO1xuXG5leHBvcnQgbGV0IGJ1aWxkU3RhZ2U6c3RyaW5nID0gcHJvY2Vzcy5lbnYuQ0lfQlVJTERfU1RBR0U7XG5cbi8vIGhhbmRsaW5nIGNvbmZpZyBiZXR3ZWVuIGNvbW1hbmRzXG5leHBvcnQgbGV0IGRvY2tlclJlZ2lzdHJ5OyAvLyB3aWxsIGJlIHNldCBieSBucG1jaS5wcmVwYXJlXG5leHBvcnQgbGV0IGRvY2tlckZpbGVzQnVpbHQ6RG9ja2VyZmlsZVtdID0gW107XG5leHBvcnQgbGV0IGRvY2tlckZpbGVzOkRvY2tlcmZpbGVbXSA9IFtdO1xuXG5leHBvcnQgbGV0IGNvbmZpZ1N0b3JlID0gKCkgPT4ge1xuICAgIGxldCBjb25maWcgPSB7XG4gICAgICAgIGRvY2tlclJlZ2lzdHJ5OiBkb2NrZXJSZWdpc3RyeSxcbiAgICAgICAgZG9ja2VyRmlsZXNCdWlsdDogZG9ja2VyRmlsZXNCdWlsdCxcbiAgICAgICAgZG9ja2VyRmlsZXM6IGRvY2tlckZpbGVzXG4gICAgfVxuICAgIHBsdWdpbnMuc21hcnRmaWxlLm1lbW9yeS50b0ZzU3luYyhcbiAgICAgICAgSlNPTi5zdHJpbmdpZnkoY29uZmlnKSxcbiAgICAgICAge1xuICAgICAgICAgICAgZmlsZU5hbWU6XCJjb25maWcuanNvblwiLFxuICAgICAgICAgICAgZmlsZVBhdGg6cGF0aHMuTnBtY2lQYWNrYWdlUm9vdFxuICAgICAgICB9XG4gICAgKTtcbn1cblxuZXhwb3J0IGxldCBjb25maWdMb2FkID0gKCkgPT4ge1xuICAgIGxldCBjb25maWc7XG4gICAgdHJ5IHtcbiAgICAgICAgY29uZmlnID0gcGx1Z2lucy5zbWFydGZpbGUubG9jYWwudG9PYmplY3RTeW5jKHBhdGhzLk5wbWNpUGFja2FnZUNvbmZpZyxcImpzb25cIik7XG4gICAgfVxuICAgIGNhdGNoKGVycil7XG4gICAgICAgIGNvbmZpZyA9IHt9O1xuICAgICAgICBjb25maWdTdG9yZSgpO1xuICAgICAgICBwbHVnaW5zLmJlYXV0eWxvZy5sb2coXCJjb25maWcgaW5pdGlhbGl6ZWQhXCIpO1xuICAgIH1cbiAgICBcbiAgICBjb25maWcuZG9ja2VyUmVnaXN0cnkgPyBkb2NrZXJSZWdpc3RyeSA9IGNvbmZpZy5kb2NrZXJSZWdpc3RyeSA6IHZvaWQoMCk7XG4gICAgY29uZmlnLmRvY2tlckZpbGVzQnVpbHQgPyBkb2NrZXJGaWxlc0J1aWx0ID0gY29uZmlnLmRvY2tlckZpbGVzQnVpbHQgOiB2b2lkKDApO1xufVxuY29uZmlnTG9hZCgpOyJdfQ==
+//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm5wbWNpLmVudi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsUUFBTyxnQkFBZ0IsQ0FBQyxDQUFBO0FBQ3hCLElBQVksT0FBTyxXQUFNLGlCQUFpQixDQUFDLENBQUE7QUFDM0MsSUFBWSxLQUFLLFdBQU0sZUFBZSxDQUFDLENBQUE7QUFDdkMsNEJBQXNCLGFBQWEsQ0FBQyxDQUFBO0FBSXBDLEVBQUUsQ0FBQSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsYUFBYSxDQUFDO0lBQUMsWUFBSSxHQUFHLElBQUkscUJBQU8sQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLGFBQWEsQ0FBQyxDQUFDO0FBRWpFLGtCQUFVLEdBQVUsT0FBTyxDQUFDLEdBQUcsQ0FBQyxjQUFjLENBQUM7QUFJL0Msd0JBQWdCLEdBQWdCLEVBQUUsQ0FBQztBQUNuQyxtQkFBVyxHQUFnQixFQUFFLENBQUM7QUFHOUIsbUJBQVcsR0FBRztJQUNyQixJQUFJLE1BQU0sR0FBRztRQUNULGNBQWMsRUFBRSxzQkFBYztRQUM5QixnQkFBZ0IsRUFBRSx3QkFBZ0I7UUFDbEMsV0FBVyxFQUFFLG1CQUFXO0tBQzNCLENBQUE7SUFDRCxPQUFPLENBQUMsU0FBUyxDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQzdCLElBQUksQ0FBQyxTQUFTLENBQUMsTUFBTSxDQUFDLEVBQ3RCO1FBQ0ksUUFBUSxFQUFDLGFBQWE7UUFDdEIsUUFBUSxFQUFDLEtBQUssQ0FBQyxnQkFBZ0I7S0FDbEMsQ0FDSixDQUFDO0FBQ04sQ0FBQyxDQUFBO0FBRUQsSUFBSSxVQUFVLEdBQUc7SUFDYix1RUFBdUU7SUFDdkUsSUFBSSxDQUFDO1FBQ0QsY0FBTSxHQUFHLE9BQU8sQ0FBQyxTQUFTLENBQUMsS0FBSyxDQUFDLFlBQVksQ0FBQyxLQUFLLENBQUMsa0JBQWtCLEVBQUMsTUFBTSxDQUFDLENBQUM7SUFDbkYsQ0FDQTtJQUFBLEtBQUssQ0FBQSxDQUFDLEdBQUcsQ0FBQyxDQUFBLENBQUM7UUFDUCxjQUFNLEdBQUcsRUFBRSxDQUFDO1FBQ1osbUJBQVcsRUFBRSxDQUFDO1FBQ2QsT0FBTyxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMscUJBQXFCLENBQUMsQ0FBQztJQUNqRCxDQUFDO0lBRUQsaUJBQWlCO0lBQ2pCLElBQUksQ0FBQztRQUNELEVBQUUsQ0FBQSxDQUFDLENBQUMsY0FBTSxDQUFDLE9BQU8sQ0FBQyxDQUFBLENBQUM7WUFDaEIsY0FBTSxDQUFDLE9BQU8sR0FBRyxPQUFPLENBQUMsU0FBUyxDQUFDLEtBQUssQ0FBQyxZQUFZLENBQUMsS0FBSyxDQUFDLGVBQWUsRUFBQyxZQUFZLENBQUMsQ0FBQztZQUMxRixPQUFPLENBQUMsU0FBUyxDQUFDLEVBQUUsQ0FBQyx1QkFBdUIsQ0FBQyxDQUFDO1FBQ2xELENBQUM7UUFBQSxDQUFDO0lBQ04sQ0FDQTtJQUFBLEtBQUssQ0FBQSxDQUFDLEdBQUcsQ0FBQyxDQUFBLENBQUM7UUFDUCxjQUFNLENBQUMsT0FBTyxHQUFHLEVBQUUsQ0FBQztRQUNwQixPQUFPLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBQyxnRUFBZ0UsQ0FBQyxDQUFDO0lBQzVGLENBQUM7SUFFRCxjQUFNLENBQUMsY0FBYyxHQUFHLHNCQUFjLEdBQUcsY0FBTSxDQUFDLGNBQWMsR0FBRyxLQUFJLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDekUsY0FBTSxDQUFDLGdCQUFnQixHQUFHLHdCQUFnQixHQUFHLGNBQU0sQ0FBQyxnQkFBZ0IsR0FBRyxLQUFJLENBQUMsQ0FBQyxDQUFDLENBQUM7QUFDbkYsQ0FBQyxDQUFBO0FBQ0QsVUFBVSxFQUFFLENBQUMiLCJmaWxlIjoibnBtY2kuZW52LmpzIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IFwidHlwaW5ncy1nbG9iYWxcIjtcbmltcG9ydCAqIGFzIHBsdWdpbnMgZnJvbSBcIi4vbnBtY2kucGx1Z2luc1wiO1xuaW1wb3J0ICogYXMgcGF0aHMgZnJvbSBcIi4vbnBtY2kucGF0aHNcIjtcbmltcG9ydCB7R2l0UmVwb30gZnJvbSBcInNtYXJ0c3RyaW5nXCI7XG5pbXBvcnQge0RvY2tlcmZpbGV9IGZyb20gXCIuL25wbWNpLmJ1aWxkLmRvY2tlclwiXG5cbmV4cG9ydCBsZXQgcmVwbzpHaXRSZXBvO1xuaWYocHJvY2Vzcy5lbnYuQ0lfQlVJTERfUkVQTykgcmVwbyA9IG5ldyBHaXRSZXBvKHByb2Nlc3MuZW52LkNJX0JVSUxEX1JFUE8pO1xuXG5leHBvcnQgbGV0IGJ1aWxkU3RhZ2U6c3RyaW5nID0gcHJvY2Vzcy5lbnYuQ0lfQlVJTERfU1RBR0U7XG5cbi8vIGhhbmRsaW5nIGNvbmZpZyBiZXR3ZWVuIGNvbW1hbmRzXG5leHBvcnQgbGV0IGRvY2tlclJlZ2lzdHJ5OyAvLyB3aWxsIGJlIHNldCBieSBucG1jaS5wcmVwYXJlXG5leHBvcnQgbGV0IGRvY2tlckZpbGVzQnVpbHQ6RG9ja2VyZmlsZVtdID0gW107XG5leHBvcnQgbGV0IGRvY2tlckZpbGVzOkRvY2tlcmZpbGVbXSA9IFtdO1xuZXhwb3J0IGxldCBjb25maWc7XG5cbmV4cG9ydCBsZXQgY29uZmlnU3RvcmUgPSAoKSA9PiB7XG4gICAgbGV0IGNvbmZpZyA9IHtcbiAgICAgICAgZG9ja2VyUmVnaXN0cnk6IGRvY2tlclJlZ2lzdHJ5LFxuICAgICAgICBkb2NrZXJGaWxlc0J1aWx0OiBkb2NrZXJGaWxlc0J1aWx0LFxuICAgICAgICBkb2NrZXJGaWxlczogZG9ja2VyRmlsZXNcbiAgICB9XG4gICAgcGx1Z2lucy5zbWFydGZpbGUubWVtb3J5LnRvRnNTeW5jKFxuICAgICAgICBKU09OLnN0cmluZ2lmeShjb25maWcpLFxuICAgICAgICB7XG4gICAgICAgICAgICBmaWxlTmFtZTpcImNvbmZpZy5qc29uXCIsXG4gICAgICAgICAgICBmaWxlUGF0aDpwYXRocy5OcG1jaVBhY2thZ2VSb290XG4gICAgICAgIH1cbiAgICApO1xufVxuXG5sZXQgY29uZmlnTG9hZCA9ICgpID0+IHtcbiAgICAvLyBpbnRlcm5hbCBjb25maWcgdG8gdHJhbnNmZXIgaW5mb3JtYXRpb24gaW4gYmV0d2VlbiBucG1jaSBzaGVsbCBjYWxsc1xuICAgIHRyeSB7XG4gICAgICAgIGNvbmZpZyA9IHBsdWdpbnMuc21hcnRmaWxlLmxvY2FsLnRvT2JqZWN0U3luYyhwYXRocy5OcG1jaVBhY2thZ2VDb25maWcsXCJqc29uXCIpO1xuICAgIH1cbiAgICBjYXRjaChlcnIpe1xuICAgICAgICBjb25maWcgPSB7fTtcbiAgICAgICAgY29uZmlnU3RvcmUoKTtcbiAgICAgICAgcGx1Z2lucy5iZWF1dHlsb2cubG9nKFwiY29uZmlnIGluaXRpYWxpemVkIVwiKTtcbiAgICB9XG5cbiAgICAvLyBwcm9qZWN0IGNvbmZpZ1xuICAgIHRyeSB7XG4gICAgICAgIGlmKCFjb25maWcucHJvamVjdCl7XG4gICAgICAgICAgICBjb25maWcucHJvamVjdCA9IHBsdWdpbnMuc21hcnRmaWxlLmxvY2FsLnRvT2JqZWN0U3luYyhwYXRocy5OcG1jaVByb2plY3REaXIsXCJucG1jaS5qc29uXCIpO1xuICAgICAgICAgICAgcGx1Z2lucy5iZWF1dHlsb2cub2soXCJwcm9qZWN0IGNvbmZpZyBmb3VuZCFcIik7XG4gICAgICAgIH07XG4gICAgfVxuICAgIGNhdGNoKGVycil7XG4gICAgICAgIGNvbmZpZy5wcm9qZWN0ID0ge307XG4gICAgICAgIHBsdWdpbnMuYmVhdXR5bG9nLmxvZyhcIm5vIHByb2plY3QgY29uZmlnIGZvdW5kLCBzbyBwcm9jZWVkaW5nIHdpdGggZGVmYXVsdCBiZWhhdmlvdXIhXCIpO1xuICAgIH1cbiAgICBcbiAgICBjb25maWcuZG9ja2VyUmVnaXN0cnkgPyBkb2NrZXJSZWdpc3RyeSA9IGNvbmZpZy5kb2NrZXJSZWdpc3RyeSA6IHZvaWQoMCk7XG4gICAgY29uZmlnLmRvY2tlckZpbGVzQnVpbHQgPyBkb2NrZXJGaWxlc0J1aWx0ID0gY29uZmlnLmRvY2tlckZpbGVzQnVpbHQgOiB2b2lkKDApO1xufVxuY29uZmlnTG9hZCgpOyJdfQ==
diff --git a/ts/npmci.env.ts b/ts/npmci.env.ts
index 078f835..ec0c2a6 100644
--- a/ts/npmci.env.ts
+++ b/ts/npmci.env.ts
@@ -13,6 +13,7 @@ export let buildStage:string = process.env.CI_BUILD_STAGE;
 export let dockerRegistry; // will be set by npmci.prepare
 export let dockerFilesBuilt:Dockerfile[] = [];
 export let dockerFiles:Dockerfile[] = [];
+export let config;
 
 export let configStore = () => {
     let config = {
@@ -29,8 +30,8 @@ export let configStore = () => {
     );
 }
 
-export let configLoad = () => {
-    let config;
+let configLoad = () => {
+    // internal config to transfer information in between npmci shell calls
     try {
         config = plugins.smartfile.local.toObjectSync(paths.NpmciPackageConfig,"json");
     }
@@ -39,6 +40,18 @@ export let configLoad = () => {
         configStore();
         plugins.beautylog.log("config initialized!");
     }
+
+    // project config
+    try {
+        if(!config.project){
+            config.project = plugins.smartfile.local.toObjectSync(paths.NpmciProjectDir,"npmci.json");
+            plugins.beautylog.ok("project config found!");
+        };
+    }
+    catch(err){
+        config.project = {};
+        plugins.beautylog.log("no project config found, so proceeding with default behaviour!");
+    }
     
     config.dockerRegistry ? dockerRegistry = config.dockerRegistry : void(0);
     config.dockerFilesBuilt ? dockerFilesBuilt = config.dockerFilesBuilt : void(0);