From a5ea5b2fd96119ec0773fb3d4fd9dcca1514aca3 Mon Sep 17 00:00:00 2001 From: Ayman Bagabas Date: Fri, 8 Oct 2021 14:06:34 -0400 Subject: [PATCH] Make modules internal --- {config => internal/config}/config.go | 2 +- {config => internal/config}/defaults.go | 0 {config => internal/config}/git.go | 0 {git => internal/git}/git.go | 0 {tui => internal/tui}/bubble.go | 10 +++++----- {tui => internal/tui}/bubbles/commits/bubble.go | 0 {tui => internal/tui}/bubbles/commits/style.go | 0 {tui => internal/tui}/bubbles/repo/bubble.go | 4 ++-- {tui => internal/tui}/bubbles/repo/viewport_patch.go | 0 {tui => internal/tui}/bubbles/selection/bubble.go | 2 +- {tui => internal/tui}/commands.go | 6 +++--- {tui => internal/tui}/session.go | 2 +- {tui => internal/tui}/style/style.go | 0 13 files changed, 13 insertions(+), 13 deletions(-) rename {config => internal/config}/config.go (98%) rename {config => internal/config}/defaults.go (100%) rename {config => internal/config}/git.go (100%) rename {git => internal/git}/git.go (100%) rename {tui => internal/tui}/bubble.go (94%) rename {tui => internal/tui}/bubbles/commits/bubble.go (100%) rename {tui => internal/tui}/bubbles/commits/style.go (100%) rename {tui => internal/tui}/bubbles/repo/bubble.go (98%) rename {tui => internal/tui}/bubbles/repo/viewport_patch.go (100%) rename {tui => internal/tui}/bubbles/selection/bubble.go (97%) rename {tui => internal/tui}/commands.go (93%) rename {tui => internal/tui}/session.go (93%) rename {tui => internal/tui}/style/style.go (100%) diff --git a/config/config.go b/internal/config/config.go similarity index 98% rename from config/config.go rename to internal/config/config.go index 028e173fa76c5bc21894f353af32ae930edbbf44..8c716305a5cee07abe6cbff2c2786cf7d0f70e6c 100644 --- a/config/config.go +++ b/internal/config/config.go @@ -7,7 +7,7 @@ import ( "os" "path/filepath" - "github.com/charmbracelet/soft/git" + "github.com/charmbracelet/soft/internal/git" gg "github.com/go-git/go-git/v5" "github.com/go-git/go-git/v5/plumbing/object" ) diff --git a/config/defaults.go b/internal/config/defaults.go similarity index 100% rename from config/defaults.go rename to internal/config/defaults.go diff --git a/config/git.go b/internal/config/git.go similarity index 100% rename from config/git.go rename to internal/config/git.go diff --git a/git/git.go b/internal/git/git.go similarity index 100% rename from git/git.go rename to internal/git/git.go diff --git a/tui/bubble.go b/internal/tui/bubble.go similarity index 94% rename from tui/bubble.go rename to internal/tui/bubble.go index 11c238b047bc237b512a73722ab8b814b29c8934..5353824e1dd918613bbba39bfa431453295ee0e3 100644 --- a/tui/bubble.go +++ b/internal/tui/bubble.go @@ -6,11 +6,11 @@ import ( tea "github.com/charmbracelet/bubbletea" "github.com/charmbracelet/lipgloss" - "github.com/charmbracelet/soft/config" - "github.com/charmbracelet/soft/git" - "github.com/charmbracelet/soft/tui/bubbles/repo" - "github.com/charmbracelet/soft/tui/bubbles/selection" - "github.com/charmbracelet/soft/tui/style" + "github.com/charmbracelet/soft/internal/config" + "github.com/charmbracelet/soft/internal/git" + "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/gliderlabs/ssh" ) diff --git a/tui/bubbles/commits/bubble.go b/internal/tui/bubbles/commits/bubble.go similarity index 100% rename from tui/bubbles/commits/bubble.go rename to internal/tui/bubbles/commits/bubble.go diff --git a/tui/bubbles/commits/style.go b/internal/tui/bubbles/commits/style.go similarity index 100% rename from tui/bubbles/commits/style.go rename to internal/tui/bubbles/commits/style.go diff --git a/tui/bubbles/repo/bubble.go b/internal/tui/bubbles/repo/bubble.go similarity index 98% rename from tui/bubbles/repo/bubble.go rename to internal/tui/bubbles/repo/bubble.go index b8a1c3ac3a2d7f85eabfd0d316187d8f553ed98e..d3daec982b535f095a87fa688a3991fbf8b9ae6e 100644 --- a/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/git" - "github.com/charmbracelet/soft/tui/style" + "github.com/charmbracelet/soft/internal/git" + "github.com/charmbracelet/soft/internal/tui/style" "github.com/muesli/reflow/truncate" "github.com/muesli/reflow/wrap" ) diff --git a/tui/bubbles/repo/viewport_patch.go b/internal/tui/bubbles/repo/viewport_patch.go similarity index 100% rename from tui/bubbles/repo/viewport_patch.go rename to internal/tui/bubbles/repo/viewport_patch.go diff --git a/tui/bubbles/selection/bubble.go b/internal/tui/bubbles/selection/bubble.go similarity index 97% rename from tui/bubbles/selection/bubble.go rename to internal/tui/bubbles/selection/bubble.go index 954222e1b53d8c067cb87923ab93be5bfeae91c6..824a65d71078fdb417ddd947f55d2b9c8bb72ce2 100644 --- a/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/tui/style" + "github.com/charmbracelet/soft/internal/tui/style" "github.com/muesli/reflow/truncate" ) diff --git a/tui/commands.go b/internal/tui/commands.go similarity index 93% rename from tui/commands.go rename to internal/tui/commands.go index 072d83b2e2f820f7cd2680766c54f5b274df37e1..2e6ef22a9e5be73a655d870b55d46398b618d089 100644 --- a/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/config" - br "github.com/charmbracelet/soft/tui/bubbles/repo" - "github.com/charmbracelet/soft/tui/bubbles/selection" + "github.com/charmbracelet/soft/internal/config" + br "github.com/charmbracelet/soft/internal/tui/bubbles/repo" + "github.com/charmbracelet/soft/internal/tui/bubbles/selection" gm "github.com/charmbracelet/wish/git" "github.com/muesli/termenv" ) diff --git a/tui/session.go b/internal/tui/session.go similarity index 93% rename from tui/session.go rename to internal/tui/session.go index 540ced5152b5a4c70ae03944988d32d7db76fc23..848cb56718e2400890d69719b15843c53932c77b 100644 --- a/tui/session.go +++ b/internal/tui/session.go @@ -4,7 +4,7 @@ import ( "fmt" tea "github.com/charmbracelet/bubbletea" - "github.com/charmbracelet/soft/config" + "github.com/charmbracelet/soft/internal/config" "github.com/gliderlabs/ssh" ) diff --git a/tui/style/style.go b/internal/tui/style/style.go similarity index 100% rename from tui/style/style.go rename to internal/tui/style/style.go