Adjusted tag fetch to use a name and not hash

Author: snakeice

.idea/workspace.xml

@@ -2,6 +2,7 @@ package cmd
 
 import (
 	"github.com/hashload/boss/core/gc"
+	"github.com/hashload/boss/msg"
 	"github.com/spf13/cobra"
 )
 
@@ -10,6 +11,7 @@ var gcCmd = &cobra.Command{
 	Short: "Garbage collector",
 	Long:  `Garbage collector to remove old cached files`,
 	Run: func(cmd *cobra.Command, args []string) {
+		msg.Info("Running GC...")
 		gc.RunGC()
 	},
 }

cmd/gc.go

@@ -33,7 +33,7 @@ var initCmd = &cobra.Command{
 		pkgJson.Version = getParamOrDef("version: (1.0.0)", "1.0.0")
 		pkgJson.Description = getParamOrDef("description", "")
 		pkgJson.MainSrc = getParamOrDef("source folder: (src/)", "src/")
-		pkgJson.Supported = getParamOrDef("supported version: (xe+)", "xe+")
+		pkgJson.Supported = getParamOrDef("supported version: (26 'Delphi XE / C++Builder XE')", "26")
 
 		pkgJson.Private = false
 

cmd/init.go

@@ -35,7 +35,6 @@ var installCmd = &cobra.Command{
 				ver = split[1]
 			}
 			if dev {
-
 				loadPackage.AddDevDependency(split[0], ver)
 			} else {
 				loadPackage.AddDependency(split[0], ver)

cmd/install.go

@@ -59,7 +59,7 @@ func checkVersion(newVersion string) bool {
 	if needUpdate {
 		println(consts.VERSION, " -> ", newVersion)
 	} else {
-		println(consts.VERSION, " <= ", newVersion)
+		println(newVersion)
 		println("already up to date!")
 	}
 	return needUpdate
@@ -79,8 +79,13 @@ func getLink() (err error, link string, size float64, version string) {
 	if err := json.Unmarshal(contents, &obj); err != nil {
 		msg.Die("failed in parse version JSON")
 	}
-	bossExe := obj["assets"].([]interface{})[0].(map[string]interface{})
-	return nil, bossExe["browser_download_url"].(string), bossExe["size"].(float64), obj["tag_name"].(string)
+	for _, value := range obj["assets"].([]interface{}) {
+		bossExe := value.(map[string]interface{})
+		if bossExe["name"].(string) == "boss.exe" {
+			return nil, bossExe["browser_download_url"].(string), bossExe["size"].(float64), obj["tag_name"].(string)
+		}
+	}
+	return fmt.Errorf("not found"), "", 0, ""
 }
 
 func closeFile(out *os.File) {

cmd/upgrade.go

@@ -10,4 +10,4 @@ const XML_TAG_NAME_PROPERTY_ATTRIBUTE_VALUE string = "'$(Base)'!=''"
 
 const XML_TAG_NAME_LIBRARY_PATH string = "DCC_UnitSearchPath"
 
-const VERSION string = "v1.5.4"
+const VERSION string = "v1.6.0"

consts/init.go

@@ -0,0 +1,10 @@
+package compiler
+
+type DelphiVer int
+
+const (
+	DelphiSeattle10 DelphiVer = 0
+	DelphiBerlin101 DelphiVer = 1
+	DelphiTokyo     DelphiVer = 2
+	DelphiRio       DelphiVer = 3
+)

core/compiler/delphiInstallationCheck.go

@@ -11,7 +11,6 @@ import (
 )
 
 func RunGC() {
-	msg.Info("Running GC...")
 	_ = filepath.Walk(filepath.Join(env.GetCacheDir(), "info"), func(path string, info os.FileInfo, err error) error {
 		if info.IsDir() {
 			return nil

core/gc/gc.go

@@ -42,13 +42,14 @@ func UpdateCache(dep models.Dependency) *git.Repository {
 		repository = refreshCopy(dep)
 	} else {
 		worktree, _ := repository.Worktree()
-		worktree.Reset(&git.ResetOptions{
+		_ = worktree.Reset(&git.ResetOptions{
 			Mode: git.HardReset,
 		})
 	}
-	repository.Fetch(&git.FetchOptions{
-		Force: true,
-		Auth:  models.GlobalConfiguration.GetAuth(dep.GetURLPrefix())})
+	_ = repository.Fetch(&git.FetchOptions{
+		Force:    true,
+		Progress: os.Stdout,
+		Auth:     models.GlobalConfiguration.GetAuth(dep.GetURLPrefix())})
 	initSubmodules(dep, repository)
 	return repository
 }

core/git/main.go

@@ -15,8 +15,6 @@ import (
 
 var processed = make([]string, 0)
 
-var processedOld = 0
-
 func EnsureDependencies(pkg *models.Package) {
 	if pkg.Dependencies == nil {
 		return
@@ -56,11 +54,10 @@ func ensureModules(pkg *models.Package, deps []models.Dependency) {
 			short := version.Name().Short()
 			newVersion, err := semver.NewVersion(short)
 			if err != nil {
-				msg.Warn("\tErro to parse version %s: '%s' in dependency %s", short, err, dep.Repository)
+				msg.Warn("\tInvalid semantic version: %s", short)
 				continue
 			}
 			if constraints.Check(newVersion) {
-				//msg.Info("Dependency %s with version %s", dep.Repository, newVersion.String())
 				hasMatch = true
 				if bestVersion == nil || newVersion.GreaterThan(bestVersion) {
 					bestMatch = version
@@ -80,7 +77,8 @@ func ensureModules(pkg *models.Package, deps []models.Dependency) {
 		worktree.Filesystem.TempFile(filepath.Join(env.GetCacheDir(), "tmp"), "tpt")
 		err := worktree.Checkout(&git2.CheckoutOptions{
 			Force: true,
-			Hash:  bestMatch.Hash(),
+			//Hash:  bestMatch.Hash(),
+			Branch: bestMatch.Name(),
 		})
 		if err != nil {
 			msg.Die("\tError on switch to needed version from dependency: %s\n%s", dep.Repository, err)

core/main.go

@@ -62,12 +62,6 @@ func (p *Package) RemoveDependency(dep string) {
 
 func getNew(file string) *Package {
 	res := new(Package)
-	/*
-		    ALL PROPS CREATION
-			res.DevDependencies = make(map[string]interface{})
-			res.Dependencies = make(map[string]interface{})
-			res.Scripts = make(map[string]interface{})
-	*/
 	res.fileName = file
 	res.IsNew = true
 

models/package.go

@@ -105,7 +105,7 @@ func Contains(a []string, x string) bool {
 	return false
 }
 
-func GetNewPaths(paths []string) []string {
+func getNewPaths(paths []string) []string {
 	dir, _ := os.Getwd()
 	path := filepath.Join(dir, consts.FOLDER_DEPENDENCIES)
 	_, e := os.Stat(path)
@@ -135,7 +135,7 @@ func processCurrentPathpaths(node *etree.Element) {
 		}
 	}
 
-	currentPaths = GetNewPaths(currentPaths)
+	currentPaths = getNewPaths(currentPaths)
 
 	node.SetText(strings.Join(currentPaths, ";"))