Several bug fixes

Author: aplteam

APLSource/Cider/Cider.dyalog

@@ -9,10 +9,17 @@
 
     ∇ r←Version;fully
       :Access Public Shared
-      r←'0.31.1+410'
+      r←'0.32.0+410'
+      ⍝ * 0.32.0 ⋄ 2023-08-25
+      ⍝   * `APLGit2` is now part of `Cider` and therefore always available
+      ⍝   * Bug fixes
+      ⍝     * The function `GetCiderGlobalConfigHomeFolder` crashed when Cider was not properly installed
+      ⍝     * Loading Tatin packages did not act appropriately when there were packages installed but they
+      ⍝       did not fit to the dependency list and/or the build list
+      ⍝     * Inconsistencies between the build list and the dependency file were not discovered. Now Cider
+      ⍝       does a re-install if the user permits that.
+      ⍝     * It was possible to load a package and then open it as a project; this is now prevented
       ⍝ * 0.31.1 ⋄ 2023-08-05
-      ⍝   * The function `GetCiderGlobalConfigHomeFolder` crashed when Cider was not properly installed
-      ⍝   * The absence of APLGit2 is now reported by OpenProject in case the project is managed by Git
       ⍝   * Version 0.30.0 wrongly pretended to be a beta release when it wasn't
       ⍝ * 0.31.0 ⋄ 2023-08-04
       ⍝   * Step added to `OpenProject`: checks for a non-empty variable `ToDo` in the root of the project now
@@ -175,7 +182,9 @@
                   :EndTrap
               :EndIf
               :Trap 0
-                  {}LoadTatinPackages config parms.folder(⍕projectSpace_)
+                  :If 0=parms.quietFlag LoadTatinPackages config parms.folder(⍕projectSpace_)
+                      1 p↓Frame'Package folder ',parms.folder,' needs attention!'
+                  :EndIf
               :Else
                   qdmx←⎕DMX
                   buff←''
@@ -233,7 +242,7 @@
     ⍝ This function looks for "tatinFolder", and if it is found suggests an automated conversion.
     ⍝ It expects to find either a single comma or no comma at all in "tatinFolder", otherwise it throws an error.
     ⍝ II.
-    ⍝ The property `githubUsername` is deleted from the config file because is not used anymore
+    ⍝ The property `githubUsername` is deleted from the config file because it is not used anymore
     ⍝ III.
     ⍝ With version 0.26.0 the property `distributionFolder` was introduced.
     ⍝ If not found it is injected as an empty character vector.
@@ -547,42 +556,35 @@
       p'  All fine'
     ∇
 
-    ∇ {r}←CheckForGit(path config);status;dmx;success
+    ∇ {r}←CheckForGit(path config);status;dmx
     ⍝ Checks whether the project is managed by Git, and if so offers some help
       r←⍬
-      success←0
       :If ##.FilesAndDirs.Exists(AddSlash path),'.git'
-          :If 9=⎕SE.⎕NC'APLGit2'
-              :Trap 0
-                  status←⎕SE.APLGit2.Status path
-                  success←1
-              :Else
-                  dmx←⎕DMX
-                  :If 127=dmx.EN
-                      p'The project appears to be managed by Git but Git is not installed?!'
-                  :ElseIf 128=dmx.EN
-                      p'The project appears to be managed by Git but user.email and/or user.name are not defined'
-                  :ElseIf 0<≢dmx.Message
-                      ⎕←'The Git status of the project could not be determined due to an error:'
-                      ⎕←dmx.Message,'; rc=',⍕dmx.EN
-                  :Else
-                      ⎕←'The Git status of the project could not be determined due to an error'
-                  :EndIf
-              :EndTrap
-              :If success
-                  :If ∧/∨/¨'nothing to commit' 'working tree clean'⍷¨⊂∊status
-                  :AndIf ~∨/∨/¨'on branch main' 'on branch master'⍷¨⊂⎕C∊status
-                      ⎕←'Git: ',(1⊃status),', ',⊃{⍺,', ',⍵}/1↓status
-                  :Else
-                      status←(↓(,[0.5]'Git status report')⍪'='),status
-                      {{}(#.⎕NS'').(⎕ED⍠('ReadOnly' 1)&{'GIT_Status_Report'}GIT_Status_Report←⍵)}⍪status
-                  :EndIf
+          :Trap 0
+              status←##.APLGit2.Status path
+          :Else
+              dmx←⎕DMX
+              :If 127=dmx.EN
+                  p'The project appears to be managed by Git but Git is not installed?!'
+                  :Return
+              :ElseIf 128=dmx.EN
+                  p'The project appears to be managed by Git but user.email and/or user.name are not defined'
+                  :Return
+              :ElseIf 0<≢dmx.Message
+                  ⎕←'The Git status of the project could not be determined due to an error:'
+                  ⎕←dmx.Message,'; rc=',⍕dmx.EN
+                  :Return
               :Else
-                  p'The project appears to be managed by Git but the user command ]APLGit2 and'
-                  p'it''s API are missing, therefore no information can be provided regarding Git'
+                  ⎕←'The Git status of the project could not be determined due to an error'
+                  :Return
               :EndIf
+          :EndTrap
+          :If ∧/∨/¨'nothing to commit' 'working tree clean'⍷¨⊂∊status
+          :AndIf ~∨/∨/¨'on branch main' 'on branch master'⍷¨⊂⎕C∊status
+              ⎕←'Git: ',(1⊃status),', ',⊃{⍺,', ',⍵}/1↓status
           :Else
-              p'The project appears to be managed by Git, but the package "APLGit2" is not installed...'
+              status←(↓(,[0.5]'Git status report')⍪'='),status
+              {{}(#.⎕NS'').(⎕ED⍠('ReadOnly' 1)&{'GIT_Status_Report'}GIT_Status_Report←⍵)}⍪status
           :EndIf
       :EndIf
     ∇
@@ -704,13 +706,14 @@
       :EndFor
     ∇
 
-    ∇ {r}←LoadTatinPackages(config folder projectSpace);pkgFolders;pkgFolder;folder2;target;pkgFolder_;noOf;p
+    ∇ {r}←quiet LoadTatinPackages(config folder projectSpace);pkgFolders;pkgFolder;folder2;target;pkgFolder_;noOf;qdmx;q;parms;p
     ⍝ Load all installed packages (if any) into their designated host namespaces.
-      r←FAILURE
-      p←{⍺←~parms.quietFlag ⋄ ⍺ PrintToSession ⍵}
+      r←SUCCESS
       pkgFolders←GetTatinDepedencyFolders config
+      p←quiet∘{⍺ PrintToSession ⍵}
       :If 0<≢pkgFolders
           :For pkgFolder :In pkgFolders
+     ∆Retry:
               :If '='∊pkgFolder
                   (pkgFolder_ target)←SplitTatinFolders pkgFolder
                   'Target namespace for Tatin packages is addressed with absolute path (invalid)'Assert~(⊃target)∊'#⎕'
@@ -724,15 +727,42 @@
               :If ##.FilesAndDirs.Exists folder2
                   :If 0<0<≢⊃0 ⎕NINFO⍠('Wildcard' 1)⊣folder2,'/*'
                       p ReportPackageOrigins folder2
-                      noOf←≢⎕SE.Tatin.LoadDependencies folder2 target
-                      p(⍕noOf),' Tatin package',((1<noOf)/'s'),' loaded'
+                      :Trap 0
+                          noOf←≢⎕SE.Tatin.LoadDependencies folder2 target
+                          p(⍕noOf),' Tatin package',((1<noOf)/'s'),' loaded'
+                      :Else
+                          qdmx←⎕DMX
+                          :If 998=qdmx.EN
+                              :If ∧/∨/¨'The build list in ' ' that are not installed:'⍷¨⊂qdmx.EM
+                                  q←'ReinstallBecauseOfInconsistency@The installed packages don''t fit the dependency/build list file(s); re-install?'
+                                  :If YesOrNo q
+                                      parms←⎕SE.Tatin.CreateReInstallParms
+                                      {}parms ⎕SE.Tatin.ReInstallDependencies folder2
+                                      →∆Retry
+                                  :Else
+                                      p'*** Packages in ',folder2,' need attention!'
+                                  :EndIf
+                              :ElseIf ∨/'Invalid entry:'⍷qdmx.EM
+                                  q←'ReinstallBecauseOfInvalidPkg@There are invalid entries in the dependency list; re-install?'
+                                  :If YesOrNo q
+                                      ⎕SE.Tatin.ReInstallDependencies folder2
+                                      →∆Retry
+                                  :Else
+                                      p'*** Packages in ',folder2,' need attention!'
+                                      r←FAILURE
+                                  :EndIf
+                              :Else
+                                  p'*** ',qdmx.EM
+                                  r←FAILURE
+                              :EndIf
+                          :EndIf
+                      :EndTrap
                   :Else
                       p'Tatin installation folder "',folder2,'" is empty, therefore no packages loaded'
                   :EndIf
               :Else
                   p'Tatin installation folder "',folder2,'" does not exists, therefore no packages loaded'
               :EndIf
-              r←SUCCESS
           :EndFor
       :EndIf
     ∇
@@ -1403,6 +1433,7 @@
     ⍝ be empty, otherwise an error is thrown.
       :If (⎕NC⊂⍕ref)∊9.1 9.4 9.5
           nsIsEmpty←0=≢' '~¨⍨↓ref.⎕NL⍳16
+          'Cannot open, is already loaded as a package'Assert'_tatin'≢{⍵↑⍨¯1+⍵⍳'.'}{⍵↓⍨⍵⍳'.'}⍕ref
           :If 0=##.FilesAndDirs.Exists parms.folder,'/',source
               folderIsEmpty←1
           :Else

APLSource/TestCases/Initial.aplf

@@ -2,4 +2,5 @@
  ∆LINK_NOTIFY_WAS←⎕SE.Link.NOTIFY
  ⎕SE.Link.NOTIFY←0
  'Cider''s version number in # and ⎕SE diverge'Assert ⎕SE.Cider.Version≡##.Cider.Cider.Version
+⍝ T.exec_before_each_test←T.exec_after_each_test←'#.WS_Check'
 ⍝Done

APLSource/TestCases/Test_Misc_010.aplf

@@ -7,7 +7,7 @@
  :EndIf
  r←T._Failed
 
- 0 0⍴⍞,0/⎕←'This test needs you! Simply close the editor window after pressing <enter>. Press <enter> to continue.'
+ CommTools.Pause'This test needs you! Simply close the editor window after pressing <enter>. Press <enter> to continue.'
 
  filename←##.CiderConfig.HOME,'/cider.config'
  buff←⊃⎕NGET filename

APLSource/TestCases/Test_Open_082.aplf

@@ -0,0 +1,28 @@
+ R←Test_Open_082(stopFlag batchFlag);⎕TRAP;parms;r;rc;tempDir
+⍝ Tries to open a project that has packages but the installed packages and the build list don't fit
+ ⎕TRAP←(999 'C' '∘∘∘ ⍝ Deliberate error')(0 'N')
+ R←T._Failed
+
+ tempDir←FilesAndDirs.GetTempSubDir⊃⎕SI
+ #.⎕SHADOW'TEMP' ⋄ 'TEMP'#.⎕NS''
+ tempDir ⎕NCOPY⍠('Wildcard' 1)⊣##.CiderConfig.HOME,'/TestData/PksDontFitBuildList/*'
+
+ parms←##.Cider.Cider.CreateOpenParms ⍬
+ parms.folder←tempDir
+ parms.parent←'#.TEMP'
+ parms.watch←'ns'
+ parms.quietFlag←1
+ parms.ignoreUserExec←1
+
+ ##.Cider.CommTools.YesOrNo_Answers←1 2⍴'ReinstallBecauseOfInvalidPkg@' 'y'
+ {}##.Cider.Cider.OpenProject parms
+ →T.GoToTidyUp'#._tatin.aplteam_Tester2_3_5_0.Tester2'≢⍕#.TEMP.fooproj.Tester2  ⍝ VALUE ERROR? Try again, but execute stuff after ∆TidyUp
+ →T.GoToTidyUp'#._tatin.aplteam_CodeCoverage_0_7_3.CodeCoverage'≢⍕#.TEMP.fooproj.CodeCoverage
+
+ R←T._OK
+
+∆TidyUp:
+ ##.Cider.CommTools.Cleanup
+ {}##.Cider.Cider.CloseProject'#.TEMP.fooproj'
+ {}FilesAndDirs.RmDirByForce tempDir
+⍝Done

APLSource/TestCases/Test_Open_083.aplf

@@ -0,0 +1,25 @@
+ R←Test_Open_083(stopFlag batchFlag);⎕TRAP;parms;r;rc;qdmx
+⍝ Loads a package and then tries to open the corresponding project; must be prevented
+ ⎕TRAP←(999 'C' '∘∘∘ ⍝ Deliberate error')(0 'N')
+ R←T._Failed
+
+ #.⎕SHADOW'TEMP' ⋄ 'TEMP'#.⎕NS''
+ {}⎕SE.Tatin.LoadPackages(##.CiderConfig.HOME,'\TestData\APLTreeUtils2\aplteam-APLTreeUtils2-1.2.0.zip')'#.TEMP'
+
+ parms←##.Cider.Cider.CreateOpenParms ⍬
+ parms.folder←##.CiderConfig.HOME,'\TestData\APLTreeUtils2\APLTreeUtils2'
+ parms.parent←'#.TEMP'
+ parms.watch←'ns'
+ parms.quietFlag←1
+ parms.ignoreUserExec←1
+
+ :Trap 11
+     {}##.Cider.Cider.OpenProject parms
+     →T.PassesIf 0
+ :Else
+     qdmx←⎕DMX
+     →T.PassesIf'Cannot open, is already loaded as a package'≡qdmx.EM
+ :EndTrap
+
+ R←T._OK
+⍝Done

APLSource/TestCases/Test_Tatin_001.aplf

@@ -3,7 +3,7 @@
  ⎕TRAP←(999 'C' '∘∘∘ ⍝ Deliberate error')(0 'N')
  R←T._Failed
 
- 'TEMP'#.⎕NS''
+ #.⎕SHADOW'TEMP' ⋄ 'TEMP'#.⎕NS''
  folder←∆GetTestPath⊃⎕SI
 
  parms←⎕NS''

README.md

@@ -5,7 +5,7 @@
 
 Cider offers some User commands that are useful to manage projects. In addition is also offers an API.
 
-It cooperates with [Tatin](https://github.com/aplteam.Cider "Link to Cider on GitHub") and [APLGit2](https://github.com/aplteam.APLGit2 "Link to APLGit2 on GitHub") if available.
+It cooperates with [Tatin](https://github.com/aplteam.Cider "Link to Cider on GitHub") if available.
 
 
 ## Requirements
@@ -68,7 +68,7 @@ If that is not good enough for you, this article explains how to load user comma
 ## Methods
 
 
-### OpenProject
+### `OpenProject`
 
 
 #### Parameters
@@ -103,7 +103,8 @@ Once a folder is established that holds a Cider config file, the user command pe
    * adds a variable `HOME` that remembers the path the project was loaded from   
 1. Injects a namespace `TatinVars` in case the project would end up as a package
 1. Checks whether the project's config file does carry a non-empty value for `init`. If that's the case it must be a function that is then called by Cider, typically for initializing the project
-1. If the project is managed by Git and the user command `]APLGit` is around and the git bash is installed then Cider executes the `git status` command on the project folder and puts the result on view
+1. If there is a variable `ToDo` in the root of the project, and the variable is not empty, then this variable is printed to the session
+1. If the project is managed by Git then Cider executes the `git status` command on the project folder and puts the result on view
 
 Notes:
 
@@ -131,7 +132,7 @@ Notes:
 
   * All principal packages found in `packages_dev/` within the project folder  are loaded into the project's sub namespace `TestCases` within the project space because the default _was_ overwritten
 
-### CloseProject
+### `CloseProject`
 
 Takes one or more folders or a aliases and breaks the Link between the namespace and its folder for all of them.
 
@@ -140,45 +141,46 @@ Separate projects with space or commas.
 You may specify the `-all` flag to close all projects in `#` (*not* `⎕SE`!), but check the user command's detailed help (`-??`) for details.
 
 
-### CreateProject
+### `CreateProject`
 
 Requires one mandatory parameter: a folder that is going to be a project. 
 
 Creates a file `cider.config` in that folder.
 
 
-### Help
+### `Help`
 
 Offers the user to view selected or all HTML documents with her standard browser.
 
-### ListOpenProjects
+### `ListOpenProjects`
 
 Lists the project spaces of all currently linked projects together with the fully qualified paths of all projects currently open.
 
 
-### ListAliases
+### `ListAliases`
 
 Lists all Cider aliases together with their folders.
 
 
-### Make
+### `Make`
 
 Prints an APL statement to the session which, when executed, will build a new version of the project.
 
 
-### RunTests
+### `RunTests`
 
 Prints an APL statement to the session which, when executed, runs the project's test suite.
 
 
-### Version
+### `Version`
 
 Returns a three-item-vector with "Name", "Version number" and "Version date".
 
 
-### ViewConfig
+### `ViewConfig`
 
 Puts the config file of a project on display. 
 
 By specifying the `-edit` flag the user might edit the file rather than just viewing it.
 
+