Skip to content

Commit

Permalink
Merge pull request #13 from tiborhercz/rename
Browse files Browse the repository at this point in the history
Rename
  • Loading branch information
tiborhercz authored Apr 5, 2022
2 parents fae122d + a5079ac commit d5a2d24
Show file tree
Hide file tree
Showing 18 changed files with 53 additions and 39 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
*.wasm
*.wasm
dist
16 changes: 8 additions & 8 deletions .goreleaser.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
project_name: "cli-toolbox"
project_name: "toolbox"

before:
hooks:
Expand All @@ -8,20 +8,20 @@ before:

builds:
- main: ./main.go
binary: cli-toolbox
binary: toolbox
goos: [ "linux", "darwin", "windows" ]
goarch: [ "386", "amd64" ]
ldflags:
- -s -w -X "github.com/tiborhercz/cli-toolbox/cmd.version={{.Version}}"
- -s -w -X "github.com/tiborhercz/toolbox/cmd.version={{.Version}}"
env:
- CGO_ENABLED=0

brews:
- tap:
owner: tiborhercz
name: homebrew-cli-toolbox
name: cli-toolbox
homepage: "https://github.com/tiborhercz/cli-toolbox"
name: homebrew-toolbox
name: toolbox
homepage: "https://github.com/tiborhercz/toolbox"
description: "A collection of various cli tools"
license: "MIT"
skip_upload: auto
Expand All @@ -30,6 +30,6 @@ brews:
email: [email protected]
folder: Formula
install: |-
bin.install "cli-toolbox"
bin.install "toolbox"
test: |
system "#{bin}/cli-toolbox -v"
system "#{bin}/toolbox -v"
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ Install instructions

### Binary

Get the binary from the [GitHub release page](https://github.com/tiborhercz/cli-toolbox/releases)
Get the binary from the [GitHub release page](https://github.com/tiborhercz/toolbox/releases)

### Brew

```shell
brew tap tiborhercz/cli-toolbox
brew install cli-toolbox
brew tap tiborhercz/toolbox
brew install toolbox
```

### Compile
Expand All @@ -35,15 +35,15 @@ GOOS=js GOARCH=wasm go build -o static/UI/public/main.wasm wasm/*.go
```
2. Build the Vue.js frontend. Run `npm run build` inside the `static/UI/public/` directory
3. Run `go build .` in the root directory
4. Run cli-toolbox with `./cli-toolbox`
4. Run toolbox with `./toolbox`

### Makefile
To build the cli-toolbox run: `make build`
To build the toolbox run: `make build`

## Usage

```
cli-toolbox [command]
toolbox [command]
Available Commands:
base64 Encode and decode base64 strings
Expand All @@ -57,7 +57,7 @@ Available Commands:

### Launching the web UI
```shell
cli-toolbox webui
toolbox webui
```

## License
Expand Down
4 changes: 2 additions & 2 deletions cmd/base64.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"fmt"
"github.com/sirupsen/logrus"
"github.com/spf13/cobra"
"github.com/tiborhercz/cli-toolbox/internal/model"
"github.com/tiborhercz/cli-toolbox/pkg/base64"
"github.com/tiborhercz/toolbox/internal/model"
"github.com/tiborhercz/toolbox/pkg/base64"
"io/ioutil"
"os"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/cidr.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package cmd
import (
"github.com/sirupsen/logrus"
"github.com/spf13/cobra"
"github.com/tiborhercz/cli-toolbox/internal/cidr"
"github.com/tiborhercz/toolbox/internal/cidr"
)

var (
Expand Down
4 changes: 2 additions & 2 deletions cmd/hash.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"fmt"
"github.com/sirupsen/logrus"
"github.com/spf13/cobra"
"github.com/tiborhercz/cli-toolbox/internal/model"
"github.com/tiborhercz/cli-toolbox/pkg/hash"
"github.com/tiborhercz/toolbox/internal/model"
"github.com/tiborhercz/toolbox/pkg/hash"
"strings"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/jwtdecode.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"encoding/json"
"github.com/sirupsen/logrus"
"github.com/spf13/cobra"
"github.com/tiborhercz/cli-toolbox/pkg/jwtdecode"
"github.com/tiborhercz/toolbox/pkg/jwtdecode"
"log"
)

Expand Down
4 changes: 2 additions & 2 deletions cmd/password.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package cmd
import (
"github.com/sirupsen/logrus"
"github.com/spf13/cobra"
"github.com/tiborhercz/cli-toolbox/internal/model"
"github.com/tiborhercz/cli-toolbox/pkg/password"
"github.com/tiborhercz/toolbox/internal/model"
"github.com/tiborhercz/toolbox/pkg/password"
"log"
)

Expand Down
17 changes: 15 additions & 2 deletions cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (

var (
rootCmd = &cobra.Command{
Use: "cli-toolbox",
Short: "cli toolbox",
Use: "toolbox",
Run: func(cmd *cobra.Command, args []string) {
fmt.Println(toolboxArt())
cmd.Help()
},
}
Expand All @@ -22,3 +22,16 @@ func Execute() {
os.Exit(1)
}
}

func toolboxArt() string {
return `
________ __ __
| \ | \ \
\▓▓▓▓▓▓▓▓ ______ ______ | ▓▓ ▓▓____ ______ __ __
| ▓▓ / \ / \| ▓▓ ▓▓ \ / \| \ / \
| ▓▓ | ▓▓▓▓▓▓\ ▓▓▓▓▓▓\ ▓▓ ▓▓▓▓▓▓▓\ ▓▓▓▓▓▓\\▓▓\/ ▓▓
| ▓▓ | ▓▓ | ▓▓ ▓▓ | ▓▓ ▓▓ ▓▓ | ▓▓ ▓▓ | ▓▓ >▓▓ ▓▓
| ▓▓ | ▓▓__/ ▓▓ ▓▓__/ ▓▓ ▓▓ ▓▓__/ ▓▓ ▓▓__/ ▓▓/ ▓▓▓▓\
| ▓▓ \▓▓ ▓▓\▓▓ ▓▓ ▓▓ ▓▓ ▓▓\▓▓ ▓▓ ▓▓ \▓▓\
\▓▓ \▓▓▓▓▓▓ \▓▓▓▓▓▓ \▓▓\▓▓▓▓▓▓▓ \▓▓▓▓▓▓ \▓▓ \▓▓`
}
4 changes: 2 additions & 2 deletions cmd/webUI.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package cmd
import (
"fmt"
"github.com/spf13/cobra"
"github.com/tiborhercz/cli-toolbox/internal/model"
"github.com/tiborhercz/cli-toolbox/static"
"github.com/tiborhercz/toolbox/internal/model"
"github.com/tiborhercz/toolbox/static"
"net"
"os"
)
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/tiborhercz/cli-toolbox
module github.com/tiborhercz/toolbox

go 1.18

Expand Down
4 changes: 2 additions & 2 deletions internal/cidr/cidr.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package cidr
import (
"fmt"
"github.com/sirupsen/logrus"
"github.com/tiborhercz/cli-toolbox/internal/model"
"github.com/tiborhercz/cli-toolbox/pkg/ipv4"
"github.com/tiborhercz/toolbox/internal/model"
"github.com/tiborhercz/toolbox/pkg/ipv4"
"net"
"strconv"
"strings"
Expand Down
4 changes: 2 additions & 2 deletions main.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package main

import (
"github.com/tiborhercz/cli-toolbox/cmd"
"github.com/tiborhercz/cli-toolbox/internal/logrus"
"github.com/tiborhercz/toolbox/cmd"
"github.com/tiborhercz/toolbox/internal/logrus"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion wasm/main.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package main

import (
"github.com/tiborhercz/cli-toolbox/wasm/pkg"
"github.com/tiborhercz/toolbox/wasm/pkg"
"syscall/js"
)

Expand Down
2 changes: 1 addition & 1 deletion wasm/pkg/base64.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package pkg

import (
"fmt"
"github.com/tiborhercz/cli-toolbox/pkg/base64"
"github.com/tiborhercz/toolbox/pkg/base64"
"syscall/js"
)

Expand Down
2 changes: 1 addition & 1 deletion wasm/pkg/hash.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package pkg

import (
"fmt"
"github.com/tiborhercz/cli-toolbox/pkg/hash"
"github.com/tiborhercz/toolbox/pkg/hash"
"syscall/js"
)

Expand Down
4 changes: 2 additions & 2 deletions wasm/pkg/ipv4.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package pkg
import (
"encoding/json"
"fmt"
"github.com/tiborhercz/cli-toolbox/internal/utils"
"github.com/tiborhercz/cli-toolbox/pkg/ipv4"
"github.com/tiborhercz/toolbox/internal/utils"
"github.com/tiborhercz/toolbox/pkg/ipv4"
"syscall/js"
)

Expand Down
2 changes: 1 addition & 1 deletion wasm/pkg/jwtDecode.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"bytes"
"encoding/json"
"fmt"
"github.com/tiborhercz/cli-toolbox/pkg/jwtdecode"
"github.com/tiborhercz/toolbox/pkg/jwtdecode"
"syscall/js"
)

Expand Down

0 comments on commit d5a2d24

Please sign in to comment.