Merge pull request #199 from ortus-boxlang/development

version bump

Author: lmajano

build.gradle

@@ -150,22 +150,18 @@ project.ext.bumpVersion = {
 	boolean minor = false,
 	boolean patch = false,
 	boolean beta = false,
-	boolean rc = false ->
+	boolean rc = false,
+	property = "version" ->
 
 	def propertiesFile = file( './gradle.properties' );
 	def properties = new Properties();
 
 	properties.load( propertiesFile.newDataInputStream() )
 	def versionTarget = major ? 0 : minor ? 1 : beta ? 2 : 3
 
-	def currentVersion = properties.getProperty( 'version' )
-	// 1.1.0 -> -> [ 1, 1, 0 ]
-	// 1.0.0-beta1 -> [ 1, 0, 0-beta1 ]
-	// 1.0.0-rc.1 -> [ 1, 0, 0-rc, 1 ]
+	def currentVersion = properties.getProperty( property )
 	def versionParts = currentVersion.split( '\\.' )
-	if( !beta ){
-		def newPathVersion = versionParts[ versionTarget ].toInteger() + 1
-	}
+	def newPathVersion = versionParts[ versionTarget ].toInteger() + 1
 	def newVersion = '';
 
 	if( patch ){
@@ -184,7 +180,7 @@ project.ext.bumpVersion = {
 		newVersion = "${versionParts[ 0 ]}.${versionParts[ 1 ]}.${versionParts[ 2 ]}.${newPathVersion}"
 	}
 
-	properties.setProperty( 'version', newVersion )
+	properties.setProperty( property, newVersion )
 	properties.store( propertiesFile.newWriter(), null )
 
 	println "Bumped version from ${currentVersion} to ${newVersion}"

changelog.md

@@ -9,6 +9,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+
+- Detection on `boxlang file` execution with invalid paths was not working properly.
+
 ## [1.0.0] - 2025-04-30
 
 [Unreleased]: https://github.com/ortus-boxlang/BoxLang/compare/v1.0.0...HEAD

gradle.properties

@@ -1,4 +1,4 @@
 #Tue Feb 18 09:03:33 UTC 2025
 antlrVersion=4.13.1
 jdkVersion=21
-version=1.0.0
+version=1.0.1

src/main/java/ortus/boxlang/runtime/BoxRunner.java

@@ -31,7 +31,6 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.lang3.StringUtils;
 
 import com.fasterxml.jackson.jr.ob.JSONObjectException;
@@ -470,9 +469,9 @@ private static CLIOptions parseCommandLineOptions( String[] args ) {
 			}
 
 			// Template to execute?
-			Path targetPath = getExecutableTemplate( currentArgument );
-			if ( actionCommand == null && Files.exists( targetPath ) ) {
-				file = targetPath.toString();
+			String targetPath = getExecutableTemplate( currentArgument );
+			if ( actionCommand == null && targetPath != null ) {
+				file = targetPath;
 				continue;
 			}
 
@@ -514,26 +513,45 @@ private static CLIOptions parseCommandLineOptions( String[] args ) {
 	/**
 	 * Verifies if the passed in path is a valid template for execution
 	 *
-	 * @param path The path to the template
+	 * @param path Possible path to the template
 	 *
-	 * @return Whether or not the template is valid for execution
+	 * @return The absolute path if it's valid and exists, null otherwise
 	 */
-	private static Path getExecutableTemplate( String path ) {
-		String extension = FilenameUtils.getExtension( path );
+	private static String getExecutableTemplate( String path ) {
+		String[]	currentParts	= path.split( "\\." );
+		String		currentExt		= "";
 
+		if ( currentParts.length > 0 ) {
+			currentExt = "." + currentParts[ currentParts.length - 1 ].toLowerCase();
+		}
 		// Do we have the extension? If not, let's assume it's a class
-		if ( extension.isEmpty() ) {
-			extension	= "bx";
-			path		+= ".bx";
+		boolean presumptiveExtension = false;
+		if ( currentExt.isEmpty() ) {
+			currentExt				= "bx";
+			path					+= ".bx";
+			presumptiveExtension	= true;
 		}
 
 		// Check if the extension is allowed or not
-		if ( !ALLOWED_TEMPLATE_EXECUTIONS.contains( "." + extension ) ) {
-			return Path.of( path );
+		if ( !ALLOWED_TEMPLATE_EXECUTIONS.contains( currentExt ) ) {
+			return null;
 		}
 
 		// Check if the file exists
-		return Path.of( templateToAbsolute( path ) );
+		String absPath = templateToAbsolute( path );
+		try {
+			Path templatePath = Paths.get( absPath );
+
+			if ( !Files.exists( templatePath ) ) {
+				if ( !presumptiveExtension ) {
+					throw new BoxRuntimeException( "The template [" + path + "] does not exist." );
+				}
+				return null;
+			}
+		} catch ( InvalidPathException e ) {
+			return null;
+		}
+		return absPath;
 	}
 
 	/**