Skip to content

Commit bacb7d6

Browse files
committed
Merge branch 'development'
2 parents 6e55729 + 94f789c commit bacb7d6

33 files changed

+510
-158
lines changed

.cfformat.json

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
{
22
"array.empty_padding": false,
33
"array.padding": true,
4-
"array.multiline.min_length": 50,
4+
"array.multiline.min_length": 40,
55
"array.multiline.element_count": 2,
66
"array.multiline.leading_comma.padding": true,
77
"array.multiline.leading_comma": false,
88
"alignment.consecutive.assignments": true,
99
"alignment.consecutive.properties": true,
1010
"alignment.consecutive.params": true,
11-
"alignment.doc_comments" : true,
1211
"brackets.padding": true,
1312
"comment.asterisks": "align",
1413
"binary_operators.padding": true,
@@ -18,22 +17,22 @@
1817
"function_call.multiline.leading_comma.padding": true,
1918
"function_call.casing.builtin": "cfdocs",
2019
"function_call.casing.userdefined": "camel",
21-
"function_call.multiline.element_count": 3,
20+
"function_call.multiline.element_count": 2,
2221
"function_call.multiline.leading_comma": false,
23-
"function_call.multiline.min_length": 50,
22+
"function_call.multiline.min_length": 40,
2423
"function_declaration.padding": true,
2524
"function_declaration.empty_padding": false,
2625
"function_declaration.multiline.leading_comma": false,
2726
"function_declaration.multiline.leading_comma.padding": true,
28-
"function_declaration.multiline.element_count": 3,
29-
"function_declaration.multiline.min_length": 50,
27+
"function_declaration.multiline.element_count": 2,
28+
"function_declaration.multiline.min_length": 40,
3029
"function_declaration.group_to_block_spacing": "compact",
3130
"function_anonymous.empty_padding": false,
3231
"function_anonymous.group_to_block_spacing": "compact",
33-
"function_anonymous.multiline.element_count": 3,
32+
"function_anonymous.multiline.element_count": 2,
3433
"function_anonymous.multiline.leading_comma": false,
3534
"function_anonymous.multiline.leading_comma.padding": true,
36-
"function_anonymous.multiline.min_length": 50,
35+
"function_anonymous.multiline.min_length": 40,
3736
"function_anonymous.padding": true,
3837
"indent_size": 4,
3938
"keywords.block_to_keyword_spacing": "spaced",
@@ -42,13 +41,13 @@
4241
"keywords.spacing_to_block": "spaced",
4342
"keywords.spacing_to_group": true,
4443
"keywords.empty_group_spacing": false,
45-
"max_columns": 115,
44+
"max_columns": 120,
4645
"metadata.multiline.element_count": 3,
47-
"metadata.multiline.min_length": 50,
46+
"metadata.multiline.min_length": 40,
4847
"method_call.chain.multiline" : 3,
4948
"newline":"\n",
5049
"property.multiline.element_count": 3,
51-
"property.multiline.min_length": 30,
50+
"property.multiline.min_length": 40,
5251
"parentheses.padding": true,
5352
"strings.quote": "double",
5453
"strings.attributes.quote": "double",
@@ -58,6 +57,6 @@
5857
"struct.multiline.leading_comma": false,
5958
"struct.multiline.leading_comma.padding": true,
6059
"struct.multiline.element_count": 2,
61-
"struct.multiline.min_length": 60,
60+
"struct.multiline.min_length": 40,
6261
"tab_indent": true
6362
}

.github/workflows/pr.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ jobs:
2222
runs-on: ubuntu-20.04
2323
steps:
2424
- name: Checkout Repository
25-
uses: actions/checkout@v3
25+
uses: actions/checkout@v4
2626

27-
- uses: Ortus-Solutions/commandbox-action@v1.0.2
27+
- uses: Ortus-Solutions/commandbox-action@v1.0.3
2828
with:
2929
cmd: run-script format:check

.github/workflows/release.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
runs-on: ubuntu-20.04
3030
steps:
3131
- name: Checkout Repository
32-
uses: actions/checkout@v3
32+
uses: actions/checkout@v4
3333

3434
- name: Setup CommandBox
3535
uses: Ortus-Solutions/setup-commandbox@v2.0.1
@@ -64,7 +64,7 @@ jobs:
6464
box task run taskfile=build/Build target=run :version=${{ env.VERSION }} :projectName=${{ env.MODULE_ID }} :buildID=${{ github.run_number }} :branch=${{ env.BRANCH }}
6565
6666
- name: Commit Changelog To Master
67-
uses: EndBug/add-and-commit@v9.1.1
67+
uses: EndBug/add-and-commit@v9.1.4
6868
if: env.SNAPSHOT == 'false'
6969
with:
7070
author_name: Github Actions
@@ -73,7 +73,7 @@ jobs:
7373
add: changelog.md
7474

7575
- name: Tag Version
76-
uses: rickstaa/action-create-tag@v1.6.1
76+
uses: rickstaa/action-create-tag@v1.7.2
7777
if: env.SNAPSHOT == 'false'
7878
with:
7979
tag: "v${{ env.VERSION }}"
@@ -82,7 +82,7 @@ jobs:
8282

8383
- name: Upload Build Artifacts
8484
if: success()
85-
uses: actions/upload-artifact@v3
85+
uses: actions/upload-artifact@v4
8686
with:
8787
name: ${{ env.MODULE_ID }}
8888
path: |
@@ -118,7 +118,7 @@ jobs:
118118
box forgebox publish --force
119119
120120
- name: Create Github Release
121-
uses: taiki-e/create-gh-release-action@v1.6.2
121+
uses: taiki-e/create-gh-release-action@v1.8.0
122122
continue-on-error: true
123123
if: env.SNAPSHOT == 'false'
124124
with:
@@ -148,7 +148,7 @@ jobs:
148148
forgeboxAPIKey: ${{ secrets.FORGEBOX_TOKEN }}
149149

150150
- name: Download build artifacts
151-
uses: actions/download-artifact@v2
151+
uses: actions/download-artifact@v4
152152
with:
153153
name: ${{ env.MODULE_ID }}
154154
path: .tmp
@@ -165,7 +165,7 @@ jobs:
165165
166166
# Commit it back to development
167167
- name: Commit Version Bump
168-
uses: EndBug/add-and-commit@v9.1.1
168+
uses: EndBug/add-and-commit@v9.1.4
169169
with:
170170
author_name: Github Actions
171171
author_email: info@ortussolutions.com

.github/workflows/snapshot.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ jobs:
2020
name: Code Auto-Formatting
2121
runs-on: ubuntu-20.04
2222
steps:
23-
- uses: actions/checkout@v3
23+
- uses: actions/checkout@v4
2424

2525
- name: Auto-format
26-
uses: Ortus-Solutions/commandbox-action@v1.0.2
26+
uses: Ortus-Solutions/commandbox-action@v1.0.3
2727
with:
2828
cmd: run-script format
2929

3030
- name: Commit Format Changes
31-
uses: stefanzweifel/git-auto-commit-action@v4
31+
uses: stefanzweifel/git-auto-commit-action@v5
3232
with:
3333
commit_message: Apply cfformat changes
3434

.github/workflows/tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ jobs:
1313
runs-on: ubuntu-20.04
1414
steps:
1515
- name: Checkout Repository
16-
uses: actions/checkout@v3
16+
uses: actions/checkout@v4
1717

1818
- name: Setup Java
19-
uses: actions/setup-java@v3
19+
uses: actions/setup-java@v4
2020
with:
2121
distribution: "temurin"
2222
java-version: "11"

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
# Dependencies
22
/docbox/**
3+
modules/**
34

45
# Build Artifacts
6+
.DS_Store
57
.tmp/**
68
.artifacts/**
79
changelog-latest.md

.markdownlint.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,6 @@
1111
"no-duplicate-header" : {
1212
"siblings_only" : true
1313
},
14+
"no-duplicate-heading" : false,
1415
"no-inline-html" : false
1516
}

CONTRIBUTING.md

Lines changed: 108 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,108 @@
1+
# Contributing Guide
2+
3+
Hola amigo! I'm really excited that you are interested in contributing to coldbox-cli. Before submitting your contribution, please make sure to take a moment and read through the following guidelines:
4+
5+
- [Code Of Conduct](#code-of-conduct)
6+
- [Bug Reporting](#bug-reporting)
7+
- [Support Questions](#support-questions)
8+
- [Pull Request Guidelines](#pull-request-guidelines)
9+
- [Security Vulnerabilities](#security-vulnerabilities)
10+
- [Development Setup](#development-setup)
11+
- [Language Compatibility](#language-compatibility)
12+
- [Coding Styles \& Formatting](#coding-styles--formatting)
13+
- [CFC Docs With DocBox](#cfc-docs-with-docbox)
14+
- [Financial Contributions](#financial-contributions)
15+
- [Contributors](#contributors)
16+
17+
## Code Of Conduct
18+
19+
This project is open source, and as such, the maintainers give their free time to build and maintain the source code held within. They make the code freely available in the hope that it will be of use to other developers and/or businesses. Please be considerate towards maintainers when raising issues or presenting pull requests. **We all follow the Golden Rule: Do to others as you want them to do to you.**
20+
21+
- As contributors and maintainers of this project, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities.
22+
- Participants will be tolerant of opposing views.
23+
- Examples of unacceptable behavior by participants include the use of sexual language or imagery, derogatory comments or personal attacks, trolling, public or private harassment, insults, or other unprofessional conduct.
24+
- Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned with this Code of Conduct. Project maintainers who do not follow the Code of Conduct may be removed from the project team.
25+
- When interpreting the words and actions of others, participants should always assume good intentions. Emotions cannot be derived from textual representations.
26+
- Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by opening an issue or contacting one or more of the project maintainers.
27+
28+
29+
## Bug Reporting
30+
31+
Please make sure also that if you submit a pull request, you link it to the appropriate issue(s).
32+
33+
If you file a bug report, your issue should contain a title, a clear description of the issue, a way to replicate the issue, and any support files that we might need to replicate your issue. The goal of a bug report is to make it easy for yourself - and others - to replicate the bug and develop a fix for it. All issues that do not contain a way to replicate will not be addressed.
34+
35+
## Support Questions
36+
37+
If you have any questions on usage, professional support or just ideas to bounce off the maintainers, please do not create an issue. Leverage our support channels first.
38+
39+
- Ortus Community Discourse: https://community.ortussolutions.com
40+
- Box Slack Team: http://boxteam.ortussolutions.com/
41+
- Professional Support: https://www.ortussolutions.com/services/support
42+
43+
## Pull Request Guidelines
44+
45+
- The `(master|main)` branch is just a snapshot of the latest stable release. All development should be done in dedicated branches. Do not submit PRs against the master branch. They will be closed.
46+
- All pull requests should be sent to the `development` branch or the appropriate LTS branch (`releases/v{version}`).
47+
- It's OK to have multiple small commits as you work on the PR - GitHub will automatically squash it before merging.
48+
- Make sure all local tests pass before submitting the merge.
49+
- Please make sure all your pull requests have companion tests.
50+
- Please link the Jira issue in your PR title when sending the final PR
51+
52+
## Security Vulnerabilities
53+
54+
If you discover a security vulnerability, please send an email to the Ortus security team at [security@ortussolutions.com](mailto:security@ortussolutions.com?subject=security) and make sure you report it to the `#security` channel in our Box Team Slack Channel. All security vulnerabilities will be promptly addressed.
55+
56+
## Development Setup
57+
58+
1. Fork and Star our project.
59+
2. Make sure you have CommandBox installed: https://www.ortussolutions.com/products/commandbox#download
60+
3. Start a CommandBox shell in the root of the project: `box`
61+
4. Install the development dependencies: `run-script install:dependencies`
62+
5. Hack away! Create tests under `/test-harness/specs` or wherever they are set in the project and run the tests!
63+
64+
## Language Compatibility
65+
66+
Please make sure your code runs on the following CFML Engines:
67+
68+
- Lucee 5+
69+
- Adobe ColdFusion 2018+
70+
71+
## Coding Styles & Formatting
72+
73+
We are big on coding styles and have included a `.cfformat.json` in the root of the project so that you can run the formatting tools and CommandBox scripts:
74+
75+
```bash
76+
# Format everything
77+
box run-script format
78+
79+
# Start a watcher, type away, save and auto-format for you
80+
box run-script format:watch
81+
```
82+
83+
We recommend that anytime you hack on the core you start the formatter watcher (`box run-script format:watch`). This will monitor your changes and auto-format your code for you.
84+
85+
You can also see the Ortus Coding Standards you must follow here: https://github.com/Ortus-Solutions/coding-standards.
86+
87+
## CFC Docs With DocBox
88+
89+
All CFCs are self-documenting and we leverage [DocBox](https://docbox.ortusbooks.com/) to document the entire software. All functions must be properly documented using the DocBox syntax: https://docbox.ortusbooks.com/getting-started/annotating-your-code
90+
91+
92+
## Financial Contributions
93+
94+
You can support ColdBox and all of our Open Source initiatives at Ortus Solutions by becoming a patreon. You can also get lots of goodies and services depending on the level of contributions.
95+
96+
- [Become a backer or sponsor on Patreon](https://www.patreon.com/ortussolutions)
97+
- [One-time donations via PayPal](https://www.paypal.com/paypalme/ortussolutions)
98+
99+
## Contributors
100+
101+
Thank you to all the people who have already contributed to coldbox-cli! We :heart: :heart: :heart: love you!
102+
103+
104+
<a href = "https://github.com/coldbox/coldbox-cli/graphs/contributors">
105+
<img src = "https://contrib.rocks/image?repo=coldbox/coldbox-cli"/>
106+
</a>
107+
108+
Made with [contributors-img](https://contrib.rocks)

box.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name":"ColdBox CLI",
3-
"version":"7.2.1",
3+
"version":"7.3.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",
@@ -25,11 +25,11 @@
2525
],
2626
"devDependencies":{
2727
"commandbox-cfformat":"*",
28-
"commandbox-docbox":"*"
28+
"commandbox-docbox":"*",
29+
"commandbox-migrations":"^5.0.0",
30+
"testbox-cli":"^1.0.0"
2931
},
3032
"dependencies":{
31-
"commandbox-migrations":"^5.0.0",
32-
"testbox-cli":"^1.0.0"
3333
},
3434
"installPaths":{},
3535
"ignore":[

0 commit comments

Comments
 (0)