From bd06f71a690dc7f53fb9adb9d96be73e6a8dc4aa Mon Sep 17 00:00:00 2001 From: Ayman Bagabas Date: Thu, 7 Apr 2022 13:05:16 -0400 Subject: [PATCH] refactor: move pkg/{git,tui} to root --- {pkg/git => git}/commit.go | 0 {pkg/git => git}/errors.go | 0 {pkg/git => git}/patch.go | 0 {pkg/git => git}/reference.go | 0 {pkg/git => git}/repo.go | 0 {pkg/git => git}/tree.go | 0 internal/git/git.go | 2 +- internal/tui/bubble.go | 2 +- internal/tui/bubbles/repo/bubble.go | 6 +++--- internal/tui/bubbles/selection/bubble.go | 2 +- internal/tui/commands.go | 2 +- server/middleware.go | 4 ++-- {pkg/tui => tui}/about/bubble.go | 8 ++++---- {pkg/tui => tui}/bubble.go | 12 ++++++------ {pkg/tui => tui}/common/consts.go | 0 {pkg/tui => tui}/common/error.go | 0 {pkg/tui => tui}/common/formatter.go | 0 {pkg/tui => tui}/common/git.go | 2 +- {pkg/tui => tui}/common/help.go | 0 {pkg/tui => tui}/common/reset.go | 0 {pkg/tui => tui}/common/utils.go | 0 {pkg/tui => tui}/log/bubble.go | 8 ++++---- {pkg/tui => tui}/refs/bubble.go | 4 ++-- {pkg/tui => tui}/tree/bubble.go | 8 ++++---- {pkg/tui => tui}/viewport/viewport_patch.go | 0 25 files changed, 30 insertions(+), 30 deletions(-) rename {pkg/git => git}/commit.go (100%) rename {pkg/git => git}/errors.go (100%) rename {pkg/git => git}/patch.go (100%) rename {pkg/git => git}/reference.go (100%) rename {pkg/git => git}/repo.go (100%) rename {pkg/git => git}/tree.go (100%) rename {pkg/tui => tui}/about/bubble.go (93%) rename {pkg/tui => tui}/bubble.go (91%) rename {pkg/tui => tui}/common/consts.go (100%) rename {pkg/tui => tui}/common/error.go (100%) rename {pkg/tui => tui}/common/formatter.go (100%) rename {pkg/tui => tui}/common/git.go (88%) rename {pkg/tui => tui}/common/help.go (100%) rename {pkg/tui => tui}/common/reset.go (100%) rename {pkg/tui => tui}/common/utils.go (100%) rename {pkg/tui => tui}/log/bubble.go (97%) rename {pkg/tui => tui}/refs/bubble.go (97%) rename {pkg/tui => tui}/tree/bubble.go (97%) rename {pkg/tui => tui}/viewport/viewport_patch.go (100%) diff --git a/pkg/git/commit.go b/git/commit.go similarity index 100% rename from pkg/git/commit.go rename to git/commit.go diff --git a/pkg/git/errors.go b/git/errors.go similarity index 100% rename from pkg/git/errors.go rename to git/errors.go diff --git a/pkg/git/patch.go b/git/patch.go similarity index 100% rename from pkg/git/patch.go rename to git/patch.go diff --git a/pkg/git/reference.go b/git/reference.go similarity index 100% rename from pkg/git/reference.go rename to git/reference.go diff --git a/pkg/git/repo.go b/git/repo.go similarity index 100% rename from pkg/git/repo.go rename to git/repo.go diff --git a/pkg/git/tree.go b/git/tree.go similarity index 100% rename from pkg/git/tree.go rename to git/tree.go diff --git a/internal/git/git.go b/internal/git/git.go index 87c84ac9f91d39ec939ae62c248a2e7ac2b79bc1..05e2ab70fdcebb694767944653f64642d0787c43 100644 --- a/internal/git/git.go +++ b/internal/git/git.go @@ -7,7 +7,7 @@ import ( "path/filepath" "sync" - "github.com/charmbracelet/soft-serve/pkg/git" + "github.com/charmbracelet/soft-serve/git" "github.com/gobwas/glob" "github.com/golang/groupcache/lru" ) diff --git a/internal/tui/bubble.go b/internal/tui/bubble.go index bacc3de883538dd8cace59bbd1cce185b0b783bf..436dbc4db92ec62b0a84c49478aa9da1260dd5e4 100644 --- a/internal/tui/bubble.go +++ b/internal/tui/bubble.go @@ -10,7 +10,7 @@ import ( "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/charmbracelet/soft-serve/pkg/tui/common" + "github.com/charmbracelet/soft-serve/tui/common" "github.com/gliderlabs/ssh" ) diff --git a/internal/tui/bubbles/repo/bubble.go b/internal/tui/bubbles/repo/bubble.go index b8cdd0e2d7e689c671fa4d1f8576faf65cb8d14f..6e9a34a99a99db365955758f5ae776f1dbfbdd22 100644 --- a/internal/tui/bubbles/repo/bubble.go +++ b/internal/tui/bubbles/repo/bubble.go @@ -6,10 +6,10 @@ import ( tea "github.com/charmbracelet/bubbletea" "github.com/charmbracelet/lipgloss" + "github.com/charmbracelet/soft-serve/git" "github.com/charmbracelet/soft-serve/internal/tui/style" - "github.com/charmbracelet/soft-serve/pkg/git" - gitui "github.com/charmbracelet/soft-serve/pkg/tui" - "github.com/charmbracelet/soft-serve/pkg/tui/common" + gitui "github.com/charmbracelet/soft-serve/tui" + "github.com/charmbracelet/soft-serve/tui/common" "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 866de2db81e189426cfad9bc9f1f89f02140c89c..8be37dcf3b2a1e78974bc22c7c1caa830f5a8390 100644 --- a/internal/tui/bubbles/selection/bubble.go +++ b/internal/tui/bubbles/selection/bubble.go @@ -6,7 +6,7 @@ import ( tea "github.com/charmbracelet/bubbletea" "github.com/charmbracelet/lipgloss" "github.com/charmbracelet/soft-serve/internal/tui/style" - "github.com/charmbracelet/soft-serve/pkg/tui/common" + "github.com/charmbracelet/soft-serve/tui/common" "github.com/muesli/reflow/truncate" ) diff --git a/internal/tui/commands.go b/internal/tui/commands.go index e95bfc3dcbd6eba275a4e26c91e11fdef1779b3c..64c1ff4851dc3ec81f41babc2a758be065b600d3 100644 --- a/internal/tui/commands.go +++ b/internal/tui/commands.go @@ -7,7 +7,7 @@ import ( "github.com/charmbracelet/lipgloss" "github.com/charmbracelet/soft-serve/internal/tui/bubbles/repo" "github.com/charmbracelet/soft-serve/internal/tui/bubbles/selection" - "github.com/charmbracelet/soft-serve/pkg/tui/common" + "github.com/charmbracelet/soft-serve/tui/common" gm "github.com/charmbracelet/wish/git" ) diff --git a/server/middleware.go b/server/middleware.go index 9f3f230090ba2fe5f1d4dea30e7de08def307e52..cfe89a3fd9a444ee19de17eb504fe4bfdf23de47 100644 --- a/server/middleware.go +++ b/server/middleware.go @@ -8,9 +8,9 @@ import ( "github.com/alecthomas/chroma/lexers" gansi "github.com/charmbracelet/glamour/ansi" "github.com/charmbracelet/lipgloss" + "github.com/charmbracelet/soft-serve/git" appCfg "github.com/charmbracelet/soft-serve/internal/config" - "github.com/charmbracelet/soft-serve/pkg/git" - "github.com/charmbracelet/soft-serve/pkg/tui/common" + "github.com/charmbracelet/soft-serve/tui/common" "github.com/charmbracelet/wish" gitwish "github.com/charmbracelet/wish/git" "github.com/gliderlabs/ssh" diff --git a/pkg/tui/about/bubble.go b/tui/about/bubble.go similarity index 93% rename from pkg/tui/about/bubble.go rename to tui/about/bubble.go index bc819af6ab6d267e9f4e6afde4f23f12e25d7018..9205268e97a49a16846cd81c4cea4d1fd28800e9 100644 --- a/pkg/tui/about/bubble.go +++ b/tui/about/bubble.go @@ -3,11 +3,11 @@ package about import ( "github.com/charmbracelet/bubbles/viewport" tea "github.com/charmbracelet/bubbletea" + "github.com/charmbracelet/soft-serve/git" "github.com/charmbracelet/soft-serve/internal/tui/style" - "github.com/charmbracelet/soft-serve/pkg/git" - "github.com/charmbracelet/soft-serve/pkg/tui/common" - "github.com/charmbracelet/soft-serve/pkg/tui/refs" - vp "github.com/charmbracelet/soft-serve/pkg/tui/viewport" + "github.com/charmbracelet/soft-serve/tui/common" + "github.com/charmbracelet/soft-serve/tui/refs" + vp "github.com/charmbracelet/soft-serve/tui/viewport" "github.com/muesli/reflow/wrap" ) diff --git a/pkg/tui/bubble.go b/tui/bubble.go similarity index 91% rename from pkg/tui/bubble.go rename to tui/bubble.go index 40a3ace61c52730d7fa208dbf2dbcd5c47420a49..e23442472c4260ccae1a77523e1e8071212380d9 100644 --- a/pkg/tui/bubble.go +++ b/tui/bubble.go @@ -3,13 +3,13 @@ package tui import ( tea "github.com/charmbracelet/bubbletea" "github.com/charmbracelet/lipgloss" + "github.com/charmbracelet/soft-serve/git" "github.com/charmbracelet/soft-serve/internal/tui/style" - "github.com/charmbracelet/soft-serve/pkg/git" - "github.com/charmbracelet/soft-serve/pkg/tui/about" - "github.com/charmbracelet/soft-serve/pkg/tui/common" - "github.com/charmbracelet/soft-serve/pkg/tui/log" - "github.com/charmbracelet/soft-serve/pkg/tui/refs" - "github.com/charmbracelet/soft-serve/pkg/tui/tree" + "github.com/charmbracelet/soft-serve/tui/about" + "github.com/charmbracelet/soft-serve/tui/common" + "github.com/charmbracelet/soft-serve/tui/log" + "github.com/charmbracelet/soft-serve/tui/refs" + "github.com/charmbracelet/soft-serve/tui/tree" ) const ( diff --git a/pkg/tui/common/consts.go b/tui/common/consts.go similarity index 100% rename from pkg/tui/common/consts.go rename to tui/common/consts.go diff --git a/pkg/tui/common/error.go b/tui/common/error.go similarity index 100% rename from pkg/tui/common/error.go rename to tui/common/error.go diff --git a/pkg/tui/common/formatter.go b/tui/common/formatter.go similarity index 100% rename from pkg/tui/common/formatter.go rename to tui/common/formatter.go diff --git a/pkg/tui/common/git.go b/tui/common/git.go similarity index 88% rename from pkg/tui/common/git.go rename to tui/common/git.go index 64a371de644feef6adb5d41c00dda4ed59c28e2f..43cb53ca46a632ef64b7685a5186ef9070449f0f 100644 --- a/pkg/tui/common/git.go +++ b/tui/common/git.go @@ -1,7 +1,7 @@ package common import ( - "github.com/charmbracelet/soft-serve/pkg/git" + "github.com/charmbracelet/soft-serve/git" ) type GitRepo interface { diff --git a/pkg/tui/common/help.go b/tui/common/help.go similarity index 100% rename from pkg/tui/common/help.go rename to tui/common/help.go diff --git a/pkg/tui/common/reset.go b/tui/common/reset.go similarity index 100% rename from pkg/tui/common/reset.go rename to tui/common/reset.go diff --git a/pkg/tui/common/utils.go b/tui/common/utils.go similarity index 100% rename from pkg/tui/common/utils.go rename to tui/common/utils.go diff --git a/pkg/tui/log/bubble.go b/tui/log/bubble.go similarity index 97% rename from pkg/tui/log/bubble.go rename to tui/log/bubble.go index e58b6d5ba15d286e33cb62a296565380da1a6919..328e338e77eed1975e0510eee997faa3c58f998e 100644 --- a/pkg/tui/log/bubble.go +++ b/tui/log/bubble.go @@ -11,11 +11,11 @@ import ( "github.com/charmbracelet/bubbles/viewport" tea "github.com/charmbracelet/bubbletea" gansi "github.com/charmbracelet/glamour/ansi" + "github.com/charmbracelet/soft-serve/git" "github.com/charmbracelet/soft-serve/internal/tui/style" - "github.com/charmbracelet/soft-serve/pkg/git" - "github.com/charmbracelet/soft-serve/pkg/tui/common" - "github.com/charmbracelet/soft-serve/pkg/tui/refs" - vp "github.com/charmbracelet/soft-serve/pkg/tui/viewport" + "github.com/charmbracelet/soft-serve/tui/common" + "github.com/charmbracelet/soft-serve/tui/refs" + vp "github.com/charmbracelet/soft-serve/tui/viewport" ) var ( diff --git a/pkg/tui/refs/bubble.go b/tui/refs/bubble.go similarity index 97% rename from pkg/tui/refs/bubble.go rename to tui/refs/bubble.go index f31f12aaceb6c2855c93b886788f169411d96588..7a794c2b6af8fbe1c89f726541459edac60fda2d 100644 --- a/pkg/tui/refs/bubble.go +++ b/tui/refs/bubble.go @@ -7,9 +7,9 @@ import ( "github.com/charmbracelet/bubbles/list" tea "github.com/charmbracelet/bubbletea" + "github.com/charmbracelet/soft-serve/git" "github.com/charmbracelet/soft-serve/internal/tui/style" - "github.com/charmbracelet/soft-serve/pkg/git" - "github.com/charmbracelet/soft-serve/pkg/tui/common" + "github.com/charmbracelet/soft-serve/tui/common" ) type RefMsg = *git.Reference diff --git a/pkg/tui/tree/bubble.go b/tui/tree/bubble.go similarity index 97% rename from pkg/tui/tree/bubble.go rename to tui/tree/bubble.go index d2b276d55131a778b3882745d4ae6aa4210845c7..74a5ccb3c8b84181179ba2322cf2281d649233e4 100644 --- a/pkg/tui/tree/bubble.go +++ b/tui/tree/bubble.go @@ -11,11 +11,11 @@ import ( "github.com/charmbracelet/bubbles/viewport" tea "github.com/charmbracelet/bubbletea" "github.com/charmbracelet/lipgloss" + "github.com/charmbracelet/soft-serve/git" "github.com/charmbracelet/soft-serve/internal/tui/style" - "github.com/charmbracelet/soft-serve/pkg/git" - "github.com/charmbracelet/soft-serve/pkg/tui/common" - "github.com/charmbracelet/soft-serve/pkg/tui/refs" - vp "github.com/charmbracelet/soft-serve/pkg/tui/viewport" + "github.com/charmbracelet/soft-serve/tui/common" + "github.com/charmbracelet/soft-serve/tui/refs" + vp "github.com/charmbracelet/soft-serve/tui/viewport" "github.com/dustin/go-humanize" ) diff --git a/pkg/tui/viewport/viewport_patch.go b/tui/viewport/viewport_patch.go similarity index 100% rename from pkg/tui/viewport/viewport_patch.go rename to tui/viewport/viewport_patch.go