v3.3.0 Release

Author: lmajano

.babelrc

@@ -1,23 +1,7 @@
 {
 	"plugins": [
-		"@babel/plugin-syntax-dynamic-import"
 	],
-	"env": {
-		"test": {
-			"plugins": [
-				"dynamic-import-node"
-			],
-			"presets": [
-				[
-					"@babel/preset-env",
-					{
-						"modules": "commonjs",
-						"targets": {
-							"node": "current"
-						}
-					}
-				]
-			]
-		}
-	}
-}
+	"presets" : [
+		"@babel/preset-env"
+	]
+}

test-harness/.cfconfig.json renamed to .cfconfig.json

@@ -4,7 +4,7 @@
     "debuggingReportExecutionTimes":false,
     "disableInternalCFJavaComponents":false,
     "inspectTemplate":"always",
-    "requestTimeout":"0,0,0,90",
+    "requestTimeout":"0,0,5,0",
     "robustExceptionEnabled":true,
 	"datasources": {
         "coolblog": {
@@ -23,4 +23,4 @@
 			"validate":"false"
         }
     }
-}
+}

.cfformat.json

@@ -1,13 +1,14 @@
 {
 	"array.empty_padding": false,
 	"array.padding": true,
-	"array.multiline.min_length": 40,
+	"array.multiline.min_length": 50,
 	"array.multiline.element_count": 2,
 	"array.multiline.leading_comma.padding": true,
 	"array.multiline.leading_comma": false,
 	"alignment.consecutive.assignments": true,
 	"alignment.consecutive.properties": true,
 	"alignment.consecutive.params": true,
+	"alignment.doc_comments" : true,
 	"brackets.padding": true,
 	"comment.asterisks": "align",
 	"binary_operators.padding": true,
@@ -17,22 +18,22 @@
 	"function_call.multiline.leading_comma.padding": true,
 	"function_call.casing.builtin": "cfdocs",
 	"function_call.casing.userdefined": "camel",
-	"function_call.multiline.element_count": 2,
+	"function_call.multiline.element_count": 3,
 	"function_call.multiline.leading_comma": false,
-	"function_call.multiline.min_length": 40,
+	"function_call.multiline.min_length": 50,
 	"function_declaration.padding": true,
 	"function_declaration.empty_padding": false,
 	"function_declaration.multiline.leading_comma": false,
 	"function_declaration.multiline.leading_comma.padding": true,
-	"function_declaration.multiline.element_count": 2,
-	"function_declaration.multiline.min_length": 40,
+	"function_declaration.multiline.element_count": 3,
+	"function_declaration.multiline.min_length": 50,
 	"function_declaration.group_to_block_spacing": "compact",
 	"function_anonymous.empty_padding": false,
 	"function_anonymous.group_to_block_spacing": "compact",
-	"function_anonymous.multiline.element_count": 2,
+	"function_anonymous.multiline.element_count": 3,
 	"function_anonymous.multiline.leading_comma": false,
 	"function_anonymous.multiline.leading_comma.padding": true,
-	"function_anonymous.multiline.min_length": 40,
+	"function_anonymous.multiline.min_length": 50,
 	"function_anonymous.padding": true,
 	"indent_size": 4,
 	"keywords.block_to_keyword_spacing": "spaced",
@@ -41,13 +42,13 @@
 	"keywords.spacing_to_block": "spaced",
 	"keywords.spacing_to_group": true,
 	"keywords.empty_group_spacing": false,
-	"max_columns": 120,
+	"max_columns": 115,
 	"metadata.multiline.element_count": 3,
-	"metadata.multiline.min_length": 40,
-	"method_call.chain.multiline": 3,
-	"newline": "\n",
+	"metadata.multiline.min_length": 50,
+	"method_call.chain.multiline" : 3,
+	"newline":"\n",
 	"property.multiline.element_count": 3,
-	"property.multiline.min_length": 40,
+	"property.multiline.min_length": 30,
 	"parentheses.padding": true,
 	"strings.quote": "double",
 	"strings.attributes.quote": "double",
@@ -57,6 +58,6 @@
 	"struct.multiline.leading_comma": false,
 	"struct.multiline.leading_comma.padding": true,
 	"struct.multiline.element_count": 2,
-	"struct.multiline.min_length": 40,
+	"struct.multiline.min_length": 60,
 	"tab_indent": true
-}
+}

test-harness/.env.template renamed to .env.template

@@ -0,0 +1 @@
+patreon: ortussolutions

.github/FUNDING.YML

@@ -1,4 +1,4 @@
-name: cbDebugger CI
+name: cbdebugger CI
 
 # Only on Development we build snapshots
 on:
@@ -15,121 +15,9 @@ jobs:
   # Tests First baby! We fail, no build :(
   #############################################
   tests:
-    name: Tests
-    runs-on: ubuntu-20.04
-    env:
-      DB_USER: root
-      DB_PASSWORD: root
-    strategy:
-      fail-fast: false
-      matrix:
-        cfengine: [ "lucee@5", "adobe@2016", "adobe@2018", "adobe@2021" ]
-    steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v2
-
-      - name: Setup Java
-        uses: actions/setup-java@v2
-        with:
-          distribution: "adopt"
-          java-version: "11"
-
-      - name: Setup Database and Fixtures
-        run: |
-          sudo /etc/init.d/mysql start
-          # Create Database
-          mysql -u${{ env.DB_USER }} -p${{ env.DB_PASSWORD }} -e 'CREATE DATABASE coolblog;'
-          # Import Database
-          mysql -u${{ env.DB_USER }} -p${{ env.DB_PASSWORD }} < test-harness/tests/resources/coolblog.sql
-
-      - name: Setup Environment For Testing Process
-        working-directory: ./test-harness
-        run: |
-          # Setup .env
-          touch .env
-          # ENV
-          printf "DB_HOST=localhost\n" >> .env
-          printf "DB_USER=${{ env.DB_USER }}\n" >> .env
-          printf "DB_PASSWORD=${{ env.DB_PASSWORD }}\n" >> .env
-          printf "DB_CLASS=com.mysql.cj.jdbc.Driver\n" >> .env
-          printf "DB_BUNDLEVERSION=8.0.19\n" >> .env
-          printf "DB_BUNDLENAME=com.mysql.cj\n" >> .env
-
-      - name: Cache CommandBox Dependencies
-        uses: actions/cache@v1
-        if: ${{ true }}
-        with:
-          path: ~/.CommandBox/artifacts
-          key: ${{ runner.OS }}-commandbox-cache-${{ hashFiles( 'box.json' ) }}-${{ hashFiles( 'test-harness/box.json' ) }}
-          restore-keys: |
-            ${{ runner.OS }}-commandbox-cache-${{ hashFiles( 'box.json' ) }}-${{ hashFiles( 'test-harness/box.json' ) }}
-
-      - name: Setup CommandBox
-        uses: elpete/[email protected]
-
-      - name: Install Test Harness Dependencies
-        working-directory: ./test-harness
-        run: |
-          box install
-
-      - name: Start ${{ matrix.cfengine }} Server
-        working-directory: ./test-harness
-        run: |
-          box server start serverConfigFile="server-${{ matrix.cfengine }}.json" --noSaveSettings --debug
-          # Install Adobe 2021 cfpm modules
-          if [[ "${{ matrix.cfengine }}" == "adobe@2021" ]] ; then
-            box run-script install:2021
-          fi
-          curl http://127.0.0.1:60299
-
-      - name: Run Tests
-        working-directory: ./test-harness
-        run: |
-          mkdir tests/results
-          box package set testbox.runner="http://localhost:60299/tests/runner.cfm"
-          box testbox run --verbose outputFile=tests/results/test-results outputFormats=json,antjunit
-
-      - name: Publish Test Results
-        uses: EnricoMi/publish-unit-test-result-action@v1
-        if: always()
-        with:
-          files: test-harness/tests/results/**/*.xml
-          check_name: "${{ matrix.cfengine }} Test Results"
-
-      - name: Upload Test Results Artifacts
-        if: always()
-        uses: actions/upload-artifact@v2
-        with:
-          name: test-results-${{ matrix.cfengine }}
-          path: |
-            test-harness/tests/results/**/*
-
-      - name: Slack Notification
-        if: failure()
-        uses: rtCamp/action-slack-notify@v2
-        env:
-          SLACK_CHANNEL: coding
-          SLACK_COLOR: ${{ job.status }} # or a specific color like 'green' or '#ff00ff'
-          SLACK_ICON_EMOJI: ":bell:"
-          SLACK_MESSAGE: '${{ env.MODULE_ID }} tests failed :cry:'
-          SLACK_TITLE: ${{ env.MODULE_ID }} Tests For ${{ matrix.cfengine }} failed
-          SLACK_USERNAME: CI
-          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_URL }}
-
-      - name: Failure Debugging Info
-        if: ${{ failure() }}
-        working-directory: ./test-harness
-        run: |
-          box server log serverConfigFile="server-${{ matrix.cfengine }}.json"
-
-      - name: Upload Debugging Info To Artifacts
-        if: ${{ failure() }}
-        uses: actions/upload-artifact@v2
-        with:
-          name: Failure Debugging Info - ${{ matrix.cfengine }}
-          path: |
-            test-harness/.engine/**/logs/*
-            test-harness/.engine/**/WEB-INF/cfusion/logs/*
+    uses: ./.github/workflows/tests.yml
+    secrets:
+      SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
 
   #############################################
   # Build Module
@@ -155,17 +43,8 @@ jobs:
         with:
           node-version: 12.x
 
-      - name: Cache CommandBox Dependencies
-        uses: actions/cache@v1
-        if: ${{ true }}
-        with:
-          path: ~/.CommandBox/artifacts
-          key: ${{ runner.OS }}-commandbox-cache-${{ hashFiles( 'box.json' ) }}-${{ hashFiles( 'test-harness/box.json' ) }}
-          restore-keys: |
-            ${{ runner.OS }}-commandbox-cache-${{ hashFiles( 'box.json' ) }}-${{ hashFiles( 'test-harness/box.json' ) }}
-
       - name: Setup CommandBox
-        uses: elpete/setup-commandbox@v1.0.0
+        uses: Ortus-Solutions/setup-commandbox@main
         with:
           forgeboxAPIKey: ${{ secrets.FORGEBOX_TOKEN }}
 

.github/workflows/ci.yml

@@ -0,0 +1,19 @@
+# Publish Github Release
+name: Github Release
+
+on:
+  push:
+    tags:
+      - v[0-9]+.*
+
+jobs:
+  create-release:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: taiki-e/[email protected]
+        with:
+          # Produced by the build/Build.cfc
+          changelog: changelog.md
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}