Merge branch 'development'

Author: lmajano

.markdownlintrc.json

@@ -0,0 +1,9 @@
+{
+	"MD024": { "siblings_only": true },
+	"line-length": false,
+	"single-h1": false,
+	"first-line-h1": false,
+	"no-multiple-blanks": {
+		"maximum": 2
+	}
+}

.travis.yml

@@ -37,8 +37,9 @@ install:
   - box config set endpoints.forgebox.APIToken=$FORGEBOX_API_TOKEN > /dev/null
 
 script:
-  # Set Current Version
+  # Set Current Version and Travis Tag
   - TARGET_VERSION=`cat $TRAVIS_BUILD_DIR/box.json | jq '.version' -r`
+  - TRAVIS_TAG=${TARGET_VERSION}
   - echo "Starting build for ${MODULE_ID} v${TARGET_VERSION}"
   # Replace version so builder can issue it
   - box package set [email protected]@[email protected]@
@@ -57,7 +58,7 @@ script:
   # 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
+  #- cat build/results.json
 
 after_failure:
   - cd $TRAVIS_BUILD_DIR/test-harness
@@ -100,9 +101,26 @@ deploy:
     upload-dir: coldbox-modules/$MODULE_ID/$TARGET_VERSION
     acl: public_read
 
+  # Github Release only on Master
+  - provider: releases
+    api_key: ${GITHUB_TOKEN}
+    on:
+      branch:
+        - master
+      condition: "$ENGINE = lucee@5"
+    skip_cleanup: true
+    edge: true
+    file_glob: true
+    file: $TRAVIS_BUILD_DIR/.artifacts/$MODULE_ID/**/*
+    release_notes_file: changelog.md
+    name: v${TRAVIS_TAG}
+    tag_name: v${TRAVIS_TAG}
+    overwrite: true
+
+# Once API Docs and Binaries are deployed to S3 Publish to ForgeBox
 after_deploy:
   # Move to build out artifact
   - cd ${TRAVIS_BUILD_DIR}/.tmp/${MODULE_ID}
   - cat box.json
-  # Only publish once
+  # Only publish once using the lucee matrix
   - if [ ${ENGINE} = 'lucee@5' ]; then box forgebox publish; fi

ModuleConfig.cfc

@@ -119,7 +119,7 @@ component {
 
 		//defaults
 		configStruct.debugger = {
-			debugMode = false,
+			debugMode = controller.getSetting( name = "environment", defaultValue = "production" ) == "development",
 			debugPassword = "cb:null",
 			enableDumpVar = true,
 			persistentRequestProfiler = true,
@@ -148,10 +148,6 @@ component {
 	// This appender is part of a module, so we need to register it after the modules have been loaded.
 	function afterConfigurationLoad() {
 	    var logBox = controller.getLogBox();
-	    // Only 4.3
-	    if( !findNoCase( "4.3", controller.getSetting( "version", true ) ) ){
-	    	return;
-	    }
 	    logBox.registerAppender( 'tracer', 'cbdebugger.includes.appenders.ColdboxTracerAppender' );
     	var appenders = logBox.getAppendersMap( 'tracer' );
     	// Register the appender with the root loggger, and turn the logger on.

box.json

@@ -2,7 +2,7 @@
     "name":"ColdBox Debugger",
     "author":"Ortus Solutions <[email protected]",
     "location":"https://downloads.ortussolutions.com/ortussolutions/coldbox-modules/cbdebugger/@build.version@/[email protected]@.zip",
-    "version":"2.0.0",
+    "version":"2.1.0",
     "slug":"cbdebugger",
     "type":"modules",
     "homepage":"https://github.com/coldbox-modules/cbdebugger",
@@ -12,7 +12,7 @@
         "type":"git",
         "url":"https://github.com/coldbox-modules/cbdebugger"
     },
-    "shortDescription":"The official ColdBox 4 debugger module",
+    "shortDescription":"The official ColdBox debugger module",
     "license":[
         {
             "type":"Apache2",
@@ -30,6 +30,9 @@
         "*/.md"
     ],
     "scripts":{
-        "toMaster":"recipe build/toMaster.boxr"
+        "release":"recipe build/release.boxr",
+        "format":"cfformat run includes/,interceptors/,models/,test-harness/tests/ --overwrite",
+        "format:watch":"cfformat watch includes/,interceptors/,models/,test-harness/tests/",
+        "format:check":"cfformat check includes/,interceptors/,models/,test-harness/tests/"
     }
 }

build/Build.cfc

@@ -56,6 +56,8 @@ component{
         buildID=createUUID(),
         branch="development"
     ){
+		// Create project mapping
+		fileSystemUtil.createMapping( arguments.projectName, variables.cwd );
 
         // Run the tests
         runTests();
@@ -76,7 +78,7 @@ component{
             .toConsole();
     }
 
-     /**
+    /**
      * Run the test suites
      */
     function runTests(){

build/toMaster.boxr renamed to build/release.boxr

@@ -1,20 +1,25 @@
 # This recipe signifies a new release of the module by doing merges and bumps accordingly
 
-# Check out master
+# Check out master and update it locally
 !git checkout -f master
-!git pull
-# Merge development into it
+!git pull origin master
+
+# Merge development into it for release
 !git merge --no-ff development
-# Tag the master repo with the version in box.json
+
+# Tag the master repo with the version from box.json
 !git tag v`box package show version`
-# Push all branches
+
+# Push all branches back out to github
 !git push origin --all
+
 # Push all tags
 !git push origin --tags
+
 # Check development again
 !git checkout -f development
+
 # Bump to prepare for a new release, do minor, change if needed and don't tag
 bump --minor --!tagVersion
-# Send it out
 !git commit -a -m "version bump"
 !git push origin development

changelog.md

@@ -1,50 +1,91 @@
-# CHANGELOG
+# Changelog
 
-## 2.0.0
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+----
+
+## [2.1.0] => 2020-MAY-14
+
+### Added
+
+* ColdBox 6 support
+* Formatting
+
+## Removed
+
+* ColdBox 4 lingering code
+
+----
+
+## [2.0.0] => 2020-MAY-04
+
+### Added
 
-* Dropped ACF 11 support
 * Formatting updates
 * Quick/QB Panels
 
-## 1.7.1
+### Removed
+
+* Dropped ACF 11 support
+
+----
+
+## [1.7.1]  => 2019-MAR-06
 
 * Updated location protocol
 
-## 1.7.0
+----
+
+## [1.7.0] => 2019-MAR-06
 
 * Missing interception points for extending the panels: `afterDebuggerPanel`, `beforeDebuggerPanel`
 * New Module Layout
 * Dropping lucee 4.5 support
 
-## 1.6.0 
+----
+
+## [1.6.0 ]
 
 * ColdBox 5 Support
 
-## 1.5.0
+----
+
+## [1.5.0]
 
 * Case-Sensitive filesystems fix
 * Updated travis builds
 * Unified workbench approach
 
-## 1.4.0
+----
+
+## [1.4.0]
 
 * ColdBox Tracer Appender added by Default by Eric Peterson
 
-## 1.3.0
+----
+
+## [1.3.0]
 
 * Travis integration
 * DocBox update
 * Build process update
 
-## 1.2.0
+----
+
+## [1.2.0]
 
 * Fix unscoped currentrow which was throwing an error when debugging was enabled.
 * Removed reference to missing images in CSS
 * Updated build scripts
 * How to turn off debugger for tests, it does this automatically now.
 * filename cases don't match #5 on certain includes
 
-## 1.1.0
+----
+
+## [1.1.0]
 
 * https://ortussolutions.atlassian.net/browse/CCM-14 Issue with unloading modules
 * https://ortussolutions.atlassian.net/browse/CCM-25 Lucee support
@@ -53,10 +94,14 @@
 views and layouts
 * Updated production ignore lists
 
-## 1.0.1
+----
+
+## [1.0.1]
 
 * Bug fixes on caching panels and chicken/egg issues for ColdBox loading
 
-## 1.0.0
+----
+
+## [1.0.0]
 
 * Create first module version