Merge remote-tracking branch 'origin/fix/module-system-code-issues-2' into feat/use-npr-client

Author: jorgee

modules/nextflow/src/main/groovy/nextflow/cli/module/CmdModuleInfo.groovy

@@ -120,7 +120,7 @@ class CmdModuleInfo extends CmdBase {
             throw new AbortOperationException("No release information available for ${reference}")
         }
         if( !release.metadata ) {
-            log.info("No metadata found for $reference ${release.version ? "($release.version)" : ''}")
+            throw new AbortOperationException("No metadata found for ${reference}${release.version ? " (${release.version})" : ''}")
         }
         def moduleUrl = buildModuleUrl(registryConfig.url, reference, release.version)
         if( !output || output == 'text' ) {

modules/nextflow/src/main/groovy/nextflow/cli/module/CmdModuleInstall.groovy

@@ -29,6 +29,7 @@ import nextflow.module.ModuleReference
 import io.seqera.npr.client.RegistryClient
 import nextflow.module.RegistryClientFactory
 import nextflow.module.ModuleResolver
+import nextflow.module.ModuleSpec
 
 import nextflow.util.TestOnly
 
@@ -86,7 +87,8 @@ class CmdModuleInstall extends CmdBase {
 
         try {
             def installedMainFile = resolver.installModule(reference, version, force)
-            def installedVersion = version ?: resolver.resolveVersion(reference)
+            // Read the installed version from meta.yml to avoid a redundant registry call
+            def installedVersion = ModuleSpec.load(installedMainFile.parent.resolve('meta.yml')).version
 
             println "Module ${reference}@${installedVersion} installed and configured successfully"
         }

modules/nextflow/src/main/groovy/nextflow/cli/module/CmdModulePublish.groovy

@@ -261,7 +261,7 @@ class CmdModulePublish extends CmdBase {
         final localStorage = new ModuleStorage(root ?: Paths.get('.').toAbsolutePath().normalize())
 
         if (!localStorage.isInstalled(ref)){
-            throw new AbortOperationException("No module diretory found for $module")
+            throw new AbortOperationException("No module directory found for $module")
         }
         useModuleReference = true
         return localStorage.getModuleDir(ref)

modules/nextflow/src/main/groovy/nextflow/module/ModuleInfo.groovy

@@ -94,13 +94,13 @@ class ModuleInfo {
      * Load all properties from the .module-info file in the module directory
      *
      * @param moduleDir The module directory path
-     * @return The checksum, or null if file doesn't exist
+     * @return Map of properties, or null if file doesn't exist
      */
     static Map<String, String> load(Path moduleDir) {
         def moduleInfoFile = moduleDir.resolve(MODULE_INFO_FILE)
         if( !Files.exists(moduleInfoFile) ) {
             log.debug("Module file $moduleInfoFile not found")
-            return [:]
+            return null
         }
         def props = new Properties()
         moduleInfoFile.withInputStream { is -> props.load(is) }

modules/nextflow/src/main/groovy/nextflow/module/ModuleReference.groovy

@@ -31,9 +31,7 @@ import java.util.regex.Pattern
 @EqualsAndHashCode
 class ModuleReference {
 
-    // Pattern allows: scope with letters/digits/hyphens/dots/underscores, name segments separated by slashes (no trailing slash)
-    // Scope: starts with letter/digit, followed by letters/digits/dots/underscores/hyphens
-    // Name: one or more segments (each starting with letter, followed by letters/digits/underscores/hyphens), separated by slashes
+    // Must stay in sync with ModuleResolver.REMOTE_MODULE_PATTERN in nf-lang
     private static final Pattern MODULE_NAME_PATTERN = ~/^([a-z0-9][a-z0-9._\-]*)\/([a-z][a-z0-9._\-]*(?:\/[a-z][a-z0-9._\-]*)*)$/
 
     final String scope