Skip to content

Commit e7b3aa2

Browse files
lmajanolmajano
committed
Merge branch 'development'
# Conflicts: # .travis.yml # box.json # changelog.md # modules/swagger-sdk/models/OpenAPI/Util.cfc # tests/test.properties
2 parents e79be3c + e54bf78 commit e7b3aa2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+1899
-1477
lines changed

‎.cfformat.json‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
{
2+
"brackets.padding": true,
3+
"strings.quote": "double",
4+
"strings.attributes.quote": "double",
5+
"function_call.empty_padding": false,
6+
"function_call.padding": true,
7+
"function_declaration.padding": true,
8+
"function_call.multiline.leading_comma.padding": true,
9+
"function_declaration.multiline.leading_comma.padding" : true,
10+
"function_declaration.empty_padding": false,
11+
"function_declaration.group_to_block_spacing": "compact",
12+
"struct.padding": true,
13+
"struct.empty_padding": false,
14+
"struct.multiline.leading_comma.padding" : true,
15+
"array.empty_padding":false,
16+
"array.padding":true,
17+
"array.multiline.leading_comma.padding":true,
18+
"binary_operators.padding":true,
19+
"for_loop_semicolons.padding":true,
20+
"indent_size":4,
21+
"parentheses.padding":true,
22+
"struct.separator":" : ",
23+
"tab_indent":true,
24+
"keywords.block_to_keyword_spacing" : "spaced",
25+
"keywords.group_to_block_spacing" : "spaced",
26+
"keywords.padding_inside_group" : true,
27+
"keywords.spacing_to_block" : "compact",
28+
"keywords.spacing_to_group" : true
29+
}

‎.cflintrc‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
{
2+
"rule": [],
3+
"includes": [
4+
{ "code": "AVOID_USING_CFINCLUDE_TAG" },
5+
{ "code": "AVOID_USING_CFABORT_TAG" },
6+
{ "code": "AVOID_USING_CFEXECUTE_TAG" },
7+
{ "code": "AVOID_USING_DEBUG_ATTR" },
8+
{ "code": "AVOID_USING_ABORT" },
9+
{ "code": "AVOID_USING_ISDATE" },
10+
{ "code": "AVOID_USING_ISDEBUGMODE" },
11+
{ "code": "AVOID_USING_CFINSERT_TAG" },
12+
{ "code": "AVOID_USING_CFUPDATE_TAG" },
13+
{ "code": "ARG_VAR_CONFLICT" },
14+
{ "code": "ARG_HINT_MISSING" },
15+
{ "code": "ARG_HINT_MISSING_SCRIPT" },
16+
{ "code" : "ARGUMENT_INVALID_NAME" },
17+
{ "code" : "ARGUMENT_ALLCAPS_NAME" },
18+
{ "code" : "ARGUMENT_TOO_WORDY" },
19+
{ "code" : "ARGUMENT_IS_TEMPORARY" },
20+
{ "code": "CFQUERYPARAM_REQ" },
21+
{ "code": "COMPARE_INSTEAD_OF_ASSIGN" },
22+
{ "code": "COMPONENT_HINT_MISSING" },
23+
{ "code" : "COMPONENT_INVALID_NAME" },
24+
{ "code" : "COMPONENT_ALLCAPS_NAME" },
25+
{ "code" : "COMPONENT_TOO_SHORT" },
26+
{ "code" : "COMPONENT_TOO_LONG" },
27+
{ "code" : "COMPONENT_TOO_WORDY" },
28+
{ "code" : "COMPONENT_IS_TEMPORARY" },
29+
{ "code" : "COMPONENT_HAS_PREFIX_OR_POSTFIX" },
30+
{ "code": "COMPLEX_BOOLEAN_CHECK" },
31+
{ "code": "EXCESSIVE_FUNCTION_LENGTH" },
32+
{ "code": "EXCESSIVE_COMPONENT_LENGTH" },
33+
{ "code": "EXCESSIVE_ARGUMENTS" },
34+
{ "code": "EXCESSIVE_FUNCTIONS" },
35+
{ "code": "EXPLICIT_BOOLEAN_CHECK" },
36+
{ "code": "FUNCTION_TOO_COMPLEX" },
37+
{ "code": "FUNCTION_HINT_MISSING" },
38+
{ "code": "FILE_SHOULD_START_WITH_LOWERCASE" },
39+
{ "code": "LOCAL_LITERAL_VALUE_USED_TOO_OFTEN" },
40+
{ "code": "GLOBAL_LITERAL_VALUE_USED_TOO_OFTEN" },
41+
{ "code": "MISSING_VAR" },
42+
{ "code" : "METHOD_INVALID_NAME" },
43+
{ "code" : "METHOD_ALLCAPS_NAME" },
44+
{ "code" : "METHOD_IS_TEMPORARY" },
45+
{ "code": "NESTED_CFOUTPUT" },
46+
{ "code": "NEVER_USE_QUERY_IN_CFM" },
47+
{ "code": "OUTPUT_ATTR" },
48+
{ "code" : "QUERYPARAM_REQ" },
49+
{ "code": "UNUSED_LOCAL_VARIABLE" },
50+
{ "code": "UNUSED_METHOD_ARGUMENT" },
51+
{ "code": "SQL_SELECT_STAR" },
52+
{ "code": "SCOPE_ALLCAPS_NAME" },
53+
{ "code": "VAR_ALLCAPS_NAME" },
54+
{ "code": "VAR_INVALID_NAME" },
55+
{ "code": "VAR_TOO_WORDY" }
56+
],
57+
"inheritParent": false,
58+
"parameters": {
59+
"TooManyFunctionsChecker.maximum" : 20
60+
}
61+
}

‎.editorconfig‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# http://editorconfig.org
2+
3+
root = true
4+
5+
[*]
6+
end_of_line = lf
7+
charset = utf-8
8+
trim_trailing_whitespace = true
9+
insert_final_newline = false
10+
indent_style = tab
11+
indent_size = 4
12+
tab_width = 4
13+
14+
[*.yml]
15+
indent_style = space
16+
indent_size = 2
17+
18+
[*.{md,markdown}]
19+
trim_trailing_whitespace = false
20+
insert_final_newline = false

‎.gitignore‎

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,14 @@
1-
.DS_Store
2-
Thumbs.db
3-
.settings
4-
logs/*
5-
settings.xml
6-
.netbeans
7-
/bower_components/*
8-
/bower_components
9-
/node_modules/*
10-
/node_modules
11-
tests/results/*
12-
apidocs/docbox/
13-
artifacts/
14-
workbench/
15-
build/*
16-
modules/*
17-
!modules/swagger-sdk
18-
coldbox
19-
testbox
1+
.vscode
2+
3+
.artifacts/**
4+
.tmp/**
5+
6+
test-harness/.engine/**
7+
test-harness/coldbox/**
8+
test-harness/docbox/**
9+
test-harness/testbox/**
10+
test-harness/logs/**
11+
test-harness/modules/**
12+
13+
# log files
14+
logs/**

‎.module.properties‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎.travis.yml‎

Lines changed: 105 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -1,72 +1,108 @@
11
language: java
2-
notifications:
3-
slack:
4-
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=
5-
env:
6-
global:
7-
- MODULE_ID=swagger-sdk
8-
matrix:
9-
- ENGINE=lucee@5
10-
- [email protected]
11-
- ENGINE=adobe@2018
12-
- ENGINE=adobe@2016
13-
- ENGINE=adobe@11
14-
- ENGINE=adobe@10
15-
branches:
16-
only:
17-
- development
18-
- master
2+
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+
# Fill out these global variables for build process
9+
global:
10+
- MODULE_ID=swagger-sdk
11+
matrix:
12+
- ENGINE=lucee@5
13+
- ENGINE=adobe@2016
14+
- ENGINE=adobe@2018
15+
16+
branches:
17+
only:
18+
- development
19+
- master
20+
1921
dist: trusty
22+
2023
sudo: required
21-
before_install:
22-
- curl -fsSl https://downloads.ortussolutions.com/debs/gpg | sudo apt-key add -
23-
- sudo echo "deb http://downloads.ortussolutions.com/debs/noarch /" | sudo tee -a /etc/apt/sources.list.d/commandbox.list
24-
install:
25-
- sudo apt-get update && sudo apt-get --assume-yes install git haveged rsync commandbox
26-
- box version
27-
- box config set endpoints.forgebox.APIToken=$FORGEBOX_API_TOKEN > /dev/null
28-
- mkdir tests/results
29-
- sudo chmod -R 775 tests/results
30-
script:
31-
- box install
32-
- printf "\nmodule.name=$MODULE_ID" >> workbench/build.properties
33-
- printf "\ncfengine=$ENGINE" >> workbench/build.properties
34-
- printf "\ncfengine=$ENGINE" >> workbench/build.properties
35-
- ant -DisTravis=true -Dbuild.number=$TRAVIS_BUILD_NUMBER -Dbuild.branch=$TRAVIS_BRANCH -f workbench/build.xml
36-
after_failure:
37-
- cd $TRAVIS_BUILD_DIR
38-
- box server log name=$ENGINE
39-
- cat `box system-log`
40-
before_deploy:
41-
- cd $TRAVIS_BUILD_DIR
42-
- mkdir -p s3deploy
43-
- rsync -av ./artifacts/$MODULE_ID/ ./s3deploy/
44-
- rm -f ./s3deploy/box-repo.json
45-
deploy:
46-
- provider: s3
47-
on:
48-
branch:
49-
- master
50-
- development
51-
condition: $ENGINE = [email protected]
52-
skip_cleanup: true
53-
access_key_id: $AWS_ACCESS_KEY
54-
secret_access_key: $AWS_ACCESS_SECRET
55-
bucket: downloads.ortussolutions.com
56-
local-dir: s3deploy
57-
upload-dir: ortussolutions/coldbox-modules/$MODULE_ID
58-
acl: public_read
59-
- provider: s3
60-
on:
61-
branch:
62-
- master
63-
condition: $ENGINE = [email protected]
64-
skip_cleanup: true
65-
access_key_id: $AWS_ACCESS_KEY
66-
secret_access_key: $AWS_ACCESS_SECRET
67-
bucket: apidocs.ortussolutions.com
68-
local-dir: build/apidocs
69-
upload-dir: coldbox-modules/$MODULE_ID
70-
acl: public_read
71-
after_deploy:
72-
- cd $TRAVIS_BUILD_DIR/build && box forgebox publish
24+
25+
before_install:
26+
# CommandBox Keys
27+
- curl -fsSl https://downloads.ortussolutions.com/debs/gpg | sudo apt-key add -
28+
- sudo echo "deb https://downloads.ortussolutions.com/debs/noarch /" | sudo tee -a
29+
/etc/apt/sources.list.d/commandbox.list
30+
31+
install:
32+
# Install Commandbox
33+
- sudo apt-get update && sudo apt-get --assume-yes install rsync jq commandbox
34+
# Install CommandBox Supporting Librarires
35+
- box install commandbox-cfconfig,commandbox-dotenv,commandbox-docbox
36+
# If using auto-publish, you will need to provide your API token with this line:
37+
- box config set endpoints.forgebox.APIToken=$FORGEBOX_API_TOKEN > /dev/null
38+
39+
script:
40+
# Set Current Version
41+
- TARGET_VERSION=`cat $TRAVIS_BUILD_DIR/box.json | jq '.version' -r`
42+
- echo "Starting build for ${MODULE_ID} v${TARGET_VERSION}"
43+
# Replace version so builder can issue it
44+
- box package set [email protected]@[email protected]@
45+
# Startup the harness
46+
- cd test-harness
47+
# run our dependency install to ensure the workbench is in place
48+
- box install
49+
# run our matrix server
50+
- box server start serverConfigFile="server-${ENGINE}.json"
51+
# Startup the app
52+
- curl http://localhost:60299
53+
# Debugging of tests
54+
#- curl http://localhost:60299/tests/runner.cfm?reporter=json -o testresults.json && cat testresults.json
55+
# move back to build dir to build it
56+
- cd $TRAVIS_BUILD_DIR
57+
# Build Project
58+
- box task run taskfile=build/Build target=run :version=${TARGET_VERSION} :projectName=${MODULE_ID} :buildID=${TRAVIS_BUILD_NUMBER} :branch=${TRAVIS_BRANCH}
59+
# Cat results for debugging
60+
- cat build/results.json
61+
62+
after_failure:
63+
- cd $TRAVIS_BUILD_DIR/test-harness
64+
# Display the contents of our root directory
65+
# Spit out our Commandbox log in case we need to debug
66+
- box server log server-${ENGINE}.json
67+
- cat `box system-log`
68+
69+
deploy:
70+
# Module Deployment
71+
- provider: s3
72+
on:
73+
branch:
74+
- master
75+
- development
76+
condition: "$ENGINE = lucee@5"
77+
skip_cleanup: true
78+
#AWS Credentials need to be set in Travis
79+
access_key_id: $AWS_ACCESS_KEY
80+
secret_access_key: $AWS_ACCESS_SECRET
81+
# Destination
82+
bucket: "downloads.ortussolutions.com"
83+
local-dir: $TRAVIS_BUILD_DIR/.artifacts/$MODULE_ID
84+
upload-dir: ortussolutions/coldbox-modules/$MODULE_ID
85+
acl: public_read
86+
87+
# API Docs Deployment
88+
- provider: s3
89+
on:
90+
branch:
91+
- master
92+
- development
93+
condition: "$ENGINE = lucee@5"
94+
skip_cleanup: true
95+
#AWS Credentials need to be set in Travis
96+
access_key_id: $AWS_ACCESS_KEY
97+
secret_access_key: $AWS_ACCESS_SECRET
98+
bucket: "apidocs.ortussolutions.com"
99+
local-dir: $TRAVIS_BUILD_DIR/.tmp/apidocs
100+
upload-dir: coldbox-modules/$MODULE_ID/$TARGET_VERSION
101+
acl: public_read
102+
103+
after_deploy:
104+
# Move to build out artifact
105+
- cd ${TRAVIS_BUILD_DIR}/.tmp/${MODULE_ID}
106+
- cat box.json
107+
# Only publish once
108+
- if [ ${ENGINE} = 'lucee@5' ]; then box forgebox publish; fi

0 commit comments

Comments
 (0)