diff --git a/APLSource/Cider/CloseProject.aplf b/APLSource/Cider/CloseProject.aplf index 3d9b114..a68b7a3 100644 --- a/APLSource/Cider/CloseProject.aplf +++ b/APLSource/Cider/CloseProject.aplf @@ -7,9 +7,9 @@ ⍝ 3. One or more alias names like `[my-alias]` ⍝ 4. One or more paths of currently open projects ⍝ 5. A mixture of 2, 3 and 4 -⍝ `x` can be a Boolean that defaults to 1, meaning "perform checks, if any"; see "CheckForDropboxConflicts" as -⍝ an example. -⍝ A 0 as left argument would therefore prevent checks from being performed. +⍝ `performChecks` can be a Boolean that defaults to 1, meaning "perform checks, if any". +⍝ See "CheckForDropboxConflicts" as an example. +⍝ A 0 as left argument would therefore prevent such checks from being performed.\\ ⍝ Returns the number of projects closed. r←0 performChecks←{0<⎕NC ⍵:⍎⍵ ⋄ 1}'performChecks' @@ -21,7 +21,7 @@ :Else closed←'' list[;2]←F.NormalizePath list[;2] - projects←⊆projects + projects←,⊆projects :For project :In projects project←⍕project :If ∧/'[]'∊project diff --git a/APLSource/Cider/History.apla b/APLSource/Cider/History.apla index aed93e4..7b51148 100644 --- a/APLSource/Cider/History.apla +++ b/APLSource/Cider/History.apla @@ -1,18 +1,24 @@ ( - '* 0.46.0 ⋄ 2024-12-28' + '* 0.46.0 ⋄ 2025-01-07' ' * When a project is opened and a file .linkconfig is found in the project''s source folder, its content is' - ' now checked. If it contains nothing but stop & trace vectors and Link''s version number, then that file' - ' is now ignored, and any Link-related settings in Cider''s project config file are evaluated.' - ' * New command ]Cider.LinkConfig added that allows printing, editing and deleting a Link config file' + ' now checked. If it contains nothing but stop & trace vectors and Link''s version number, then any ' + ' Link-related settings in Cider''s project config file are evaluated, and the user is told to reconcile' + ' the two sources of Link options, and eventually to delete the LINK section in the project config file.' + ' ' + ' If the file `linkconfig` contains more than just the Link version number and Stop and Trace vectors, ' + ' then the LINK section in the project config file (if any) will be ignored, and the user will be told' + ' to delete it.' + ' * New command ]Cider.LinkConfig added that allows printing, editing and deleting a file `linkconfig`.' ' * A Cider project config file does not have to have a LINK section anymore because there might be a Link' ' configuration file be used instead.' - ' * `CloseProject`: minor syntax change insofar as no project list can be provided anymore via the left argument' - ' Almost certainly used only by the ]CloseProject user command' - ' * `CloseProject` now processes the name of an unqualified namespace name by trying to find it in the namespace' - ' it was called from.' + ' * `CloseProject`: minor syntax change insofar as no project list can be provided anymore via the left ' + ' argument. Was almost certainly only used by the `]CloseProject` user command.' + ' * `CloseProject` now processes the name of an unqualified namespace name by trying to find it in the ' + ' namespace it was called from.' + ' * Development packages updated.' ' * Bug fixes' ' * `]ListTatinDependencies` did not always report the folder that was investigated (#93)' - ' * `]ListTatinDependencies` had a problem with -full: only obe level of sub-folders was investigated (#94)' + ' * `]ListTatinDependencies` had a problem with -full: only one level of sub-folders was investigated (#94)' ' * `ReadProjectConfigFile` now injects `dependencies` into the config file when undefined.' ' * The `TatinVars` namespace was created as a ref pointing to another namespace `TatinVars` which was' ' then deleted. That can cause confusion. Now the namespace is copied.' diff --git a/tatin-packages_dev/apl-buildlist.json b/tatin-packages_dev/apl-buildlist.json index 63b25e5..525f0ac 100644 --- a/tatin-packages_dev/apl-buildlist.json +++ b/tatin-packages_dev/apl-buildlist.json @@ -1,6 +1,6 @@ { packageID: [ - "aplteam-Tester2-3.11.0", + "aplteam-Tester2-3.11.1", "aplteam-FilesAndDirs-5.8.1", "aplteam-CommTools-2.0.0", "aplteam-CodeCoverage-0.10.7", diff --git a/tatin-packages_dev/apl-dependencies.txt b/tatin-packages_dev/apl-dependencies.txt index 0d1b4fb..829ccdb 100644 --- a/tatin-packages_dev/apl-dependencies.txt +++ b/tatin-packages_dev/apl-dependencies.txt @@ -3,4 +3,4 @@ aplteam-FilesAndDirs-5.8.1 aplteam-CodeCoverage-0.10.7 aplteam-CommTools-2.0.0 aplteam-APLProcess-0.7.0 -aplteam-Tester2-3.11.0 +aplteam-Tester2-3.11.1 diff --git a/tatin-packages_dev/aplteam-Tester2-3.11.0/APLSource/Tester2.aplc b/tatin-packages_dev/aplteam-Tester2-3.11.1/APLSource/Tester2.aplc similarity index 98% rename from tatin-packages_dev/aplteam-Tester2-3.11.0/APLSource/Tester2.aplc rename to tatin-packages_dev/aplteam-Tester2-3.11.1/APLSource/Tester2.aplc index 98dae61..d5ea047 100644 --- a/tatin-packages_dev/aplteam-Tester2-3.11.0/APLSource/Tester2.aplc +++ b/tatin-packages_dev/aplteam-Tester2-3.11.1/APLSource/Tester2.aplc @@ -19,19 +19,31 @@ ⎕IO←1 ⋄ ⎕ML←1 - ∇ r←Version;buff;history;date + ∇ r←Version;buff :Access Public shared - ⍝ Returns the version number from the package config file + ⍝ Returns the version number from TatinVars (if we can) ⍝ See also `History` - buff←(⎕JSON⍠('Dialect' 'JSON5')⊢((⊃⊃⎕CLASS ⎕THIS).##).TatinVars.CONFIG).version - history←History - date←{⍵↑⍨¯1+⍵⍳' '}'⋄'{⍵↓⍨(≢⍺)+1⍳⍨⍺⍷⍵}history[1;] - r←'Tester2'buff date - ⍝Done + :If 0<⎕NC'TatinVars.CONFIG' + buff←(⎕JSON⍠('Dialect' 'JSON5')⊢TatinVars.CONFIG).version + :ElseIf 0<##.⎕NC'TatinVars.CONFIG' + buff←(⎕JSON⍠('Dialect' 'JSON5')⊢##.TatinVars.CONFIG).version + :Else + ⍝ When a script is not loaded with Tatin, there will be no namespace `TatinVars` + ⍝ In such cases we cannot provide a version number. + buff←'' + :EndIf + ⍝ Originally this was , , + ⍝ We cannot provide the version date anymore + r←'Tester2' buff '' ∇ ∇ r←History :Access Public shared + ⍝ * 3.11.1 ⋄ 2024-12-30 + ⍝ Bug fixes + ⍝ * In `Version`: if for some reason it cannot find `TatinVars` it should return + ⍝ an empty vector for the version number rather than crashing. + ⍝ * Reports were intended to honour ⎕PW but got one char too long ⍝ * 3.11.0 ⋄ 2024-12-25 ⍝ * `ListTestFunctions` enhanced ⍝ * `Version` extracts the version number now from the package config file @@ -477,7 +489,7 @@ :If ps.guiFlag _parms.ref2Gui←ps.ref2Gui←ps CreateGui ⍬ :EndIf - ShowLog{'--- Test framework "Tester2" version ',(2⊃⍵),' from ',(3⊃⍵),' ----'}Version + ShowLog{'--- Test framework "Tester2" version ',(2⊃⍵),' ----'}Version _ref←ProcessIniFiles _ref ps ps.returnCodes←⍬ initialFlag←0 ⍝ Tells whether `Initial was executed or not @@ -793,7 +805,7 @@ ∇ ProcessTestCases(ref ps);cw;max;noOf;length2;length;i;testFns;currentGroup;testNo;continueFlag;rc;comment;desc;marker cw←≢max←⍕noOf←≢ps.list length←2+⌈/≢¨ps.list - length2←length+≢'(',max,'/',max,') ' + length2←¯1+length+≢'(',max,'/',max,') ' :If ps.guiFlag :If 0<≢ps.list ps.ref2Gui.∆n.Grid.Values←(noOf,1↓⍴ps.ref2Gui.∆n.Grid.Values)⍴ps.ref2Gui.∆n.Grid.Values @@ -846,7 +858,8 @@ :EndIf ps AddReturnCodeToGrid rc i comment←2↓ref GetFirstCommentLine testFns - desc←(⎕PW-length2){⍺<≢⍵:'...',⍨⍵↑⍨⍺-4 ⋄ ⍵}⍣(~ps.guiFlag)⊢comment + ⍝TODO⍝ desc←(⎕PW-length2){⍺<≢⍵:'...',⍨⍵↑⍨⍺-4 ⋄ ⍵}⍣(~ps.guiFlag)⊢comment + desc←⊢comment :If rc∊0 1 marker←('*✓'[1+rc=0]) :Else @@ -872,7 +885,8 @@ ps.errCounter+←1 ps.totalCounter+←1 comment←2↓ref GetFirstCommentLine testFns - desc←(⎕PW-length2){⍺<≢⍵:'...',⍨⍵↑⍨⍺-4 ⋄ ⍵}⍣(~ps.guiFlag)⊢comment + ⍝TODO⍝ desc←(⎕PW-length2){⍺<≢⍵:'...',⍨⍵↑⍨⍺-4 ⋄ ⍵}⍣(~ps.guiFlag)⊢comment + desc←⊢comment marker←'#' ¯2 ShowLog marker' ',desc i AddToGui(length2↑(length↑marker,' ',testFns),' (',(cw 0⍕i),'/',max,')'),' ⍝ ',desc diff --git a/tatin-packages_dev/aplteam-Tester2-3.11.0/LICENSE b/tatin-packages_dev/aplteam-Tester2-3.11.1/LICENSE similarity index 100% rename from tatin-packages_dev/aplteam-Tester2-3.11.0/LICENSE rename to tatin-packages_dev/aplteam-Tester2-3.11.1/LICENSE diff --git a/tatin-packages_dev/aplteam-Tester2-3.11.0/apl-dependencies.txt b/tatin-packages_dev/aplteam-Tester2-3.11.1/apl-dependencies.txt similarity index 100% rename from tatin-packages_dev/aplteam-Tester2-3.11.0/apl-dependencies.txt rename to tatin-packages_dev/aplteam-Tester2-3.11.1/apl-dependencies.txt diff --git a/tatin-packages_dev/aplteam-Tester2-3.11.0/apl-package.json b/tatin-packages_dev/aplteam-Tester2-3.11.1/apl-package.json similarity index 90% rename from tatin-packages_dev/aplteam-Tester2-3.11.0/apl-package.json rename to tatin-packages_dev/aplteam-Tester2-3.11.1/apl-package.json index 86e1203..3113dae 100644 --- a/tatin-packages_dev/aplteam-Tester2-3.11.0/apl-package.json +++ b/tatin-packages_dev/aplteam-Tester2-3.11.1/apl-package.json @@ -1,7 +1,7 @@ { api: "Tester2", assets: "html/", - date: 20241225.140351, + date: 20241231.084147, description: "Dyalog APL test framework", documentation: "", files: "", @@ -21,5 +21,5 @@ tags: "test,test-framework", uri: "https://tatin.dev/", userCommandScript: "", - version: "3.11.0+48", + version: "3.11.1+52", } diff --git a/tatin-packages_dev/aplteam-Tester2-3.11.0/html/Tester2-Reference.html b/tatin-packages_dev/aplteam-Tester2-3.11.1/html/Tester2-Reference.html similarity index 100% rename from tatin-packages_dev/aplteam-Tester2-3.11.0/html/Tester2-Reference.html rename to tatin-packages_dev/aplteam-Tester2-3.11.1/html/Tester2-Reference.html diff --git a/tatin-packages_dev/aplteam-Tester2-3.11.0/html/gui_1.png b/tatin-packages_dev/aplteam-Tester2-3.11.1/html/gui_1.png similarity index 100% rename from tatin-packages_dev/aplteam-Tester2-3.11.0/html/gui_1.png rename to tatin-packages_dev/aplteam-Tester2-3.11.1/html/gui_1.png diff --git a/tatin-packages_dev/aplteam-Tester2-3.11.0/html/gui_2.png b/tatin-packages_dev/aplteam-Tester2-3.11.1/html/gui_2.png similarity index 100% rename from tatin-packages_dev/aplteam-Tester2-3.11.0/html/gui_2.png rename to tatin-packages_dev/aplteam-Tester2-3.11.1/html/gui_2.png diff --git a/tatin-packages_dev/aplteam-Tester2-3.11.0/html/gui_3.png b/tatin-packages_dev/aplteam-Tester2-3.11.1/html/gui_3.png similarity index 100% rename from tatin-packages_dev/aplteam-Tester2-3.11.0/html/gui_3.png rename to tatin-packages_dev/aplteam-Tester2-3.11.1/html/gui_3.png diff --git a/tatin-packages_dev/aplteam-Tester2-3.11.0/html/gui_4.png b/tatin-packages_dev/aplteam-Tester2-3.11.1/html/gui_4.png similarity index 100% rename from tatin-packages_dev/aplteam-Tester2-3.11.0/html/gui_4.png rename to tatin-packages_dev/aplteam-Tester2-3.11.1/html/gui_4.png