Merge pull request #24 from intersystems-ru/develop_tsafin

Small bug-fixes:

Author: daimor

CPM.mac.xml

@@ -10,6 +10,7 @@ SHELL
     new
     #; here goes interactive entry
     #; aliases for commands
+    do init
     do ALIASES(.aliases)
     for i=1:1 {
         set line=$text(ALIASES+i)
@@ -35,8 +36,26 @@ SHELL
 
         do BATCH(command, args...)
     }
+    do fini
     quit
 
+#; shell initialization code
+init() {
+    do RegisterAllSourceTypes()
+    do $$$CpmInstance.Registry.Cache.Update()
+}
+
+#; shell finalization code
+fini() {
+    do ##class(CPM.Source.IBase).UnregisterExts()
+}
+
+#; register all known metainfo extensions
+RegisterAllSourceTypes() {
+    do ##class(CPM.Source.IBase).UnregisterExts()
+    do ##class(CPM.Source.IBase).ForEachSuccessor("RegisterExts")
+}
+
 ExtractArgs(&line,&command,&args) {
     #dim pattern As %String = ##class(%Regex.Matcher).%New("\""([^\""]+)\""|[^ ]+")
 
@@ -154,14 +173,10 @@ ALIASES(aliases)
         }
     }
     quit
+
 COMMANDS
 
-RegisterAllSourceTypes() {
-    do ##class(CPM.Source.IBase).UnregisterExts()
-    do ##class(CPM.Source.IBase).ForEachSuccessor("RegisterExts")
-}
 INSTALL(packages...) ;;install package
-    do RegisterAllSourceTypes()
     do $$$CpmInstance.Install(packages...)
     quit
 
@@ -259,7 +274,7 @@ IncreaseMajorVersion(version) {
     quit $lts(list, ".")
 }
 
-EXPORT(args...) ;; prepare to publish - export package(s)
+EXPORT(args...) ;;prepare to publish - export package(s)
     new (args)
     #dim verbose As %Boolean = 0
     #dim minor As %Boolean = 0
@@ -297,7 +312,7 @@ SEARCH(terms...) ;;search packages
     do $$$CpmInstance.Search(terms...)
     quit
 
-LIST(args...) ;;list of installed packages
+LIST(args...) ;;list of installed and available packages
     new (args)
     #dim verbose As %Boolean = 0
     #dim local As %Boolean = 1
@@ -323,7 +338,7 @@ LIST(args...) ;;list of installed packages
     }
     quit
 
-CONFIG(args...) ;; get/set configuration parameters
+CONFIG(args...) ;;get/set configuration parameters
     new (args)
     #dim debug As %Boolean = 0
     #dim getOp As %Boolean = 0

CPM/Registry/Cache.cls.xml

@@ -46,7 +46,7 @@ FIXME - implement proper caching [all/since]</Description>
         write "Updating index",!
     } else {
         set url("path")  = $$$GetParam(url, "path", "/-/all/")
-        write "Building the local index for the first time",!
+        write !,"Building the local index for the first time",!
     }
     #dim exception As %Exception.AbstractException
     try {
@@ -61,13 +61,7 @@ FIXME - implement proper caching [all/since]</Description>
     quit:$data(exception) $$$OK
     
     #dim data As %ZEN.proxyObject
-#if 1
     set tSC=##class(%ZEN.Auxiliary.jsonProvider).%ConvertJSONToObject(response.Data,..%ClassName(1),.data,1)
-#else
-    zw response
-    do response.Data.OutputToDevice()
-    set tSC=##class(%ZEN.Auxiliary.jsonProvider).%ConvertJSONToObject(response.Data,,.data)
-#endif
     $$$ThrowOnError(tSC)
     
     quit $$$OK

CPM/Source/IBase.cls.xml

@@ -110,7 +110,7 @@ given different handler class will be called)</Description>
         kill response
         set o = $classmethod($$$PpvExtensions("TGZ"), "%New")
         if $isobject(o) {
-            do o.Open(fileName)
+            do o.Open(package.Filename)
         }
     }