<stop>-related bug fixed & tests amended & <Make> improved

Author: aplteam

APLSource/Admin/Make.aplf

@@ -1,23 +1,23 @@
- Make flag;M;C;path;zipFilename;res;cfg;parms;F
-⍝ "Make" a new version of this project
+ Make flag;M;C;path;zipFilename;res;parms;cfg
+⍝ "Make" a new version of this projects
  :If flag
      :If 0=⎕SE.⎕NC'MakeHelpers'
          {}⎕SE.Tatin.LoadPackages'[tatin]MakeHelpers'⎕SE
      :EndIf
      M←⎕SE.MakeHelpers
-     C←##.CiderConfig ⋄ F←M.##.FilesAndDirs
+     C←##.CiderConfig
+     ⎕←'' ⋄ 0 0⍴⍞,0/⍞←'Pause sync services like Dropbox, Google Drive etc. in order to avoid FILE ACCESS errors. Press <enter> to continue '
+     :If ⎕NULL≡cfg←M.EditPackageConfigFile C.HOME
+         ⎕←'Cancelled by user' ⋄ →0
+     :EndIf
      path←C.HOME,'/',C.CIDER.distributionFolder
-     cfg←M.GetPackageCfg C.HOME
-     cfg←M.EditVersion cfg
      M.RecreateFolder path
-     M.RecreateFolder C.HOME,'/html'
      M.ConvertMarkdownToHtml5 C.HOME∘,¨'/docs/' '/html/'
-     (C.HOME,'/html/')∘{⍺ ⎕NCOPY ⍵}¨F.ListFiles C.HOME,'/docs/*.png'
+     (C.HOME,'/html/')∘{⍺ ⎕NCOPY⍠('IfExists' 'Replace')⊢⍵}¨M.##.F.ListFiles C.HOME,'/docs/*.png'
      path ⎕NCOPY C.HOME,'/html'
      parms←⎕SE.Tatin.CreateBuildParms C.HOME
-     parms.targetPath←path
+     parms.targetPath←C.CIDER.distributionFolder
      parms.version←cfg.version
      zipFilename←⎕SE.Tatin.BuildPackage parms
      ⎕←'*** New version build successfully:',M.CR,'   ',zipFilename
  :EndIf
- ⍝Done

APLSource/TestCases/Test_Misc_91.aplf

@@ -1,20 +1,16 @@
- r←Test_Misc_91(flag batchFlag);log;⎕TRAP;res;was
+ r←Test_Misc_91(stop batchFlag);log;⎕TRAP;res;was
 ⍝ Exercise the function "Version"
  ⎕TRAP←(999 'C' '∘∘∘ ⍝ Deliberate error')(0 'N')
  r←T._Failed
 
  res←##.Tester2.Version
- →T.PassesIf 3=≢res
- →T.PassesIf'Tester2'≡1⊃res
- →T.PassesIf 0<≢2⊃res
- →T.PassesIf 0=≢3⊃res
+ →T.PassesIf 1=≡res
+ →T.PassesIf' '=1↑0⍴res
+ →T.PassesIf∧/⎕D∊⍨{⍵↑⍨¯1+⌊/¯1+⍵⍳'-+'}res~'. '
 
  was←⎕NS #.Tester2.TatinVars    ⍝ Take a copy
  #.Tester2.⎕EX'TatinVars'       ⍝ Delete it
  res←##.Tester2.Version         ⍝ Run "Version"
- #.Tester2.TatinVars←⎕NS was    ⍝ Restore initial "TatinVars"
- →T.PassesIf'Tester2'≡1⊃res
- →T.PassesIf 0=≢2⊃res           ⍝ Because it could return a version number
- →T.PassesIf 0=≢3⊃res
+  →T.PassesIf ''≡res
 
  r←T._OK

APLSource/Tester2.aplc

@@ -20,7 +20,7 @@
     ⎕IO←1 ⋄ ⎕ML←1
 
 
-    ∇ r←Version
+    ∇ r←Version;ref
       :Access Public shared
     ⍝ Returns the version number from `TatinVars` if possible.
     ⍝ See also `History`
@@ -31,14 +31,22 @@
       :Else
     ⍝ When a script was not loaded with Tatin, there will be no namespace `TatinVars`.
     ⍝ In such cases we cannot provide a version number, so we return just ''.
-          r←''
+          :If '#.Tester2.TestCases.'{⍺≡(≢⍺)↑⍵}⍕⎕THIS
+              ⍝ Runs in its own testcases, and therefore won't find the correct function without help
+              ref←⊃⊃⎕CLASS ⎕THIS
+              r←ref.Version
+          :Else
+              r←''
+          :EndIf
       :EndIf
     ∇
 
     ∇ r←History
       :Access Public shared
       ⍝ * 4.0.0 ⋄ 2025-04-03
       ⍝   * Potenially breaking change: `Version` now returns the package config version number as a char vector
+      ⍝   * Packages updated
+      ⍝   * `Make` improved
       ⍝ * 3.11.1 ⋄ 2024-12-30
       ⍝   Bug fixes
       ⍝   * In `Version`: if for some reason it cannot find `TatinVars` it should return
@@ -489,7 +497,7 @@
       :If ps.guiFlag
           _parms.ref2Gui←ps.ref2Gui←ps CreateGui ⍬
       :EndIf
-      ShowLog{'--- Test framework "Tester2" version ',(2⊃⍵),' ----'}Version
+      ShowLog{'--- Test framework "Tester2" version ',⍵,' ----'}Version
       _ref←ProcessIniFiles _ref ps
       ps.returnCodes←⍬
       initialFlag←0 ⍝ Tells whether `Initial was executed or not
@@ -1308,6 +1316,9 @@
           :If 0<ref.⎕NC'stopFlag'
           :AndIf 0=ref.⎕NC'debugFlag'
               flag2←ref.stopFlag
+          :ElseIf 0<ref.⎕NC'stop'
+          :AndIf 0=ref.⎕NC'debugFlag'
+              flag2←ref.stop
           :Else
               flag2←ref.debugFlag
           :EndIf
@@ -1331,6 +1342,9 @@
       :If 0<ref.⎕NC'stopFlag'
       :AndIf 0=ref.⎕NC'debugFlag'
           flag2←ref.stopFlag
+      :ElseIf 0<ref.⎕NC'stop'
+      :AndIf 0=ref.⎕NC'debugFlag'
+          flag2←ref.stop
       :Else
           flag2←ref.debugFlag
       :EndIf

TestResults/CodeCoverage.cr

@@ -19,5 +19,5 @@
   source: "APLSource/Tester2.aplc",
   tags: "test,test-framework",
   userCommandScript: "",
-  version: "3.11.1+52",
+  version: "4.0.0+54",
 }