Merge pull request #7 from dhcgn/upgrade-and-cleanup

Upgrade to Go 1.17 and remove update feature

README.md

@@ -8,7 +8,7 @@ Download a file from a GitLab server and save it to disk if file is different.
 
 ## Latest
 
-https://dl.equinox.io/dhcgn/gitlabfiledownloader/stable
+See Releases
 
 ## Using
 
@@ -27,8 +27,6 @@ Usage of gitlabfiledownloader.exe:
         File path in repo, like src/main.go
   -token string
         Private-Token with access right for "api" and "read_repository"
-  -update
-        Update executable from equinox.io
   -url string
         Url to Api v4, like https://my-git-lab-server.local/api/v4/
 ```

_build.ps1

@@ -23,13 +23,17 @@ if ((Get-Command Go -ErrorAction Ignore) -eq $null) {
 }
 
 $appName = "GitLabDownloader"
-$version = "1.0.1"
+$version = "1.0.2"
 $publishFolder = "publish"
 $debugFolder = "debug"
-$compressPublish = $false
+
+$commitID = Invoke-Expression "git rev-list -1 HEAD"
+if ($LASTEXITCODE -ne 0) {
+    Write-Error "Couldn't get commit ID"
+    EXIT
+}
 
 $rootFolder = Split-Path -parent $PSCommandPath
-$upx = [System.IO.Path]::Combine($rootFolder, "build", "tools", "upx.exe" )
 
 # Just uncomment the platfoms you don't need
 $platforms = @()
@@ -54,6 +58,10 @@ if($compressPublish)
     $maxCount += $platforms.Count
 }
 
+# Save GO envs for restore
+$savedGOOS = $env:GOOS
+$savedGOARCH = $env:GOARCH
+
 foreach ($item in $platforms ) {
     # Write-Host "Build" $item.GOOS $item.GOARCH  -ForegroundColor Green
     Write-Progress -Activity ("Build $($item.GOOS) $($item.GOARCH)")  -PercentComplete ([Double]$count / $maxCount * 100)
@@ -75,7 +83,7 @@ foreach ($item in $platforms ) {
     Write-Progress -Activity ("Build $($item.GOOS) $($item.GOARCH)") -Status "Build publish" -PercentComplete ([Double]$count / $maxCount * 100)
 
     $buildOutput = ([System.IO.Path]::Combine( $rootFolder, "build", $publishFolder, ("{0}_{1}_{2}_{3}{4}" -f $appName, $item.GOOS, $item.GOARCH, $version, $extension)))
-    $executeExpression = "go build -ldflags ""-s -w -X main.version={0}"" -trimpath -o {1} {2}" -f $version, $buildOutput, $buildCode 
+    $executeExpression = "go build -ldflags ""-s -w -X main.version={0} -X main.commitID={1}"" -trimpath -o {2} {3}" -f $version, $commitID, $buildOutput, $buildCode 
     Write-Host "Execute", $executeExpression -ForegroundColor Green
     Invoke-Expression $executeExpression
 
@@ -86,15 +94,6 @@ foreach ($item in $platforms ) {
 
     Start-Sleep -Seconds 1 # Because of stupid AV-Shit 
 
-    if ($compressPublish) {
-        $count += 1
-        Write-Progress -Activity ("Build $($item.GOOS) $($item.GOARCH)") -Status "Compress publish" -PercentComplete ([Double]$count / $maxCount * 100)
-
-        $executeExpression =  "$upx --lzma $buildOutput -q"
-        Write-Host "Execute", $executeExpression -ForegroundColor Green
-        Invoke-Expression -Command $executeExpression >> $null
-    }
-
     $count += 1
     Write-Progress -Activity ("Build $($item.GOOS) $($item.GOARCH)") -Status "Build debug" -PercentComplete ([Double]$count / $maxCount * 100)
 
@@ -104,4 +103,8 @@ foreach ($item in $platforms ) {
     Invoke-Expression $executeExpression
 }
 
+# Restore GO envs
+$env:GOOS = $savedGOOS
+$env:GOARCH = $savedGOARCH
+
 Write-Host "Done!" -ForegroundColor Green

cmd/GitLabFileDownloader/main.go

@@ -15,8 +15,6 @@ import (
 	"os"
 	"path/filepath"
 	"strconv"
-
-	"github.com/dhcgn/GitLabFileDownloader/cmd/GitLabFileDownloader/updater"
 )
 
 const (
@@ -28,11 +26,11 @@ const (
 	flagUrl           = "url"
 	flagProjectNumber = "projectNumber"
 	flagRepoFilePath  = "repoFilePath"
-	flagUpdate        = "update"
 )
 
 var (
-	version = "undef"
+	version  = "undef"
+	commitID = "undef"
 
 	flagTokenPtr   = flag.String(flagToken, ``, `Private-Token with access right for "api" and "read_repository"`)
 	flagOutPathPtr = flag.String(flagOutPath, ``, "Path to write file to disk")
@@ -42,8 +40,6 @@ var (
 	flagProjectNumberPtr = flag.Int(flagProjectNumber, 0, "The Project ID from your project")
 	flagRepoFilePathPar  = flag.String(flagRepoFilePath, ``, "File path in repo, like src/main.go")
 
-	flagUpdatePtr = flag.Bool(flagUpdate, false, "Update executable from equinox.io")
-
 	exitCode int
 )
 
@@ -67,27 +63,16 @@ func main() {
 }
 
 func mainSub(args []string) {
-	log.Println(AppName, "Version:", version)
+	log.Println(AppName, "Version:", version, "Commit:", commitID)
 	log.Println(`Project: https://github.com/dhcgn/GitLabFileDownloader/`)
 
-	if len(args) == 2 && args[1] == "update" {
-		updater.EquinoxUpdate()
-		Exit(2)
-		return
-	}
-
 	flag.Parse()
 
-	if *flagUpdatePtr == true {
-		updater.EquinoxUpdate()
-		Exit(2)
-		return
-	}
-
 	settings := getSettings()
 	isValid, args := isSettingsValid(settings)
 	if !isValid {
 		log.Println("Arguments are missing:", args)
+		flag.PrintDefaults()
 		Exit(-1)
 		return
 	}

cmd/GitLabFileDownloader/main_test.go

@@ -9,7 +9,6 @@ import (
 	"os"
 	"strings"
 	"testing"
-	"time"
 )
 
 func Test_main_no_arguments(t *testing.T) {
@@ -26,50 +25,7 @@ func Test_main_no_arguments(t *testing.T) {
 	}
 }
 
-func Test_main_update(t *testing.T) {
-	tests := []struct {
-		name    string
-		args []string
-		prepare func()
-	}{
-		{
-			name: "Use Flag",
-			args:[]string{""},
-			prepare: func() {
-				updateflag := true
-				flagUpdatePtr = &updateflag
-			},
-		},
-		{
-			name: "Use Args",
-			args:[]string{"", "update"},
-			prepare: func() {
-				updateflag := false
-				flagUpdatePtr = &updateflag
-			},
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			tt.prepare()
-
-			output := captureOutput(func() {
-				mainSub(tt.args)
-				time.Sleep(time.Millisecond*100)
-			})
-
-			// fmt.Println(output)
-
-			expectedString := "Starting update"
-			if !strings.Contains(output, expectedString) {
-				t.Errorf("main() got console output = \"%v\", want \"%v\"", output, expectedString)
-			}
-		})
-	}
-}
-
-func Test_main_use_cases(t *testing.T) {
+func Test_main_integration(t *testing.T) {
 	err, filePath := getTempFilePath()
 	if err != nil {
 		t.Error(err)
@@ -164,9 +120,6 @@ func getTempFilePath() (error, string) {
 }
 
 func setFlags(path string) {
-	update := false
-	flagUpdatePtr = &update
-
 	filePath := "settings.json"
 	flagRepoFilePathPar = &filePath
 

go.mod

@@ -1,5 +1,3 @@
 module github.com/dhcgn/GitLabFileDownloader
 
-go 1.14
-
-require github.com/equinox-io/equinox v1.2.0
+go 1.17

go.sum

@@ -1,2 +0,0 @@
-github.com/equinox-io/equinox v1.2.0 h1:bBS7Ou+Y7Jwgmy8TWSYxEh85WctuFn7FPlgbUzX4DBA=
-github.com/equinox-io/equinox v1.2.0/go.mod h1:6s3HJB0PYUNgs0mxmI8fHdfVl3TQ25ieA/PVfr+eyVo=