Bug fix in LoadDependencies

aplteam · Mar 11, 2023 · 02d5885 · 02d5885
1 parent 7324cdb
commit 02d5885
Show file tree

Hide file tree

Showing 335 changed files with 763 additions and 161 deletions.
diff --git a/APLSource/Client/LoadDependencies.aplf b/APLSource/Client/LoadDependencies.aplf
@@ -16,7 +16,7 @@
  :EndIf
  ('Folder does not exist:',⍕installFolder)Assert ⎕NEXISTS installFolder
  :If 0=≢targetSpace
-     installFolder←(1+isUC)⊃'#' '⎕SE'
+     targetSpace←(1+isUC)⊃'#' '⎕SE'
  :EndIf
  r←refs←⍬
  targetSpace←⍕targetSpace

diff --git a/APLSource/Registry/History.apla b/APLSource/Registry/History.apla
@@ -1,4 +1,6 @@
 (
+ '* 0.90.1 ⋄ 2023-03-11'
+ '  * Bug fix in `LoadDependencies`: did not work when only one right argument was provided'
  '* 0.90.0 ⋄ 2023-02-27'
  '  * BREAKING CHANGE: syntax and behaviour of the `LoadDependencies` function has changed'
  '  * BREAKING CHANGE: behaviour of the `]LoadDependencies` user command has changed'

diff --git a/APLSource/Registry/Version.aplf b/APLSource/Registry/Version.aplf
@@ -1,3 +1,3 @@
  r←Version
  ⍝ See also `History`
- r←'Tatin' '0.90.0+1485' '2023-02-27'
+ r←'Tatin' '0.90.1+1488' '2023-03-11'
diff --git a/APLSource/Tatin.dyalog b/APLSource/Tatin.dyalog
@@ -1,6 +1,6 @@
 :Namespace Tatin
 ⍝ The ]Tatin user commands for managing packages.\\
-⍝ * 0.60.0 - 2023-02-26
+⍝ * 0.61.0 - 2023-03-01
 
     ⎕IO←1 ⋄ ⎕ML←1
 
@@ -2253,7 +2253,7 @@
 
     IsAbsolutePath←{'/'=1⍴⍵:1 ⋄ ':'∊⍵:1 ⋄ '//'≡2↑⍵}
 
-    ∇ folder←{quietFlag}EstablishPackageFolder folder;list;ind
+    ∇ folder←{quietFlag}EstablishPackageFolder folder;list;ind;cfg;buff
     ⍝ Checks first whether it's meant to be an open Cider project (if Cider is around).
     ⍝ Next it tries to find it in the current dir.
     ⍝ The user should always be asked for confirmation.
@@ -2265,6 +2265,22 @@
           :If 0<⎕SE.⎕NC'Cider'
               :If 1=≢list←⎕SE.Cider.ListOpenProjects 0
                   folder←'expand'TC.F.NormalizePath(2⊃list[1;]),'/',folder
+                  :If 0=TC.F.IsFile folder,'apl-dependencies.txt'
+                      cfg←TC.Reg.JSON⊃TC.F.NGET folder,'cider.config'
+                      :If 0=≢cfg.CIDER.tatinFolder
+                          folder←''
+                      :ElseIf ','∊cfg.CIDER.tatinFolder
+                          buff←{⍵↑⍨¯1+⍵⍳'='}¨','(≠⊆⊢)cfg.CIDER.tatinFolder
+                          ind←'Select target folder:'TC.CommTools.Select folder∘,¨buff
+                          :If 0=≢ind
+                              folder←''
+                          :Else
+                              folder,←ind⊃buff
+                          :EndIf
+                      :Else
+                          folder←{⍵↑⍨¯1+⍵⍳'='}cfg.CIDER.tatinFolder
+                      :EndIf
+                  :EndIf
               :ElseIf 0=≢list
                   :If TC.F.IsDir TC.F.PWD,'/',folder
                       folder←TC.F.PWD,'/',folder

diff --git a/APLSource/TestCases/Test_API_011.aplf b/APLSource/TestCases/Test_API_011.aplf
@@ -1,4 +1,4 @@
- r←Test_API_011(stopFlag batchFlag);⎕TRAP;res;rc;msg;list;zip1;zip2;expected;Done;dir1;dir2
+ r←Test_API_011(stopFlag batchFlag);⎕TRAP;res;rc;msg;list;zip1;zip2;expected;Done
 ⍝ Exercise "InstallPackages" with multiple packages that are user commands
  ⎕TRAP←(999 'C' '. ⍝ Deliberate error')(0 'N')
  r←T._Failed
@@ -9,14 +9,14 @@
  expected←'example-UC-1.0.0' 'example-UC_2-1.0.0'
  →T.GoToTidyUp expected≢res
 
- →T.GoToTidyUp~TC.F.IsDir dir1←TC.GetMyUCMDsFolder'UC/example-UC-1.0.0'
- →T.GoToTidyUp~TC.F.IsDir dir2←TC.GetMyUCMDsFolder'UC_2/example-UC_2-1.0.0'
+ →T.GoToTidyUp~TC.F.IsDir TC.GetMyUCMDsFolder'UC/example-UC-1.0.0'
+ →T.GoToTidyUp~TC.F.IsDir TC.GetMyUCMDsFolder'UC_2/example-UC_2-1.0.0'
 
  r←T._OK
 
 ∆TidyUp:
- (rc msg)←F.RmDirByForce dir1
+ (rc msg)←F.RmDirByForce TC.GetMyUCMDsFolder'UC'
  Assert rc=0
- (rc msg)←F.RmDirByForce dir2
+ (rc msg)←F.RmDirByForce TC.GetMyUCMDsFolder'UC_2'
  Assert rc=0
 ⍝Done
diff --git a/APLSource/TestCases/Test_InstallAndLoad_042.aplf b/APLSource/TestCases/Test_InstallAndLoad_042.aplf
@@ -0,0 +1,35 @@
+ r←Test_InstallAndLoad_042(stopFlag batchFlag);⎕TRAP;dir;src;zip;body;cfg;zipfile;installFolder;res;rc;msg
+⍝ Install and load simple package without specifying a target namespace; was once a bug
+⍝ Must be loaded into #
+ ⎕TRAP←(999 'C' '. ⍝ Deliberate error')(0 'N')
+ r←T._Failed
+
+ dir←∆GetTempDir''
+ (src zip)←(⊂dir,'/'),¨'src' 'reg'
+ F.MkDir src zip
+
+ body←':Namespace CrazyName___' '∇r←PI' 'r←3.14' '∇' ':EndNamespace'
+ (⊂body)F.NPUT src,'/CrazyName___.apln'
+ cfg←TC.InitPackageConfig ⍬
+ cfg.(group name version)←'Example' 'CrazyName___' '0.1.0'
+ cfg.source←'CrazyName___.apln'
+ cfg.api←'CrazyName___'
+ cfg.os_win←1
+ TC.WritePackageConfigFile src cfg
+ zipfile←TC.BuildPackage src zip''
+ installFolder←∆GetTempDir'/MyAppPackages'
+ {}TC.InstallPackages('file://',zipfile)installFolder
+
+ res←TC.LoadDependencies⊆installFolder    ⍝ Only one argument
+ →T.GoToTidyUp'#._tatin.Example_CrazyName____0_1_0'≢⍕⊃,/res
+ →T.GoToTidyUp 9≠#._tatin.⎕NC'Example_CrazyName____0_1_0'
+ →T.GoToTidyUp 9≠#.⎕NC'CrazyName___'
+
+ r←T._OK
+
+∆TidyUp:
+ #.⎕EX'CrazyName___'
+ (rc msg)←F.RmDirByForce dir
+ Assert 0=rc
+ #._tatin.⎕EX'Example_CrazyName____0_1_0'
+⍝Done