From 4b86035511975b9e99e4a0fd9f56dad1b7272e8a Mon Sep 17 00:00:00 2001 From: Tim Cooper Date: Tue, 8 May 2018 18:00:30 -0300 Subject: [PATCH] move barnard main package to package root There's only a single executable, so this makes things cleaner --- barnard.go | 2 +- client.go | 2 +- doc.go | 2 ++ cmd/barnard/main.go => main.go | 7 +++---- ui.go | 2 +- ui_tree.go | 2 +- uiterm/attributes.go | 2 +- uiterm/doc.go | 1 + uiterm/keys.go | 2 +- uiterm/label.go | 2 +- uiterm/textbox.go | 2 +- uiterm/textview.go | 2 +- uiterm/tree.go | 2 +- uiterm/ui.go | 2 +- uiterm/view.go | 2 +- 15 files changed, 18 insertions(+), 16 deletions(-) create mode 100644 doc.go rename cmd/barnard/main.go => main.go (88%) create mode 100644 uiterm/doc.go diff --git a/barnard.go b/barnard.go index 9ee58c1..0e121b3 100644 --- a/barnard.go +++ b/barnard.go @@ -1,4 +1,4 @@ -package barnard // import "layeh.com/barnard" +package main import ( "crypto/tls" diff --git a/client.go b/client.go index 2eda4b8..6f932e5 100644 --- a/client.go +++ b/client.go @@ -1,4 +1,4 @@ -package barnard // import "layeh.com/barnard" +package main import ( "fmt" diff --git a/doc.go b/doc.go new file mode 100644 index 0000000..b00b6f0 --- /dev/null +++ b/doc.go @@ -0,0 +1,2 @@ +// barnard is a terminal based client for the Mumble VoIP system. +package main // import "layeh.com/barnard" diff --git a/cmd/barnard/main.go b/main.go similarity index 88% rename from cmd/barnard/main.go rename to main.go index a426c3e..7a779d5 100644 --- a/cmd/barnard/main.go +++ b/main.go @@ -1,4 +1,4 @@ -package main // import "layeh.com/barnard/cmd/barnard" +package main import ( "crypto/tls" @@ -6,7 +6,6 @@ import ( "fmt" "os" - "layeh.com/barnard" "layeh.com/barnard/uiterm" "layeh.com/gumble/gumble" _ "layeh.com/gumble/opus" @@ -23,8 +22,8 @@ func main() { flag.Parse() // Initialize - b := barnard.Barnard{ - Config: gumble.NewConfig(), + b := Barnard{ + Config: gumble.NewConfig(), Address: *server, } diff --git a/ui.go b/ui.go index f127caf..98b7b7b 100644 --- a/ui.go +++ b/ui.go @@ -1,4 +1,4 @@ -package barnard // import "layeh.com/barnard" +package main import ( "fmt" diff --git a/ui_tree.go b/ui_tree.go index aa05e26..67463b0 100644 --- a/ui_tree.go +++ b/ui_tree.go @@ -1,4 +1,4 @@ -package barnard // import "layeh.com/barnard" +package main import ( "layeh.com/barnard/uiterm" diff --git a/uiterm/attributes.go b/uiterm/attributes.go index 62f1353..ba1534d 100644 --- a/uiterm/attributes.go +++ b/uiterm/attributes.go @@ -1,4 +1,4 @@ -package uiterm // import "layeh.com/barnard/uiterm" +package uiterm /* * Source: https://godoc.org/github.com/nsf/termbox-go diff --git a/uiterm/doc.go b/uiterm/doc.go new file mode 100644 index 0000000..d26f3c8 --- /dev/null +++ b/uiterm/doc.go @@ -0,0 +1 @@ +package uiterm // import "layeh.com/barnard/uiterm" diff --git a/uiterm/keys.go b/uiterm/keys.go index a0e79db..a5466b8 100644 --- a/uiterm/keys.go +++ b/uiterm/keys.go @@ -1,4 +1,4 @@ -package uiterm // import "layeh.com/barnard/uiterm" +package uiterm /* * Source: https://godoc.org/github.com/nsf/termbox-go diff --git a/uiterm/label.go b/uiterm/label.go index 312b92d..9ba39e4 100644 --- a/uiterm/label.go +++ b/uiterm/label.go @@ -1,4 +1,4 @@ -package uiterm // import "layeh.com/barnard/uiterm" +package uiterm import ( "strings" diff --git a/uiterm/textbox.go b/uiterm/textbox.go index 9001cdf..a7d0d4d 100644 --- a/uiterm/textbox.go +++ b/uiterm/textbox.go @@ -1,4 +1,4 @@ -package uiterm // import "layeh.com/barnard/uiterm" +package uiterm import ( "strings" diff --git a/uiterm/textview.go b/uiterm/textview.go index c799f3d..d1c155f 100644 --- a/uiterm/textview.go +++ b/uiterm/textview.go @@ -1,4 +1,4 @@ -package uiterm // import "layeh.com/barnard/uiterm" +package uiterm import ( "strings" diff --git a/uiterm/tree.go b/uiterm/tree.go index 5cdc618..628fbb1 100644 --- a/uiterm/tree.go +++ b/uiterm/tree.go @@ -1,4 +1,4 @@ -package uiterm // import "layeh.com/barnard/uiterm" +package uiterm import ( "strings" diff --git a/uiterm/ui.go b/uiterm/ui.go index 3eb1222..31114c7 100644 --- a/uiterm/ui.go +++ b/uiterm/ui.go @@ -1,4 +1,4 @@ -package uiterm // import "layeh.com/barnard/uiterm" +package uiterm import ( "errors" diff --git a/uiterm/view.go b/uiterm/view.go index ff866a2..c63387f 100644 --- a/uiterm/view.go +++ b/uiterm/view.go @@ -1,4 +1,4 @@ -package uiterm // import "layeh.com/barnard/uiterm" +package uiterm type View interface { uiInitialize(ui *Ui)