Merge branch 'development'

Author: lmajano

.module.properties

@@ -1,5 +1,3 @@
 project.name=cbdebugger
-project.version=1.5.0
-module.name=cbdebugger
-# Default CF Engine to Build With
-cfengine=[email protected]
+project.version=1.6.0
+module.name=cbdebugger

.travis.yml

@@ -6,9 +6,7 @@ notifications:
 
 env:
   global:
-    - PROJECT_NAME=cbdebugger
     - MODULE_ID=cbdebugger
-    - MODULE_VERSION=1.5.0
   matrix:
     - [email protected]
     - ENGINE=lucee@5
@@ -47,8 +45,6 @@ script:
   # run our dependency install to ensure the workbench is in place
   - box install
   # add our module-specific build properties
-  - printf "\nproject.version=$MODULE_VERSION" >> workbench/build.properties
-  - printf "\nproject.name=$PROJECT_NAME" >> workbench/build.properties
   - printf "\nmodule.name=$MODULE_ID" >> workbench/build.properties
   - printf "\ncfengine=$ENGINE" >> workbench/build.properties
   # execute our build
@@ -64,7 +60,7 @@ after_failure:
 before_deploy:
   - cd $TRAVIS_BUILD_DIR
   - mkdir -p s3deploy
-  - rsync -av ./artifacts/$PROJECT_NAME/ ./s3deploy/
+  - rsync -av ./artifacts/$MODULE_ID/ ./s3deploy/
   - rm -f ./s3deploy/box-repo.json
 
 deploy:

box.json

@@ -1,19 +1,25 @@
 {
     "name":"cbdebugger Builder",
-    "version":"1.0.0",
+    "version":"1.6.0",
     "slug":"cbdebugger-shell",
     "private":false,
     "defaultPort":0,
     "dependencies":{
-        "coldbox":"^4.3.0",
-        "workbench":"git+https://github.com/Ortus-Solutions/unified-workbench.git"
+        "workbench":"git+https://github.com/Ortus-Solutions/unified-workbench.git",
+        "coldbox":"^4.3.0+188"
     },
     "devDependencies":{
-        "testbox":"2.3.0+00044"
+        "testbox":"^2.5.0+107"
     },
     "installPaths":{
-        "testbox":"testbox",
-        "coldbox":"coldbox",
-        "workbench":"workbench"
+        "workbench":"workbench",
+        "testbox":"testbox/",
+        "coldbox":"coldbox/"
+    },
+    "testbox":{
+        "runner":"http://localhost:49616"
+    },
+    "scripts":{
+        "postVersion":"recipe workbench/bump.boxr"
     }
 }

changelog.md

@@ -1,6 +1,9 @@
 CHANGELOG
 =========
 
+## 1.6.0 
+* ColdBox 5 Support
+
 ## 1.5.0
 * Case-Sensitive filesystems fix
 * Updated travis builds

modules/cbdebugger/interceptors/Debugger.cfc

@@ -12,12 +12,10 @@ component extends="coldbox.system.Interceptor"{
 	}
 
 	// Before we capture.
-	function onRequestCapture(event, interceptData){
+	function onRequestCapture( event, interceptData, rc, prc ){
 		// init tracker
 		request.cbdebugger = {};
 		request.fwExecTime = getTickCount();
-		// get reference
-		var rc = event.getCollection();
 
 		// Debug Mode Checks
 		if ( structKeyExists( rc, "debugMode" ) AND isBoolean( rc.debugMode ) ){
@@ -55,12 +53,12 @@ component extends="coldbox.system.Interceptor"{
 	}
 
 	//setup all the timers
-	public function preProcess(event, interceptData) {
+	public function preProcess( event, interceptData, rc, prc ){
 		request.cbdebugger.processHash = debuggerService.timerStart( "[preProcess to postProcess] for #arguments.event.getCurrentEvent()#" );
 	}
 
 	// post processing
-	public function postProcess(event, interceptData) {
+	public function postProcess( event, interceptData, rc, prc, buffer ){
 		var debugHTML 	= "";
 		var command 	= event.getTrimValue( "cbox_command","" );
 
@@ -82,57 +80,57 @@ component extends="coldbox.system.Interceptor"{
 			// render out the debugger
 			debugHTML = debuggerService.renderDebugLog();
 			// render out the debugger to output
-			appendToBuffer( debugHTML );
+			buffer.append( debugHTML );
 		}
 	}
 
-	public function preEvent(event, interceptData) {
+	public function preEvent( event, interceptData, rc, prc ){
 		request.cbdebugger.eventhash = debuggerService.timerStart( "[preEvent to postEvent] for #arguments.event.getCurrentEvent()#" );
 	}
 
-	public function postEvent(event, interceptData) {
+	public function postEvent( event, interceptData, rc, prc ){
 		debuggerService.timerEnd(request.cbdebugger.eventhash);
 	}
 
-	public function preLayout(event, interceptData) {
+	public function preLayout( event, interceptData, rc, prc ){
 		request.cbdebugger.layoutHash = debuggerService.timerStart( "[preLayout to postLayout] for #arguments.event.getCurrentEvent()#" );
 	}
 
-	public function postLayout(event, interceptData) {
+	public function postLayout( event, interceptData, rc, prc ){
 		debuggerService.timerEnd(request.cbdebugger.layoutHash);
 	}
 
-	public function preRender(event, interceptData) {
+	public function preRender( event, interceptData, rc, prc ){
 		request.cbdebugger.renderHash = debuggerService.timerStart( "[preRender to postRender] for #arguments.event.getCurrentEvent()#" );
 	}
 
-	public function postRender(event, interceptData) {
+	public function postRender( event, interceptData, rc, prc ){
 		debuggerService.timerEnd(request.cbdebugger.renderHash);
 	}
 
-	public function preViewRender(event, interceptData) {
+	public function preViewRender( event, interceptData, rc, prc ){
 		request.cbdebugger.renderViewHash = debuggerService.timerStart( "Rendering View: #interceptData.view# from event: #arguments.event.getCurrentEvent()#" );
 	}
 
-	public function postViewRender(event, interceptData) {
+	public function postViewRender( event, interceptData, rc, prc ){
 		debuggerService.timerEnd( request.cbdebugger.renderViewHash );
 	}
 
-	public function preLayoutRender(event, interceptData) {
+	public function preLayoutRender( event, interceptData, rc, prc ){
 		request.cbdebugger.layoutHash = debuggerService.timerStart( "Rendering Layout: #interceptData.layout# from event: #arguments.event.getCurrentEvent()#" );
 	}
 
-	public function postLayoutRender(event, interceptData) {
+	public function postLayoutRender( event, interceptData, rc, prc ){
 		debuggerService.timerEnd(request.cbdebugger.layoutHash);
 	}
 
-	public function beforeInstanceCreation(event,interceptData){
+	public function beforeInstanceCreation( event, interceptData,rc, prc ){
 		if( variables.debuggerConfig.wireboxCreationProfiler ){
 			request.cbdebugger[ interceptData.mapping.getName( ) ] = debuggerService.timerStart( "Wirebox instance creation of #interceptData.mapping.getName()#" );
 		}
 	}
 
-	public function afterInstanceCreation(event, interceptData){
+	public function afterInstanceCreation( event, interceptData, rc, prc ){
 		// so many checks, due to chicken and the egg problems
 		if( variables.debuggerConfig.wireboxCreationProfiler
 			and structKeyExists( request, "cbdebugger" )

tests/Application.cfc

@@ -7,6 +7,8 @@ component{
 	this.name = "A TestBox Runner Suite " & hash( getCurrentTemplatePath() );
 	// any other application.cfc stuff goes below:
 	this.sessionManagement = true;
+	// Turn on/off white space managemetn
+	this.whiteSpaceManagement = "smart";
 
 	// any mappings go here, we create one that points to the root called test.
 	this.mappings[ "/tests" ] = getDirectoryFromPath( getCurrentTemplatePath() );