Bug fix and -quite for CreateProject

Author: aplteam

APLSource/Cider.aplc

@@ -7,11 +7,18 @@
 
     ∇ r←Version
       :Access Public Shared
-      r←'Cider' '0.8.5+181' '2022-03-14'
+      r←'Cider' '0.9.0+193' '2022-03-17'
+      ⍝   * The alias syntax got enhanced; accepts now a wildcard like ]Cider.OpenProject [co*]
+      ⍝   * ]Cider.CreateProject now asks the user whether the project should also be opened.
+      ⍝     It did so in the past but silently, leaving some room for doubt.
+      ⍝   * Mainly for tests the ]Cider.CreateProject command now has a -quiet flag.
+      ⍝   * When no namespace is passed to ]Cider.CreateProject the last part of the path is taken as name
       ⍝   * The file cider.config.RemoveMe got renamed to cider.config.template
       ⍝   * When a tatin installation folder does not exist or is empty no error is generated anymore
       ⍝   * Bug fixes:
       ⍝     * Alias names should NOT be case-sensitive.
+      ⍝     * Some user commands accepted an argument when they shouldn't.
+      ⍝     * Erratic RANK ERROR on OpenProject fixed
       ⍝ * 0.8.4+176 ⋄ 2022-02-27
       ⍝   * Minor internal improvements
       ⍝   * LF is now enforced for text files via .gitattributes
@@ -137,6 +144,7 @@
       :Else
           projectSpace_←⍎parms.projectSpace(⍎parms.parent).⎕NS''                        ⍝ Create project space from "parent" to avoid problems
       :EndIf
+      'Already opened?!'Assert~CheckForAlreadyOpened projectSpace_
       CheckParameters config
       configFilename HandleSysVars config
       source←parms.folder,(0<≢config.CIDER.source)/'/',config.CIDER.source              ⍝ For linking we are only interested in the code folder
@@ -884,4 +892,13 @@
       :EndIf
     ∇
 
+    ∇ flag←CheckForAlreadyOpened projectSpace;activeLinks
+    ⍝ Returns a 1 in case projectSpace is already opened, otherwise 0
+      flag←0
+      :If 2=⍴⍴activeLinks←⎕SE.Link.Status''
+      :AndIf 0<≢activeLinks                                          ⍝ Maybe one day when Link has a real API...
+          flag←(⊂⍕projectSpace)∊activeLinks[;1]
+      :EndIf
+    ∇
+
 :EndClass

APLSource/Cider_uc.dyalog

@@ -1,6 +1,6 @@
 :Class Cider_uc
 ⍝ User Command class for the project manager "Cider"
-⍝ Kai Jaeger ⋄ APL Team Ltd
+⍝ Kai Jaeger
 
     ⎕IO←1 ⋄ ⎕ML←1 ⋄ ⎕WX←3
     MinimumVersionOfDyalog←'18.0'
@@ -18,7 +18,7 @@
           c.Group←'Cider'
           c.Parse←'1s -projectSpace= -parent= -alias= -suppressLX -quiet -import -noPkgLoad -watch=ns dir both'
           r,←c
-          
+     
           c←⎕NS''
           c.Name←'ListOpenProjects'
           c.Desc←'List all currently open projects'
@@ -37,7 +37,7 @@
           c.Name←'CreateProject'
           c.Desc←'Makes the given folder a project folder'
           c.Group←'Cider'
-          c.Parse←'2s -alias= -acceptConfig -noEdit'
+          c.Parse←'2s -alias= -acceptConfig -noEdit -quiet'
           r,←c
 
           c←⎕NS''
@@ -133,9 +133,9 @@
       :EndIf
       :If 0=≢Args._2
       :OrIf 0≡Args._2
-          r←CreateProject_ folder(Args.acceptConfig)(Args.noEdit)
+          r←CreateProject_ folder(Args.acceptConfig)(Args.noEdit)(Args.quiet)
       :Else
-          r←Args._2 CreateProject_ folder(Args.acceptConfig)(Args.noEdit)
+          r←Args._2 CreateProject_ folder(Args.acceptConfig)(Args.noEdit)(Args.quiet)
       :EndIf
       :If 0≢Args.alias
           :If 0<≢msg←P.ProcessAlias folder Args.alias
@@ -158,7 +158,7 @@
       r(AddTitles)←'Namespace name' 'Path',Args.verbose/'No. of objects' 'Alias'
     ∇
 
-    ∇ r←OpenProject Args;path;parms
+    ∇ r←OpenProject Args;path;parms;aliasDefs;bool;info;opCode;alias
       r←0 0⍴''
       Args.projectSpace←{(,0)≡,⍵:'' ⋄ ⍵}Args.projectSpace
       :If 0≡Args._1
@@ -180,10 +180,28 @@
       :Else
           path←Args._1
       :EndIf
+      aliasDefs←P.GetAliasFileContent
       :If (⊂,path)∊,¨'[' '[?' '[?]'
-          :If 0=≢path←SelectFromAliases ⍬
+          :If 0=≢path←SelectFromAliases aliasDefs
               :Return
           :EndIf
+      :ElseIf '['=1⍴path
+      :AndIf '*'=¯1↑path~'[]'
+          bool←(¯1↓path~'[]'){(⎕C(≢⍺)↑[2]⍵)∧.=⎕C ⍺}↑aliasDefs[;1]
+          :Select +/bool
+          :Case 0
+              :Return
+          :Case 1
+              (alias path)←aliasDefs[bool⍳1;]
+              :If 0=1 YesOrNo'Sure you want to open "',path,'" ?'
+                  :Return
+              :EndIf
+          :Else
+              info←'(',((⍕+/bool),' of ',(⍕≢aliasDefs)),')'
+              :If 0=≢path←info SelectFromAliases bool⌿aliasDefs
+                  :Return
+              :EndIf
+          :EndSelect
       :EndIf
       path←⎕C⍣('['∊path)⊣path
       parms←P.CreateOpenParms''
@@ -218,7 +236,7 @@
               r,←⊂']Cider.ListAliases [-prune] [-edit] [-quiet]'
           :Case ⎕C'CreateProject'
               r,←⊂'Makes the given folder a project folder'
-              r,←⊂']Cider.CreateProject <folder> [<project-namespace>] [-alias=] [-acceptConfig] [-noEdit]'
+              r,←⊂']Cider.CreateProject <folder> [<project-namespace>] [-alias=] [-acceptConfig] [-noEdit] [-quiet]'
           :Case ⎕C'CloseProject'
               r,←⊂'Breaks the Link between the project space and the files on disk'
               r,←⊂']Cider.CloseProject [<project-namespace>] [-all]'
@@ -300,6 +318,7 @@
               r,←⊂' * Lets the user edit that file and makes sure that all mandatory settings are done and'
               r,←⊂'   also that those are correct'
               r,←⊂' * In case an alias is specified the alias is saved'
+              r,←⊂' * Finally it attempts to open the new project'
               r,←⊂''
               r,←⊂'If no path is specified it acts on the current directory, but in that case the user'
               r,←⊂'is prompted for confirmation to avoid mishaps.'
@@ -310,6 +329,9 @@
               r,←⊂'-noEdit:       With -noEdit you can prevent the user from being asked to edit the config file.'
               r,←⊂'-alias:        In case you are going to work on that project frequently you may specify'
               r,←⊂'               -alias=name'
+              r,←⊂'-quiet         After a project has been created successfully, the user will be asked whether'
+              r,←⊂'               she wants to open the project as well. You can enforce that without the user'
+              r,←⊂'               being interrogated by setting the -quiet flag. Mainly useful for test cases.'
               r,←⊂'Note that the alias is not case sensitive'
           :Case ⎕C'CloseProject'
               r,←⊂'Breaks the Link between the project and the files on disk.'
@@ -411,9 +433,9 @@
       P←⍎P,'.Cider'
     ∇
 
-    ∇ r←{namespace}CreateProject_(folder acceptFlag noEditFlag);filename;success;config;projectFolder;parms
+    ∇ r←{namespace}CreateProject_(folder acceptFlag noEditFlag quietFlag);filename;success;config;projectFolder;parms
       :Access Public Shared
-      namespace←{0<⎕NC ⍵:⍎⍵ ⋄ ''}'namespace'
+      namespace←folder{0<⎕NC ⍵:⍎⍵ ⋄ ⊃¯1↑{⍵/⍨0<≢¨⍵}(~⍺∊'/\')⊆⍺}'namespace'
       r←''
       :If 0≡folder
           folder←⊃1 ⎕NPARTS''
@@ -459,6 +481,7 @@
               parms.projectSpace←config.CIDER.projectSpace
               parms.parent←config.CIDER.parent
               parms.quietFlag←1
+          :AndIf {⍵:1 ⋄ 1 YesOrNo'Project successfully created; open as well?' ⋄ 1}quietFlag
           :AndIf P.OpenProject parms
               r←'Project created and opened'
           :Else
@@ -518,6 +541,7 @@
       :Else
           name←Args._1
           :If ~(⊃Args._1)∊'#⎕'
+              'Not a valid APL name'Assert(⎕NS'').{0=⎕NC ⍵}name~'[]'
               list←P.ListOpenProjects 0
               :If 0<≢list
                   :If 1=+/bool←name∘≡¨{⍵↓⍨⍵⍳'.'}¨list[;1]
@@ -698,10 +722,15 @@
       :Until isOkay
     ∇
 
-    ∇ r←SelectFromAliases dummy;data;row
+    ∇ r←{caption}SelectFromAliases data;row
       r←⍬
-      :If 0<≢data←P.GetAliasFileContent
+      caption←{0<⎕NC ⍵:⍎⍵ ⋄ ''}'caption'
+      :If 0=≢data
+          data←P.GetAliasFileContent
+      :EndIf
+      :If 0<≢data
           data[;1]←{'[',⍵,']'}¨data[;1]
+          caption←'Select project to be opened',({0=≢⍵:⍵ ⋄ ' ',⍵,' '}caption),':'
       :AndIf ⍬≢row←'Select project to be opened:'SelectOneItem↓⎕FMT data
           r←row⊃data[;2]
       :EndIf

APLSource/TestCases/Test_Create_001.aplf

@@ -1,14 +1,14 @@
  R←Test_Create_001(stopFlag batchFlag);⎕TRAP;tempDir;sourceFolder;list;config
 ⍝ Create a project from a folder without Linking a namespace; project space name defaults
  ⎕TRAP←(999 'C' '∘∘∘ ⍝ Deliberate error')(0 'N')
-
  R←T._Failed
+
  tempDir←FilesAndDirs.GetTempSubDir⊃⎕SI
  sourceFolder←tempDir,'/APLSource'
  'Create!'FilesAndDirs.CheckPath sourceFolder
  (⊂'r←Hello' 'r←''World''')FilesAndDirs.NPUT sourceFolder,'/hello.aplf'
 
- {}⎕SE.UCMD'Cider.CreateProject "',tempDir,'" -noEdit'
+ {}⎕SE.UCMD'Cider.CreateProject "',tempDir,'" -noEdit -quiet'
  list←FilesAndDirs.ListFiles tempDir
  →T.GoToTidyUp 1≠≢list
  →T.GoToTidyUp'cider.config'≢⊃,/1↓⎕NPARTS 1⊃list
@@ -18,5 +18,6 @@
  R←T._OK
 
 ∆TidyUp:
+ ∆LINK'Break'(#.⊃{⍺,'.',⍵}/config.CIDER.(parent projectSpace))
  FilesAndDirs.RmDir tempDir
 ⍝Done

APLSource/TestCases/Test_Misc_005.aplf

@@ -3,6 +3,10 @@
  ⎕TRAP←(999 'C' '. ⍝ Deliberate error')(0 'N')
  r←T._Failed
 
+ :If ~batchFlag
+     ⎕←'Sorry, but this will take a while...'
+ :EndIf
+
  dir←FilesAndDirs.GetTempPath,'Cider/',⊃⎕SI
  FilesAndDirs.RmDir dir                         ⍝ Paranoia...
  3 ⎕MKDIR dir
@@ -27,5 +31,5 @@
  r←T._OK
 
 ∆TidyUp:
- {}⎕SE.Link.Break #.TEMP
+ ∆LINK'Break'#.TEMP
  FilesAndDirs.RmDir dir

APLSource/TestCases/Test_OpenAndClose_001.aplf

@@ -1,16 +1,15 @@
  R←Test_OpenAndClose_001(stopFlag batchFlag);⎕TRAP;tempDir;list;sourceFolder1;projectFolder1;projectFolder2;sourceFolder2;aliase
 ⍝ Open two (new) projects and then close both of them, one by alias and one by path. Uses `DropAlias`.
  ⎕TRAP←(999 'C' '∘∘∘ ⍝ Deliberate error')(0 'N')
-
  R←T._Failed
- tempDir←FilesAndDirs.GetTempSubDir⊃⎕SI
 
+ tempDir←FilesAndDirs.GetTempSubDir⊃⎕SI
  projectFolder1←tempDir,'/Foo'
  sourceFolder1←projectFolder1,'/APLSource'
  'Create!'FilesAndDirs.CheckPath sourceFolder1
  (projectFolder1,'/cider.config')⎕NCOPY(##.CiderConfig.HOME,'/TestData/cider.config.Foo')
  'Foo'#.⎕NS''
- {}⎕SE.UCMD'Cider.CreateProject "',projectFolder1,'" #.Foo -alias=test-case-alias-Foo -noEdit -acceptConfig'
+ {}⎕SE.UCMD'Cider.CreateProject "',projectFolder1,'" #.Foo -alias=test-case-alias-Foo -noEdit -acceptConfig -quiet'
  #.Foo.⎕FX'r←Hello' 'r←''World'''
  {}⎕SE.Link.Add'#.Foo.Hello'
  list←FilesAndDirs.ListFiles projectFolder1
@@ -25,7 +24,7 @@
  (projectFolder2,'/cider.config')⎕NCOPY(##.CiderConfig.HOME,'/TestData/cider.config.Goo')
  'Goo'#.⎕NS''
  #.Goo.⎕FX'r←Hello' 'r←''Galaxy'''
- {}⎕SE.UCMD'Cider.CreateProject "',projectFolder2,'" #.Goo -alias=test-case-alias-Goo -noEdit -acceptConfig'
+ {}⎕SE.UCMD'Cider.CreateProject "',projectFolder2,'" #.Goo -alias=test-case-alias-Goo -noEdit -acceptConfig -quiet'
  list←FilesAndDirs.ListFiles projectFolder2
  →T.GoToTidyUp 1≠≢list
  →T.GoToTidyUp'cider.config'≢⊃,/1↓⎕NPARTS 1⊃list
@@ -39,8 +38,8 @@
  R←T._OK
 
 ∆TidyUp:
- {}⎕SE.Link.Break'#.Foo'
- {}⎕SE.Link.Break'#.Goo'
+ ∆LINK'Break' '#.Foo'
+ ∆LINK'Break' '#.Goo'
  {}FilesAndDirs.RmDir tempDir
  #.⎕EX¨'Foo' 'Goo'
  ⎕SE.Cider.DropAlias'test-case-alias-Foo' 'test-case-alias-Goo'

APLSource/TestCases/Test_OpenAndClose_002.aplf

@@ -1,21 +1,22 @@
  R←Test_OpenAndClose_002(stopFlag batchFlag);⎕TRAP;tempDir;sourceFolder;list
-⍝ Open two (new) projects and then close both of them, one by alias and one by path
+⍝ Open a (new) project and then close it by path
  ⎕TRAP←(999 'C' '∘∘∘ ⍝ Deliberate error')(0 'N')
-
  R←T._Failed
+
  tempDir←FilesAndDirs.GetTempSubDir⊃⎕SI
  sourceFolder←tempDir,'/APLSource'
  'Create!'FilesAndDirs.CheckPath sourceFolder
  (tempDir,'/cider.config')⎕NCOPY(##.CiderConfig.HOME,'/TestData/cider.config.Foo')
  (⊂'r←Hello' 'r←''World''')FilesAndDirs.NPUT sourceFolder,'/hello.aplf'
 
- {}⎕SE.UCMD'Cider.CreateProject "',tempDir,'" -noEdit -acceptConfig'
+ {}⎕SE.UCMD'Cider.CreateProject "',tempDir,'" # -noEdit -acceptConfig -quiet'
  list←FilesAndDirs.ListFiles tempDir
  →T.GoToTidyUp 1≠≢list
  →T.GoToTidyUp'cider.config'≢⊃,/1↓⎕NPARTS 1⊃list
 
  R←T._OK
 
 ∆TidyUp:
+ ∆LINK'Break' '#.Foo'
  FilesAndDirs.RmDir tempDir
 ⍝Done

APLSource/TestCases/Test_OpenAndClose_003.aplf

@@ -1,18 +1,13 @@
- R←Test_OpenAndClose_003(stopFlag batchFlag);⎕TRAP;tempDir;list;res;parms
+ R←Test_OpenAndClose_003(stopFlag batchFlag);⎕TRAP;tempDir;list;res
 ⍝ Open a (new) project and then attempt to close a non-existing one (was once a bug)
 ⍝ The bug: closed ALL projects rather than none
  ⎕TRAP←(999 'C' '∘∘∘ ⍝ Deliberate error')(0 'N')
-
  R←T._Failed
+
  tempDir←FilesAndDirs.GetTempSubDir⊃⎕SI
  (tempDir,'/cider.config')⎕NCOPY(##.CiderConfig.HOME,'/TestData/cider.config.Foo')
 
- {}⎕SE.UCMD'Cider.CreateProject "',tempDir,'" -noEdit -acceptConfig'
-
- parms←##.Cider.CreateOpenParms ⍬
- parms.folder←tempDir
- parms.quietFlag←1
- res←##.Cider.OpenProject parms
+ {}⎕SE.UCMD'Cider.CreateProject "',tempDir,'" -noEdit -acceptConfig -quiet'
 
  list←##.Cider.ListOpenProjects 0
  →T.GoToTidyUp 0≠##.Cider.CloseProject'DoesNotExist'
@@ -23,6 +18,7 @@
  R←T._OK
 
 ∆TidyUp:
+ res←∆LINK'Break' 'Foo'
  FilesAndDirs.RmDir tempDir
  #.⎕EX'Foo'
 ⍝Done

APLSource/TestCases/Test_Open_005.aplf

@@ -1,4 +1,4 @@
- R←Test_Open_005(stopFlag batchFlag);⎕TRAP;parms;folder;r;res
+ R←Test_Open_005(stopFlag batchFlag);⎕TRAP;parms;folder;r
 ⍝ Open a project with an initialisation function
  ⎕TRAP←(999 'C' '∘∘∘ ⍝ Deliberate error')(0 'N')
  R←T._Failed
@@ -19,7 +19,6 @@
  R←T._OK
 
 ∆TidyUp:
- res←⎕SE.Link.Break'#.TEMP.Foo'
- Assert res ∆StartsWith'Unlinked:'
+ ∆LINK'Break' '#.TEMP.Foo'
  #.⎕EX'TEMP'
 ⍝Done

APLSource/TestCases/Test_Open_007.aplf

@@ -1,4 +1,4 @@
- R←Test_Open_007(stopFlag batchFlag);⎕TRAP;parms;folder;r;res
+ R←Test_Open_007(stopFlag batchFlag);⎕TRAP;parms;folder;r
 ⍝ Open a project with two (diamondized) initialisation functions
  ⎕TRAP←(999 'C' '∘∘∘ ⍝ Deliberate error')(0 'N')
  R←T._Failed
@@ -19,7 +19,6 @@
  R←T._OK
 
 ∆TidyUp:
- res←⎕SE.Link.Break'#.TEMP.Foo'
- Assert res ∆StartsWith'Unlinked:'
+ ∆LINK 'Break' '#.TEMP.Foo'
  #.⎕EX'TEMP'
 ⍝Done

APLSource/TestCases/Test_Tatin_004.aplf

@@ -1,5 +1,6 @@
- R←Test_Tatin_004(stopFlag batchFlag);⎕TRAP;res;folder;parms;dmx
-⍝ Attempt to load project with a path pointing to installed Tatin packages that is non-existen.
+ R←Test_Tatin_004(stopFlag batchFlag);⎕TRAP;res;folder;parms
+⍝ Attempt to load project with a path pointing to installed Tatin packages that is non-existent.
+⍝ Will work from 0.9.0 onwards
  ⎕TRAP←(999 'C' '∘∘∘ ⍝ Deliberate error')(0 'N')
  R←T._Failed
 
@@ -10,13 +11,7 @@
  parms.folder←folder
  parms.quietFlag←1
 
- :Trap 0
-     res←##.Cider.OpenProject parms
-     →T.GoToTidyUp 1
- :Else
-     dmx←⎕DMX
-     →T.GoToTidyUp~dmx.EM ∆StartsWith'Tatin installation folder does not exist'
- :EndTrap
+ res←##.Cider.OpenProject parms
 
  R←T._OK