Merge pull request #39 from StatelessSoftware/v0.4.0

V0.4.0

Author: DrewImm

CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog - html-to-app
 
+## [0.4.0] - 2018-04-04
+
+### Additions
+
+- [Issue #36] - Layout file should not be required
+
+### Fixes
+
+- [Issue #38] - Throws exception if app directory does not exist or is empty
+
 ## [0.3.0] - 2018-03-30
 
 ### Additions

lib/chainlinks/builder.js

@@ -58,14 +58,20 @@ let Builder = function() {
             }
 
             // Check for an app directory to merge
+            this._mergeCmd = false;
             if (this.dirMerge && this.dirMerge.length &&
                 fs.existsSync(this.dirMerge)) {
 
                 // Create app directory path
                 let mergePath = path.normalize(this.dirMerge);
+
+                // Check directory contents
+                if (fs.readdirSync(mergePath).length) {
 
-                // Merge the directory
-                this._mergeCmd = "cp -rf ../" + mergePath + "/* .";
+                    // Merge the directory
+                    this._mergeCmd = "cp -rf ../" + mergePath + "/* .";
+
+                }
 
             }
 
@@ -75,28 +81,25 @@ let Builder = function() {
                 // Install
                 if (
                     this.binCmd(this.installCmd) &&
-                    this.binCmd(this.cleanupCmd) &&
-                    (this._mergeCmd && this.binCmd(this._mergeCmd)))
+                    this.binCmd(this.cleanupCmd))
                 {
-        
-                    accept(payload);
 
                 }
                 else {
                     reject("Could not install");
                 }
 
             }
-            else {
 
-                // Merge build
-                if (this._mergeCmd && this.binCmd(this._mergeCmd)) {
-                    accept(payload);
-                }
-                else {
-                    reject("Could not merge");
-                }
+            // Merge build
+            if (this._mergeCmd && this.binCmd(this._mergeCmd)) {
+
             }
+            else if (this._mergeCmd) {
+                reject("Could not merge");
+            }
+        
+            accept(payload);
 
         });
     }

lib/chainlinks/importer.js

@@ -110,10 +110,6 @@ let Importer = function() {
                 payload.import.names.push(this.layoutFile.split(".")[0]);
 
             }
-            else {
-                reject("Layout file " + this.fixFilename(this.layoutFile) +
-                    " does not exist.");
-            }
 
             // Load the view files
             this._views = fs.readdirSync(this.fixFilename());

package.json

@@ -1,6 +1,6 @@
 {
   "name": "html-to-app",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "description": "Convert HTML flat file sites to Apps",
   "main": "lib/index.js",
   "bin": {