Default revision

modules/nextflow/src/main/groovy/nextflow/config/Manifest.groovy

@@ -55,11 +55,23 @@ class Manifest {
 
 
     String getDefaultBranch() {
-        target.defaultBranch
+        target.defaultBranch ?: 'master'
+    }
+
+    /**
+     * Gets the default revision to use
+     * Priority order:
+     * 1. defaultRevision if set
+     * 2. version if set
+     * 3. defaultBranch
+     * @return The revision to use
+     */
+    String getDefaultRevision() {
+        target.defaultRevision ?: getVersion() ?: getDefaultBranch()
     }
 
     String getDescription() {
-        target.description 
+        target.description
     }
 
     String getAuthor() {
@@ -104,6 +116,10 @@ class Manifest {
         target.nextflowVersion
     }
 
+    /**
+     * Gets the version
+     * @return The version string or null if not set
+     */
     String getVersion() {
         target.version
     }
@@ -139,6 +155,7 @@ class Manifest {
             .map(c -> c.toMap())
             .collect(Collectors.toList())
         result.defaultBranch = getDefaultBranch()
+        result.defaultRevision = getDefaultRevision()
         result.description = getDescription()
         result.homePage = homePage
         result.gitmodules = getGitmodules()
@@ -193,4 +210,100 @@ class Manifest {
         MAINTAINER,
         CONTRIBUTOR
     }
+
+    /**
+     * Checks if the current version is a development version
+     * @return true if version ends with 'dev' or '-dev', false otherwise
+     */
+    boolean isDevelopmentVersion() {
+        def version = getVersion()
+        if (!version) return false
+        return version.endsWith('dev') || version.endsWith('-dev')
+    }
+
+    /**
+     * Checks if the current version is a release candidate
+     * @return true if version contains '-RC', false otherwise
+     */
+    boolean isReleaseCandidate() {
+        def version = getVersion()
+        if (!version) return false
+        return version.contains('-RC')
+    }
+
+    /**
+     * Checks if the current version is a hotfix
+     * @return true if version contains '-hotfix', false otherwise
+     */
+    boolean isHotfix() {
+        def version = getVersion()
+        if (!version) return false
+        return version.contains('-hotfix')
+    }
+
+    /**
+     * Validates if a version string is a valid semantic version
+     * @param version The version string to validate
+     * @return true if valid, false otherwise
+     */
+    boolean isValidVersion(String version) {
+        if (!version) return false
+        // Matches standard versions like 1.0.0, release candidates like 1.0.0-RC1, development versions like 1.0.0dev, and hotfixes like 1.0.0-hotfix
+        version ==~ /^\d+\.\d+\.\d+(-RC\d+|-dev|dev|-hotfix)?$/
+    }
+
+    /**
+     * Compares two version strings
+     * @return -1 if v1 < v2, 0 if v1 == v2, 1 if v1 > v2
+     */
+    private int compareVersions(String v1, String v2) {
+        def v1Parts = v1.tokenize('.')
+        def v2Parts = v2.tokenize('.')
+
+        for (int i = 0; i < Math.min(v1Parts.size(), v2Parts.size()); i++) {
+            def v1Part = v1Parts[i].replaceAll(/(-RC\d+|-dev|dev|-hotfix)$/, '') as int
+            def v2Part = v2Parts[i].replaceAll(/(-RC\d+|-dev|dev|-hotfix)$/, '') as int
+            if (v1Part != v2Part) {
+                return v1Part <=> v2Part
+            }
+        }
+
+        v1Parts.size() <=> v2Parts.size()
+    }
+
+    /**
+     * Checks if the current version is greater than the provided version
+     * @param otherVersion The version to compare against
+     * @return true if current version is greater, false otherwise
+     */
+    boolean isVersionGreaterThan(String otherVersion) {
+        def version = getVersion()
+        if (!version || !otherVersion) return false
+
+        // Strip any suffixes for comparison
+        def v1 = version.replaceAll(/(-RC\d+|-dev|dev|-hotfix)$/, '')
+        def v2 = otherVersion.replaceAll(/(-RC\d+|-dev|dev|-hotfix)$/, '')
+
+        compareVersions(v1, v2) > 0
+    }
+
+    /**
+     * Checks if the current version is compatible with the provided version
+     * @param otherVersion The version to check compatibility with
+     * @return true if compatible, false otherwise
+     */
+    boolean isVersionCompatibleWith(String otherVersion) {
+        def version = getVersion()
+        if (!version || !otherVersion) return false
+
+        // Development versions are always compatible
+        if (isDevelopmentVersion()) return true
+
+        // For release candidates and hotfixes, compare base versions
+        def v1 = version.replaceAll(/(-RC\d+|-dev|dev|-hotfix)$/, '')
+        def v2 = otherVersion.replaceAll(/(-RC\d+|-dev|dev|-hotfix)$/, '')
+
+        // Version should be greater than or equal to the other version
+        compareVersions(v1, v2) >= 0
+    }
 }

modules/nextflow/src/main/groovy/nextflow/scm/AssetManager.groovy

@@ -937,9 +937,18 @@ class AssetManager {
         assert localPath
 
         def current = getCurrentRevision()
-        if( current != defaultBranch ) {
+        def defaultRev = getManifest().getDefaultRevision()
+        if( current != defaultRev ) {
+            // NOTE This is the issue
             if( !revision ) {
-                throw new AbortOperationException("Project `$project` is currently stuck on revision: $current -- you need to explicitly specify a revision with the option `-r` in order to use it")
+                Ref head = git.getRepository().findRef(Constants.HEAD);
+
+                // try to resolve the the current object id to a tag name
+                Map<ObjectId, String> names = git.nameRev().addPrefix( "refs/tags/" ).add(head.objectId).call()
+                def tag = names.get( head.objectId ) ?: head.objectId.name()
+                if( current != tag ) {
+                    throw new AbortOperationException("Project `$project` is currently stuck on revision: $current -- you need to explicitly specify a revision with the option `-r` in order to use it")
+                }
             }
         }
         if( !revision || revision == current ) {

modules/nextflow/src/test/groovy/nextflow/cli/CmdRunTest.groovy

@@ -313,7 +313,7 @@ class CmdRunTest extends Specification {
     }
 
     @Unroll
-    def 'should guss is repo' () {
+    def 'should guess is repo' () {
         expect:
         CmdRun.guessIsRepo(PATH) == EXPECTED