Skip to content

Commit 6386dac

Browse files
lmajanolmajano
committed
move to unified workbench
1 parent 025a251 commit 6386dac

File tree

11 files changed

+194
-136
lines changed

11 files changed

+194
-136
lines changed

‎.gitignore‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,18 @@
1+
# IDE Stuff
12
.settings
2-
logs/*.log
33
settings.xml
4-
.netbeans
4+
5+
# Logs
6+
logs/*.log
7+
8+
# Test Results
59
tests/results/*
6-
modules/cbi18n
10+
11+
# Dependenncies
712
coldbox/*
813
testbox/*
914
artifacts/*
1015
apidocs/docbox/*
11-
workbench/build.number
12-
build/*
16+
workbench/*
17+
build/*
18+
modules/cbi18n

‎.module.properties‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
project.name=cbvalidation
2+
project.version=1.3.0
3+
module.name=cbvalidation

‎.travis.yml‎

Lines changed: 69 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,27 @@
11
language: java
22

3+
notifications:
4+
slack:
5+
secure: FIHlTn/YO7Wgumm1uIqmoEsqjQA7fV0AE94Rjc5yKzM3AquQa8HicgDVVk0d2GrKRnl0xt3j4ZJV//VJyIjlCd/QVKuj48R2ChjEY2im3+99HFPafCUI5/S2uyowKU6mJTFonH9v6p41eqxdbiAxJdDGOT0V2Gpt3UBSNuHz8ED9/aIHqv+P7M+VD6Xd2XYwctPniWlaSWx57sWcnG/VkFG45qFQAyha64uxOOe4M3ZmG/n5FfauZ8cBVLiRKEIr+CyNhh1ujfzi7+4uzMlSNL5t/BbZamAQuZzqGzGQ9RVvIlyPgUGNJtDEE/hWS09aagXF5T6EMj00szizErh4J1/x4qZwml5+TcBN31E0QmAhCtZe85sr3tYgic+hEz9XX1yymQzf/C7n4to2yNvq0r4g51xDk8IuP95WEh7zaqLlvFZvBFgxpHZBMYlRvhytjOYDeIFRMcGwHZcXosaG2ejqDwcGq/LC4oeG4sSwmg9sdRrtcmcanrNqrBka86WYO6LntI3JdZ86/1ACEUHzhCCwvrKELc9Ji1xxGAgS7QKH+s2/hnJuiMyv73gOVLKYC+wPMLt+fvOmPLSEl+PJiAIlToBq1KUBg03RSQLfPOLD7OrJ8VvDZsEPwejqlGDyc4wRglS9OTi7SnN5LYHSDNDdGdREegWqq9qDHEYEVLI=
6+
7+
env:
8+
global:
9+
- MODULE_ID=cbvalidation
10+
matrix:
11+
- [email protected]
12+
- ENGINE=lucee@5
13+
- ENGINE=adobe@11
14+
- ENGINE=adobe@2016
15+
316
branches:
417
only:
518
- development
619
- master
720

8-
sudo: required
9-
1021
dist: trusty
1122

23+
sudo: required
24+
1225
before_install:
1326
# CommandBox Keys
1427
- sudo apt-key adv --keyserver keys.gnupg.net --recv 6DA70622
@@ -17,43 +30,70 @@ before_install:
1730

1831
install:
1932
# Install Commandbox
20-
- sudo apt-get update && sudo apt-get --assume-yes install commandbox
33+
- sudo apt-get update && sudo apt-get --assume-yes install git haveged rsync commandbox
2134
# Test that the box binary is available and ready for our tests
2235
- box version
23-
# Store the Ortus API Key for forgebox publishing in `master`
36+
# If using auto-publish, you will need to provide your API token with this line:
2437
- box config set endpoints.forgebox.APIToken=$FORGEBOX_API_TOKEN > /dev/null
25-
# Startup Server
26-
- box server start
38+
# Setup for our tests
39+
- mkdir tests/results
40+
- sudo chmod -R 775 tests/results
2741

42+
# Build script - note module versioning is passed to ANT
2843
script:
29-
# Execute build via ANT
30-
- ant -DisTravis=true -Dbuild.number=$TRAVIS_BUILD_NUMBER -f workbench/build.xml
31-
# Spit out log just in case we need to debug
32-
- box server log
44+
# run our dependency install to ensure the workbench is in place
45+
- box install
46+
# add our module-specific build properties
47+
- printf "\nmodule.name=$MODULE_ID" >> workbench/build.properties
48+
- printf "\ncfengine=$ENGINE" >> workbench/build.properties
49+
# execute our build
50+
- ant -DisTravis=true -Dbuild.number=$TRAVIS_BUILD_NUMBER -Dbuild.branch=$TRAVIS_BRANCH -f workbench/build.xml
3351

34-
# Only executed when merging to master
52+
after_failure:
53+
- cd $TRAVIS_BUILD_DIR
54+
# Display the contents of our root directory
55+
# Spit out our Commandbox log in case we need to debug
56+
- box server log name=$ENGINE
57+
- cat `box system-log`
58+
3559
before_deploy:
36-
- mkdir s3deploy
37-
- cp -r ./artifacts/cbvalidation/* ./s3deploy/
60+
- cd $TRAVIS_BUILD_DIR
61+
- mkdir -p s3deploy
62+
- rsync -av ./artifacts/$MODULE_ID/ ./s3deploy/
3863
- rm -f ./s3deploy/box-repo.json
3964

4065
deploy:
41-
on:
42-
branch:
43-
- master
44-
skip_cleanup: true
45-
provider: s3
46-
#AWS Credentials need to be set in Travis
47-
access_key_id: $AWS_ACCESS_KEY
48-
secret_access_key: $AWS_ACCESS_SECRET
49-
bucket: "downloads.ortussolutions.com"
50-
local-dir: s3deploy
51-
upload-dir: ortussolutions/coldbox-modules/cbvalidation
52-
acl: public_read
66+
#Module Deployment
67+
- provider: s3
68+
on:
69+
branch:
70+
- master
71+
- development
72+
condition: "$ENGINE = [email protected]"
73+
skip_cleanup: true
74+
#AWS Credentials need to be set in Travis
75+
access_key_id: $AWS_ACCESS_KEY
76+
secret_access_key: $AWS_ACCESS_SECRET
77+
bucket: "downloads.ortussolutions.com"
78+
local-dir: s3deploy
79+
upload-dir: ortussolutions/coldbox-modules/$MODULE_ID
80+
acl: public_read
81+
#API Docs Deployment
82+
- provider: s3
83+
on:
84+
branch:
85+
- master
86+
- development
87+
condition: "$ENGINE = [email protected]"
88+
skip_cleanup: true
89+
#AWS Credentials need to be set in Travis
90+
access_key_id: $AWS_ACCESS_KEY
91+
secret_access_key: $AWS_ACCESS_SECRET
92+
bucket: "apidocs.ortussolutions.com"
93+
local-dir: build/apidocs
94+
upload-dir: coldbox-modules/$MODULE_ID
95+
acl: public_read
96+
5397

5498
after_deploy:
5599
- cd $TRAVIS_BUILD_DIR/build && box forgebox publish
56-
57-
notifications:
58-
slack:
59-
secure: FIHlTn/YO7Wgumm1uIqmoEsqjQA7fV0AE94Rjc5yKzM3AquQa8HicgDVVk0d2GrKRnl0xt3j4ZJV//VJyIjlCd/QVKuj48R2ChjEY2im3+99HFPafCUI5/S2uyowKU6mJTFonH9v6p41eqxdbiAxJdDGOT0V2Gpt3UBSNuHz8ED9/aIHqv+P7M+VD6Xd2XYwctPniWlaSWx57sWcnG/VkFG45qFQAyha64uxOOe4M3ZmG/n5FfauZ8cBVLiRKEIr+CyNhh1ujfzi7+4uzMlSNL5t/BbZamAQuZzqGzGQ9RVvIlyPgUGNJtDEE/hWS09aagXF5T6EMj00szizErh4J1/x4qZwml5+TcBN31E0QmAhCtZe85sr3tYgic+hEz9XX1yymQzf/C7n4to2yNvq0r4g51xDk8IuP95WEh7zaqLlvFZvBFgxpHZBMYlRvhytjOYDeIFRMcGwHZcXosaG2ejqDwcGq/LC4oeG4sSwmg9sdRrtcmcanrNqrBka86WYO6LntI3JdZ86/1ACEUHzhCCwvrKELc9Ji1xxGAgS7QKH+s2/hnJuiMyv73gOVLKYC+wPMLt+fvOmPLSEl+PJiAIlToBq1KUBg03RSQLfPOLD7OrJ8VvDZsEPwejqlGDyc4wRglS9OTi7SnN5LYHSDNDdGdREegWqq9qDHEYEVLI=

‎apidocs/box.json‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
2-
"name":"API Docs",
3-
"version":"1.0.0",
4-
"slug":"module-apidocs",
5-
"private":true,
6-
"dependencies":{
7-
"docbox":"^2.0.7+00005"
2+
"name": "API Docs",
3+
"version": "1.0.0",
4+
"slug": "module-apidocs",
5+
"private": true,
6+
"dependencies": {
7+
"docbox": "^2.0.7+00005"
88
},
9-
"devDependencies":{
10-
9+
"devDependencies": {
10+
1111
},
12-
"installPaths":{
13-
"docbox":"docbox"
12+
"installPaths": {
13+
"docbox": "docbox"
1414
}
1515
}

‎box.json‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,26 @@
11
{
22
"name":"CBValidation Builder",
3-
"version":"1.0.0",
3+
"version":"1.3.0",
44
"slug":"cbvalidation-shell",
55
"private":false,
66
"dependencies":{
77
"cbi18n":"^1.3.1",
8-
"coldbox":"^4.3.0"
8+
"coldbox":"^4.3.0",
9+
"workbench":"git+https://github.com/Ortus-Solutions/unified-workbench.git"
910
},
1011
"devDependencies":{
11-
"testbox":"^2.3.0+00044"
12+
"testbox":"^2.5.0"
1213
},
1314
"installPaths":{
14-
"cbi18n":"modules/cbi18n",
15+
"cbi18n":"modules/cbi18n/",
1516
"coldbox":"coldbox",
16-
"testbox":"testbox"
17+
"testbox":"testbox",
18+
"workbench":"workbench/"
19+
},
20+
"testbox":{
21+
"runner":"http://localhost:49616"
22+
},
23+
"scripts":{
24+
"postVersion":"recipe workbench/bump.boxr"
1725
}
1826
}

‎changelog.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ CHANGELOG
88
* `MinValidator` The explanation needs to better reflect the min validator which is >=
99
* Allow custom validators to be specified just by key and the payload to be passed in as validation data
1010
* `GenericObject` Should return `null` on non-existent keys instead of an exception if not we cannot validate nullness
11+
* You can now pass a list of fields to ONLY validate via `validate()` methods using the `includeFields` argument.
1112

1213
## 1.2.1
1314
* Dependency updates

‎config/Coldbox.cfc‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
<cfcomponent output="false" hint="My App Configuration">
2-
<cfscript>
1+
component{
2+
33
// Configure ColdBox Application
44
function configure(){
55

@@ -62,7 +62,7 @@
6262
appenders = {
6363
files={class="coldbox.system.logging.appenders.RollingFileAppender",
6464
properties = {
65-
filename = "javaloader", filePath="/#appMapping#/logs"
65+
filename = "app", filePath="/#appMapping#/logs"
6666
}
6767
}
6868
},
@@ -75,16 +75,14 @@
7575
//Register interceptors as an array, we need order
7676
interceptors = [
7777
//SES
78-
{class="coldbox.system.interceptors.SES",
79-
properties={}
80-
}
78+
{ class="coldbox.system.interceptors.SES" }
8179
];
8280

8381
validation = {
8482
sharedConstraints = {
8583
"sharedUser" = {
86-
username = {required=true, size="6..20"},
87-
password = {required=true, size="6..20"}
84+
username = { required=true, size="6..20" },
85+
password = { required=true, size="6..20 "}
8886
}
8987
}
9088
};

‎server.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
2-
"force":true,
3-
"openbrowser":"false",
4-
"web":{
5-
"http":{
6-
"port":"49616"
2+
"force": true,
3+
"openbrowser": "false",
4+
"web": {
5+
"http": {
6+
"port": "49616"
77
}
88
}
99
}

‎tests/Application.cfc‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ component{
77
this.name = "A TestBox Runner Suite " & hash( getCurrentTemplatePath() );
88
// any other application.cfc stuff goes below:
99
this.sessionManagement = true;
10-
1110
// Turn on/off white space management
1211
this.whiteSpaceManagement = "smart";
1312

‎tests/test.properties‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,5 @@
1-
url.runner=http://localhost:49616/tests/runner.cfm?
1+
url.runners.lucee@4.5=http://127.0.0.1:50680/tests/runner.cfm?
2+
url.runners.lucee@5=http://127.0.0.1:50685/tests/runner.cfm?
3+
url.runners.adobe@10=http://127.0.0.1:49610/tests/runner.cfm?
4+
url.runners.adobe@11=http://127.0.0.1:49611/tests/runner.cfm?
5+
url.runners.adobe@2016=http://127.0.0.1:49616/tests/runner.cfm?

0 commit comments

Comments
 (0)