Skip to content

Commit 38198be

Browse files
authored
Merge pull request #6 from ColdBox/development
v7.4.0
2 parents f4ef10c + 652dbb8 commit 38198be

File tree

7 files changed

+45
-21
lines changed

7 files changed

+45
-21
lines changed

.github/workflows/tests.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,13 @@ jobs:
4545
4646
- name: Run Tests
4747
run: |
48-
# Create the CommandBox modules folder, for some reason it is not created
49-
mkdir -p ~/.CommandBox/cfml/modules
50-
# Link up the module so we can do testing!
51-
box link --force
52-
# Test
53-
box task run taskfile=build/Build target="runTests"
48+
# Create the CommandBox modules folder, for some reason it is not created
49+
rm -Rf ~/.CommandBox/cfml/modules/coldbox-cli
50+
mkdir -p ~/.CommandBox/cfml/modules
51+
# Link up the module so we can do testing!
52+
box link --force
53+
# Test
54+
box task run taskfile=build/Build target="runTests"
5455
5556
- name: Failure Logs
5657
if: failure()

box.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name":"ColdBox CLI",
3-
"version":"7.3.0",
3+
"version":"7.4.0",
44
"location":"https://downloads.ortussolutions.com/ortussolutions/commandbox-modules/coldbox-cli/@build.version@/coldbox-cli-@build.version@.zip",
55
"slug":"coldbox-cli",
66
"author":"Ortus Solutions, Corp",
@@ -26,11 +26,10 @@
2626
"devDependencies":{
2727
"commandbox-cfformat":"*",
2828
"commandbox-docbox":"*",
29-
"commandbox-migrations":"^5.0.0",
29+
"commandbox-migrations":"^5.0.0",
3030
"testbox-cli":"^1.0.0"
3131
},
32-
"dependencies":{
33-
},
32+
"dependencies":{},
3433
"installPaths":{},
3534
"ignore":[
3635
"**/.*",

changelog.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
99

1010
## [Unreleased]
1111

12+
### Fixed
13+
14+
- Create resources missing `open` param
15+
16+
### Added
17+
18+
- More documentation
19+
1220
## [7.3.0] - 2024-02-12
1321

1422
### Added

commands/coldbox/create/bdd.cfc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* {code}
99
*
1010
**/
11-
component extends="coldbox-cli.models.BaseCommand" {
11+
component extends="coldbox-cli.models.BaseCommand" {
1212

1313
/**
1414
* @name Name of the BDD spec to create without the .cfc. For packages, specify name as 'myPackage/myBDDSpec'

commands/coldbox/create/resource.cfc

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,9 @@ component extends="coldbox-cli.models.BaseCommand" {
7070
* @specsDirectory Your specs directory. Only used if tests is true
7171
* @api If true, this will generate api resources, else normal html resources
7272
* @force Force the generation of the resource, even if it exists
73+
* @migration Generate the cfmigrations for the entities
74+
* @seeder Generate a mock data seeder for the entitites
75+
* @open Open the resources once created
7376
*/
7477
function run(
7578
required resource,
@@ -95,7 +98,8 @@ component extends="coldbox-cli.models.BaseCommand" {
9598
boolean api = false,
9699
boolean force = false,
97100
boolean migration = false,
98-
boolean seeder = false
101+
boolean seeder = false,
102+
boolean open = false
99103
){
100104
// Normalize paths
101105
arguments.specsDirectory = resolvePath( arguments.specsDirectory );

commands/coldbox/create/unit.cfc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* {code}
99
*
1010
**/
11-
component extends="coldbox-cli.models.BaseCommand" {
11+
component extends="coldbox-cli.models.BaseCommand" {
1212

1313
/**
1414
* @name Name of the xUnit Bundle to create without the .cfc. For packages, specify name as 'myPackage/MyServiceTest'

models/Utility.cfc

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ component singleton {
22

33
// DI
44
property name="moduleService" inject="ModuleService";
5-
property name="wirebox" inject="wirebox";
6-
property name="print" inject="PrintBuffer";
5+
property name="wirebox" inject="wirebox";
6+
property name="print" inject="PrintBuffer";
77

88
this.BREAK = chr( 13 ) & chr( 10 );
99
this.TAB = chr( 9 );
@@ -13,13 +13,16 @@ component singleton {
1313
* else install it
1414
*/
1515
function ensureTestBoxModule(){
16-
if( !isTestBoxModuleInstalled() ){
16+
if ( !isTestBoxModuleInstalled() ) {
1717
variables.print
1818
.redLine( "TestBox-CLI module not installed. Installing it for you, please wait..." )
1919
.line()
2020
.toConsole();
2121
variables.wirebox
22-
.getInstance( name : "CommandDSL", initArguments : { name : "install testbox-cli" } )
22+
.getInstance(
23+
name : "CommandDSL",
24+
initArguments: { name : "install testbox-cli" }
25+
)
2326
.run();
2427
}
2528
}
@@ -29,13 +32,16 @@ component singleton {
2932
* else install it
3033
*/
3134
function ensureMigrationsModule(){
32-
if( !isMigrationsModuleInstalled() ){
35+
if ( !isMigrationsModuleInstalled() ) {
3336
variables.print
3437
.redLine( "CommandBox-Migrations module not installed. Installing it for you, please wait..." )
3538
.line()
3639
.toConsole();
3740
variables.wirebox
38-
.getInstance( name : "CommandDSL", initArguments : { name : "install commandbox-migrations" } )
41+
.getInstance(
42+
name : "CommandDSL",
43+
initArguments: { name : "install commandbox-migrations" }
44+
)
3945
.run();
4046
}
4147
}
@@ -44,14 +50,20 @@ component singleton {
4450
* Is TestBox module installed
4551
*/
4652
boolean function isTestBoxModuleInstalled(){
47-
return variables.moduleService.getModuleRegistry().keyArray().findNoCase( "testbox-cli" ) > 0 ? true : false;
53+
return variables.moduleService
54+
.getModuleRegistry()
55+
.keyArray()
56+
.findNoCase( "testbox-cli" ) > 0 ? true : false;
4857
}
4958

5059
/**
5160
* Is CommandBox Migrations module installed
5261
*/
5362
boolean function isMigrationsModuleInstalled(){
54-
return variables.moduleService.getModuleRegistry().keyArray().findNoCase( "commandbox-migrations" ) > 0 ? true : false;
63+
return variables.moduleService
64+
.getModuleRegistry()
65+
.keyArray()
66+
.findNoCase( "commandbox-migrations" ) > 0 ? true : false;
5567
}
5668

5769
/**

0 commit comments

Comments
 (0)