From b336eb6b8d220cf30d9237d71570070170d1849f Mon Sep 17 00:00:00 2001 From: babarot Date: Tue, 14 Jan 2025 22:09:09 +0900 Subject: [PATCH] Replace b4b4r07 with babarot --- .goreleaser.yaml | 6 +- Makefile | 6 +- README.md | 16 ++-- cmd/check.go | 8 +- cmd/completion.go | 2 +- cmd/init.go | 2 +- cmd/install.go | 10 +-- cmd/meta.go | 16 ++-- cmd/root.go | 10 +-- cmd/self-update.go | 8 +- cmd/show.go | 6 +- cmd/state.go | 6 +- cmd/uninstall.go | 6 +- cmd/update.go | 8 +- docs/configuration/package/gist.md | 2 +- docs/configuration/plugin.md | 20 ++--- docs/getting-started.md | 16 ++-- docs/how-it-works.md | 14 +-- docs/links.md | 2 +- go.mod | 2 +- hack/README.md | 4 +- hack/install | 8 +- main.go | 2 +- mkdocs.yml | 12 +-- pkg/config/command.go | 2 +- pkg/config/config.go | 4 +- pkg/config/gist.go | 4 +- pkg/config/github.go | 12 +-- pkg/config/http.go | 8 +- pkg/config/local.go | 4 +- pkg/config/package.go | 2 +- pkg/config/util.go | 2 +- pkg/github/client.go | 2 +- pkg/github/github.go | 4 +- pkg/state/state_test.go | 140 ++++++++++++++--------------- pkg/templates/templates.go | 2 +- pkg/update/update.go | 2 +- pkg/update/update_test.go | 2 +- 38 files changed, 191 insertions(+), 191 deletions(-) diff --git a/.goreleaser.yaml b/.goreleaser.yaml index 19e9883c..ee7d0e8 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -9,9 +9,9 @@ builds: binary: afx ldflags: - -s -w - - -X github.com/b4b4r07/afx/cmd.Version={{ .Version }} - - -X github.com/b4b4r07/afx/cmd.BuildTag={{ .Tag }} - - -X github.com/b4b4r07/afx/cmd.BuildSHA={{ .ShortCommit }} + - -X github.com/babarot/afx/cmd.Version={{ .Version }} + - -X github.com/babarot/afx/cmd.BuildTag={{ .Tag }} + - -X github.com/babarot/afx/cmd.BuildSHA={{ .ShortCommit }} env: - CGO_ENABLED=0 archives: diff --git a/Makefile b/Makefile index e5ddc18..b8780dc 100644 --- a/Makefile +++ b/Makefile @@ -13,11 +13,11 @@ GIT_SHA = $(shell git rev-parse --short HEAD) GIT_TAG = $(shell git describe --tags --abbrev=0 --exact-match 2>/dev/null || echo "canary") GIT_DIRTY = $(shell test -n "`git status --porcelain`" && echo "dirty" || echo "clean") -LDFLAGS += -X github.com/b4b4r07/afx/cmd.BuildSHA=${GIT_SHA} -LDFLAGS += -X github.com/b4b4r07/afx/cmd.GitTreeState=${GIT_DIRTY} +LDFLAGS += -X github.com/babarot/afx/cmd.BuildSHA=${GIT_SHA} +LDFLAGS += -X github.com/babarot/afx/cmd.GitTreeState=${GIT_DIRTY} ifneq ($(GIT_TAG),) - LDFLAGS += -X github.com/b4b4r07/afx/cmd.BuildTag=${GIT_TAG} + LDFLAGS += -X github.com/babarot/afx/cmd.BuildTag=${GIT_TAG} endif all: build diff --git a/README.md b/README.md index 7174f59..4833dbb 100644 --- a/README.md +++ b/README.md @@ -5,14 +5,14 @@ AFX is a package manager for command-line tools and shell plugins. afx can allow [![][afx-mark]][afx-link] [![][test-mark]][test-link] [![][release-mark]][release-link] -[afx-mark]: https://img.shields.io/github/v/release/b4b4r07/afx?color=EF2D5E&display_name=release&label=AFX&logo=alchemy&logoColor=EF2D5E&sort=semver -[afx-link]: https://github.com/b4b4r07/afx/releases +[afx-mark]: https://img.shields.io/github/v/release/babarot/afx?color=EF2D5E&display_name=release&label=AFX&logo=alchemy&logoColor=EF2D5E&sort=semver +[afx-link]: https://github.com/babarot/afx/releases -[test-mark]: https://github.com/b4b4r07/afx/actions/workflows/go.yaml/badge.svg -[test-link]: https://github.com/b4b4r07/afx/actions/workflows/go.yaml +[test-mark]: https://github.com/babarot/afx/actions/workflows/go.yaml/badge.svg +[test-link]: https://github.com/babarot/afx/actions/workflows/go.yaml -[release-mark]: https://github.com/b4b4r07/afx/actions/workflows/release.yaml/badge.svg -[release-link]: https://github.com/b4b4r07/afx/actions/workflows/release.yaml +[release-mark]: https://github.com/babarot/afx/actions/workflows/release.yaml/badge.svg +[release-link]: https://github.com/babarot/afx/actions/workflows/release.yaml Full document is here: [AFX](https://babarot.me/afx/) @@ -152,10 +152,10 @@ Download the binary from [GitHub Release][release] and drop it in your `$PATH`. Or, bash installer has been provided so you can install afx by running this one command at your own risk ([detail](./hack/README.md)). ```bash -curl -sL https://raw.githubusercontent.com/b4b4r07/afx/HEAD/hack/install | bash +curl -sL https://raw.githubusercontent.com/babarot/afx/HEAD/hack/install | bash ``` -[release]: https://github.com/b4b4r07/afx/releases/latest +[release]: https://github.com/babarot/afx/releases/latest [website]: https://babarot.me/afx/ ## License diff --git a/cmd/check.go b/cmd/check.go index 8d81294..a8cf2fd 100644 --- a/cmd/check.go +++ b/cmd/check.go @@ -7,10 +7,10 @@ import ( "os" "os/signal" - "github.com/b4b4r07/afx/pkg/config" - "github.com/b4b4r07/afx/pkg/errors" - "github.com/b4b4r07/afx/pkg/helpers/templates" - "github.com/b4b4r07/afx/pkg/state" + "github.com/babarot/afx/pkg/config" + "github.com/babarot/afx/pkg/errors" + "github.com/babarot/afx/pkg/helpers/templates" + "github.com/babarot/afx/pkg/state" "github.com/spf13/cobra" "golang.org/x/sync/errgroup" ) diff --git a/cmd/completion.go b/cmd/completion.go index 1847395..bc25cf1 100644 --- a/cmd/completion.go +++ b/cmd/completion.go @@ -3,7 +3,7 @@ package cmd import ( "os" - "github.com/b4b4r07/afx/pkg/helpers/templates" + "github.com/babarot/afx/pkg/helpers/templates" "github.com/spf13/cobra" ) diff --git a/cmd/init.go b/cmd/init.go index bedb5d6..63ef2ce 100644 --- a/cmd/init.go +++ b/cmd/init.go @@ -4,7 +4,7 @@ import ( "fmt" "log" - "github.com/b4b4r07/afx/pkg/helpers/templates" + "github.com/babarot/afx/pkg/helpers/templates" "github.com/spf13/cobra" ) diff --git a/cmd/install.go b/cmd/install.go index 72ddfd4..24af055 100644 --- a/cmd/install.go +++ b/cmd/install.go @@ -7,11 +7,11 @@ import ( "os" "os/signal" - "github.com/b4b4r07/afx/pkg/config" - "github.com/b4b4r07/afx/pkg/errors" - "github.com/b4b4r07/afx/pkg/helpers/templates" - "github.com/b4b4r07/afx/pkg/logging" - "github.com/b4b4r07/afx/pkg/state" + "github.com/babarot/afx/pkg/config" + "github.com/babarot/afx/pkg/errors" + "github.com/babarot/afx/pkg/helpers/templates" + "github.com/babarot/afx/pkg/logging" + "github.com/babarot/afx/pkg/state" "github.com/spf13/cobra" "golang.org/x/sync/errgroup" ) diff --git a/cmd/meta.go b/cmd/meta.go index f5bd8b1..09618f1 100644 --- a/cmd/meta.go +++ b/cmd/meta.go @@ -11,14 +11,14 @@ import ( "strings" "github.com/AlecAivazis/survey/v2" - "github.com/b4b4r07/afx/pkg/config" - "github.com/b4b4r07/afx/pkg/env" - "github.com/b4b4r07/afx/pkg/errors" - "github.com/b4b4r07/afx/pkg/github" - "github.com/b4b4r07/afx/pkg/helpers/shell" - "github.com/b4b4r07/afx/pkg/printers" - "github.com/b4b4r07/afx/pkg/state" - "github.com/b4b4r07/afx/pkg/update" + "github.com/babarot/afx/pkg/config" + "github.com/babarot/afx/pkg/env" + "github.com/babarot/afx/pkg/errors" + "github.com/babarot/afx/pkg/github" + "github.com/babarot/afx/pkg/helpers/shell" + "github.com/babarot/afx/pkg/printers" + "github.com/babarot/afx/pkg/state" + "github.com/babarot/afx/pkg/update" "github.com/fatih/color" "github.com/mattn/go-shellwords" ) diff --git a/cmd/root.go b/cmd/root.go index 501e70a..5ae4310 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -6,14 +6,14 @@ import ( "os" "runtime" - "github.com/b4b4r07/afx/pkg/errors" - "github.com/b4b4r07/afx/pkg/helpers/templates" - "github.com/b4b4r07/afx/pkg/logging" - "github.com/b4b4r07/afx/pkg/update" + "github.com/babarot/afx/pkg/errors" + "github.com/babarot/afx/pkg/helpers/templates" + "github.com/babarot/afx/pkg/logging" + "github.com/babarot/afx/pkg/update" "github.com/spf13/cobra" ) -var Repository string = "b4b4r07/afx" +var Repository string = "babarot/afx" var ( rootLong = templates.LongDesc(`Package manager for CLI`) diff --git a/cmd/self-update.go b/cmd/self-update.go index 038798c..b495638 100644 --- a/cmd/self-update.go +++ b/cmd/self-update.go @@ -8,9 +8,9 @@ import ( "runtime" "github.com/AlecAivazis/survey/v2" - "github.com/b4b4r07/afx/pkg/errors" - "github.com/b4b4r07/afx/pkg/github" - "github.com/b4b4r07/afx/pkg/helpers/templates" + "github.com/babarot/afx/pkg/errors" + "github.com/babarot/afx/pkg/github" + "github.com/babarot/afx/pkg/helpers/templates" "github.com/creativeprojects/go-selfupdate" "github.com/fatih/color" "github.com/spf13/cobra" @@ -115,7 +115,7 @@ func (c *selfUpdateCmd) run(args []string) error { return nil } - release, err := github.NewRelease(ctx, "b4b4r07", "afx", "v"+latest.Version(), github.WithVerbose()) + release, err := github.NewRelease(ctx, "babarot", "afx", "v"+latest.Version(), github.WithVerbose()) if err != nil { return err } diff --git a/cmd/show.go b/cmd/show.go index 025a859..561b1cd 100644 --- a/cmd/show.go +++ b/cmd/show.go @@ -6,9 +6,9 @@ import ( "sort" "strings" - "github.com/b4b4r07/afx/pkg/helpers/templates" - "github.com/b4b4r07/afx/pkg/printers" - "github.com/b4b4r07/afx/pkg/state" + "github.com/babarot/afx/pkg/helpers/templates" + "github.com/babarot/afx/pkg/printers" + "github.com/babarot/afx/pkg/state" "github.com/goccy/go-yaml" "github.com/spf13/cobra" ) diff --git a/cmd/state.go b/cmd/state.go index 9475ffe..be963d7 100644 --- a/cmd/state.go +++ b/cmd/state.go @@ -4,9 +4,9 @@ import ( "fmt" "github.com/AlecAivazis/survey/v2" - "github.com/b4b4r07/afx/pkg/errors" - "github.com/b4b4r07/afx/pkg/helpers/templates" - "github.com/b4b4r07/afx/pkg/state" + "github.com/babarot/afx/pkg/errors" + "github.com/babarot/afx/pkg/helpers/templates" + "github.com/babarot/afx/pkg/state" "github.com/fatih/color" "github.com/spf13/cobra" ) diff --git a/cmd/uninstall.go b/cmd/uninstall.go index 1f49c1a..c87da70 100644 --- a/cmd/uninstall.go +++ b/cmd/uninstall.go @@ -4,9 +4,9 @@ import ( "fmt" "os" - "github.com/b4b4r07/afx/pkg/errors" - "github.com/b4b4r07/afx/pkg/helpers/templates" - "github.com/b4b4r07/afx/pkg/state" + "github.com/babarot/afx/pkg/errors" + "github.com/babarot/afx/pkg/helpers/templates" + "github.com/babarot/afx/pkg/state" "github.com/spf13/cobra" ) diff --git a/cmd/update.go b/cmd/update.go index 351332d..48e0ec4 100644 --- a/cmd/update.go +++ b/cmd/update.go @@ -7,10 +7,10 @@ import ( "os" "os/signal" - "github.com/b4b4r07/afx/pkg/config" - "github.com/b4b4r07/afx/pkg/errors" - "github.com/b4b4r07/afx/pkg/helpers/templates" - "github.com/b4b4r07/afx/pkg/state" + "github.com/babarot/afx/pkg/config" + "github.com/babarot/afx/pkg/errors" + "github.com/babarot/afx/pkg/helpers/templates" + "github.com/babarot/afx/pkg/state" "github.com/spf13/cobra" "golang.org/x/sync/errgroup" ) diff --git a/docs/configuration/package/gist.md b/docs/configuration/package/gist.md index 2021ae4..2418d3f 100644 --- a/docs/configuration/package/gist.md +++ b/docs/configuration/package/gist.md @@ -6,7 +6,7 @@ Gist type allows you to manage [Gist](https://gist.github.com/) pages as a plugi gist: - name: context-scripts description: Get current GCP/Kubernetes context which you are on. - owner: b4b4r07 + owner: babarot id: bb820b99fdba605ea4bd4fb29046ce58 command: link: diff --git a/docs/configuration/plugin.md b/docs/configuration/plugin.md index abb6ad8..48f4e96 100644 --- a/docs/configuration/plugin.md +++ b/docs/configuration/plugin.md @@ -16,9 +16,9 @@ list | (required) ```yaml hl_lines="9 10" title="Simple case, just register to init.sh as load scripts" github: - - name: b4b4r07/enhancd + - name: babarot/enhancd description: A next-generation cd command with your interactive filter - owner: b4b4r07 + owner: babarot repo: enhancd plugin: env: @@ -31,9 +31,9 @@ list | (required) ```yaml hl_lines="10 11" title="Using wildcards to register multiple files" github: - - name: b4b4r07/zsh-prompt-minimal + - name: babarot/zsh-prompt-minimal description: Super super super minimal prompt for zsh - owner: b4b4r07 + owner: babarot repo: zsh-prompt-minimal plugin: env: @@ -74,9 +74,9 @@ map | `{}` ```yaml hl_lines="7 8 9" github: - - name: b4b4r07/zsh-prompt-minimal + - name: babarot/zsh-prompt-minimal description: Super super super minimal prompt for zsh - owner: b4b4r07 + owner: babarot repo: zsh-prompt-minimal plugin: env: @@ -98,9 +98,9 @@ string | `""` ```yaml hl_lines="11 12 13" title="Login message if tpm is installed" github: - - name: b4b4r07/enhancd + - name: babarot/enhancd description: A next-generation cd command with your interactive filter - owner: b4b4r07 + owner: babarot repo: enhancd plugin: env: @@ -109,7 +109,7 @@ string | `""` - init.sh snippet: | echo "enhancd is enabled, cd command is overrided by enhancd" - echo "see github.com/b4b4r07/enhancd" + echo "see github.com/babarot/enhancd" ``` ### snippet-prepare (beta) @@ -124,7 +124,7 @@ string | `""` 2. Load `sources` 3. Run `snippet` -This option comes from https://github.com/b4b4r07/afx/issues/6. +This option comes from https://github.com/babarot/afx/issues/6. === "Case 1" diff --git a/docs/getting-started.md b/docs/getting-started.md index 60496e1..57efd9d 100644 --- a/docs/getting-started.md +++ b/docs/getting-started.md @@ -13,18 +13,18 @@ bash installer has been provided so you can install afx by running this one comm === "Latest" ```bash - curl -sL https://raw.githubusercontent.com/b4b4r07/afx/HEAD/hack/install | bash + curl -sL https://raw.githubusercontent.com/babarot/afx/HEAD/hack/install | bash ``` === "Version" ```bash - curl -sL https://raw.githubusercontent.com/b4b4r07/afx/HEAD/hack/install | AFX_VERSION=v0.1.24 bash + curl -sL https://raw.githubusercontent.com/babarot/afx/HEAD/hack/install | AFX_VERSION=v0.1.24 bash ``` env | description | default ---|---|--- -`AFX_VERSION` | afx version, available versions are on [releases](https://github.com/b4b4r07/afx/releases) | `latest` +`AFX_VERSION` | afx version, available versions are on [releases](https://github.com/babarot/afx/releases) | `latest` `AFX_BIN_DIR` | Path to install | `~/bin` ### go install @@ -32,14 +32,14 @@ env | description | default For Go developers. ```bash -go install github.com/b4b4r07/afx@latest +go install github.com/babarot/afx@latest ``` ### manually Download the pre-compiled binaries from the [OSS releases page][releases] and copy them to the desired location. -[releases]: https://github.com/b4b4r07/afx/releases +[releases]: https://github.com/babarot/afx/releases ## Write YAML @@ -58,9 +58,9 @@ github: link: - from: '*jq*' to: jq -- name: b4b4r07/enhancd +- name: babarot/enhancd description: A next-generation cd command with your interactive filter - owner: b4b4r07 + owner: babarot repo: enhancd plugin: env: @@ -95,7 +95,7 @@ $ source <(afx init) ```sh $ afx init -source /Users/babarot/.afx/github.com/b4b4r07/enhancd/init.sh +source /Users/babarot/.afx/github.com/babarot/enhancd/init.sh export ENHANCD_FILTER="fzf --height 25% --reverse --ansi:fzy" ``` diff --git a/docs/how-it-works.md b/docs/how-it-works.md index 5b274ba..7cc5e54 100644 --- a/docs/how-it-works.md +++ b/docs/how-it-works.md @@ -65,9 +65,9 @@ afx have a state feature like [Terraform](https://www.terraform.io/). In afx, du ```diff github: - - name: b4b4r07/enhancd + - name: babarot/enhancd description: A next-generation cd command with your interactive filter - owner: b4b4r07 + owner: babarot repo: enhancd plugin: env: @@ -95,9 +95,9 @@ afx have a state feature like [Terraform](https://www.terraform.io/). In afx, du ```diff github: - - name: b4b4r07/enhancd + - name: babarot/enhancd description: A next-generation cd command with your interactive filter - owner: b4b4r07 + owner: babarot repo: enhancd plugin: env: @@ -144,13 +144,13 @@ This is just an example of `afx init`. Running `source` command with this output ```bash $ afx init -source /Users/babarot/.afx/github.com/b4b4r07/enhancd/init.sh +source /Users/babarot/.afx/github.com/babarot/enhancd/init.sh export ENHANCD_FILTER="fzf --height 25% --reverse --ansi:fzy" source /Users/babarot/.afx/github.com/zdharma-continuum/history-search-multi-word/history-search-multi-word.plugin.zsh -source /Users/babarot/.afx/github.com/b4b4r07/zsh-vimode-visual/zsh-vimode-visual.zsh +source /Users/babarot/.afx/github.com/babarot/zsh-vimode-visual/zsh-vimode-visual.zsh alias diff="colordiff -u" source /Users/babarot/.afx/github.com/zdharma-continuum/fast-syntax-highlighting/fast-syntax-highlighting.plugin.zsh -source /Users/babarot/.afx/github.com/b4b4r07/zsh-prompt-minimal/minimal.zsh-theme +source /Users/babarot/.afx/github.com/babarot/zsh-prompt-minimal/minimal.zsh-theme export PROMPT_PATH_STYLE="minimal" export PROMPT_USE_VIM_MODE="true" ## package shlide is not installed, so skip to init diff --git a/docs/links.md b/docs/links.md index 26e3a48..987e1c1 100644 --- a/docs/links.md +++ b/docs/links.md @@ -2,7 +2,7 @@ Examples on afx config: -- [b4b4r07/dotfiles](https://github.com/b4b4r07/dotfiles/tree/HEAD/.config/afx) +- [babarot/dotfiles](https://github.com/babarot/dotfiles/tree/HEAD/.config/afx) Similar projects: diff --git a/go.mod b/go.mod index 1a63c7f..3e1d532 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/b4b4r07/afx +module github.com/babarot/afx go 1.23 diff --git a/hack/README.md b/hack/README.md index aa77474..74eeaa8 100644 --- a/hack/README.md +++ b/hack/README.md @@ -9,11 +9,11 @@ $ cat hack/install | bash Run script via curl (when not cloning repo): ```console -$ curl -sL https://raw.githubusercontent.com/b4b4r07/afx/HEAD/hack/install | AFX_VERSION=v0.1.24 bash +$ curl -sL https://raw.githubusercontent.com/babarot/afx/HEAD/hack/install | AFX_VERSION=v0.1.24 bash ``` env | description | default ---|---|--- -`AFX_VERSION` | afx version, available versions are on [releases](https://github.com/b4b4r07/afx/releases) | `latest` +`AFX_VERSION` | afx version, available versions are on [releases](https://github.com/babarot/afx/releases) | `latest` `AFX_BIN_DIR` | Path to install | `~/bin` diff --git a/hack/install b/hack/install index 3b69568..75d20c5 100644 --- a/hack/install +++ b/hack/install @@ -36,7 +36,7 @@ main() { command -v afx &>/dev/null && afx --version - echo 'For more information, see: https://github.com/b4b4r07/afx' + echo 'For more information, see: https://github.com/babarot/afx' } try_curl() { @@ -81,9 +81,9 @@ download() { } if [[ ${afx_version} == latest ]]; then - url="https://github.com/b4b4r07/afx/releases/latest/download/${tarball}" + url="https://github.com/babarot/afx/releases/latest/download/${tarball}" else - url="https://github.com/b4b4r07/afx/releases/download/${afx_version}/${tarball}" + url="https://github.com/babarot/afx/releases/download/${afx_version}/${tarball}" fi echo "Downloading afx ..." @@ -100,7 +100,7 @@ download() { try_go() { local do_cp=false - local path="github.com/b4b4r07/afx" + local path="github.com/babarot/afx" local cmd="${path}/cmd" echo -n "Building binary (go get -u ${path}) ... " diff --git a/main.go b/main.go index e031508..cfd0fbd 100644 --- a/main.go +++ b/main.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - "github.com/b4b4r07/afx/cmd" + "github.com/babarot/afx/cmd" ) func main() { diff --git a/mkdocs.yml b/mkdocs.yml index b9b16b2..de9aa92 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -3,8 +3,8 @@ site_name: AFX site_url: https://babarot.me/afx/ site_description: Package manager for CLI -repo_name: b4b4r07/afx -repo_url: https://github.com/b4b4r07/afx +repo_name: babarot/afx +repo_url: https://github.com/babarot/afx edit_uri: copyright: Copyright © 2022 babarot @@ -58,7 +58,7 @@ markdown_extensions: repo_url_shortener: true repo_url_shorthand: true social_url_shorthand: true - user: b4b4r07 + user: babarot repo: afx - pymdownx.mark - pymdownx.smartsymbols @@ -76,11 +76,11 @@ extra: - icon: fontawesome/solid/blog link: https://tellme.tokyo - icon: fontawesome/brands/github - link: https://github.com/b4b4r07 + link: https://github.com/babarot - icon: fontawesome/brands/twitter - link: https://twitter.com/b4b4r07 + link: https://twitter.com/babarot - icon: fontawesome/brands/docker - link: https://hub.docker.com/u/b4b4r07 + link: https://hub.docker.com/u/babarot nav: - Home: index.md diff --git a/pkg/config/command.go b/pkg/config/command.go index 2d22100..fbd6174 100644 --- a/pkg/config/command.go +++ b/pkg/config/command.go @@ -11,7 +11,7 @@ import ( "path/filepath" "strings" - "github.com/b4b4r07/afx/pkg/errors" + "github.com/babarot/afx/pkg/errors" "github.com/goccy/go-yaml" "github.com/mattn/go-shellwords" "github.com/mattn/go-zglob" diff --git a/pkg/config/config.go b/pkg/config/config.go index 5d2ad35..238497d 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -8,8 +8,8 @@ import ( "path/filepath" "strings" - "github.com/b4b4r07/afx/pkg/dependency" - "github.com/b4b4r07/afx/pkg/state" + "github.com/babarot/afx/pkg/dependency" + "github.com/babarot/afx/pkg/state" "github.com/go-playground/validator/v10" "github.com/goccy/go-yaml" "github.com/hashicorp/go-multierror" diff --git a/pkg/config/gist.go b/pkg/config/gist.go index c0a698f..59a9628 100644 --- a/pkg/config/gist.go +++ b/pkg/config/gist.go @@ -7,8 +7,8 @@ import ( "os" "path/filepath" - "github.com/b4b4r07/afx/pkg/errors" - "github.com/b4b4r07/afx/pkg/state" + "github.com/babarot/afx/pkg/errors" + "github.com/babarot/afx/pkg/state" git "gopkg.in/src-d/go-git.v4" ) diff --git a/pkg/config/github.go b/pkg/config/github.go index fba872b..2ee50f7 100644 --- a/pkg/config/github.go +++ b/pkg/config/github.go @@ -16,12 +16,12 @@ import ( "gopkg.in/yaml.v2" "github.com/Masterminds/semver" - "github.com/b4b4r07/afx/pkg/data" - "github.com/b4b4r07/afx/pkg/errors" - "github.com/b4b4r07/afx/pkg/github" - "github.com/b4b4r07/afx/pkg/logging" - "github.com/b4b4r07/afx/pkg/state" - "github.com/b4b4r07/afx/pkg/templates" + "github.com/babarot/afx/pkg/data" + "github.com/babarot/afx/pkg/errors" + "github.com/babarot/afx/pkg/github" + "github.com/babarot/afx/pkg/logging" + "github.com/babarot/afx/pkg/state" + "github.com/babarot/afx/pkg/templates" "github.com/fatih/color" "github.com/go-playground/validator/v10" ) diff --git a/pkg/config/http.go b/pkg/config/http.go index 4edb9cf..260ea79 100644 --- a/pkg/config/http.go +++ b/pkg/config/http.go @@ -11,10 +11,10 @@ import ( "os" "path/filepath" - "github.com/b4b4r07/afx/pkg/data" - "github.com/b4b4r07/afx/pkg/errors" - "github.com/b4b4r07/afx/pkg/state" - "github.com/b4b4r07/afx/pkg/templates" + "github.com/babarot/afx/pkg/data" + "github.com/babarot/afx/pkg/errors" + "github.com/babarot/afx/pkg/state" + "github.com/babarot/afx/pkg/templates" "github.com/h2non/filetype" "github.com/mholt/archiver" ) diff --git a/pkg/config/local.go b/pkg/config/local.go index 2264285..d5cf225 100644 --- a/pkg/config/local.go +++ b/pkg/config/local.go @@ -4,8 +4,8 @@ import ( "context" "os" - "github.com/b4b4r07/afx/pkg/errors" - "github.com/b4b4r07/afx/pkg/state" + "github.com/babarot/afx/pkg/errors" + "github.com/babarot/afx/pkg/state" ) // Local represents diff --git a/pkg/config/package.go b/pkg/config/package.go index ec5fbad..3ca2010 100644 --- a/pkg/config/package.go +++ b/pkg/config/package.go @@ -3,7 +3,7 @@ package config import ( "context" - "github.com/b4b4r07/afx/pkg/state" + "github.com/babarot/afx/pkg/state" "github.com/mattn/go-shellwords" ) diff --git a/pkg/config/util.go b/pkg/config/util.go index 9a93306..fb2dc35 100644 --- a/pkg/config/util.go +++ b/pkg/config/util.go @@ -6,7 +6,7 @@ import ( "runtime" "strings" - "github.com/b4b4r07/afx/pkg/errors" + "github.com/babarot/afx/pkg/errors" ) // const errors diff --git a/pkg/github/client.go b/pkg/github/client.go index 2496dd5..db0d0ed 100644 --- a/pkg/github/client.go +++ b/pkg/github/client.go @@ -7,7 +7,7 @@ import ( "net/http" "os" - "github.com/b4b4r07/afx/pkg/errors" + "github.com/babarot/afx/pkg/errors" ) // ClientOption represents an argument to NewClient diff --git a/pkg/github/github.go b/pkg/github/github.go index f295408..5017962 100644 --- a/pkg/github/github.go +++ b/pkg/github/github.go @@ -13,8 +13,8 @@ import ( "runtime" "strings" - "github.com/b4b4r07/afx/pkg/errors" - "github.com/b4b4r07/afx/pkg/logging" + "github.com/babarot/afx/pkg/errors" + "github.com/babarot/afx/pkg/logging" "github.com/inconshreveable/go-update" "github.com/mholt/archiver" "github.com/schollz/progressbar/v3" diff --git a/pkg/state/state_test.go b/pkg/state/state_test.go index 8f4899a..51d1ee0 100644 --- a/pkg/state/state_test.go +++ b/pkg/state/state_test.go @@ -24,15 +24,15 @@ func TestOpen(t *testing.T) { "state.json": ` { "resources": { - "github.com/b4b4r07/enhancd": { - "id": "github.com/b4b4r07/enhancd", - "name": "b4b4r07/enhancd", - "home": "/Users/babarot/.afx/github.com/b4b4r07/enhancd", + "github.com/babarot/enhancd": { + "id": "github.com/babarot/enhancd", + "name": "babarot/enhancd", + "home": "/Users/babarot/.afx/github.com/babarot/enhancd", "type": "GitHub", "version": "", "paths": [ - "/Users/babarot/.afx/github.com/b4b4r07/enhancd", - "/Users/babarot/.afx/github.com/b4b4r07/enhancd/init.sh" + "/Users/babarot/.afx/github.com/babarot/enhancd", + "/Users/babarot/.afx/github.com/babarot/enhancd/init.sh" ] } } @@ -54,15 +54,15 @@ func TestOpen(t *testing.T) { packages: nil, Self: Self{ Resources: map[ID]Resource{ - "github.com/b4b4r07/enhancd": { - ID: "github.com/b4b4r07/enhancd", - Name: "b4b4r07/enhancd", - Home: "/Users/babarot/.afx/github.com/b4b4r07/enhancd", + "github.com/babarot/enhancd": { + ID: "github.com/babarot/enhancd", + Name: "babarot/enhancd", + Home: "/Users/babarot/.afx/github.com/babarot/enhancd", Type: "GitHub", Version: "", Paths: []string{ - "/Users/babarot/.afx/github.com/b4b4r07/enhancd", - "/Users/babarot/.afx/github.com/b4b4r07/enhancd/init.sh", + "/Users/babarot/.afx/github.com/babarot/enhancd", + "/Users/babarot/.afx/github.com/babarot/enhancd/init.sh", }, }, }, @@ -70,14 +70,14 @@ func TestOpen(t *testing.T) { Additions: nil, Deletions: []Resource{ { - ID: "github.com/b4b4r07/enhancd", - Name: "b4b4r07/enhancd", - Home: "/Users/babarot/.afx/github.com/b4b4r07/enhancd", + ID: "github.com/babarot/enhancd", + Name: "babarot/enhancd", + Home: "/Users/babarot/.afx/github.com/babarot/enhancd", Type: "GitHub", Version: "", Paths: []string{ - "/Users/babarot/.afx/github.com/b4b4r07/enhancd", - "/Users/babarot/.afx/github.com/b4b4r07/enhancd/init.sh", + "/Users/babarot/.afx/github.com/babarot/enhancd", + "/Users/babarot/.afx/github.com/babarot/enhancd/init.sh", }, }, }, @@ -110,15 +110,15 @@ func TestList(t *testing.T) { "state.json": ` { "resources": { - "github.com/b4b4r07/enhancd": { - "id": "github.com/b4b4r07/enhancd", - "name": "b4b4r07/enhancd", - "home": "/Users/babarot/.afx/github.com/b4b4r07/enhancd", + "github.com/babarot/enhancd": { + "id": "github.com/babarot/enhancd", + "name": "babarot/enhancd", + "home": "/Users/babarot/.afx/github.com/babarot/enhancd", "type": "GitHub", "version": "", "paths": [ - "/Users/babarot/.afx/github.com/b4b4r07/enhancd", - "/Users/babarot/.afx/github.com/b4b4r07/enhancd/init.sh" + "/Users/babarot/.afx/github.com/babarot/enhancd", + "/Users/babarot/.afx/github.com/babarot/enhancd/init.sh" ] } } @@ -133,14 +133,14 @@ func TestList(t *testing.T) { filename: "state.json", resources: []Resource{ { - ID: "github.com/b4b4r07/enhancd", - Name: "b4b4r07/enhancd", - Home: "/Users/babarot/.afx/github.com/b4b4r07/enhancd", + ID: "github.com/babarot/enhancd", + Name: "babarot/enhancd", + Home: "/Users/babarot/.afx/github.com/babarot/enhancd", Type: "GitHub", Version: "", Paths: []string{ - "/Users/babarot/.afx/github.com/b4b4r07/enhancd", - "/Users/babarot/.afx/github.com/b4b4r07/enhancd/init.sh", + "/Users/babarot/.afx/github.com/babarot/enhancd", + "/Users/babarot/.afx/github.com/babarot/enhancd/init.sh", }, }, }, @@ -263,15 +263,15 @@ func Test_listNoChanges(t *testing.T) { "state.json": ` { "resources": { - "github.com/b4b4r07/enhancd": { - "id": "github.com/b4b4r07/enhancd", - "name": "b4b4r07/enhancd", - "home": "/Users/babarot/.afx/github.com/b4b4r07/enhancd", + "github.com/babarot/enhancd": { + "id": "github.com/babarot/enhancd", + "name": "babarot/enhancd", + "home": "/Users/babarot/.afx/github.com/babarot/enhancd", "type": "GitHub", "version": "", "paths": [ - "/Users/babarot/.afx/github.com/b4b4r07/enhancd", - "/Users/babarot/.afx/github.com/b4b4r07/enhancd/init.sh" + "/Users/babarot/.afx/github.com/babarot/enhancd", + "/Users/babarot/.afx/github.com/babarot/enhancd/init.sh" ] } } @@ -287,27 +287,27 @@ func Test_listNoChanges(t *testing.T) { filename: "state.json", pkgs: stubPackages([]Resource{ { - ID: "github.com/b4b4r07/enhancd", - Name: "b4b4r07/enhancd", - Home: "/Users/babarot/.afx/github.com/b4b4r07/enhancd", + ID: "github.com/babarot/enhancd", + Name: "babarot/enhancd", + Home: "/Users/babarot/.afx/github.com/babarot/enhancd", Type: "GitHub", Version: "", Paths: []string{ - "/Users/babarot/.afx/github.com/b4b4r07/enhancd", - "/Users/babarot/.afx/github.com/b4b4r07/enhancd/init.sh", + "/Users/babarot/.afx/github.com/babarot/enhancd", + "/Users/babarot/.afx/github.com/babarot/enhancd/init.sh", }, }, }), resources: []Resource{ { - ID: "github.com/b4b4r07/enhancd", - Name: "b4b4r07/enhancd", - Home: "/Users/babarot/.afx/github.com/b4b4r07/enhancd", + ID: "github.com/babarot/enhancd", + Name: "babarot/enhancd", + Home: "/Users/babarot/.afx/github.com/babarot/enhancd", Type: "GitHub", Version: "", Paths: []string{ - "/Users/babarot/.afx/github.com/b4b4r07/enhancd", - "/Users/babarot/.afx/github.com/b4b4r07/enhancd/init.sh", + "/Users/babarot/.afx/github.com/babarot/enhancd", + "/Users/babarot/.afx/github.com/babarot/enhancd/init.sh", }, }, }, @@ -361,27 +361,27 @@ func Test_listAdditions(t *testing.T) { filename: "state.json", pkgs: stubPackages([]Resource{ { - ID: "github.com/b4b4r07/enhancd", - Name: "b4b4r07/enhancd", - Home: "/Users/babarot/.afx/github.com/b4b4r07/enhancd", + ID: "github.com/babarot/enhancd", + Name: "babarot/enhancd", + Home: "/Users/babarot/.afx/github.com/babarot/enhancd", Type: "GitHub", Version: "", Paths: []string{ - "/Users/babarot/.afx/github.com/b4b4r07/enhancd", - "/Users/babarot/.afx/github.com/b4b4r07/enhancd/init.sh", + "/Users/babarot/.afx/github.com/babarot/enhancd", + "/Users/babarot/.afx/github.com/babarot/enhancd/init.sh", }, }, }), resources: []Resource{ { - ID: "github.com/b4b4r07/enhancd", - Name: "b4b4r07/enhancd", - Home: "/Users/babarot/.afx/github.com/b4b4r07/enhancd", + ID: "github.com/babarot/enhancd", + Name: "babarot/enhancd", + Home: "/Users/babarot/.afx/github.com/babarot/enhancd", Type: "GitHub", Version: "", Paths: []string{ - "/Users/babarot/.afx/github.com/b4b4r07/enhancd", - "/Users/babarot/.afx/github.com/b4b4r07/enhancd/init.sh", + "/Users/babarot/.afx/github.com/babarot/enhancd", + "/Users/babarot/.afx/github.com/babarot/enhancd/init.sh", }, }, }, @@ -420,15 +420,15 @@ func Test_listDeletions(t *testing.T) { "state.json": ` { "resources": { - "github.com/b4b4r07/enhancd": { - "id": "github.com/b4b4r07/enhancd", - "name": "b4b4r07/enhancd", - "home": "/Users/babarot/.afx/github.com/b4b4r07/enhancd", + "github.com/babarot/enhancd": { + "id": "github.com/babarot/enhancd", + "name": "babarot/enhancd", + "home": "/Users/babarot/.afx/github.com/babarot/enhancd", "type": "GitHub", "version": "", "paths": [ - "/Users/babarot/.afx/github.com/b4b4r07/enhancd", - "/Users/babarot/.afx/github.com/b4b4r07/enhancd/init.sh" + "/Users/babarot/.afx/github.com/babarot/enhancd", + "/Users/babarot/.afx/github.com/babarot/enhancd/init.sh" ] } } @@ -445,14 +445,14 @@ func Test_listDeletions(t *testing.T) { pkgs: stubPackages([]Resource{}), resources: []Resource{ { - ID: "github.com/b4b4r07/enhancd", - Name: "b4b4r07/enhancd", - Home: "/Users/babarot/.afx/github.com/b4b4r07/enhancd", + ID: "github.com/babarot/enhancd", + Name: "babarot/enhancd", + Home: "/Users/babarot/.afx/github.com/babarot/enhancd", Type: "GitHub", Version: "", Paths: []string{ - "/Users/babarot/.afx/github.com/b4b4r07/enhancd", - "/Users/babarot/.afx/github.com/b4b4r07/enhancd/init.sh", + "/Users/babarot/.afx/github.com/babarot/enhancd", + "/Users/babarot/.afx/github.com/babarot/enhancd/init.sh", }, }, }, @@ -475,14 +475,14 @@ func Test_listDeletions(t *testing.T) { }), resources: []Resource{ { - ID: "github.com/b4b4r07/enhancd", - Name: "b4b4r07/enhancd", - Home: "/Users/babarot/.afx/github.com/b4b4r07/enhancd", + ID: "github.com/babarot/enhancd", + Name: "babarot/enhancd", + Home: "/Users/babarot/.afx/github.com/babarot/enhancd", Type: "GitHub", Version: "", Paths: []string{ - "/Users/babarot/.afx/github.com/b4b4r07/enhancd", - "/Users/babarot/.afx/github.com/b4b4r07/enhancd/init.sh", + "/Users/babarot/.afx/github.com/babarot/enhancd", + "/Users/babarot/.afx/github.com/babarot/enhancd/init.sh", }, }, }, diff --git a/pkg/templates/templates.go b/pkg/templates/templates.go index 3a1eaf9..1f5b4ff 100644 --- a/pkg/templates/templates.go +++ b/pkg/templates/templates.go @@ -7,7 +7,7 @@ import ( "text/template" "time" - "github.com/b4b4r07/afx/pkg/data" + "github.com/babarot/afx/pkg/data" ) // Template holds data that can be applied to a template string. diff --git a/pkg/update/update.go b/pkg/update/update.go index 35d826b..3b3bb06 100644 --- a/pkg/update/update.go +++ b/pkg/update/update.go @@ -13,7 +13,7 @@ import ( "strings" "time" - "github.com/b4b4r07/afx/pkg/github" + "github.com/babarot/afx/pkg/github" "github.com/hashicorp/go-version" ) diff --git a/pkg/update/update_test.go b/pkg/update/update_test.go index 1951907..bfa1a31 100644 --- a/pkg/update/update_test.go +++ b/pkg/update/update_test.go @@ -8,7 +8,7 @@ import ( "os" "testing" - "github.com/b4b4r07/afx/pkg/github" + "github.com/babarot/afx/pkg/github" "github.com/cli/cli/v2/pkg/httpmock" )