From fb42d63a333e405523cc83757f17df4e575b57e7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Oct 2023 05:27:38 +0000 Subject: [PATCH 1/3] Bump github.com/jedib0t/go-pretty/v6 from 6.4.6 to 6.4.9 Bumps [github.com/jedib0t/go-pretty/v6](https://github.com/jedib0t/go-pretty) from 6.4.6 to 6.4.9. - [Release notes](https://github.com/jedib0t/go-pretty/releases) - [Commits](https://github.com/jedib0t/go-pretty/compare/v6.4.6...v6.4.9) --- updated-dependencies: - dependency-name: github.com/jedib0t/go-pretty/v6 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index ed9b278..a2ae973 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.20 require ( github.com/fatih/color v1.15.0 - github.com/jedib0t/go-pretty/v6 v6.4.6 + github.com/jedib0t/go-pretty/v6 v6.4.9 github.com/spf13/cobra v1.7.0 github.com/stretchr/testify v1.8.4 gopkg.in/ini.v1 v1.67.0 diff --git a/go.sum b/go.sum index 69d0a51..edde851 100644 --- a/go.sum +++ b/go.sum @@ -6,8 +6,8 @@ github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs= github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= -github.com/jedib0t/go-pretty/v6 v6.4.6 h1:v6aG9h6Uby3IusSSEjHaZNXpHFhzqMmjXcPq1Rjl9Jw= -github.com/jedib0t/go-pretty/v6 v6.4.6/go.mod h1:Ndk3ase2CkQbXLLNf5QDHoYb6J9WtVfmHZu9n8rk2xs= +github.com/jedib0t/go-pretty/v6 v6.4.9 h1:vZ6bjGg2eBSrJn365qlxGcaWu09Id+LHtrfDWlB2Usc= +github.com/jedib0t/go-pretty/v6 v6.4.9/go.mod h1:Ndk3ase2CkQbXLLNf5QDHoYb6J9WtVfmHZu9n8rk2xs= github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= From fd40a764a7fe858d64cac1eab955619a06997826 Mon Sep 17 00:00:00 2001 From: Akshay Raj Gollahalli Date: Fri, 3 Nov 2023 10:57:29 +1300 Subject: [PATCH 2/3] update to Go 1.21 --- .github/workflows/go.yml | 2 +- .goreleaser.yaml | 1 + go.mod | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 628d4e5..7cd937e 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -21,7 +21,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v3 with: - go-version: "1.20" + go-version: "1.21" - name: Build run: go build -v ./... diff --git a/.goreleaser.yaml b/.goreleaser.yaml index 79b0b7a..74d64de 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -1,3 +1,4 @@ +# yaml-language-server: $schema=https://goreleaser.com/static/schema.json builds: - env: - CGO_ENABLED=0 diff --git a/go.mod b/go.mod index a2ae973..9dd711f 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/akshaybabloo/git-alias -go 1.20 +go 1.21 require ( github.com/fatih/color v1.15.0 From a632b2e56d9df955b12592db104c63dc9229cfa3 Mon Sep 17 00:00:00 2001 From: Akshay Raj Gollahalli Date: Fri, 3 Nov 2023 11:06:19 +1300 Subject: [PATCH 3/3] Remove -s/--search flag --- main.go | 11 +++++------ main_test.go | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/main.go b/main.go index 012b1c0..048f915 100644 --- a/main.go +++ b/main.go @@ -14,7 +14,6 @@ import ( var version = "dev" -var SearchString string var Sort bool var ConfigPath string @@ -53,14 +52,15 @@ func RootCmd() *cobra.Command { t := table.NewWriter() t.SetOutputMirror(os.Stdout) t.AppendHeader(table.Row{"#", "Alias", "Command", "Description"}) - if SearchString != "" { + if len(args) > 0 { c := color.New(color.BgCyan, color.Bold) index := 1 + searchString := args[0] for _, key := range section.Keys() { - if strings.Contains(key.Value(), SearchString) { - valueIndex := strings.Index(key.Value(), SearchString) + if strings.Contains(key.Value(), searchString) { + valueIndex := strings.Index(key.Value(), searchString) if valueIndex != -1 { - t.AppendRow(table.Row{index, key.Name(), key.Value()[0:valueIndex] + c.Sprint(key.Value()[valueIndex:valueIndex+len(SearchString)]) + key.Value()[valueIndex+len(SearchString):], key.Comment}) + t.AppendRow(table.Row{index, key.Name(), key.Value()[0:valueIndex] + c.Sprint(key.Value()[valueIndex:valueIndex+len(searchString)]) + key.Value()[valueIndex+len(searchString):], key.Comment}) t.AppendSeparator() index++ } @@ -86,7 +86,6 @@ func RootCmd() *cobra.Command { }, } - command.PersistentFlags().StringVarP(&SearchString, "search", "s", "", "Search for aliases containing the given string") command.PersistentFlags().StringVar(&ConfigPath, "config", "~/.gitconfig", "Path to git config file") command.PersistentFlags().BoolVar(&Sort, "sort", false, "Sort aliases by alias name") diff --git a/main_test.go b/main_test.go index d45011a..722d432 100644 --- a/main_test.go +++ b/main_test.go @@ -59,7 +59,7 @@ func Test_Main_Search_Pass(t *testing.T) { ` _, err = file.WriteString(config) - actual := execute(fmt.Sprintf("--config %s -s checkout", file.Name())) + actual := execute(fmt.Sprintf("--config %s checkout", file.Name())) expected := "checkout" assert.Contains(t, expected, actual) }