Skip to content

Commit 5f63683

Browse files
authored
Merge pull request #1854 from wheels-dev/fix/wheels-cli-fixes
commit: update wheels about command
2 parents 786deb5 + eab1e64 commit 5f63683

File tree

9 files changed

+64
-48
lines changed

9 files changed

+64
-48
lines changed

cli/src/commands/wheels/about.cfc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ component extends="base" {
9090

9191
// Helpful Links
9292
print.boldGreenLine("Resources");
93-
print.cyanLine(" Documentation: https://wheels.dev/docs");
94-
print.cyanLine(" API Reference: https://wheels.dev/api");
93+
print.cyanLine(" Documentation: https://wheels.dev/guides");
94+
print.cyanLine(" API Reference: https://wheels.dev/api/v3.0.0");
9595
print.cyanLine(" GitHub: https://github.com/wheels-dev/wheels");
9696
print.cyanLine(" Community: https://wheels.dev/community");
9797
print.line();

cli/src/commands/wheels/dbmigrate/create/column.cfc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
arguments = reconstructArgs(
5151
argStruct = arguments,
5252
allowedValues = {
53-
dataType= ["string", "text", "integer", "biginteger", "float", "boolean", "date", "time", "datetime", "timestamp", "binary"]
53+
dataType: ["biginteger", "binary", "boolean", "date", "datetime", "decimal", "float", "integer", "string", "text", "time", "timestamp", "uuid"]
5454
}
5555
);
5656

cli/src/commands/wheels/generate/app.cfc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@ component aliases="wheels g app" extends="../base" {
4343

4444
// Map these shortcut names to the actual ForgeBox slugs
4545
variables.templateMap = {
46-
'Base' : 'wheels-base-template@BE',
47-
'Base@BE' : 'wheels-base-template@BE',
48-
'HelloWorld' : 'cfwheels-template-helloworld',
49-
'HelloDynamic': 'cfwheels-template-hellodynamic',
50-
'HelloPages' : 'cfwheels-template-hellopages'
46+
'WheelsBaseTemplate' : 'wheels-base-template@^3.0.0',
47+
'BleedingEdge' : 'wheels-base-template@BE',
48+
'WheelsTemplateHTMX' : 'cfwheels-template-htmx-alpine-simple',
49+
'WheelsStarterApp' : 'wheels-starter-app',
50+
'WheelsTodoMVCHTMX' : 'cfwheels-todomvc-htmx'
5151
};
5252

5353
return this;
@@ -68,7 +68,7 @@ component aliases="wheels g app" extends="../base" {
6868
**/
6969
function run(
7070
name = 'MyApp',
71-
template = 'wheels-base-template@BE',
71+
template = 'wheels-base-template@^3.0.0',
7272
directory,
7373
reloadPassword = '',
7474
datasourceName,

cli/src/commands/wheels/generate/property.cfc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ component aliases='wheels g property' extends="../base" {
5858
arguments = reconstructArgs(
5959
argStruct=arguments,
6060
allowedValues={
61-
dataType: ["biginteger", "binary", "boolean", "date", "datetime", "decimal", "float", "integer", "string", "limit", "text", "time", "timestamp", "uuid"]
61+
dataType: ["biginteger", "binary", "boolean", "date", "datetime", "decimal", "float", "integer", "string", "text", "time", "timestamp", "uuid"]
6262
}
6363
);
6464

cli/src/commands/wheels/generate/scaffold.cfc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ component aliases="wheels g scaffold, wheels g resource, wheels generate resourc
3838

3939
// Custom validation for properties parameter format (name:type,name2:type2)
4040
if (len(trim(arguments.properties))) {
41-
var validTypes = ["biginteger", "binary", "boolean", "date", "datetime", "decimal", "float", "integer", "string", "limit", "text", "time", "timestamp", "uuid"];
41+
var validTypes = ["biginteger", "binary", "boolean", "date", "datetime", "decimal", "float", "integer", "string", "text", "time", "timestamp", "uuid"];
4242
var properties = listToArray(arguments.properties, ",");
4343
var invalidTypes = [];
4444

docs/src/SUMMARY.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
* Core Commands
2121
* [wheels init](command-line-tools/commands/core/init.md)
2222
* [wheels info](command-line-tools/commands/core/info.md)
23+
* [wheels about](command-line-tools/commands/application-utilities/about.md)
2324
* [wheels reload](command-line-tools/commands/core/reload.md)
2425
* [wheels deps](command-line-tools/commands/core/deps.md)
2526
* [wheels destroy](command-line-tools/commands/core/destroy.md)

docs/src/command-line-tools/commands/application-utilities/about.md

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -26,41 +26,40 @@ wheels about
2626

2727
Output:
2828
```
29-
\ \ / / | | |
30-
\ \ /\ / /| |__ ___ ___| |___
29+
__ ___ _
30+
\ \ / / | | |
31+
\ \ /\ / /| |__ ___ ___| |___
3132
\ \/ \/ / | '_ \ / _ \/ _ \ / __|
3233
\ /\ / | | | | __/ __/ \__ \
3334
\/ \/ |_| |_|\___|\___|_|___/
3435
3536
Wheels Framework
36-
Version: 2.5.0
37+
Version: 3.0.0
3738
3839
Wheels CLI
39-
Version: 1.0.0
40+
Version: 3.0.0
4041
Location: /commandbox/modules/wheels-cli/
4142
4243
Application
4344
Path: /Users/developer/myapp
44-
Name: MyWheelsApp
4545
Environment: development
4646
Database: Configured
4747
4848
Server Environment
49-
CFML Engine: Lucee 5.4.1.8
50-
Java Version: 11.0.15
51-
OS: macOS 13.0
49+
CFML Engine: Lucee 7.0.1+100
50+
Java Version: 17.0.17
51+
OS: Mac OS X 15.7.3
5252
Architecture: x86_64
5353
5454
CommandBox
55-
Version: 5.9.0
56-
Home: /Users/developer/.CommandBox
55+
Version: 6.3.1+00853
5756
5857
Application Statistics
59-
Controllers: 12
60-
Models: 8
61-
Views: 45
62-
Tests: 23
63-
Migrations: 15
58+
Controllers: 15
59+
Models: 7
60+
Views: 31
61+
Tests: 3
62+
Migrations: 9
6463
6564
Resources
6665
Documentation: https://wheels.dev/guides

docs/src/command-line-tools/commands/generate/app-wizard.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ The `wheels generate app-wizard` command provides an interactive, step-by-step w
3333
| `directory` | Directory to create app in | Valid directory path | `{current directory}/{name}` |
3434
| `reloadPassword` | Reload password for the app | Any string | `changeMe` |
3535
| `datasourceName` | Database datasource name | Valid datasource name | `{app name}` |
36-
| `cfmlEngine` | CFML engine for server.json | `lucee`, `adobe`, `lucee6`, `lucee5`, `adobe2023`, etc. | `lucee` |
36+
| `cfmlEngine` | CFML engine for server.json | `lucee5, lucee6, lucee7`, `adobe2018`, `adobe2021`, `adobe2023`, `adobe2025`, `boxlang`, etc. | `lucee` |
3737
| `useBootstrap` | Add Bootstrap to the app | `true`, `false` | `false` |
3838
| `setupH2` | Setup H2 database for development | `true`, `false` | `true` |
3939
| `init` | Initialize directory as a package | `true`, `false` | `false` |

docs/src/command-line-tools/commands/generate/app.md

Lines changed: 37 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ wheels g app [name] [template] [directory] [options]
1616
This command supports multiple parameter formats:
1717

1818
- **Positional parameters**: `wheels generate app blog` (most common)
19-
- **Named parameters**: `name=value` (e.g., `name=blog`, `template=HelloWorld`)
19+
- **Named parameters**: `name=value` (e.g., `name=blog`, `template=WheelsBaseTemplate`)
2020
- **Flag parameters**: `--flag` equals `flag=true` (e.g., `--useBootstrap` equals `useBootstrap=true`)
2121

2222
**Parameter Mixing Rules:**
2323

2424
**ALLOWED:**
2525
- All positional: `wheels generate app blog`
2626
- All positional + flags: `wheels generate app blog --useBootstrap --init`
27-
- All named: `name=blog template=HelloWorld --useBootstrap`
27+
- All named: `name=blog template=WheelsBaseTemplate --useBootstrap`
2828

2929
**NOT ALLOWED:**
3030
- Positional + named: `wheels generate app blog name=myapp` (causes error)
@@ -40,7 +40,7 @@ The `wheels generate app` command creates a new Wheels application with a comple
4040
| Argument | Description | Default |
4141
|----------|-------------|---------|
4242
| `name` | Application name | `MyApp` |
43-
| `template` | Template to use | `wheels-base-template@BE` |
43+
| `template` | Template to use | `wheels-base-template@^3.0.0` |
4444
| `directory` | Target directory | `./{name}` |
4545

4646
## Options
@@ -57,38 +57,54 @@ The `wheels generate app` command creates a new Wheels application with a comple
5757

5858
## Available Templates
5959

60-
### wheels-base-template@BE (Default)
60+
### wheels-base-template@^3.0.0 (stable)
6161
```bash
6262
wheels generate app myapp
6363
```
64+
- Backend Edition default template
65+
- Complete MVC structure with proven, production-ready defaults
66+
- Sample code with minimal, predictable configuration
67+
- H2 database setup by default
68+
69+
### BleedingEdge
70+
```bash
71+
wheels generate app myapp BleedingEdge
72+
```
6473
- Backend Edition template
6574
- Complete MVC structure
6675
- Sample code and configuration
6776
- H2 database setup by default
6877

69-
### HelloWorld
78+
### WheelsStarterApp
7079
```bash
71-
wheels generate app myapp HelloWorld
80+
wheels generate app myapp WheelsStarterApp
7281
```
73-
- Simple "Hello World" example
74-
- One controller and view
75-
- Great for learning
76-
77-
### HelloDynamic
82+
- Starter user management and authentication application built with Wheels 3.0
83+
- Demonstrates best practices for security, conventions, and MVC architecture
84+
- Full authentication & authorization flow (registration, verification, RBAC, admin panel)
85+
- Built-in security features: CSRF protection, audit logging, bcrypt passwords, role checks
86+
- Modern, responsive UI using Bootstrap with Wheels helpers
87+
- Multi-database support with easy setup via CommandBox (MySQL, PostgreSQL, MSSQL, Oracle, H2)
88+
89+
### WheelsTemplateHTMX
7890
```bash
79-
wheels generate app myapp HelloDynamic
91+
wheels generate app myapp WheelsTemplateHTMX
8092
```
81-
- Dynamic content example
82-
- Database interaction
83-
- Form handling
84-
85-
### HelloPages
93+
- Blank starter application for Wheels
94+
- Full MVC structure pre-configured
95+
- htmx integrated for server-side AJAX interactions
96+
- Alpine.js included for lightweight client-side interactivity
97+
- simple.css bundled for clean, minimal styling
98+
- Ready-to-extend layout with sample configuration
99+
100+
### WheelsTodoMVCHTMX
86101
```bash
87-
wheels generate app myapp HelloPages
102+
wheels generate app myapp WheelsTodoMVCHTMX
88103
```
89-
- Static pages example
90-
- Layout system
91-
- Navigation structure
104+
- Reference TodoMVC implementation built with CFWheels
105+
- Uses HTMX for server-driven interactivity
106+
- Demonstrates real-world MVC and CRUD patterns
107+
- Quick setup using CommandBox, CFWheels CLI, and H2
92108

93109
## Examples
94110

0 commit comments

Comments
 (0)