Merge pull request #15 from StatelessSoftware/v0.1.1

V0.1.1

Author: DrewImm

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog - html-to-app
 
+## [0.1.1] - 2018-03-26
+
+### Fixes
+
+- [Issue #14] - Checking builder.shouldBuild() is not idempotent
+- [Issue #13] - html-to-app fails if out-of-source build, with -f, and dist folder already existing
+- [Issue #12] - html-to-app -c should kill program after creating config file
+
 ## [0.1.0] - 2018-03-26
 
 ### Additions

lib/chainlinks/builder.js

@@ -44,8 +44,13 @@ let Builder = function() {
                 shell.execSync("rm -rf bin");
             }
 
+            // Create build directory if necessary
+            if (!fs.existsSync(buildPath)) {
+                this.binCmd("mkdir " + buildPath, false);
+            }
+
             // Install
-            if (this.binCmd("mkdir " + buildPath, false) &&
+            if (
                 this.binCmd(this.installCmd) &&
                 this.binCmd(this.cleanupCmd)) {
 

lib/index.js

@@ -72,41 +72,50 @@ try {
 }
 catch (ex) {
 
-    // Create a config file if asked to do so
-    if (cli.args.createConfig) {
+    console.log("No configuration, using defaults.");
+    
+}
 
-        // Check for config dir
-        if (!fs.existsSync("config")) { 
-            // Create dir
-            executeCommand("mkdir config");
-        }
-        
-        // Check for environment config file
-        if (!fs.existsSync("config/" + env + ".json")) {
-        
-            // Create file
-            fs.writeFileSync("config/" + env + ".json",
-                JSON.stringify(
-                    {
-                        "importer": importer,
-                        "converter": converter,
-                        "builder": builder,
-                        "exporter": exporter
-                    },
-                    null,
-                    '\t'
-                )
-            );
-        
-        }
+// Create a config file if asked to do so
+if (cli.args.createConfig) {
 
+    // Check for config dir
+    if (!fs.existsSync("config")) { 
+        // Create dir
+        executeCommand("mkdir config");
     }
 
+    // Check for environment config file
+    if (!fs.existsSync("config/" + env + ".json")) {
+    
+        // Create file
+        fs.writeFileSync("config/" + env + ".json",
+            JSON.stringify(
+                {
+                    "importer": importer,
+                    "converter": converter,
+                    "builder": builder,
+                    "exporter": exporter
+                },
+                null,
+                '\t'
+            )
+        );
+    
+    }
+
+    // Kill the program
+    console.log("Configuration file created successfully.");
+    process.exit();
+
 }
 
 // Append properties to payload
 payload.build.force = cli.args.forceBuild;
 
+// Check if we need to build
+let shouldBuild = builder.shouldBuild() || cli.args.forceBuild;
+
 // Start the engine
 console.log("Importing...");
 executeCommand(importer.precmd);
@@ -119,7 +128,7 @@ importer.run(payload)
     })
     .then((payload) => {
         executeCommand(converter.postcmd);
-        if (builder.shouldBuild() || cli.args.forceBuild) {
+        if (shouldBuild) {
             executeCommand(builder.precmd);
             console.log("Building...");
             return builder.run(payload);
@@ -130,7 +139,7 @@ importer.run(payload)
         }
     })
     .then((payload) => {
-        if (builder.shouldBuild() || cli.args.forceBuild) {
+        if (shouldBuild) {
             executeCommand(builder.postcmd);
         }
         executeCommand(exporter.precmd);