Add create bean command / cleanup

Author: Tony Junkes

fw1/create/app.cfc

@@ -29,7 +29,6 @@ component displayname="FW/1 Create Application Command"
 {
 	property name="packageService" inject="PackageService";
 	property name="parser" inject="Parser";
-	property name="skeletonLocation";
 
 	public any function init() {
 		super.init();
@@ -47,9 +46,9 @@ component displayname="FW/1 Create Application Command"
 	* @package.hint Generate a box.json to make the current directory a package.
 	*/
 	public void function run(
-		name = "My FW/1 App",
-		skeleton = "Skeleton",
-		directory = getCWD(),
+		string name = "My FW/1 App",
+		string skeleton = "Skeleton",
+		string directory = getCWD(),
 		boolean installFW1 = false,
 		boolean package = true
 	) {

fw1/create/bean.cfc

@@ -0,0 +1,94 @@
+// BASED FROM THE COLDBOX "CONTROLLER.CFC" COMMAND - https://github.com/Ortus-Solutions/commandbox/tree/master/src/cfml/commands/coldbox/create
+/**
+* Create a new bean in an existing FW/1 application.
+* .
+* {code:bash}
+* fw1 create bean MyBean
+* {code}
+* .
+* The command can also take a list of bean names.
+* .
+* {code:bash}
+* fw1 create bean MyBean,MyOtherBean
+* {code}
+* .
+* By default, the bean will be created in /model/beans but can be
+* overridden.
+* .
+* {code:bash}
+* fw1 create bean MyBean myDirectory
+* {code}
+* .
+* Bean file names are formatted as initial caps.
+* This can be altered by setting initialCaps to false.
+* .
+* {code:bash}
+* fw1 create bean MyBean /model/beans false
+* {code}
+* .
+* Once created, the bean can be opened in your default editor by
+* setting the "open" param to true.
+* .
+* {code:bash}
+* fw1 create bean MyBean --open
+* {code}
+*/
+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'.
+	* @open.hint Open the bean once generated.
+	*/
+	public void function run( 	
+		required string name,
+		string directory = "model/beans",
+		boolean initialCaps = true,
+		boolean open = false
+	) {
+		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?
+			var beanName = arguments.initialCaps
+				? reReplace( listLast( bean, "/" ), "\b(\w)", "\u\1", "all" )
+				: listLast( bean, "/" );
+			// This help readability so the success messages aren't up against the previous command line
+			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 & "}" );
+			}
+			var beanPath = "#arguments.directory#/#beanName#.cfc";
+			// Create dir if it doesn't exist
+			directoryCreate( getDirectoryFromPath( beanPath ), true, true );
+			// Create files
+			file action="write" file="#beanPath#" mode="777" output="#beanContent#";
+			print.greenLine( "Created #beanPath#" );
+			// Open file
+			if ( arguments.open ){ openPath( beanPath ); }
+		}		
+	}
+}

fw1/create/controller.cfc

@@ -56,19 +56,19 @@ component displayname="FW/1 Create Controller Command"
 	}
 
 	/**
-	* @name.hint Name of the controller to create without the .cfc. For packages, specify name as 'myPackage/myController'
+	* @name.hint Name of the controller to create.
 	* @actions.hint A comma-delimited list of actions to generate
 	* @directory.hint The base directory to create your controller in. Defaults to 'controllers'.
 	* @views.hint Generate a view for each action.
-	* @viewsDirectory.hint The directory where your views are stored. Only used if views is set to true.
+	* @viewsDirectory.hint The directory where your views are stored.
 	* @open.hint Open the controller once generated.
 	*/
 	public void function run( 	
-		required name,
-		actions = "default",
-		directory = "controllers",
+		required string name,
+		string actions = "default",
+		string directory = "controllers",
 		boolean views = true,
-		viewsDirectory = "views",
+		string viewsDirectory = "views",
 		boolean open = false
 	) {
 		// This will make each directory canonical and absolute
@@ -87,7 +87,7 @@ component displayname="FW/1 Create Controller Command"
 			writeOutput( "component {" & ascii.br );
 			for ( var thisAction in actionArray ) {
 				index++;
-				writeOutput( ascii.tb & "public void function #thisAction#() {" & ascii.br );
+				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 ) }
@@ -101,6 +101,6 @@ component displayname="FW/1 Create Controller Command"
 		file action="write" file="#controllerPath#" mode="777" output="#controllerContent#";
 		print.greenLine( "Created #controllerPath#" );
 		// Open file
-		if ( arguments.open ){ openPath( controllerPath ); }			
+		if ( arguments.open ){ openPath( controllerPath ); }	
 	}
 }

fw1/create/layout.cfc

@@ -20,9 +20,8 @@ component displayname="FW/1 Create Layout Command"
 	* @directory.hint The base directory to create your layout in.
 	*/
 	public void function run( 	
-		required name,
-		boolean helper = false,
-		directory = "layouts" 
+		required string name,
+		string directory = "layouts" 
 	) {
 		// This will make each directory canonical and absolute		
 		arguments.directory = fileSystemUtil.resolvePath( arguments.directory );				

fw1/create/subsystem.cfc

@@ -22,8 +22,8 @@ component displayname="FW/1 Create Subsystem Command"
 	* @directory.hint The directory to create the app in. Defaults to the subsystem name passed in.
 	*/
 	public void function run(
-		required name,
-		directory = getCWD()
+		required string name,
+		string directory = getCWD()
 	) {
 		var skeletonLocation = getDirectoryFromPath( getCurrentTemplatePath() )  & "/../resources/templates/";
 		// This will make the directory canonical and absolute

fw1/create/view.cfc

@@ -21,8 +21,8 @@ component displayname="FW/1 Create View Command"
 	* @directory.hint The base directory to create your view in. Defaults to current working directory.
 	*/
 	public void function run(
-		required name,
-		directory = "views"
+		required string name,
+		string directory = "views"
 	) {
 		// This will make each directory canonical and absolute		
 		arguments.directory = fileSystemUtil.resolvePath( arguments.directory );