Merge pull request #39 from intersystems-community/stage

default branch

Author: nsolov

src/cls/ZPM/Package.cls

@@ -273,10 +273,29 @@ ClassMethod GetPackageNameFromRepositoryURL(url As %String) As %String
   Return $PIECE(url, "/", *-1)
 }
 
-ClassMethod DownloadPackageFromGitHub(url As %String) As %String
+ClassMethod GetDefaultBranch(path As %String) As %String
+{
+  If ($Extract(path,$Length(path))="/") {
+    Set path = $Extract(path,1,*-1)
+  }
+  Set branch = "main"
+  Set ht = ##class(%Net.HttpRequest).%New()
+  Set ht.Server = "api.github.com"
+  Set ht.SSLConfiguration = ..GetSSLConfiguration(ht.Server)
+  Set ht.Https = 1
+  Set ht.Location = "/repos"_path 
+  $$$ThrowOnError(ht.Get())
+  If (ht.HttpResponse.StatusCode=200) {
+    Set jo = {}.%FromJSON(ht.HttpResponse.Data)
+    Set branch = jo."default_branch" 
+  }
+  return branch
+}
+
+ClassMethod DownloadPackageFromGitHub(url As %String, Output branch As %String) As %String
 {
-  SET url = url _ "archive/master.tar.gz"
   Do ##class(%Net.URLParser).Parse(url, .tComponents)
+  Set branch = ..GetDefaultBranch(tComponents("path"))
   Set ht = ##class(%Net.HttpRequest).%New()
   Set ht.Server = tComponents("host")
   If $get(tComponents("scheme"))="https" {
@@ -286,8 +305,7 @@ ClassMethod DownloadPackageFromGitHub(url As %String) As %String
   If $data(tComponents("port"), port), port'="" {
     Set ht.Port = port
   }
-  Set ht.Location = tComponents("path")
-
+  Set ht.Location = tComponents("path")_"archive/"_branch_".tar.gz"
   $$$ThrowOnError(ht.Get())
   If (ht.HttpResponse.StatusCode'=200) {
     $$$ThrowStatus($$$ERROR(5001,"Unable to download repository "_url))
@@ -387,8 +405,9 @@ 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)
+  Set branch = "master"
+  Set outputFolder = ..DownloadPackageFromGitHub(url, .branch)
+  Set packageFolder = ##class(%File).NormalizeDirectory(name_"-"_branch, outputFolder)
   Return ..LoadPackage(packageFolder, url, 1)
 }
 
@@ -401,8 +420,9 @@ ClassMethod LoadFromGitHub(Url = "")
     Set Url = Url _ "/"
   }
   Set name = ..GetPackageNameFromRepositoryURL(Url)
-  Set outputFolder = ..DownloadPackageFromGitHub(Url)
-  Set packageFolder = ##class(%File).NormalizeDirectory(name _ "-master", outputFolder)
+  Set branch = "master"
+  Set outputFolder = ..DownloadPackageFromGitHub(Url, .branch)
+  Set packageFolder = ##class(%File).NormalizeDirectory(name_"-"_branch, outputFolder)
   Set tSC = ..LoadPackage(packageFolder, Url)
   If $$$ISERR(tSC) { 
     Do $system.OBJ.DisplayError()