.gitignore 🔗
@@ -1,4 +1,4 @@
-soft
+cmd/soft/soft
.ssh
.repos
dist
Rename module name and move binary to cmd/soft
Ayman Bagabas created
Change summary
.gitignore | 2 +-
.goreleaser.yml | 1 +
README.md | 2 +-
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(-)
Detailed changes
.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
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
```
main.go → 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 (
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
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=
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"
)
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"
)
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"
)
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"
)
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"
)
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"
)
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"
)
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"