Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Version 1.1.2 #92

Merged
merged 33 commits into from
Apr 1, 2024
Merged

Version 1.1.2 #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
c883532
Bump github.com/essentialkaos/ek/v12 from 12.93.0 to 12.94.0
dependabot[bot] Jan 17, 2024
668555f
Merge pull request #82 from essentialkaos/dependabot/go_modules/devel…
andyone Jan 17, 2024
2e20764
Bump github.com/essentialkaos/ek/v12 from 12.94.0 to 12.95.0
dependabot[bot] Jan 19, 2024
c4a872d
Merge pull request #83 from essentialkaos/dependabot/go_modules/devel…
andyone Jan 19, 2024
67ecf73
Bump github.com/essentialkaos/ek/v12 from 12.95.0 to 12.96.1
dependabot[bot] Jan 22, 2024
6272b74
Merge pull request #84 from essentialkaos/dependabot/go_modules/devel…
andyone Jan 22, 2024
486a9c9
Bump github.com/essentialkaos/ek/v12 from 12.96.1 to 12.98.0
dependabot[bot] Jan 24, 2024
fd13d42
Merge pull request #85 from essentialkaos/dependabot/go_modules/devel…
andyone Jan 24, 2024
712f6bb
Bump github.com/essentialkaos/ek/v12 from 12.98.0 to 12.99.0
dependabot[bot] Feb 6, 2024
1f68718
Merge pull request #86 from essentialkaos/dependabot/go_modules/devel…
andyone Feb 7, 2024
056955e
Bump github.com/essentialkaos/ek/v12 from 12.99.0 to 12.100.0
dependabot[bot] Feb 13, 2024
9751e39
Merge pull request #87 from essentialkaos/dependabot/go_modules/devel…
andyone Feb 13, 2024
9555118
Update for compatibility with the latest version of ek package
andyone Feb 13, 2024
366c67c
Improve CI workflow
andyone Feb 13, 2024
6bf65fc
Bump github.com/essentialkaos/ek/v12 from 12.100.0 to 12.101.0
dependabot[bot] Feb 28, 2024
9b85d9e
Merge pull request #88 from essentialkaos/dependabot/go_modules/devel…
andyone Feb 28, 2024
d236a5c
Bump github.com/essentialkaos/ek/v12 from 12.101.0 to 12.102.0
dependabot[bot] Mar 4, 2024
3b84e9e
Merge pull request #89 from essentialkaos/dependabot/go_modules/devel…
andyone Mar 4, 2024
880f44a
Bump github.com/essentialkaos/ek/v12 from 12.102.0 to 12.104.0
dependabot[bot] Mar 8, 2024
1a18a41
Merge pull request #90 from essentialkaos/dependabot/go_modules/devel…
andyone Mar 9, 2024
7f34aac
Bump github.com/essentialkaos/ek/v12 from 12.104.0 to 12.107.0
dependabot[bot] Mar 18, 2024
fccb2ca
Merge pull request #91 from essentialkaos/dependabot/go_modules/devel…
andyone Mar 18, 2024
4b0c2aa
Improved support information gathering
andyone Mar 20, 2024
a48745b
Bump github.com/essentialkaos/ek/v12 from 12.108.1 to 12.109.0
dependabot[bot] Mar 22, 2024
af8c39b
Merge pull request #93 from essentialkaos/dependabot/go_modules/devel…
andyone Mar 22, 2024
39cf8b8
Bump github.com/essentialkaos/ek/v12 from 12.109.0 to 12.111.0
dependabot[bot] Mar 25, 2024
43c4215
Merge pull request #94 from essentialkaos/dependabot/go_modules/devel…
andyone Mar 25, 2024
9f9d093
Bump github.com/essentialkaos/ek/v12 from 12.111.0 to 12.111.1
dependabot[bot] Mar 27, 2024
4cf58f7
Merge pull request #95 from essentialkaos/dependabot/go_modules/devel…
andyone Mar 27, 2024
5a06fdc
Code refactoring
andyone Mar 28, 2024
d35d556
Bump github.com/essentialkaos/ek/v12 from 12.111.1 to 12.113.0
dependabot[bot] Apr 1, 2024
82964f3
Merge pull request #96 from essentialkaos/dependabot/go_modules/devel…
andyone Apr 1, 2024
25c54f9
Dependencies update
andyone Apr 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:

strategy:
matrix:
go: [ '1.20.x', '1.21.x' ]
go: [ '1.21.x', '1.22.x' ]

steps:
- name: Checkout
Expand Down
32 changes: 27 additions & 5 deletions cli/cli.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,14 @@ import (
"strings"
"time"

"github.com/essentialkaos/ek/v12/env"
"github.com/essentialkaos/ek/v12/fmtc"
"github.com/essentialkaos/ek/v12/fmtutil"
"github.com/essentialkaos/ek/v12/options"
"github.com/essentialkaos/ek/v12/signal"
"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/timeutil"
"github.com/essentialkaos/ek/v12/usage"
"github.com/essentialkaos/ek/v12/usage/completion/bash"
Expand All @@ -27,7 +31,6 @@ import (
"github.com/essentialkaos/ek/v12/usage/man"
"github.com/essentialkaos/ek/v12/usage/update"

"github.com/essentialkaos/fz/cli/support"
"github.com/essentialkaos/fz/gofuzz"
)

Expand All @@ -36,7 +39,7 @@ import (
// App info
const (
APP = "fz"
VER = "1.1.1"
VER = "1.1.2"
DESC = "Tool for formatting go-fuzz output"
)

Expand Down Expand Up @@ -97,7 +100,12 @@ func Run(gitRev string, gomod []byte) {
genAbout(gitRev).Print(options.GetS(OPT_VER))
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()).
WithChecks(checkForGoFuzz()).
Print()
os.Exit(0)
case options.GetB(OPT_HELP) || !hasStdinData():
genUsage().Print()
Expand Down Expand Up @@ -254,6 +262,17 @@ func printError(f string, a ...any) {

// ////////////////////////////////////////////////////////////////////////////////// //

// checkForGoFuzz checks if go-fuzz binary present on the system
func checkForGoFuzz() support.Check {
goFuzzBin := env.Which("go-fuzz")

if goFuzzBin == "" {
return support.Check{support.CHECK_ERROR, "go-fuzz", "Binary not found in PATH"}
}

return support.Check{support.CHECK_OK, "go-fuzz", fmt.Sprintf("Binary found (%s)", goFuzzBin)}
}

// printCompletion prints completion for given shell
func printCompletion() int {
switch options.GetS(OPT_COMPLETION) {
Expand Down Expand Up @@ -309,12 +328,15 @@ func genAbout(gitRev string) *usage.About {
VersionColorTag: colorTagVer,
DescSeparator: "{s}—{!}",

License: "Apache License, Version 2.0 <https://www.apache.org/licenses/LICENSE-2.0>",
UpdateChecker: usage.UpdateChecker{"essentialkaos/fz", 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/fz",
update.GitHubChecker,
}
}

return about
Expand Down
162 changes: 0 additions & 162 deletions cli/support/support.go
View file
Open in desktop

This file was deleted.

40 changes: 0 additions & 40 deletions cli/support/support_darwin.go
View file
Open in desktop

This file was deleted.

63 changes: 0 additions & 63 deletions cli/support/support_linux.go
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ go 1.18

require (
github.com/essentialkaos/check v1.4.0
github.com/essentialkaos/depsy v1.1.0
github.com/essentialkaos/ek/v12 v12.93.0
github.com/essentialkaos/ek/v12 v12.113.1
)

require (
github.com/essentialkaos/depsy v1.1.0 // indirect
github.com/kr/pretty v0.3.1 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/rogpeppe/go-internal v1.11.0 // indirect
golang.org/x/sys v0.16.0 // indirect
golang.org/x/sys v0.18.0 // indirect
)
8 changes: 4 additions & 4 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ github.com/essentialkaos/check v1.4.0 h1:kWdFxu9odCxUqo1NNFNJmguGrDHgwi3A8daXX1n
github.com/essentialkaos/check v1.4.0/go.mod h1:LMKPZ2H+9PXe7Y2gEoKyVAwUqXVgx7KtgibfsHJPus0=
github.com/essentialkaos/depsy v1.1.0 h1:U6dp687UkQwXlZU17Hg2KMxbp3nfZAoZ8duaeUFYvJI=
github.com/essentialkaos/depsy v1.1.0/go.mod h1:kpiTAV17dyByVnrbNaMcZt2jRwvuXClUYOzpyJQwtG8=
github.com/essentialkaos/ek/v12 v12.93.0 h1:5lwuNYgUYjQHy2h57adWt2t1w5L2MxqTPKgHjyH3h6k=
github.com/essentialkaos/ek/v12 v12.93.0/go.mod h1:peB5w8zUkRuDs7m/QG5Z2gMmqzSIs2viAmxzzNFIIoo=
github.com/essentialkaos/ek/v12 v12.113.1 h1:3opV9dwRpIQq1fqg5mkaSEt6ogECL4VLzrH/829qeYg=
github.com/essentialkaos/ek/v12 v12.113.1/go.mod h1:SslW97Se34YQKc08Ume2V/8h/HPTgLS1+Iok64cNF/U=
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
Expand All @@ -13,5 +13,5 @@ github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsK
github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU=
golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
Loading