Merge branch 'development'

.cfformat.json

@@ -0,0 +1,29 @@
+{
+    "brackets.padding": true,
+	"strings.quote": "double",
+	"strings.attributes.quote": "double",
+	"function_call.empty_padding": false,
+    "function_call.padding": true,
+	"function_declaration.padding": true,
+	"function_call.multiline.leading_comma.padding": true,
+	"function_declaration.multiline.leading_comma.padding" : true,
+	"function_declaration.empty_padding": false,
+	"function_declaration.group_to_block_spacing": "compact",
+	"struct.padding": true,
+	"struct.empty_padding": false,
+	"struct.multiline.leading_comma.padding" : true,
+	"array.empty_padding":false,
+    "array.padding":true,
+    "array.multiline.leading_comma.padding":true,
+    "binary_operators.padding":true,
+    "for_loop_semicolons.padding":true,
+    "indent_size":4,
+    "parentheses.padding":true,
+    "struct.separator":" : ",
+	"tab_indent":true,
+	"keywords.block_to_keyword_spacing" : "spaced",
+	"keywords.group_to_block_spacing" : "spaced",
+	"keywords.padding_inside_group" : true,
+	"keywords.spacing_to_block" : "compact",
+	"keywords.spacing_to_group" : true
+}

.cflintrc

@@ -0,0 +1,61 @@
+{
+    "rule": [],
+    "includes": [
+        { "code": "AVOID_USING_CFINCLUDE_TAG" },
+		{ "code": "AVOID_USING_CFABORT_TAG" },
+		{ "code": "AVOID_USING_CFEXECUTE_TAG" },
+		{ "code": "AVOID_USING_DEBUG_ATTR" },
+		{ "code": "AVOID_USING_ABORT" },
+		{ "code": "AVOID_USING_ISDATE" },
+		{ "code": "AVOID_USING_ISDEBUGMODE" },
+		{ "code": "AVOID_USING_CFINSERT_TAG" },
+		{ "code": "AVOID_USING_CFUPDATE_TAG" },
+		{ "code": "ARG_VAR_CONFLICT" },
+		{ "code": "ARG_HINT_MISSING" },
+		{ "code": "ARG_HINT_MISSING_SCRIPT" },
+		{ "code" : "ARGUMENT_INVALID_NAME" },
+		{ "code" : "ARGUMENT_ALLCAPS_NAME" },
+		{ "code" : "ARGUMENT_TOO_WORDY" },
+		{ "code" : "ARGUMENT_IS_TEMPORARY" },
+        { "code": "CFQUERYPARAM_REQ" },
+        { "code": "COMPARE_INSTEAD_OF_ASSIGN" },
+		{ "code": "COMPONENT_HINT_MISSING" },
+		{ "code" : "COMPONENT_INVALID_NAME" },
+		{ "code" : "COMPONENT_ALLCAPS_NAME" },
+		{ "code" : "COMPONENT_TOO_SHORT" },
+		{ "code" : "COMPONENT_TOO_LONG" },
+		{ "code" : "COMPONENT_TOO_WORDY" },
+		{ "code" : "COMPONENT_IS_TEMPORARY" },
+		{ "code" : "COMPONENT_HAS_PREFIX_OR_POSTFIX" },
+		{ "code": "COMPLEX_BOOLEAN_CHECK" },
+        { "code": "EXCESSIVE_FUNCTION_LENGTH" },
+        { "code": "EXCESSIVE_COMPONENT_LENGTH" },
+        { "code": "EXCESSIVE_ARGUMENTS" },
+		{ "code": "EXCESSIVE_FUNCTIONS" },
+		{ "code": "EXPLICIT_BOOLEAN_CHECK" },
+        { "code": "FUNCTION_TOO_COMPLEX" },
+		{ "code": "FUNCTION_HINT_MISSING" },
+		{ "code": "FILE_SHOULD_START_WITH_LOWERCASE" },
+        { "code": "LOCAL_LITERAL_VALUE_USED_TOO_OFTEN" },
+        { "code": "GLOBAL_LITERAL_VALUE_USED_TOO_OFTEN" },
+		{ "code": "MISSING_VAR" },
+		{ "code" : "METHOD_INVALID_NAME" },
+		{ "code" : "METHOD_ALLCAPS_NAME" },
+		{ "code" : "METHOD_IS_TEMPORARY" },
+		{ "code": "NESTED_CFOUTPUT" },
+		{ "code": "NEVER_USE_QUERY_IN_CFM" },
+		{ "code": "OUTPUT_ATTR" },
+		{ "code" : "QUERYPARAM_REQ" },
+        { "code": "UNUSED_LOCAL_VARIABLE" },
+        { "code": "UNUSED_METHOD_ARGUMENT" },
+		{ "code": "SQL_SELECT_STAR" },
+		{ "code": "SCOPE_ALLCAPS_NAME" },
+		{ "code": "VAR_ALLCAPS_NAME" },
+		{ "code": "VAR_INVALID_NAME" },
+		{ "code": "VAR_TOO_WORDY" }
+    ],
+    "inheritParent": false,
+    "parameters": {
+		"TooManyFunctionsChecker.maximum" : 20
+	}
+}

.editorconfig

@@ -0,0 +1,20 @@
+# http://editorconfig.org
+
+root = true
+
+[*]
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = false
+indent_style = tab
+indent_size = 4
+tab_width = 4
+
+[*.yml]
+indent_style = space
+indent_size = 2
+
+[*.{md,markdown}]
+trim_trailing_whitespace = false
+insert_final_newline = false

.gitignore

@@ -1,21 +1,14 @@
-.DS_Store
-Thumbs.db
-.settings
-logs/*
-settings.xml
-.vscode/*
-.netbeans
-/bower_components/*
-/bower_components
-/node_modules/*
-/node_modules
-tests/results/*
-apidocs/docbox/
-artifacts/
-workbench/build.number
-build/*
-modules/*
-!modules/cbi18n
-!modules/test1
-coldbox
-testbox
+.vscode
+
+.artifacts/**
+.tmp/**
+
+test-harness/.engine/**
+test-harness/coldbox/**
+test-harness/docbox/**
+test-harness/testbox/**
+test-harness/logs/**
+test-harness/modules/**
+
+# log files
+logs/**

.travis.yml

@@ -1,98 +1,109 @@
 language: java
 
-sudo: required
-
 notifications:
   slack:
     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=
 
 env:
+  # Fill out these global variables for build process
   global:
     - MODULE_ID=cbi18n
   matrix:
-    - [email protected]
     - ENGINE=lucee@5
     - ENGINE=adobe@11
     - ENGINE=adobe@2016
+    - ENGINE=adobe@2018
 
 branches:
   only:
   - development
   - master
 
+dist: trusty
+
+sudo: required
+
 before_install:
   # CommandBox Keys
-  - sudo apt-key adv --keyserver keys.gnupg.net --recv 6DA70622
+  - curl -fsSl https://downloads.ortussolutions.com/debs/gpg | sudo apt-key add -
   - sudo echo "deb http://downloads.ortussolutions.com/debs/noarch /" | sudo tee -a
     /etc/apt/sources.list.d/commandbox.list
 
 install:
   # Install Commandbox
   - sudo apt-get update && sudo apt-get --assume-yes install rsync jq commandbox
-  # Test that the box binary is available and ready for our tests
-  - box version
+  # Install CommandBox Supporting Librarires
+  - box install commandbox-cfconfig,commandbox-dotenv,commandbox-docbox
   # If using auto-publish, you will need to provide your API token with this line:
   - box config set endpoints.forgebox.APIToken=$FORGEBOX_API_TOKEN > /dev/null
-  # Setup for our tests
-  - mkdir tests/results
-  - sudo chmod -R 775 tests/results
 
-# Build script - note module versioning is passed to ANT
 script:
+  # Set Current Version
+  - TARGET_VERSION=`cat $TRAVIS_BUILD_DIR/box.json | jq '.version' -r`
+  - echo "Starting build for ${MODULE_ID} v${TARGET_VERSION}"
+  # Replace version so builder can issue it
+  - box package set [email protected]@[email protected]@
+  # Startup the harness
+  - cd test-harness
   # run our dependency install to ensure the workbench is in place
   - box install
-  # add our module-specific build properties
-  - printf "\nmodule.name=$MODULE_ID" >> workbench/build.properties
-  - printf "\ncfengine=$ENGINE" >> workbench/build.properties
-  # execute our build
-  - ant -DisTravis=true -Dbuild.number=$TRAVIS_BUILD_NUMBER -Dbuild.branch=$TRAVIS_BRANCH -f workbench/build.xml
+  # run our matrix server
+  - box server start serverConfigFile="server-${ENGINE}.json"
+  # Startup the app
+  - curl http://localhost:60299
+  # Debugging of tests
+  #- curl http://localhost:60299/tests/runner.cfm?reporter=json -o testresults.json && cat testresults.json
+  # move back to build dir to build it
+  - cd $TRAVIS_BUILD_DIR
+  # Build Project
+  - box task run taskfile=build/Build target=run :version=${TARGET_VERSION} :projectName=${MODULE_ID} :buildID=${TRAVIS_BUILD_NUMBER} :branch=${TRAVIS_BRANCH}
+  # Cat results for debugging
+  - cat build/results.json
 
 after_failure:
-  - cd $TRAVIS_BUILD_DIR
+  - cd $TRAVIS_BUILD_DIR/test-harness
   # Display the contents of our root directory
   # Spit out our Commandbox log in case we need to debug
-  - box server log name=$ENGINE
+  - box server log server-${ENGINE}.json
   - cat `box system-log`
 
-# Only executed when merging to master 
-before_deploy:
-  - cd $TRAVIS_BUILD_DIR
-  - mkdir -p s3deploy
-  - rsync -av ./artifacts/$MODULE_ID/ ./s3deploy/
-  - rm -f ./s3deploy/box-repo.json
-
 deploy:
-  #Module Deployment
+  # Module Deployment
   - provider: s3
     on:
-      branch: 
+      branch:
         - master
         - development
-      condition: "$ENGINE = lucee@4.5"
+      condition: "$ENGINE = lucee@5"
     skip_cleanup: true
     #AWS Credentials need to be set in Travis
     access_key_id: $AWS_ACCESS_KEY
     secret_access_key: $AWS_ACCESS_SECRET
+    # Destination
     bucket: "downloads.ortussolutions.com"
-    local-dir: s3deploy
+    local-dir: $TRAVIS_BUILD_DIR/.artifacts/$MODULE_ID
     upload-dir: ortussolutions/coldbox-modules/$MODULE_ID
     acl: public_read
-  #API Docs Deployment
+
+  # API Docs Deployment
   - provider: s3
     on:
-      branch: 
+      branch:
         - master
         - development
-      condition: "$ENGINE = lucee@4.5"
+      condition: "$ENGINE = lucee@5"
     skip_cleanup: true
     #AWS Credentials need to be set in Travis
     access_key_id: $AWS_ACCESS_KEY
     secret_access_key: $AWS_ACCESS_SECRET
     bucket: "apidocs.ortussolutions.com"
-    local-dir: build/apidocs
-    upload-dir: coldbox-modules/$MODULE_ID
+    local-dir: $TRAVIS_BUILD_DIR/.tmp/apidocs
+    upload-dir: coldbox-modules/$MODULE_ID/$TARGET_VERSION
     acl: public_read
 
-
 after_deploy:
-  - cd $TRAVIS_BUILD_DIR/build && box forgebox publish
+  # Move to build out artifact
+  - cd ${TRAVIS_BUILD_DIR}/.tmp/${MODULE_ID}
+  - cat box.json
+  # Only publish once
+  - if [ ${ENGINE} = 'lucee@5' ]; then box forgebox publish; fi