From 33ca245d3a159cda6fdc01b81fa78579ec0a99fe Mon Sep 17 00:00:00 2001 From: Grzegorz Dlugoszewski Date: Fri, 12 Jun 2020 20:19:05 +0200 Subject: [PATCH] Refactor pkg directory back --- cmd/{ => list}/main.go | 9 ++++----- {cfg => pkg/cfg}/config.go | 0 {cfg => pkg/cfg}/config_test.go | 0 {git => pkg/git}/repo.go | 2 +- {git => pkg/git}/repo_test.go | 0 {git => pkg/git}/status.go | 2 +- {git => pkg/git}/status_test.go | 0 {path => pkg/path}/bundle.go | 2 +- {path => pkg/path}/bundle_test.go | 0 {path => pkg/path}/list.go | 4 ++-- {path => pkg/path}/url.go | 2 +- {path => pkg/path}/url_test.go | 2 +- {print => pkg/print}/flat.go | 2 +- {print => pkg/print}/print.go | 2 +- {print => pkg/print}/tree.go | 2 +- {print => pkg/print}/tree_test.go | 2 +- 16 files changed, 15 insertions(+), 16 deletions(-) rename cmd/{ => list}/main.go (97%) rename {cfg => pkg/cfg}/config.go (100%) rename {cfg => pkg/cfg}/config_test.go (100%) rename {git => pkg/git}/repo.go (99%) rename {git => pkg/git}/repo_test.go (100%) rename {git => pkg/git}/status.go (99%) rename {git => pkg/git}/status_test.go (100%) rename {path => pkg/path}/bundle.go (98%) rename {path => pkg/path}/bundle_test.go (100%) rename {path => pkg/path}/list.go (98%) rename {path => pkg/path}/url.go (98%) rename {path => pkg/path}/url_test.go (99%) rename {print => pkg/print}/flat.go (97%) rename {print => pkg/print}/print.go (99%) rename {print => pkg/print}/tree.go (99%) rename {print => pkg/print}/tree_test.go (99%) diff --git a/cmd/main.go b/cmd/list/main.go similarity index 97% rename from cmd/main.go rename to cmd/list/main.go index 13d8500..8fd14f0 100644 --- a/cmd/main.go +++ b/cmd/list/main.go @@ -2,12 +2,11 @@ package main import ( "fmt" - "git-get/cfg" - "git-get/git" - "git-get/path" - "git-get/print" + "git-get/pkg/cfg" + "git-get/pkg/git" + "git-get/pkg/path" + "git-get/pkg/print" "os" - pathpkg "path" "github.com/spf13/cobra" diff --git a/cfg/config.go b/pkg/cfg/config.go similarity index 100% rename from cfg/config.go rename to pkg/cfg/config.go diff --git a/cfg/config_test.go b/pkg/cfg/config_test.go similarity index 100% rename from cfg/config_test.go rename to pkg/cfg/config_test.go diff --git a/git/repo.go b/pkg/git/repo.go similarity index 99% rename from git/repo.go rename to pkg/git/repo.go index b4c253d..015140f 100644 --- a/git/repo.go +++ b/pkg/git/repo.go @@ -2,7 +2,7 @@ package git import ( "fmt" - "git-get/cfg" + "git-get/pkg/cfg" "github.com/go-git/go-git/v5/plumbing" diff --git a/git/repo_test.go b/pkg/git/repo_test.go similarity index 100% rename from git/repo_test.go rename to pkg/git/repo_test.go diff --git a/git/status.go b/pkg/git/status.go similarity index 99% rename from git/status.go rename to pkg/git/status.go index d7e7fa8..48cf8be 100644 --- a/git/status.go +++ b/pkg/git/status.go @@ -1,7 +1,7 @@ package git import ( - "git-get/cfg" + "git-get/pkg/cfg" "sort" "strings" diff --git a/git/status_test.go b/pkg/git/status_test.go similarity index 100% rename from git/status_test.go rename to pkg/git/status_test.go diff --git a/path/bundle.go b/pkg/path/bundle.go similarity index 98% rename from path/bundle.go rename to pkg/path/bundle.go index 1f641e1..89613b7 100644 --- a/path/bundle.go +++ b/pkg/path/bundle.go @@ -2,7 +2,7 @@ package path import ( "bufio" - "git-get/git" + "git-get/pkg/git" "os" "strings" diff --git a/path/bundle_test.go b/pkg/path/bundle_test.go similarity index 100% rename from path/bundle_test.go rename to pkg/path/bundle_test.go diff --git a/path/list.go b/pkg/path/list.go similarity index 98% rename from path/list.go rename to pkg/path/list.go index 0b5d219..4730921 100644 --- a/path/list.go +++ b/pkg/path/list.go @@ -2,8 +2,8 @@ package path import ( "fmt" - "git-get/cfg" - "git-get/git" + "git-get/pkg/cfg" + "git-get/pkg/git" "os" "sort" "strings" diff --git a/path/url.go b/pkg/path/url.go similarity index 98% rename from path/url.go rename to pkg/path/url.go index 73df039..e10141e 100644 --- a/path/url.go +++ b/pkg/path/url.go @@ -1,7 +1,7 @@ package path import ( - "git-get/cfg" + "git-get/pkg/cfg" urlpkg "net/url" "path" "regexp" diff --git a/path/url_test.go b/pkg/path/url_test.go similarity index 99% rename from path/url_test.go rename to pkg/path/url_test.go index 00b6fee..2665193 100644 --- a/path/url_test.go +++ b/pkg/path/url_test.go @@ -1,7 +1,7 @@ package path import ( - "git-get/cfg" + "git-get/pkg/cfg" "testing" ) diff --git a/print/flat.go b/pkg/print/flat.go similarity index 97% rename from print/flat.go rename to pkg/print/flat.go index 8690d74..91e988e 100644 --- a/print/flat.go +++ b/pkg/print/flat.go @@ -2,7 +2,7 @@ package print import ( "fmt" - "git-get/git" + "git-get/pkg/git" "path/filepath" "strings" ) diff --git a/print/print.go b/pkg/print/print.go similarity index 99% rename from print/print.go rename to pkg/print/print.go index e8afb7c..3acf80a 100644 --- a/print/print.go +++ b/pkg/print/print.go @@ -2,7 +2,7 @@ package print import ( "fmt" - "git-get/git" + "git-get/pkg/git" "strings" ) diff --git a/print/tree.go b/pkg/print/tree.go similarity index 99% rename from print/tree.go rename to pkg/print/tree.go index 72ee171..8f9b3e1 100644 --- a/print/tree.go +++ b/pkg/print/tree.go @@ -1,7 +1,7 @@ package print import ( - "git-get/git" + "git-get/pkg/git" "path/filepath" "strings" diff --git a/print/tree_test.go b/pkg/print/tree_test.go similarity index 99% rename from print/tree_test.go rename to pkg/print/tree_test.go index 1f3e956..9fbe325 100644 --- a/print/tree_test.go +++ b/pkg/print/tree_test.go @@ -2,7 +2,7 @@ package print import ( "fmt" - "git-get/git" + "git-get/pkg/git" "strings" "testing" )