Merge pull request #6 from ColdBox/development

v7.4.0
ColdBox · Mar 20, 2024 · 38198be · 38198be
2 parents f4ef10c + 652dbb8
commit 38198be
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 21 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -45,12 +45,13 @@ jobs:
 
       - name: Run Tests
         run: |
-          # Create the CommandBox modules folder, for some reason it is not created
-          mkdir -p ~/.CommandBox/cfml/modules
-          # Link up the module so we can do testing!
-          box link --force
-          # Test
-          box task run taskfile=build/Build target="runTests"
+            # Create the CommandBox modules folder, for some reason it is not created
+            rm -Rf ~/.CommandBox/cfml/modules/coldbox-cli
+            mkdir -p ~/.CommandBox/cfml/modules
+            # Link up the module so we can do testing!
+            box link --force
+            # Test
+            box task run taskfile=build/Build target="runTests"
 
       - name: Failure Logs
         if: failure()

diff --git a/box.json b/box.json
@@ -1,6 +1,6 @@
 {
     "name":"ColdBox CLI",
-    "version":"7.3.0",
+    "version":"7.4.0",
     "location":"https://downloads.ortussolutions.com/ortussolutions/commandbox-modules/coldbox-cli/@build.version@/[email protected]@.zip",
     "slug":"coldbox-cli",
     "author":"Ortus Solutions, Corp",
@@ -26,11 +26,10 @@
     "devDependencies":{
         "commandbox-cfformat":"*",
         "commandbox-docbox":"*",
-		"commandbox-migrations":"^5.0.0",
+        "commandbox-migrations":"^5.0.0",
         "testbox-cli":"^1.0.0"
     },
-    "dependencies":{
-    },
+    "dependencies":{},
     "installPaths":{},
     "ignore":[
         "**/.*",

diff --git a/changelog.md b/changelog.md
@@ -9,6 +9,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+
+- Create resources missing `open` param
+
+### Added
+
+- More documentation
+
 ## [7.3.0] - 2024-02-12
 
 ### Added

diff --git a/commands/coldbox/create/bdd.cfc b/commands/coldbox/create/bdd.cfc
@@ -8,7 +8,7 @@
  * {code}
  *
  **/
- component extends="coldbox-cli.models.BaseCommand" {
+component extends="coldbox-cli.models.BaseCommand" {
 
 	/**
 	 * @name      Name of the BDD spec to create without the .cfc. For packages, specify name as 'myPackage/myBDDSpec'

diff --git a/commands/coldbox/create/resource.cfc b/commands/coldbox/create/resource.cfc
@@ -70,6 +70,9 @@ component extends="coldbox-cli.models.BaseCommand" {
 	 * @specsDirectory    Your specs directory. Only used if tests is true
 	 * @api               If true, this will generate api resources, else normal html resources
 	 * @force             Force the generation of the resource, even if it exists
+	 * @migration         Generate the cfmigrations for the entities
+	 * @seeder            Generate a mock data seeder for the entitites
+	 * @open              Open the resources once created
 	 */
 	function run(
 		required resource,
@@ -95,7 +98,8 @@ component extends="coldbox-cli.models.BaseCommand" {
 		boolean api          = false,
 		boolean force        = false,
 		boolean migration    = false,
-		boolean seeder       = false
+		boolean seeder       = false,
+		boolean open         = false
 	){
 		// Normalize paths
 		arguments.specsDirectory   = resolvePath( arguments.specsDirectory );

diff --git a/commands/coldbox/create/unit.cfc b/commands/coldbox/create/unit.cfc
@@ -8,7 +8,7 @@
  * {code}
  *
  **/
- component extends="coldbox-cli.models.BaseCommand" {
+component extends="coldbox-cli.models.BaseCommand" {
 
 	/**
 	 * @name      Name of the xUnit Bundle to create without the .cfc. For packages, specify name as 'myPackage/MyServiceTest'

diff --git a/models/Utility.cfc b/models/Utility.cfc
@@ -2,8 +2,8 @@ component singleton {
 
 	// DI
 	property name="moduleService" inject="ModuleService";
-	property name="wirebox" inject="wirebox";
-	property name="print" inject="PrintBuffer";
+	property name="wirebox"       inject="wirebox";
+	property name="print"         inject="PrintBuffer";
 
 	this.BREAK = chr( 13 ) & chr( 10 );
 	this.TAB   = chr( 9 );
@@ -13,13 +13,16 @@ component singleton {
 	 * else install it
 	 */
 	function ensureTestBoxModule(){
-		if( !isTestBoxModuleInstalled() ){
+		if ( !isTestBoxModuleInstalled() ) {
 			variables.print
 				.redLine( "TestBox-CLI module not installed. Installing it for you, please wait..." )
 				.line()
 				.toConsole();
 			variables.wirebox
-				.getInstance( name : "CommandDSL", initArguments : { name : "install testbox-cli" } )
+				.getInstance(
+					name         : "CommandDSL",
+					initArguments: { name : "install testbox-cli" }
+				)
 				.run();
 		}
 	}
@@ -29,13 +32,16 @@ component singleton {
 	 * else install it
 	 */
 	function ensureMigrationsModule(){
-		if( !isMigrationsModuleInstalled() ){
+		if ( !isMigrationsModuleInstalled() ) {
 			variables.print
 				.redLine( "CommandBox-Migrations module not installed. Installing it for you, please wait..." )
 				.line()
 				.toConsole();
 			variables.wirebox
-				.getInstance( name : "CommandDSL", initArguments : { name : "install commandbox-migrations" } )
+				.getInstance(
+					name         : "CommandDSL",
+					initArguments: { name : "install commandbox-migrations" }
+				)
 				.run();
 		}
 	}
@@ -44,14 +50,20 @@ component singleton {
 	 * Is TestBox module installed
 	 */
 	boolean function isTestBoxModuleInstalled(){
-		return variables.moduleService.getModuleRegistry().keyArray().findNoCase( "testbox-cli" ) > 0 ? true : false;
+		return variables.moduleService
+			.getModuleRegistry()
+			.keyArray()
+			.findNoCase( "testbox-cli" ) > 0 ? true : false;
 	}
 
 	/**
 	 * Is CommandBox Migrations module installed
 	 */
 	boolean function isMigrationsModuleInstalled(){
-		return variables.moduleService.getModuleRegistry().keyArray().findNoCase( "commandbox-migrations" ) > 0 ? true : false;
+		return variables.moduleService
+			.getModuleRegistry()
+			.keyArray()
+			.findNoCase( "commandbox-migrations" ) > 0 ? true : false;
 	}
 
 	/**