Merge branch 'development'

Author: bdw429s

apidocs/server.json

@@ -1,5 +1,8 @@
 {
     "force":true,
+    "jvm":{
+        "heapSize":"1024"
+    },
     "openbrowser":"false",
     "web":{
         "http":{

build/build.properties

@@ -11,7 +11,7 @@ java.debug=true
 #dependencies
 dependencies.dir=${basedir}/lib
 cfml.version=5.2.9.31
-cfml.loader.version=2.1.14
+cfml.loader.version=2.1.16
 cfml.cli.version=${cfml.loader.version}.${cfml.version}
 lucee.version=${cfml.version}
 lucee.config.version=5.2.4.37

build/build.xml

@@ -16,8 +16,8 @@ External Dependencies:
  	<property name="distro.groupID"				value="ortussolutions" />
  	<property name="distro.name"				value="commandbox"/>
  	<!-- Special things happen when the version and stableVersion are the same value as that signifies a "stable" build.   -->
- 	<property name="commandbox.version"			value="4.3.0"/>
- 	<property name="commandbox.stableVersion"	value="4.3.0"/>
+ 	<property name="commandbox.version"			value="4.4.0"/>
+ 	<property name="commandbox.stableVersion"	value="4.4.0"/>
 
     <!-- Time Label -->
 	<tstamp prefix="start"/>

src/cfml/system/Quotes.txt

@@ -53,7 +53,6 @@ Computers are good at following instructions, but not at reading your mind.
 while( ! ( succeed = try() ) );
 Talk is cheap. Show me the code. --Linus Torvalds
 In theory, theory and practice are the same. In practice, they're not.
-Did you know CFML is the 4th most used web language according to W3Techs?
 There's a box for that
 Publish your CFML projects big and small to https://www.ForgeBox.io
 Quit slouching in your chair!

src/cfml/system/config/WireBox.cfc

@@ -28,12 +28,12 @@ component extends='wirebox.system.ioc.config.Binder' {
 
 		// LogBox
 		wirebox.logBoxConfig = 'commandbox.system.config.LogBox';
-		
+
 		wirebox.cacheBox = {
 			enabled = true,
 			configFile = 'commandbox.system.config.CacheBox'
 		};
-		
+
 		wirebox.metadataCache='metadataCache';
 
 		// Register CommandBox DSL for special injection namespaces
@@ -61,6 +61,7 @@ component extends='wirebox.system.ioc.config.Binder' {
 		var ortusArtifactsURL		= 'http://downloads.ortussolutions.com/';
 		var ortusPRDArtifactsURL	= 'http://downloads.ortussolutions.com/';
 		var colors256Data			= deserializeJSON( fileRead( homedir & '/cfml/system/config/colors.json' ) );
+		var semverRegex				= '\d{1,3}(?:\.\d{1,3}){2}(?:-\w+(?:\.\w+)*)?(?:\+\w+(?:\.\w+)*)?';
 		// engine versions, first is default - for lucee, first is internal version
 
 		// map constants
@@ -78,10 +79,11 @@ component extends='wirebox.system.ioc.config.Binder' {
 		map( 'ortusPRDArtifactsURL@constants' ).toValue( ortusPRDArtifactsURL );
 		map( 'rewritesDefaultConfig@constants' ).toValue( '#homeDir#/cfml/system/config/urlrewrite.xml' );
 		map( 'colors256Data@constants' ).toValue( colors256Data );
+		map( 'semverRegex@constants' ).toValue( semverRegex );
 
 		// Map Directories
 		mapDirectory( '/commandbox/system/services' );
-		mapDirectory( '/commandbox/system/util' );		
+		mapDirectory( '/commandbox/system/util' );
 	}
 
 }

src/cfml/system/endpoints/ForgeBox.cfc

@@ -86,7 +86,8 @@ component accessors="true" implements="IEndpointInteractive" singleton {
 
 		// Only bother checking if we have a version range.  If an exact version is stored in
 		// box.json, we're never going to update it anyway.
-		if( semanticVersion.isExactVersion( boxJSONversion ) ) {
+		// UNLESS the box.json has been udpated to have a new exact version that is different from what's installed (ignoreing buildID)
+		if( semanticVersion.isExactVersion( boxJSONversion ) && semanticVersion.compare( boxJSONversion, version, false ) == 0 ) {
 			return result;
 		}
 

src/cfml/system/endpoints/Gist.cfc

@@ -0,0 +1,32 @@
+/**
+*********************************************************************************
+* Copyright Since 2014 CommandBox by Ortus Solutions, Corp
+* www.coldbox.org | www.ortussolutions.com
+********************************************************************************
+* @author Brad Wood, Luis Majano, Denny Valliant
+*
+* I am the gist endpoint
+*
+* - gist:<gistID>
+* - gist:<gistID>#<commit-ish>
+* - gist:<githubname>/<gistID>
+* - gist:<githubname>/<gistID>#<commit-ish>
+*
+* If no <commit-ish> is specified, then master is used.
+*
+*/
+component accessors=true implements="IEndpoint" extends="commandbox.system.endpoints.Git" singleton {
+
+	// Properties
+	property name="namePrefixes" type="string";
+
+	function init() {
+		setNamePrefixes( 'gist' );
+		return this;
+	}
+
+	private function getProtocol() {
+		return 'https://gist.github.com/';
+	}
+
+}

src/cfml/system/endpoints/Git.cfc

@@ -32,6 +32,8 @@ component accessors="true" implements="IEndpoint" singleton {
 	property name="system" 					inject="system@constants";
 	property name="shell" 					inject="shell";
 	property name='wirebox'					inject='wirebox';
+	property name="semanticVersion"			inject="provider:semanticVersion@semver";
+	property name='semverRegex'				inject='semverRegex@constants';
 
 	// Properties
 	property name="namePrefixes" type="string";
@@ -56,7 +58,7 @@ component accessors="true" implements="IEndpoint" singleton {
 
 		// The main Git API
 		var Git = createObject( 'java', 'org.eclipse.jgit.api.Git' );
-		
+
 		var progressMonitor = createDynamicProxy(
 				wirebox.getInstance( 'JGitProgressMonitor@package-commands' ),
 				[ 'org.eclipse.jgit.lib.ProgressMonitor' ]
@@ -70,7 +72,7 @@ component accessors="true" implements="IEndpoint" singleton {
 		var CommandCaller = createObject( 'java', 'com.ortussolutions.commandbox.jgit.CommandCaller' ).init();
 
 		try {
-			
+
 			// Clone the repo locally into a temp folder
 			var cloneCommand = Git.cloneRepository()
 				.setURI( GitURL )
@@ -80,30 +82,30 @@ component accessors="true" implements="IEndpoint" singleton {
 
 			// Conditionally apply security
 			var command = secureCloneCommand( cloneCommand );
-		    // call with our special java wrapper
+			// call with our special java wrapper
 			local.result = CommandCaller.call( command );
-			
+
 			// Get a list of all branches
 			var branchListCommand = local.result.branchList();
 			var listModeAll = createObject( 'java', 'org.eclipse.jgit.api.ListBranchCommand$ListMode' ).ALL;
 			var branchList = [].append( CommandCaller.call( branchListCommand.setListMode( listModeAll ) ), true );
 			branchList = branchList.map( function( ref ){ return ref.getName(); } );
 
-	    	if( arguments.verbose ){ job.addLog( 'Available branches are #branchList.toList()#' ); }
+			if( arguments.verbose ){ job.addLog( 'Available branches are #branchList.toList()#' ); }
+
+			// If the commit-ish looks like it's a branch, modify the ref's name.
+			if( branchList.containsNoCase( branch ) ) {
+				if( arguments.verbose ){ job.addLog( 'Commit-ish [#branch#] appears to be a branch.' ); }
+				branch = 'origin/' & branch;
+			}
 
-	    	// If the commit-ish looks like it's a branch, modify the ref's name.
-		    if( branchList.containsNoCase( branch ) ) {
-		    	if( arguments.verbose ){ job.addLog( 'Commit-ish [#branch#] appears to be a branch.' ); }
-		    	branch = 'origin/' & branch;
-		    }
+			// Checkout branch, tag, or commit hash.
+			CommandCaller.call( local.result.checkout().setName( branch ) );
 
-		    // Checkout branch, tag, or commit hash.
-	        CommandCaller.call( local.result.checkout().setName( branch ) );
-	        
 		} catch( any var e ) {
 			// Check for Ctrl-C
 			shell.checkInterrupted();
-			
+
 			// If the exception came from the Java call, this exception won't be null
 			var theRealJavaException = CommandCaller.getException();
 
@@ -118,7 +120,7 @@ component accessors="true" implements="IEndpoint" singleton {
 					theRealJavaException = theRealJavaException.getCause()
 				} while( !isNull( theRealJavaException ) )
 
-				throw( message="Error Cloning Git repository", detail="#deepMessage#",  type="endpointException");
+				throw( message="Error cloning #getNamePrefixes()# repository", detail="#deepMessage#",  type="endpointException");
 			}
 
 		} finally {
@@ -170,15 +172,21 @@ component accessors="true" implements="IEndpoint" singleton {
 	}
 
 	public function getUpdate( required string package, required string version, boolean verbose=false ) {
-		var result = {
-			// Repo URLs with a semver in the name are considered to not have an update since we assume they are an exact version
-			isOutdated = !package
-				.listRest( '##' )
-				.reFindNoCase( '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}' ),
-			version = 'unknown'
-		};
+		// Check to see if commit-ish semver exists and if so use that
+		var versionMatch = reMatch( semverRegex, package.listRest( '##' ) );
+
+		if ( versionMatch.len() ) {
+			return {
+				isOutdated: semanticVersion.isNew( current=arguments.version, target=versionMatch.last() ),
+				version: versionMatch.last()
+			};
+		}
 
-		return result;
+		// Did not find a version in the commit-ish so assume package is outdated
+		return {
+			isOutdated: true,
+			version: 'unknown'
+		};
 	}
 
 	// Default is no auth

src/cfml/system/endpoints/HTTP.cfc

@@ -18,6 +18,8 @@ component accessors=true implements="IEndpoint" singleton {
 	property name="progressBar" 			inject="ProgressBar";
 	property name="CR" 						inject="CR@constants";
 	property name='wirebox'					inject='wirebox';
+	property name="semanticVersion"			inject="provider:semanticVersion@semver";
+	property name='semverRegex'				inject='semverRegex@constants';
 
 	// Properties
 	property name="namePrefixes" type="string";
@@ -85,17 +87,22 @@ component accessors=true implements="IEndpoint" singleton {
 		return reReplaceNoCase( arguments.package, '[^a-zA-Z0-9]', '', 'all' );
 	}
 
-	public function getUpdate( required string package, required string version, boolean verbose=false ) {
-		var result = {
-			// URLs with a semver in the name are considered to not have an update since we assume they are an exact version
-			isOutdated = !package
-				.reReplaceNoCase( 'http(s)?://', '' )
-				.listRest( '/\' )
-				.reFindNoCase( '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}' ),
-			version = 'unknown'
-		};
+	public function getUpdate( required string package, required string version, boolean verbose = false ) {
+		// Check to see if a semver exists in the URL and if so use that
+		var versionMatch = reMatch( semverRegex, package.reReplaceNoCase( '(https?:)?//', '' ).listRest( '/\' ) );
+
+		if ( versionMatch.len() ) {
+			return {
+				isOutdated: semanticVersion.isNew( current = arguments.version, target = versionMatch.last() ),
+				version: versionMatch.last()
+			};
+		}
 
-		return result;
+		// Did not find a version in the URL so assume package is outdated
+		return {
+			isOutdated: true,
+			version: 'unknown'
+		};
 	}
 
 }

src/cfml/system/endpoints/Jar.cfc

@@ -96,7 +96,7 @@ component accessors=true implements="IEndpoint" singleton {
 		var result = {
 			// Jars with a semver in the name are considered to not have an update since we assume they are an exact version
 			isOutdated = !package
-				.reReplaceNoCase( 'http(s)?://', '' )
+				.reReplaceNoCase( '^([\w:]+)?//', '' )
 				.listRest( '/\' )
 				.reFindNoCase( '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}' ),
 			version = 'unknown'

src/cfml/system/endpoints/S3.cfc

@@ -18,6 +18,8 @@ component accessors="true" implements="IEndpoint" singleton {
     property name="S3Service"              inject="S3Service";
     property name="tempDir"                inject="tempDir@constants";
     property name='wirebox'                inject='wirebox';
+    property name="semanticVersion"        inject="provider:semanticVersion@semver";
+    property name='semverRegex'            inject='semverRegex@constants';
 
     // Properties
     property name="namePrefixes" type="string";
@@ -66,7 +68,21 @@ component accessors="true" implements="IEndpoint" singleton {
     }
 
     public function getUpdate(required string package, required string version, boolean verbose=false) {
-        return httpsEndpoint.getUpdate(argumentCollection = arguments);
+        // Check to see if a semver exists in the path and if so use that
+        var versionMatch = reMatch( semverRegex, package.reReplaceNoCase( '(s3:)?//', '' ).listRest( '/\' ) );
+
+        if ( versionMatch.len() ) {
+            return {
+                isOutdated: semanticVersion.isNew( current = arguments.version, target = versionMatch.last() ),
+                version: versionMatch.last()
+            };
+        }
+
+        // Did not find a version in the path so assume package is outdated
+        return {
+            isOutdated: true,
+            version: 'unknown'
+        };
     }
 
 }

src/cfml/system/modules/JSONPrettyPrint/box.json

@@ -1,8 +1,8 @@
 {
     "name":"JSONPrettyPrint",
-    "version":"1.3.3",
+    "version":"1.4.1",
     "author":"",
-    "location":"Ortus-Solutions/JSONPrettyPrint#v1.3.3",
+    "location":"Ortus-Solutions/JSONPrettyPrint#v1.4.1",
     "homepage":"https://github.com/Ortus-Solutions/JSONPrettyPrint",
     "documentation":"https://github.com/Ortus-Solutions/JSONPrettyPrint",
     "repository":{

src/cfml/system/modules/JSONPrettyPrint/models/ANSIPrint.cfc

@@ -0,0 +1,38 @@
+component accessors="true" {
+
+    property ANSIDefaults;
+
+    function init() {
+        setANSIDefaults( {
+            'constant' : chr( 27 ) & '[38;5;0m',
+            'key' : chr( 27 ) & '[38;5;0m',
+            'number' : chr( 27 ) & '[38;5;0m',
+            'string' : chr( 27 ) & '[38;5;0m'
+        } );
+        return this;
+    }
+
+    function wrap( str, type, colors ) {
+        var code = 0;
+
+        if ( type == 'key' ) {
+            code = colors.key;
+        } else if ( left( str, 1 ) == '"' ) {
+            code = colors.string;
+        } else if ( len( str ) > 3 && arrayFind( [ 'true', 'false', 'null' ], str ) ) {
+            code = colors.constant;
+        } else {
+            code = colors.number;
+        }
+
+        if ( code.len() ) {
+            return code & str & ANSIReset();
+        }
+        return str;
+    }
+
+    private function ANSIReset() {
+        return chr( 27 ) & '[0m';
+    }
+
+}