Merge pull request #26 from intersystems-community/stage

Stage

Author: nsolov

src/cls/ZPM/Package.cls

@@ -98,7 +98,7 @@ Method urlGet() As %String
   SET host = ..ServerURL()
   SET name = $ZCONVERT(..name, "O", "URL")
   SET version = $ZCONVERT(..version, "O", "URL")
-  RETURN host _ "/" _ name _ "/-/" _ name _ "-" _ version _ ".tgz"
+  RETURN host _ "/download/" _ name _ "/-/" _ name _ "-" _ version _ ".tgz"
 }
 
 Method installerUrlGet() As %String
@@ -266,7 +266,6 @@ ClassMethod DownloadPackageFromGitHub(url As %String) As %String
   Do fs.CopyFromAndSave(ht.HttpResponse.Data)
 
   Set outputFolder = $$$FileTempDir
-  Do ##class(%File).CreateDirectory(outputFolder)
   Set res = $zf(-100, "", "tar", "-zxvf", archiveFileName, "-C", outputFolder)
 
   Return outputFolder
@@ -286,16 +285,29 @@ ClassMethod GetModuleMeta(url As %String) As %DynamicObject
     Set ht.Port = port
   }
   Set ht.Location = tComponents("path")_"master/module.xml"
-    
   $$$ThrowOnError(ht.Get())
   If (ht.HttpResponse.StatusCode'=200) {
     $$$ThrowStatus($$$ERROR(5001,"Unable to download XML "_ht.Location))
   }
-  $$$ThrowOnError(##class(%XML.XPATH.Document).CreateFromStream(ht.HttpResponse.Data, .xpathdoc))
+  Set tmpFolder = $$$FileTempDir
+
+  Set stream=##class(%Stream.FileCharacter).%New()
+  Do stream.LinkToFile(tmpFolder_"/module.xml")
+  Set stream.TranslateTable = "UTF8"
+  Do stream.CopyFrom(ht.HttpResponse.Data)
+  Do stream.%Save()
+
+  set binaryStream=##class(%Stream.FileBinary).%New()
+  do binaryStream.LinkToFile(tmpFolder_"/module.xml")
+
+  $$$ThrowOnError(##class(%XML.XPATH.Document).CreateFromStream(binaryStream, .xpathdoc))
   $$$ThrowOnError(xpathdoc.EvaluateExpression("/","Export/Document/Module/Version/text()", .tResults))
   set jo.version = tResults.GetAt(1).ValueGet()
   $$$ThrowOnError(xpathdoc.EvaluateExpression("/","Export/Document/Module/Name/text()", .tResults))
-  set jo.name = tResults.GetAt(1).ValueGet()  
+  set jo.name = $$$lcase(tResults.GetAt(1).ValueGet())
+
+  Do ##class(%File).RemoveDirectoryTree(tmpFolder)
+  
   return jo
 }
 
@@ -307,8 +319,8 @@ ClassMethod UpdatePackage(jo As %DynamicObject) As %Status
     #; set url = $ZCONVERT(url, "L")
     If $Extract(url, *)'="/" {
       Set url = url _ "/"
-    }
-    Set name = ..GetPackageNameFromRepositoryURL(url) 
+    } 
+    Set name = ..GetPackageNameFromRepositoryURL(url)
     Set meta = ..GetModuleMeta(url)
     If (meta.version = "") { $$$ThrowStatus($$$ERROR(5001, "Invalid package version")) }
     If (meta.name = "") { $$$ThrowStatus($$$ERROR(5001, "Package name is empty")) }
@@ -339,7 +351,6 @@ ClassMethod UpdatePackage(jo As %DynamicObject) As %Status
 
 ClassMethod Publish(url As %String, name As %String) As %Status
 {
-
   Set outputFolder = ..DownloadPackageFromGitHub(url)
   Set packageFolder = ##class(%File).NormalizeDirectory(name _ "-master", outputFolder)
   Return ..LoadPackage(packageFolder, url, 1)
@@ -353,7 +364,7 @@ ClassMethod LoadFromGitHub(Url = "")
   If $e(Url, *)'="/" { 
     Set Url = Url _ "/"
   }
-  Set name = ..GetPackageNameFromRepositoryURL(Url) 
+  Set name = ..GetPackageNameFromRepositoryURL(Url)
   Set outputFolder = ..DownloadPackageFromGitHub(Url)
   Set packageFolder = ##class(%File).NormalizeDirectory(name _ "-master", outputFolder)
   Set tSC = ..LoadPackage(packageFolder, Url)

src/cls/ZPM/Registry.cls

@@ -31,7 +31,7 @@ XData UrlMap [ XMLNamespace = "http://www.intersystems.com/urlmap" ]
   <Route Url="/packages" Method="POST" Call="PublishPackage" Cors="true" />
 
   <!-- Package Archive -->
-  <Route Url="/:package/-/:file" Method="GET" Call="GetArchive" Cors="true" />
+  <Route Url="/download/:package/-/:file" Method="GET" Call="GetArchive" Cors="true" />
 
 
   <!-- Temp url, update package, should be combined with "POST /packages"-->