From 5171b1bae459d8d4fb0a1bc67e512808fd973a43 Mon Sep 17 00:00:00 2001 From: Ayman Bagabas Date: Thu, 9 Dec 2021 18:30:55 +0300 Subject: [PATCH] Rename module name and move binary to cmd/soft --- .gitignore | 2 +- .goreleaser.yml | 1 + README.md | 2 +- main.go => cmd/soft/main.go | 4 ++-- go.mod | 4 ++-- go.sum | 3 ++- internal/config/config.go | 4 ++-- internal/tui/bubble.go | 8 ++++---- internal/tui/bubbles/commits/bubble.go | 2 +- internal/tui/bubbles/repo/bubble.go | 4 ++-- internal/tui/bubbles/selection/bubble.go | 2 +- internal/tui/commands.go | 6 +++--- internal/tui/session.go | 2 +- server/server.go | 6 +++--- 14 files changed, 26 insertions(+), 24 deletions(-) rename main.go => cmd/soft/main.go (89%) diff --git a/.gitignore b/.gitignore index 1279456b490763e6acb7b709fbd3bf54017e1a90..cceafdf5269fe20087e54962ac504d48e51af84e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -soft +cmd/soft/soft .ssh .repos dist diff --git a/.goreleaser.yml b/.goreleaser.yml index 2b870785d828d3bb6c85e392d9ac16b9b4679745..012af0384b4165f539e9bde5c9a05640a7e31809 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -10,6 +10,7 @@ before: builds: - binary: "soft" + main: "./cmd/soft" ldflags: -s -w -X main.Version=v{{ .Version }} -X main.CommitSHA={{ .Commit }} goos: - linux diff --git a/README.md b/README.md index 68b6bfe69402c6b4e482c3fdf78e81158dc1702b..cd6dc0fbc25a2fa8f478bea72934e9dcfe4767cd 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,7 @@ Or just build and install it with `go`: ```bash git clone ssh://git.charm.sh/soft-serve -cd soft-serve +cd soft-serve/cmd/soft go install ``` diff --git a/main.go b/cmd/soft/main.go similarity index 89% rename from main.go rename to cmd/soft/main.go index 827b41f058faaa4b4e03428060c258804565c410..a25e5618add65e0ce2e04d9b64719dbfa2933a63 100644 --- a/main.go +++ b/cmd/soft/main.go @@ -6,8 +6,8 @@ import ( "log" "os" - "github.com/charmbracelet/soft/config" - "github.com/charmbracelet/soft/server" + "github.com/charmbracelet/soft-serve/config" + "github.com/charmbracelet/soft-serve/server" ) var ( diff --git a/go.mod b/go.mod index 04505f836df19c89dc3923e43c2e2cd428121f8a..5e897507b247113f2195903c0015a145989da140 100644 --- a/go.mod +++ b/go.mod @@ -1,10 +1,10 @@ -module github.com/charmbracelet/soft +module github.com/charmbracelet/soft-serve go 1.17 require ( github.com/charmbracelet/bubbles v0.9.0 - github.com/charmbracelet/bubbletea v0.19.0 + github.com/charmbracelet/bubbletea v0.19.1 github.com/charmbracelet/glamour v0.3.0 github.com/charmbracelet/lipgloss v0.4.0 github.com/charmbracelet/wish v0.1.1 diff --git a/go.sum b/go.sum index 9e5f393475e230c94ea98a741fe455ef5dd1e89f..b9c8cbac5d8878bb7999a61f7fc0c3a24200e393 100644 --- a/go.sum +++ b/go.sum @@ -25,8 +25,9 @@ github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd3 github.com/charmbracelet/bubbles v0.9.0 h1:lqJ8FXwoLceQF2J0A+dWo1Cuu1dNyjbW4Opgdi2vkhw= github.com/charmbracelet/bubbles v0.9.0/go.mod h1:NWT/c+0rYEnYChz5qCyX4Lj6fDw9gGToh9EFJPajghU= github.com/charmbracelet/bubbletea v0.14.1/go.mod h1:b5lOf5mLjMg1tRn1HVla54guZB+jvsyV0yYAQja95zE= -github.com/charmbracelet/bubbletea v0.19.0 h1:1gz4rbxl3qZik/oP8QW2vUtul2gO8RDDzmoLGERpTQc= github.com/charmbracelet/bubbletea v0.19.0/go.mod h1:VuXF2pToRxDUHcBUcPmCRUHRvFATM4Ckb/ql1rBl3KA= +github.com/charmbracelet/bubbletea v0.19.1 h1:VHuzkJbnTAkxhOfi9+Lb5PYfNM9+Oh+qhP8uDX5ReOU= +github.com/charmbracelet/bubbletea v0.19.1/go.mod h1:VuXF2pToRxDUHcBUcPmCRUHRvFATM4Ckb/ql1rBl3KA= github.com/charmbracelet/glamour v0.3.0 h1:3H+ZrKlSg8s+WU6V7eF2eRVYt8lCueffbi7r2+ffGkc= github.com/charmbracelet/glamour v0.3.0/go.mod h1:TzF0koPZhqq0YVBNL100cPHznAAjVj7fksX2RInwjGw= github.com/charmbracelet/harmonica v0.1.0/go.mod h1:KSri/1RMQOZLbw7AHqgcBycp8pgJnQMYYT8QZRqZ1Ao= diff --git a/internal/config/config.go b/internal/config/config.go index d1269a19fa97752c358bbf783bc180db9da0486d..21a22b33d4589a24eaf3dc2c1d1fc04e385e8ab4 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -10,8 +10,8 @@ import ( "fmt" "os" - "github.com/charmbracelet/soft/config" - "github.com/charmbracelet/soft/internal/git" + "github.com/charmbracelet/soft-serve/config" + "github.com/charmbracelet/soft-serve/internal/git" gg "github.com/go-git/go-git/v5" "github.com/go-git/go-git/v5/plumbing/object" ) diff --git a/internal/tui/bubble.go b/internal/tui/bubble.go index 6406fc82d2493f11ee462daf73a332133ed0d496..c5071c4b836ed6e54388cb6238e42d29cab6a7ad 100644 --- a/internal/tui/bubble.go +++ b/internal/tui/bubble.go @@ -6,10 +6,10 @@ import ( tea "github.com/charmbracelet/bubbletea" "github.com/charmbracelet/lipgloss" - "github.com/charmbracelet/soft/internal/config" - "github.com/charmbracelet/soft/internal/tui/bubbles/repo" - "github.com/charmbracelet/soft/internal/tui/bubbles/selection" - "github.com/charmbracelet/soft/internal/tui/style" + "github.com/charmbracelet/soft-serve/internal/config" + "github.com/charmbracelet/soft-serve/internal/tui/bubbles/repo" + "github.com/charmbracelet/soft-serve/internal/tui/bubbles/selection" + "github.com/charmbracelet/soft-serve/internal/tui/style" "github.com/gliderlabs/ssh" ) diff --git a/internal/tui/bubbles/commits/bubble.go b/internal/tui/bubbles/commits/bubble.go index 205daa701d116d77ea01a7bc98e0866f27c3f6dc..4edc6a6c21e6a0a59c90695dfc6b1dc76e7aea2c 100644 --- a/internal/tui/bubbles/commits/bubble.go +++ b/internal/tui/bubbles/commits/bubble.go @@ -5,7 +5,7 @@ import ( "github.com/charmbracelet/bubbles/viewport" tea "github.com/charmbracelet/bubbletea" - "github.com/charmbracelet/soft/internal/git" + "github.com/charmbracelet/soft-serve/internal/git" "github.com/dustin/go-humanize" ) diff --git a/internal/tui/bubbles/repo/bubble.go b/internal/tui/bubbles/repo/bubble.go index d3daec982b535f095a87fa688a3991fbf8b9ae6e..63bf8853655a475e8458fa93a69032aaa575da77 100644 --- a/internal/tui/bubbles/repo/bubble.go +++ b/internal/tui/bubbles/repo/bubble.go @@ -10,8 +10,8 @@ import ( tea "github.com/charmbracelet/bubbletea" "github.com/charmbracelet/glamour" "github.com/charmbracelet/lipgloss" - "github.com/charmbracelet/soft/internal/git" - "github.com/charmbracelet/soft/internal/tui/style" + "github.com/charmbracelet/soft-serve/internal/git" + "github.com/charmbracelet/soft-serve/internal/tui/style" "github.com/muesli/reflow/truncate" "github.com/muesli/reflow/wrap" ) diff --git a/internal/tui/bubbles/selection/bubble.go b/internal/tui/bubbles/selection/bubble.go index 824a65d71078fdb417ddd947f55d2b9c8bb72ce2..6a8a59342651ac3ebfc0056a9328b17a0b75beb0 100644 --- a/internal/tui/bubbles/selection/bubble.go +++ b/internal/tui/bubbles/selection/bubble.go @@ -5,7 +5,7 @@ import ( tea "github.com/charmbracelet/bubbletea" "github.com/charmbracelet/lipgloss" - "github.com/charmbracelet/soft/internal/tui/style" + "github.com/charmbracelet/soft-serve/internal/tui/style" "github.com/muesli/reflow/truncate" ) diff --git a/internal/tui/commands.go b/internal/tui/commands.go index 6ace2cf37ace9d5e120ddd2fc5a64dc6e1478320..6b98ca7d6d32279c8c27ab7e0826c1d3dde70e2a 100644 --- a/internal/tui/commands.go +++ b/internal/tui/commands.go @@ -5,9 +5,9 @@ import ( tea "github.com/charmbracelet/bubbletea" "github.com/charmbracelet/lipgloss" - "github.com/charmbracelet/soft/internal/config" - br "github.com/charmbracelet/soft/internal/tui/bubbles/repo" - "github.com/charmbracelet/soft/internal/tui/bubbles/selection" + "github.com/charmbracelet/soft-serve/internal/config" + br "github.com/charmbracelet/soft-serve/internal/tui/bubbles/repo" + "github.com/charmbracelet/soft-serve/internal/tui/bubbles/selection" gm "github.com/charmbracelet/wish/git" ) diff --git a/internal/tui/session.go b/internal/tui/session.go index 9f2c48600f8c4699380c5938ea327ef95e6418d7..aa1573fd3ecf42f860e1a3afbd53a54005c5d078 100644 --- a/internal/tui/session.go +++ b/internal/tui/session.go @@ -4,7 +4,7 @@ import ( "fmt" tea "github.com/charmbracelet/bubbletea" - "github.com/charmbracelet/soft/internal/config" + "github.com/charmbracelet/soft-serve/internal/config" "github.com/gliderlabs/ssh" ) diff --git a/server/server.go b/server/server.go index 59ed0488d4769ca2b13c407a300b47192b21c572..684a6048fa280d3b40abd674bddfbfa65d870634 100644 --- a/server/server.go +++ b/server/server.go @@ -4,9 +4,9 @@ import ( "fmt" "log" - "github.com/charmbracelet/soft/config" - appCfg "github.com/charmbracelet/soft/internal/config" - "github.com/charmbracelet/soft/internal/tui" + "github.com/charmbracelet/soft-serve/config" + appCfg "github.com/charmbracelet/soft-serve/internal/config" + "github.com/charmbracelet/soft-serve/internal/tui" "github.com/charmbracelet/wish" bm "github.com/charmbracelet/wish/bubbletea"