removed erroneous newline from terse spider output, fixed asymmetry where prereqs where printed when terse spider found single matching module

Author: mrcawood

rt/terse_spider/mf/Core/gcc/13.2.0.lua

@@ -0,0 +1,3 @@
+-- Prerequisite module for testing dependencies in terse spider
+setenv("GCC_VERSION", myModuleVersion())
+

rt/terse_spider/mf/Core/gcc/9.1.0.lua

@@ -0,0 +1,3 @@
+-- Prerequisite module for testing dependencies in terse spider
+setenv("GCC_VERSION", myModuleVersion())
+

rt/terse_spider/mf/Core/gmp/6.3.0.lua

@@ -1,3 +1,9 @@
--- Simple module with no dependencies for testing terse spider output
+-- Module with dependencies for testing terse spider output
+-- This tests the asymmetry issue: single module should show module name,
+-- not prerequisites, in terse mode
+depends_on("gcc")
+depends_on("intel")
 setenv("GMP_VERSION", myModuleVersion())
 
+
+

rt/terse_spider/mf/Core/hdf5/1.14.4.lua

@@ -1,3 +1,5 @@
 -- Module for testing multiple matches in terse mode
 setenv("HDF5_VERSION", myModuleVersion())
 
+
+

rt/terse_spider/mf/Core/hdf5/1.14.6.lua

@@ -1,3 +1,5 @@
 -- Module for testing multiple matches in terse mode
 setenv("HDF5_VERSION", myModuleVersion())
 
+
+

rt/terse_spider/mf/Core/intel/19.0.5.lua

@@ -0,0 +1,3 @@
+-- Prerequisite module for testing dependencies in terse spider
+setenv("INTEL_VERSION", myModuleVersion())
+

rt/terse_spider/mf/Core/intel/19.1.1.lua

@@ -0,0 +1,3 @@
+-- Prerequisite module for testing dependencies in terse spider
+setenv("INTEL_VERSION", myModuleVersion())
+

rt/terse_spider/mf/Core/intel/23.1.0.lua

@@ -0,0 +1,3 @@
+-- Prerequisite module for testing dependencies in terse spider
+setenv("INTEL_VERSION", myModuleVersion())
+

rt/terse_spider/terse_spider.tdesc

@@ -7,7 +7,10 @@ testdescript = {
    description = [[
      Test terse mode output for spider command:
      1. Single module match should output just module name (not verbose format)
-     2. Non-existent module should output nothing (no error message)
+     2. Single module with dependencies should show module name, not prerequisites
+     3. Multiple module matches should output module names (one per line)
+     4. No blank line at end of output
+     5. Non-existent module should output nothing (no error message, no blank line)
    ]],
    keywords = {testName, "spider", "terse"},
 
@@ -28,26 +31,25 @@ testdescript = {
 
      runLmod --version                                    # 1
      
-     # Bug 1: Single module match in terse mode should output just module name
-     # Expected: gmp/6.3.0 (single line, no verbose formatting)
+     # Test 1: Single module match in terse mode should output just module name
+     # Expected: gmp/6.3.0 (single line, no verbose formatting, no blank line)
+     # This tests the asymmetry fix: single module should show module name,
+     # not prerequisites, even when dependencies exist
      runLmod -t spider gmp                                # 2
      
-     # Bug 1: Multiple module matches should still work correctly
-     # Expected: hdf5/1.14.4\nhdf5/1.14.6 (one per line)
+     # Test 2: Multiple module matches should output module names (one per line)
+     # Expected: hdf5/1.14.4\nhdf5/1.14.6 (one per line, no blank line at end)
+     # This tests that multiple modules work correctly and no blank line appears
      runLmod -t spider hdf5                               # 3
      
-     # Bug 2: Non-existent module in terse mode should output nothing
-     # Expected: (empty output, no error message)
+     # Test 3: Non-existent module in terse mode should output nothing
+     # Expected: (empty output, no error message, no blank line)
+     # This verifies no blank line issue and proper handling of non-existent modules
      runLmod -t spider alps                               # 4
      
-     # Bug 2: Non-existent module in non-terse mode should show error
+     # Test 4: Non-existent module in non-terse mode should show error
      # Expected: Error message (to verify non-terse mode still works)
      runLmod spider alps                                   # 5
-     
-     # Bug 1: Verify single module with dependencies still works in terse mode
-     # (This should still show dependencies, not just module name)
-     # Note: We don't have a module with dependencies in this test, but we can
-     # verify that the existing behavior for modules without deps is fixed
 
      HOME=$ORIG_HOME
 
@@ -74,3 +76,5 @@ testdescript = {
 
 }
 
+
+

src/Spider.lua

@@ -1225,7 +1225,7 @@ function M._Level1(self, dbT, providedByT, possibleA, sn, key, helpFlg)
    if ((m_count == 1 and p_count == 0) or (m_count == 0 and p_count == 1) or
        (numNames == 1)) then
       --io.stderr:write("going level 2: fullName: ",fullName,"\n")
-      local s = self:_Level2(sn, fullName, entryMA, entryPA, possibleA, tailMsg)
+      local s = self:_Level2(sn, fullName, entryMA, entryPA, possibleA, tailMsg, key)
       dbg.fini("Spider:_Level1")
       return s
    end
@@ -1349,8 +1349,8 @@ function M._Level1(self, dbT, providedByT, possibleA, sn, key, helpFlg)
    return concatTbl(a,"")
 end
 
-function M._Level2(self, sn, fullName, entryA, entryPA, possibleA, tailMsg)
-   dbg.start{"Spider:_Level2(\"",sn,"\", \"",fullName,"\", entryA, entryPA, possibleA, tailMsg)"}
+function M._Level2(self, sn, fullName, entryA, entryPA, possibleA, tailMsg, key)
+   dbg.start{"Spider:_Level2(\"",sn,"\", \"",fullName,"\", entryA, entryPA, possibleA, tailMsg, key: \"",key or "nil","\")"}
    --dbg.printT("entryA",entryA)
 
    local optionTbl    = optionTbl()
@@ -1380,17 +1380,16 @@ function M._Level2(self, sn, fullName, entryA, entryPA, possibleA, tailMsg)
    dbg.printT("entryA[1]", entryT)
    dbg.printT("entryPA", entryPA)
 
-   -- Early return for terse mode when no dependencies
-   if (terse and next(entryA) ~= nil) then
-      local hasDependencies = false
-      for k = 1, #entryA do
-         if (entryA[k].parentAA) then
-            hasDependencies = true
-            break
-         end
-      end
-      if (not hasDependencies) then
-         -- Return just the module name, consistent with _Level1 terse output
+   -- Early return for terse mode:
+   -- - If user searched for a specific module/version (key == fullName), show prerequisites
+   -- - If user searched for a module name and got one match (key != fullName), show module name
+   -- This fixes the asymmetry issue while preserving the expected behavior for specific version searches
+   if (terse and fullName and (next(entryA) ~= nil or next(entryPA) ~= nil)) then
+      -- If key matches fullName, user searched for specific version - show prerequisites
+      if (key and key == fullName) then
+         -- Fall through to show prerequisites (existing behavior)
+      else
+         -- User searched for module name, got one match - show module name (fix asymmetry)
          dbg.fini("Spider:_Level2")
          return fullName .. "\n"
       end