Merge pull request #11 from StatelessSoftware/v0.1.0

V0.1.0

Author: DrewImm

CHANGELOG.md

@@ -1,5 +1,17 @@
 # html-baker
 
+## [0.1.0] - 2018-03-31
+
+### Additions
+
+- [Issue #8] - Wget creates .1.html files
+- [Issue #7] - Config should allow for post-command
+- [Issue #6] - Config creator should be able to append to existing config
+
+### Fixes
+
+- [Issue #10] - Convert links should not be on by default
+
 ## [0.0.2] - 2018-03-31
 
 ### Fixes

README.md

@@ -22,10 +22,13 @@ To remove the build and rebuild, run `html-baker -f`
 
 ## Configuration
 
+- **precmd** - A command to run before the build starts
 - **domains** - An array of domain urls to download
 - **input** - If you have an app locally to download from, you can have it auto-start with these options
     - **directory** - Location of the app
     - **runcmd** - Command to run (start) the app. i.e. - `npm start`
 - **output**
     - **directory** - Directory to bake into
+    - **fixDotOnes** - (boolean) If html-baker should convert wget's .1 files to .html files
 - **options** - Array of wget options
+- **postcmd** - A command to run after the build succeeds

config.json

@@ -1,5 +1,6 @@
 {
 	"baker": {
+		"precmd": "",
 		"domains": [
 			"localhost:3000"
 		],
@@ -8,15 +9,16 @@
 			"runcmd": "npm start"
 		},
 		"output": {
-			"directory": "./docs"
+			"directory": "./docs",
+			"fixDotOnes": true
 		},
 		"options": [
 			"--recursive",
 			"--page-requisites",
 			"--html-extension",
-			"--convert-links",
 			"--restrict-file-names=windows",
 			"--no-parent"
-		]
+		],
+		"postcmd": ""
 	}
 }

index.js

@@ -1,4 +1,5 @@
 const shell = require("child_process");
+const fs = require("fs");
 
 // Load cli
 let cli = require("./lib/cli")();
@@ -27,6 +28,12 @@ if (cli.force && config.output && config.output.directory) {
 
 // Start the engine
 
+// Run the precmd
+if (config.precmd && config.precmd.length) {
+    console.log("Pre-cmd:", config.precmd);
+    shell.execSync(config.precmd);
+}
+
 /// Check for input server command
 let server = false;
 let serverStarted = false;
@@ -108,6 +115,34 @@ function download() {
 
         try {
             shell.execSync(wgetcmd);
+
+            // Run the post command
+            if (config.postcmd && config.postcmd.length) {
+                console.log("Post-cmd:", config.postcmd);
+                shell.execSync(config.postcmd);
+            }
+
+            // Fix dot ones
+            if (config.output && config.output.fixDotOnes) {
+
+                // Scan the directory
+                fs.readdirSync(config.output.directory).forEach(file => {
+                    if (file.includes(".1.html")) {
+
+                        file = config.output.directory + '/' + file;
+                        let newfile = file.replace(".1.html", ".html");
+                        
+                        try {
+                            fs.renameSync(file, newfile);
+                        }
+                        catch (ex) {
+                            throw "Could not move file " + file;
+                        }
+                    }                    
+                });
+
+            }
+
             console.log("Done.");
         }
         catch (ex) {
@@ -125,4 +160,4 @@ function download() {
     }
     process.exit();
 
-}
+}

lib/config.js

@@ -21,9 +21,11 @@ module.exports = function() {
             shell.execSync("mkdir " + dir);
         }
 
+        // Pull default config
+        let defaultConfig = require("../config.json");
+
         // Check for environment config file
         if (!fs.existsSync(file)) {
-            let defaultConfig = require("../config.json");
 
             try {
                 // Create file
@@ -34,14 +36,34 @@ module.exports = function() {
                         '\t'
                     )
                 );
+
+                console.log("Config file created successfully.");
             }
             catch (ex) {
                 throw "Could not create configuration file.";
             }
 
         }
         else {
-            console.log("Configuration file exists.  Will not overwrite.");
+            // Append the config to existing
+            let existingConfig = fs.readFileSync(file);
+            if (existingConfig) {
+                existingConfig = JSON.parse(existingConfig);
+                existingConfig.baker = defaultConfig.baker;
+    
+                // Rewrite the file
+                try {
+                    fs.writeFileSync(file, JSON.stringify(existingConfig, null, '\t'));
+                }
+                catch (ex) {
+                    throw "Could not append configuration file.";
+                }
+    
+                console.log("Config file appended successfully.");
+            }
+            else {
+                throw "Could not append configuration file."
+            }
         }
 
     }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "html-baker",
-  "version": "0.0.2",
+  "version": "0.1.0",
   "description": "Convert websites into flat-file websites",
   "main": "index.js",
   "bin": {