Minor Improvements

Adjusted some code that was poorly organized.

-- controller.cfc
Broke out the controller scaffold code into it's own function. Added
view creation back (removed it on accident).

Author: Tony Junkes

README.md

@@ -1,4 +1,4 @@
-# fw1-commands (v0.4.0)
+# fw1-commands (v0.4.1)
 A collection of commands to be used with CommandBox for working with FW/1
 
 ### Installation

box.json

@@ -1,7 +1,7 @@
 {
     "name" : "FW/1 Commands",
     "slug" : "fw1-commands",
-    "version" : "0.4.0",
+    "version" : "0.4.1",
     "author" : "Tony Junkes @cfchef",
     "location" : "https://github.com/cfchef/fw1-commands/archive/master.zip",
     "createPackageDirectory" : true,

fw1/create/bean.cfc

@@ -37,18 +37,6 @@ component displayname="FW/1 Create Bean Command"
 	extends="commandbox.system.BaseCommand"
 	excludeFromHelp=false
 {
-	public any function init() {
-		// ascii codes
-		variables.ascii = {
-			br = Chr(10) & Chr(13), // line break
-			br2 = Chr(10) & Chr(13) & Chr(10) & Chr(13), // line break 2x
-			tb = Chr(9), // tab
-			tb2 = Chr(9) & Chr(9), // tab 2x
-		};
-
-		return this;
-	}
-
 	/**
 	* @name.hint Name of the bean to create. For packages, specify name as 'myPackage/MyBean'
 	* @directory.hint The base directory to create your bean in. Defaults to 'beans'.
@@ -60,11 +48,12 @@ component displayname="FW/1 Create Bean Command"
 		boolean initialCaps = true,
 		boolean open = false
 	) {
+		// This will make each directory canonical and absolute
+		arguments.directory = fileSystemUtil.resolvePath( arguments.directory );
+		// Validate directory
+		if ( !directoryExists( arguments.directory ) ) { directoryCreate( arguments.directory ); }
+		// Generate beans
 		for ( var bean in listToArray( arguments.name ) ) {
-			// This will make each directory canonical and absolute
-			arguments.directory = fileSystemUtil.resolvePath( arguments.directory );
-			// Validate directory
-			if ( !directoryExists( arguments.directory ) ) { directoryCreate( arguments.directory ); }
 			// Allow dot-delimited paths
 			bean = replace( bean, ".", "/", "all" );
 			// Make bean name intital caps?
@@ -75,11 +64,11 @@ component displayname="FW/1 Create Bean Command"
 			print.line();
 			// Generate bean with init function
 			savecontent variable="beanContent" {
-				writeOutput( "component {" & ascii.br );
-				writeOutput( ascii.tb & "public #beanName# function init() {" & ascii.br );
-				writeOutput( ascii.tb2 & "return this;" & ascii.br );
-				writeOutput( ascii.tb & "}" );
-				writeOutput( ascii.br & "}" );
+				writeOutput( "component {" & cr );
+				writeOutput( chr(9) & "public #beanName# function init() {" & cr );
+				writeOutput( chr(9) & chr(9) & "return this;" & cr );
+				writeOutput( chr(9) & "}" );
+				writeOutput( cr & "}" );
 			}
 			var beanPath = "#arguments.directory#/#beanName#.cfc";
 			// Create dir if it doesn't exist

fw1/create/controller.cfc

@@ -43,18 +43,6 @@ component displayname="FW/1 Create Controller Command"
 	extends="commandbox.system.BaseCommand"
 	excludeFromHelp=false
 {
-	public any function init() {
-		// ascii codes
-		variables.ascii = {
-			br = Chr(10) & Chr(13), // line break
-			br2 = Chr(10) & Chr(13) & Chr(10) & Chr(13), // line break 2x
-			tb = Chr(9), // tab
-			tb2 = Chr(9) & Chr(9), // tab 2x
-		};
-
-		return this;
-	}
-
 	/**
 	* @name.hint Name of the controller to create.
 	* @actions.hint A comma-delimited list of actions to generate
@@ -81,26 +69,45 @@ component displayname="FW/1 Create Controller Command"
 		// This help readability so the success messages aren't up against the previous command line
 		print.line();
 		// Generate controller with actions passed
-		savecontent variable="controllerContent" {
-			var index = 0;
-			var actionArray = listToArray( arguments.actions );
-			writeOutput( "component {" & ascii.br );
-			for ( var thisAction in actionArray ) {
-				index++;
-				writeOutput( ascii.tb & "public void function #thisAction#(struct rc = {}) {" & ascii.br );
-				writeOutput( ascii.tb2 & ascii.br );
-				writeOutput( ascii.tb & "}" );
-				if ( index != arrayLen( actionArray ) ) { writeOutput( ascii.br2 ) }
-			}
-			writeOutput( ascii.br & "}" );
-		}
+		var controllerContent = scaffoldController( arguments.name, listToArray( arguments.actions ) );
 		var controllerPath = "#arguments.directory#/#arguments.name#.cfc";
 		// Create dir if it doesn't exist
 		directoryCreate( getDirectoryFromPath( controllerPath ), true, true );
 		// Create files
 		file action="write" file="#controllerPath#" mode="777" output="#controllerContent#";
 		print.greenLine( "Created #controllerPath#" );
+		// Create views?
+		if ( arguments.views ) {
+			for ( var action in listToArray( arguments.actions ) ) {
+				var viewPath = arguments.viewsDirectory & "/" & arguments.name & "/" & action & ".cfm";
+				// Create dir if it doesn't exist
+				directoryCreate( getDirectoryFromPath( viewPath ), true, true );
+				// Create view
+				fileWrite( viewPath, "<cfoutput>#cr##chr(9)#<h1>#arguments.name#.#action#</h1>#cr#</cfoutput>" );
+				print.greenLine( "Created " & arguments.viewsDirectory & "/" & arguments.name & "/" & action & ".cfm" );
+			}
+		}
 		// Open file
 		if ( arguments.open ){ openPath( controllerPath ); }	
 	}
+
+	private string function scaffoldController(
+		required string name,
+		array actions = ["default"]
+	) {
+		savecontent variable="controller" {
+			var index = 0;
+			writeOutput( "component {" & cr );
+			for ( var action in arguments.actions ) {
+				index++;
+				writeOutput( chr(9) & "public void function #action#(struct rc = {}) {" & cr );
+				writeOutput( chr(9) & chr(9) & cr );
+				writeOutput( chr(9) & "}" );
+				if ( index != arrayLen( arguments.actions ) ) { writeOutput( cr & cr ) }
+			}
+			writeOutput( cr & "}" );
+		}
+
+		return controller;
+	}
 }