ready for primetime

dist/index.d.ts

@@ -1,4 +1,4 @@
-export declare class qenv {
+export declare class Qenv {
     requiredEnvVars: string[];
     availableEnvVars: string[];
     missingEnvVars: string[];

test/assets/env.yml

@@ -0,0 +1,2 @@
+key1: fromYml
+key2: fromYml

test/assets/qenv.yml

@@ -0,0 +1,4 @@
+vars:
+  - key1
+  - key2
+  - key3

test/test.d.ts

@@ -0,0 +1,2 @@
+import "typings-test";
+import "should";

test/test.js

@@ -0,0 +1,23 @@
+"use strict";
+require("typings-test");
+var path = require("path");
+require("should");
+var index_1 = require("../dist/index");
+process.cwd = function () {
+    return path.join(__dirname, "./assets/");
+};
+process.env["key1"] = "original";
+var qenvTestObject;
+describe("Qenv class", function () {
+    it("should create a new class", function () {
+        qenvTestObject = new index_1.Qenv(process.cwd(), process.cwd());
+    });
+    it("key1 should be not be overwritten since it is already present", function () {
+        process.env.key1.should.equal("original");
+    });
+    it("key2 should be read from Yml", function () {
+        process.env.key2.should.equal("fromYml");
+    });
+});
+
+//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLFFBQU8sY0FBYyxDQUFDLENBQUE7QUFDdEIsSUFBWSxJQUFJLFdBQU0sTUFBTSxDQUFDLENBQUE7QUFDN0IsUUFBTyxRQUFRLENBQUMsQ0FBQTtBQUNoQixzQkFBbUIsZUFBZSxDQUFDLENBQUE7QUFFbkMsT0FBTyxDQUFDLEdBQUcsR0FBRztJQUNWLE1BQU0sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLFNBQVMsRUFBQyxXQUFXLENBQUMsQ0FBQztBQUM1QyxDQUFDLENBQUE7QUFFRCxPQUFPLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxHQUFHLFVBQVUsQ0FBQTtBQUVoQyxJQUFJLGNBQW1CLENBQUM7QUFDeEIsUUFBUSxDQUFDLFlBQVksRUFBQztJQUNsQixFQUFFLENBQUMsMkJBQTJCLEVBQUM7UUFDM0IsY0FBYyxHQUFHLElBQUksWUFBSSxDQUFDLE9BQU8sQ0FBQyxHQUFHLEVBQUUsRUFBQyxPQUFPLENBQUMsR0FBRyxFQUFFLENBQUMsQ0FBQztJQUMzRCxDQUFDLENBQUMsQ0FBQztJQUNILEVBQUUsQ0FBQywrREFBK0QsRUFBQztRQUMvRCxPQUFPLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLFVBQVUsQ0FBQyxDQUFDO0lBQzlDLENBQUMsQ0FBQyxDQUFDO0lBQ0gsRUFBRSxDQUFDLDhCQUE4QixFQUFDO1FBQzlCLE9BQU8sQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsU0FBUyxDQUFDLENBQUM7SUFDN0MsQ0FBQyxDQUFDLENBQUE7QUFFTixDQUFDLENBQUMsQ0FBQyIsImZpbGUiOiJ0ZXN0LmpzIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IFwidHlwaW5ncy10ZXN0XCI7XG5pbXBvcnQgKiBhcyBwYXRoIGZyb20gXCJwYXRoXCI7XG5pbXBvcnQgXCJzaG91bGRcIjtcbmltcG9ydCB7UWVudn0gZnJvbSBcIi4uL2Rpc3QvaW5kZXhcIjtcblxucHJvY2Vzcy5jd2QgPSAoKSA9PiB7XG4gICAgcmV0dXJuIHBhdGguam9pbihfX2Rpcm5hbWUsXCIuL2Fzc2V0cy9cIik7XG59XG5cbnByb2Nlc3MuZW52W1wia2V5MVwiXSA9IFwib3JpZ2luYWxcIlxuXG5sZXQgcWVudlRlc3RPYmplY3Q6UWVudjtcbmRlc2NyaWJlKFwiUWVudiBjbGFzc1wiLGZ1bmN0aW9uKCl7XG4gICAgaXQoXCJzaG91bGQgY3JlYXRlIGEgbmV3IGNsYXNzXCIsZnVuY3Rpb24oKXtcbiAgICAgICAgcWVudlRlc3RPYmplY3QgPSBuZXcgUWVudihwcm9jZXNzLmN3ZCgpLHByb2Nlc3MuY3dkKCkpO1xuICAgIH0pO1xuICAgIGl0KFwia2V5MSBzaG91bGQgYmUgbm90IGJlIG92ZXJ3cml0dGVuIHNpbmNlIGl0IGlzIGFscmVhZHkgcHJlc2VudFwiLGZ1bmN0aW9uKCl7XG4gICAgICAgIHByb2Nlc3MuZW52LmtleTEuc2hvdWxkLmVxdWFsKFwib3JpZ2luYWxcIik7XG4gICAgfSk7XG4gICAgaXQoXCJrZXkyIHNob3VsZCBiZSByZWFkIGZyb20gWW1sXCIsZnVuY3Rpb24oKXtcbiAgICAgICAgcHJvY2Vzcy5lbnYua2V5Mi5zaG91bGQuZXF1YWwoXCJmcm9tWW1sXCIpO1xuICAgIH0pXG5cbn0pOyJdfQ==

test/test.ts

@@ -0,0 +1,24 @@
+import "typings-test";
+import * as path from "path";
+import "should";
+import {Qenv} from "../dist/index";
+
+process.cwd = () => {
+    return path.join(__dirname,"./assets/");
+}
+
+process.env["key1"] = "original"
+
+let qenvTestObject:Qenv;
+describe("Qenv class",function(){
+    it("should create a new class",function(){
+        qenvTestObject = new Qenv(process.cwd(),process.cwd());
+    });
+    it("key1 should be not be overwritten since it is already present",function(){
+        process.env.key1.should.equal("original");
+    });
+    it("key2 should be read from Yml",function(){
+        process.env.key2.should.equal("fromYml");
+    })
+
+});

ts/index.ts

@@ -1,6 +1,6 @@
 import * as plugins from "./qenv.plugins";
 
-export class qenv {
+export class Qenv {
     requiredEnvVars:string[];
     availableEnvVars:string[];
     missingEnvVars:string[];
@@ -8,6 +8,9 @@ export class qenv {
         this.requiredEnvVars = getRequiredEnvVars(basePathArg);
         this.availableEnvVars = getAvailableEnvVars(this.requiredEnvVars,envYmlPathArg);
         this.missingEnvVars = getMissingEnvVars(this.requiredEnvVars,this.availableEnvVars);
+        for(let keyArg in this.missingEnvVars){
+            plugins.beautylog.warn(this.missingEnvVars[keyArg] + " is required, but missing!")
+        }
     }
 };
 
@@ -23,6 +26,7 @@ let getRequiredEnvVars = (pathArg:string):string[] => {
 
 let getAvailableEnvVars = (requiredEnvVarsArg:string[],envYmlPathArg:string):string[] => {
     let result = [];
+    envYmlPathArg = plugins.path.join(envYmlPathArg,"env.yml")
     let envYml;
     try {
         envYml = plugins.smartfile.local.toObjectSync(envYmlPathArg);
@@ -31,12 +35,12 @@ let getAvailableEnvVars = (requiredEnvVarsArg:string[],envYmlPathArg:string):str
         envYml = {};
     }
     for(let keyArg in requiredEnvVarsArg){
-        let envVar:string = requiredEnvVarsArg[keyArg];
-        if(process.env[envVar]){
-            result.push(envVar);
-        } else if(envYml.hasOwnPropery(envVar)){
-            process.env[envVar] = envYml.envVar;
-            result.push(envVar);
+        let requiredEnvVar:string = requiredEnvVarsArg[keyArg];
+        if(process.env[requiredEnvVar]){
+            result.push(requiredEnvVar);
+        } else if(envYml.hasOwnProperty(requiredEnvVar)){
+            process.env[requiredEnvVar] = envYml[requiredEnvVar];
+            result.push(requiredEnvVar);
         }
     }
     return result;