Merge pull request #109 from essentialkaos/develop

Version 1.0.0
essentialkaos · Apr 1, 2024 · 6c7e991 · 6c7e991
2 parents 2c4f2ce + 285336f
commit 6c7e991
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 287 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -29,7 +29,7 @@ jobs:
 
     strategy:
       matrix:
-        go: [ '1.19.x', '1.20.x', '1.21.x' ]
+        go: [ '1.19.x', '1.20.x', '1.21.x', '1.22.x' ]
 
     steps:
       - name: Checkout

diff --git a/cli/cli.go b/cli/cli.go
@@ -2,7 +2,7 @@ package cli
 
 // ////////////////////////////////////////////////////////////////////////////////// //
 //                                                                                    //
-//                         Copyright (c) 2023 ESSENTIAL KAOS                          //
+//                         Copyright (c) 2024 ESSENTIAL KAOS                          //
 //      Apache License, Version 2.0 <https://www.apache.org/licenses/LICENSE-2.0>     //
 //                                                                                    //
 // ////////////////////////////////////////////////////////////////////////////////// //
@@ -22,22 +22,23 @@ import (
 	"github.com/essentialkaos/ek/v12/options"
 	"github.com/essentialkaos/ek/v12/pager"
 	"github.com/essentialkaos/ek/v12/strutil"
+	"github.com/essentialkaos/ek/v12/support"
+	"github.com/essentialkaos/ek/v12/support/apps"
+	"github.com/essentialkaos/ek/v12/support/deps"
 	"github.com/essentialkaos/ek/v12/terminal/tty"
 	"github.com/essentialkaos/ek/v12/usage"
 	"github.com/essentialkaos/ek/v12/usage/completion/bash"
 	"github.com/essentialkaos/ek/v12/usage/completion/fish"
 	"github.com/essentialkaos/ek/v12/usage/completion/zsh"
 	"github.com/essentialkaos/ek/v12/usage/man"
 	"github.com/essentialkaos/ek/v12/usage/update"
-
-	"github.com/essentialkaos/goheft/cli/support"
 )
 
 // ////////////////////////////////////////////////////////////////////////////////// //
 
 const (
 	APP  = "GoHeft"
-	VER  = "0.8.0"
+	VER  = "1.0.0"
 	DESC = "Utility for listing sizes of used static libraries"
 )
 
@@ -85,7 +86,7 @@ var optMap = options.Map{
 	OPT_MIN_SIZE: {},
 	OPT_NO_COLOR: {Type: options.BOOL},
 	OPT_HELP:     {Type: options.BOOL},
-	OPT_VER:      {Type: options.BOOL},
+	OPT_VER:      {Type: options.MIXED},
 
 	OPT_VERB_VER:     {Type: options.BOOL},
 	OPT_COMPLETION:   {},
@@ -124,7 +125,11 @@ func Run(gitRev string, gomod []byte) {
 		genAbout(gitRev).Print()
 		os.Exit(0)
 	case options.GetB(OPT_VERB_VER):
-		support.Print(APP, VER, gitRev, gomod)
+		support.Collect(APP, VER).
+			WithRevision(gitRev).
+			WithDeps(deps.Extract(gomod)).
+			WithApps(apps.Golang()).
+			Print()
 		os.Exit(0)
 	case options.GetB(OPT_HELP) || len(args) == 0:
 		genUsage().Print()
@@ -257,13 +262,13 @@ func scanPkgImports(file string, store map[string]string) error {
 			continue
 		}
 
-		pkgInfo := strutil.ReadField(text, 1, false, " ")
-		pkgName := strutil.ReadField(pkgInfo, 0, false, "=")
+		pkgInfo := strutil.ReadField(text, 1, false, ' ')
+		pkgName := strutil.ReadField(pkgInfo, 0, false, '=')
 
 		pkgName = normalizePackageName(pkgName)
 
 		if store[pkgName] == "" {
-			store[pkgName] = strutil.ReadField(pkgInfo, 1, false, "=")
+			store[pkgName] = strutil.ReadField(pkgInfo, 1, false, '=')
 		}
 	}
 
@@ -379,7 +384,7 @@ func compileBinary(file string) (string, error) {
 		return "", fmt.Errorf("Can't start build process: %v", err)
 	}
 
-	return strutil.ReadField(workDir, 1, false, "="), nil
+	return strutil.ReadField(workDir, 1, false, '='), nil
 }
 
 // normalizePackageName format package name
@@ -484,12 +489,15 @@ func genAbout(gitRev string) *usage.About {
 		VersionColorTag: colorTagVer,
 		DescSeparator:   "—",
 
-		License:       "Apache License, Version 2.0 <https://www.apache.org/licenses/LICENSE-2.0>",
-		UpdateChecker: usage.UpdateChecker{"essentialkaos/goheft", update.GitHubChecker},
+		License: "Apache License, Version 2.0 <https://www.apache.org/licenses/LICENSE-2.0>",
 	}
 
 	if gitRev != "" {
 		about.Build = "git:" + gitRev
+		about.UpdateChecker = usage.UpdateChecker{
+			"essentialkaos/goheft",
+			update.GitHubChecker,
+		}
 	}
 
 	return about

diff --git a/cli/support/support.go b/cli/support/support.go
diff --git a/cli/support/support_darwin.go b/cli/support/support_darwin.go
diff --git a/cli/support/support_linux.go b/cli/support/support_linux.go
diff --git a/go.mod b/go.mod
@@ -2,9 +2,9 @@ module github.com/essentialkaos/goheft
 
 go 1.18
 
+require github.com/essentialkaos/ek/v12 v12.113.1
+
 require (
-	github.com/essentialkaos/depsy v1.1.0
-	github.com/essentialkaos/ek/v12 v12.92.0
+	github.com/essentialkaos/depsy v1.1.0 // indirect
+	golang.org/x/sys v0.18.0 // indirect
 )
-
-require golang.org/x/sys v0.15.0 // indirect