Merge branch 'development'

Author: bdw429s

build/build.properties

@@ -12,7 +12,7 @@ java.debug=true
 dependencies.dir=${basedir}/lib
 cfml.version=5.4.6.9
 # Compress Tags
-cfml.extensions=8D7FB0DF-08BB-1589-FE3975678F07DB17
+cfml.extensions=8D7FB0DF-08BB-1589-FE3975678F07DB17?version=1.0.0.15
 box.bunndled.modules=commandbox-update-check,commandbox-cfconfig,commandbox-dotenv,contentbox-cli,coldbox-cli,testbox-cli,commandbox-boxlang
 cfml.loader.version=2.8.5
 cfml.cli.version=${cfml.loader.version}.${cfml.version}

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="6.2.0"/>
-	<property name="commandbox.stableVersion" value="6.2.0"/>
+	<property name="commandbox.version" value="6.2.1"/>
+	<property name="commandbox.stableVersion" value="6.2.1"/>
 
 	<!-- Time Label -->
 	<tstamp prefix="start"/>
@@ -177,9 +177,11 @@ External Dependencies:
 		</move>
 
 		<!-- unzip the core.lco file (really a jar) so we can modify the manifest to inject the extensions we need to load -->
+		<propertyregex property="cfml.extensions.modified" input="${cfml.extensions}" regexp="\?" replace=";" />
+
 		<unzip src="${temp.dir}/core.lco" dest="${temp.dir}/lucee-light-core/" overwrite="true"/>
 		<manifest file="${temp.dir}/lucee-light-core/META-INF/MANIFEST.MF" mode="update">
-			<attribute name="Require-Extension" value="${cfml.extensions}"/>
+			<attribute name="Require-Extension" value="${cfml.extensions.modified}"/>
 		</manifest>
 
 		<!-- Re-zip core file] -->
@@ -1065,9 +1067,11 @@ External Dependencies:
 
 		<for list="${cfml.extensions}" param="id">
 			<sequential>
+		        <propertyregex property="id.noVersion" input="@{id}" regexp="\?version=.*" replace="" />
+
 				<echo>Downloading extension @{id}</echo>
 
-				<get src="http://extension.lucee.org/rest/extension/provider/full/@{id}" dest="${extensions.dir}/@{id}.lex" verbose="true" />
+				<get src="http://extension.lucee.org/rest/extension/provider/full/@{id}" dest="${extensions.dir}/@{id.noVersion}.lex" verbose="true" />
 
 			</sequential>
 		</for>

src/cfml/system/modules_app/system-commands/commands/tail.cfc

@@ -80,7 +80,7 @@
 				} else {
 					lastLF=false;
 				}
-				if ( char != -1 ) buffer.append( chr( char ) );
+				if ( char != -1 ) buffer.append( char );
 
 				position--;
 
@@ -96,14 +96,18 @@
 
 			if( buffer.len() ) {
 				// Strip any CR or LF from the last (first really) line to eliminate leading line breaks in console output
-				buffer[ buffer.len() ] = listChangeDelims( buffer[ buffer.len() ], '', chr(13) & chr( 10 ) );
+				loop times=2 {
+					if( buffer[ buffer.len() ] == 10 || buffer[ buffer.len() ] == 13 ) {
+						buffer.deleteAt( buffer.len() );
+					}
+				}
 			}
+			buffer = createObject("java", "java.lang.String").init(buffer.reverse(), "UTF-8");
+
 
 			// print our file to console
 			print
-				.text( buffer
-					.reverse()
-					.toList( "" )
+				.text( buffer					
 					.listToArray( chr( 13 ) & chr( 10 ) )
 					.map( function( line ) {
 						return ansiFormatter.cleanLine( line );
@@ -137,24 +141,41 @@
 			threadName = 'tail#createUUID()#';
 			thread action="run" name=threadName priority="HIGH" {
 				try{
+					var buffer = [];
 					// Only keep drawing as long as the main thread is active
 					while( variables.tailRun ) {
-
-							var randomAccessFile = createObject( "java", "java.io.RandomAccessFile" ).init( file, "r" );
-							randomAccessFile.seek( position );
-							var line = randomAccessFile.readLine();
-							while( !isnull( line ) ){
-
+							if( isNull( randomAccessFile ) ) {
+								var randomAccessFile = createObject( "java", "java.io.RandomAccessFile" ).init( file, "r" );
+								randomAccessFile.seek( position );
+							}						
+
+							// Don't convert to chars yet, just read the bytes							
+							var byte = randomAccessFile.read();
+
+							if ( byte != -1 ) buffer.append( byte );
+						
+							// If we reached the end of a line or the end of the file (and there are bytes in the buffer), print it out
+							if( byte == 13 || byte == 10 || ( byte == -1 && buffer.len() ) ) {
+								// Convert byte array to UTF-8 encoded string
+								var line = createObject("java", "java.lang.String").init(buffer, "UTF-8");
+								buffer.clear();
 								line = ansiFormatter.cleanLine( line );
 								print
-									.line( line )
+									.text( line )
 									.toConsole();
-
-								var line = randomAccessFile.readLine();
 							}
+							
+							// If we aren't at the end of the file, keep reading
+							if( byte != -1) {
+								continue;
+							}
+
+							// At the end of the file, let's close it, wait a few ms and try again
+
 							// Close the file every time so we don't keep it open and locked
 							position = randomAccessFile.getFilePointer();
 							randomAccessFile.close();
+							structDelete( local, 'randomAccessFile' );
 
 						// Decrease this to speed up the Tail
 						sleep( 300 );