From 7d84156a4bba7e6bad99d85b0472b46092cce489 Mon Sep 17 00:00:00 2001 From: Mustafa Gezen Date: Thu, 19 Aug 2021 12:09:53 +0200 Subject: [PATCH] enhancement: expose srpmproc library --- .gitignore | 5 ++--- cmd/srpmproc/fetch.go | 2 +- cmd/srpmproc/main.go | 18 +++++++++--------- {internal => pkg}/blob/blob.go | 0 {internal => pkg}/blob/file/file.go | 0 {internal => pkg}/blob/gcs/gcs.go | 0 {internal => pkg}/blob/s3/s3.go | 0 {internal => pkg}/data/import.go | 0 {internal => pkg}/data/process.go | 2 +- {internal => pkg}/data/utils.go | 0 {internal => pkg}/directives/add.go | 2 +- {internal => pkg}/directives/delete.go | 2 +- {internal => pkg}/directives/directives.go | 2 +- {internal => pkg}/directives/lookaside.go | 2 +- {internal => pkg}/directives/patch.go | 2 +- {internal => pkg}/directives/replace.go | 2 +- {internal => pkg}/directives/spec_change.go | 2 +- {internal => pkg/srpmproc}/git.go | 4 ++-- {internal => pkg/srpmproc}/gitrpm.go | 2 +- {internal => pkg/srpmproc}/mode.go | 2 +- {internal => pkg/srpmproc}/patch.go | 6 +++--- {internal => pkg/srpmproc}/process.go | 4 ++-- {internal => pkg/srpmproc}/srpm.go | 4 ++-- 23 files changed, 31 insertions(+), 32 deletions(-) rename {internal => pkg}/blob/blob.go (100%) rename {internal => pkg}/blob/file/file.go (100%) rename {internal => pkg}/blob/gcs/gcs.go (100%) rename {internal => pkg}/blob/s3/s3.go (100%) rename {internal => pkg}/data/import.go (100%) rename {internal => pkg}/data/process.go (97%) rename {internal => pkg}/data/utils.go (100%) rename {internal => pkg}/directives/add.go (98%) rename {internal => pkg}/directives/delete.go (97%) rename {internal => pkg}/directives/directives.go (97%) rename {internal => pkg}/directives/lookaside.go (98%) rename {internal => pkg}/directives/patch.go (98%) rename {internal => pkg}/directives/replace.go (98%) rename {internal => pkg}/directives/spec_change.go (99%) rename {internal => pkg/srpmproc}/git.go (99%) rename {internal => pkg/srpmproc}/gitrpm.go (99%) rename {internal => pkg/srpmproc}/mode.go (98%) rename {internal => pkg/srpmproc}/patch.go (98%) rename {internal => pkg/srpmproc}/process.go (99%) rename {internal => pkg/srpmproc}/srpm.go (98%) diff --git a/.gitignore b/.gitignore index b153b49..b315ff7 100644 --- a/.gitignore +++ b/.gitignore @@ -14,7 +14,6 @@ # Dependency directories (remove the comment below to include it) # vendor/ testdata -srpmproc +/srpmproc .idea -dist/ -dist/ +/dist/ diff --git a/cmd/srpmproc/fetch.go b/cmd/srpmproc/fetch.go index 462e2b1..a0b1da7 100644 --- a/cmd/srpmproc/fetch.go +++ b/cmd/srpmproc/fetch.go @@ -23,7 +23,7 @@ package main import ( "errors" "fmt" - "github.com/rocky-linux/srpmproc/internal/data" + "github.com/rocky-linux/srpmproc/pkg/data" "github.com/spf13/cobra" "io/ioutil" "log" diff --git a/cmd/srpmproc/main.go b/cmd/srpmproc/main.go index 654f7c6..b343c11 100644 --- a/cmd/srpmproc/main.go +++ b/cmd/srpmproc/main.go @@ -22,6 +22,7 @@ package main import ( "fmt" + "github.com/rocky-linux/srpmproc/pkg/srpmproc" "log" "os" "os/user" @@ -32,13 +33,12 @@ import ( "github.com/go-git/go-billy/v5/memfs" "github.com/go-git/go-billy/v5/osfs" "github.com/go-git/go-git/v5/plumbing/transport/ssh" - "github.com/rocky-linux/srpmproc/internal/blob" - "github.com/rocky-linux/srpmproc/internal/blob/file" - "github.com/rocky-linux/srpmproc/internal/blob/gcs" - "github.com/rocky-linux/srpmproc/internal/blob/s3" - "github.com/rocky-linux/srpmproc/internal/data" + "github.com/rocky-linux/srpmproc/pkg/blob" + "github.com/rocky-linux/srpmproc/pkg/blob/file" + "github.com/rocky-linux/srpmproc/pkg/blob/gcs" + "github.com/rocky-linux/srpmproc/pkg/blob/s3" + "github.com/rocky-linux/srpmproc/pkg/data" - "github.com/rocky-linux/srpmproc/internal" "github.com/spf13/cobra" ) @@ -96,14 +96,14 @@ func mn(_ *cobra.Command, _ []string) { sourceRpmLocation := "" if strings.HasPrefix(sourceRpm, "file://") { sourceRpmLocation = strings.TrimPrefix(sourceRpm, "file://") - importer = &internal.SrpmMode{} + importer = &srpmproc.SrpmMode{} } else { if moduleMode { sourceRpmLocation = fmt.Sprintf("%s/%s", modulePrefix, sourceRpm) } else { sourceRpmLocation = fmt.Sprintf("%s/%s", rpmPrefix, sourceRpm) } - importer = &internal.GitMode{} + importer = &srpmproc.GitMode{} } lastKeyLocation := sshKeyLocation @@ -145,7 +145,7 @@ func mn(_ *cobra.Command, _ []string) { manualCs = strings.Split(manualCommits, ",") } - internal.ProcessRPM(&data.ProcessData{ + srpmproc.ProcessRPM(&data.ProcessData{ Importer: importer, RpmLocation: sourceRpmLocation, UpstreamPrefix: upstreamPrefix, diff --git a/internal/blob/blob.go b/pkg/blob/blob.go similarity index 100% rename from internal/blob/blob.go rename to pkg/blob/blob.go diff --git a/internal/blob/file/file.go b/pkg/blob/file/file.go similarity index 100% rename from internal/blob/file/file.go rename to pkg/blob/file/file.go diff --git a/internal/blob/gcs/gcs.go b/pkg/blob/gcs/gcs.go similarity index 100% rename from internal/blob/gcs/gcs.go rename to pkg/blob/gcs/gcs.go diff --git a/internal/blob/s3/s3.go b/pkg/blob/s3/s3.go similarity index 100% rename from internal/blob/s3/s3.go rename to pkg/blob/s3/s3.go diff --git a/internal/data/import.go b/pkg/data/import.go similarity index 100% rename from internal/data/import.go rename to pkg/data/import.go diff --git a/internal/data/process.go b/pkg/data/process.go similarity index 97% rename from internal/data/process.go rename to pkg/data/process.go index cd8a540..7e58ea0 100644 --- a/internal/data/process.go +++ b/pkg/data/process.go @@ -23,7 +23,7 @@ package data import ( "github.com/go-git/go-billy/v5" "github.com/go-git/go-git/v5/plumbing/transport/ssh" - "github.com/rocky-linux/srpmproc/internal/blob" + "github.com/rocky-linux/srpmproc/pkg/blob" ) type ProcessData struct { diff --git a/internal/data/utils.go b/pkg/data/utils.go similarity index 100% rename from internal/data/utils.go rename to pkg/data/utils.go diff --git a/internal/directives/add.go b/pkg/directives/add.go similarity index 98% rename from internal/directives/add.go rename to pkg/directives/add.go index 9225456..d718d3f 100644 --- a/internal/directives/add.go +++ b/pkg/directives/add.go @@ -28,8 +28,8 @@ import ( "path/filepath" "github.com/go-git/go-git/v5" - "github.com/rocky-linux/srpmproc/internal/data" srpmprocpb "github.com/rocky-linux/srpmproc/pb" + "github.com/rocky-linux/srpmproc/pkg/data" ) // returns right if not empty, else left diff --git a/internal/directives/delete.go b/pkg/directives/delete.go similarity index 97% rename from internal/directives/delete.go rename to pkg/directives/delete.go index d2a5223..daed71a 100644 --- a/internal/directives/delete.go +++ b/pkg/directives/delete.go @@ -25,8 +25,8 @@ import ( "fmt" "github.com/go-git/go-git/v5" - "github.com/rocky-linux/srpmproc/internal/data" srpmprocpb "github.com/rocky-linux/srpmproc/pb" + "github.com/rocky-linux/srpmproc/pkg/data" ) func del(cfg *srpmprocpb.Cfg, _ *data.ProcessData, _ *data.ModeData, _ *git.Worktree, pushTree *git.Worktree) error { diff --git a/internal/directives/directives.go b/pkg/directives/directives.go similarity index 97% rename from internal/directives/directives.go rename to pkg/directives/directives.go index f369f4f..0c9d069 100644 --- a/internal/directives/directives.go +++ b/pkg/directives/directives.go @@ -28,8 +28,8 @@ import ( "strings" "github.com/go-git/go-git/v5" - "github.com/rocky-linux/srpmproc/internal/data" srpmprocpb "github.com/rocky-linux/srpmproc/pb" + "github.com/rocky-linux/srpmproc/pkg/data" ) func checkAddPrefix(file string) string { diff --git a/internal/directives/lookaside.go b/pkg/directives/lookaside.go similarity index 98% rename from internal/directives/lookaside.go rename to pkg/directives/lookaside.go index 7d63443..430183b 100644 --- a/internal/directives/lookaside.go +++ b/pkg/directives/lookaside.go @@ -33,8 +33,8 @@ import ( "time" "github.com/go-git/go-git/v5" - "github.com/rocky-linux/srpmproc/internal/data" srpmprocpb "github.com/rocky-linux/srpmproc/pb" + "github.com/rocky-linux/srpmproc/pkg/data" ) func lookaside(cfg *srpmprocpb.Cfg, _ *data.ProcessData, md *data.ModeData, patchTree *git.Worktree, pushTree *git.Worktree) error { diff --git a/internal/directives/patch.go b/pkg/directives/patch.go similarity index 98% rename from internal/directives/patch.go rename to pkg/directives/patch.go index a564c04..e3b1ce4 100644 --- a/internal/directives/patch.go +++ b/pkg/directives/patch.go @@ -28,8 +28,8 @@ import ( "github.com/bluekeyes/go-gitdiff/gitdiff" "github.com/go-git/go-git/v5" - "github.com/rocky-linux/srpmproc/internal/data" srpmprocpb "github.com/rocky-linux/srpmproc/pb" + "github.com/rocky-linux/srpmproc/pkg/data" ) func patch(cfg *srpmprocpb.Cfg, _ *data.ProcessData, _ *data.ModeData, patchTree *git.Worktree, pushTree *git.Worktree) error { diff --git a/internal/directives/replace.go b/pkg/directives/replace.go similarity index 98% rename from internal/directives/replace.go rename to pkg/directives/replace.go index c93e684..ced7db8 100644 --- a/internal/directives/replace.go +++ b/pkg/directives/replace.go @@ -27,8 +27,8 @@ import ( "os" "github.com/go-git/go-git/v5" - "github.com/rocky-linux/srpmproc/internal/data" srpmprocpb "github.com/rocky-linux/srpmproc/pb" + "github.com/rocky-linux/srpmproc/pkg/data" ) func replace(cfg *srpmprocpb.Cfg, pd *data.ProcessData, _ *data.ModeData, patchTree *git.Worktree, pushTree *git.Worktree) error { diff --git a/internal/directives/spec_change.go b/pkg/directives/spec_change.go similarity index 99% rename from internal/directives/spec_change.go rename to pkg/directives/spec_change.go index b5e6e1a..d58611f 100644 --- a/internal/directives/spec_change.go +++ b/pkg/directives/spec_change.go @@ -33,8 +33,8 @@ import ( "time" "github.com/go-git/go-git/v5" - "github.com/rocky-linux/srpmproc/internal/data" srpmprocpb "github.com/rocky-linux/srpmproc/pb" + "github.com/rocky-linux/srpmproc/pkg/data" ) const ( diff --git a/internal/git.go b/pkg/srpmproc/git.go similarity index 99% rename from internal/git.go rename to pkg/srpmproc/git.go index a788224..8fd7153 100644 --- a/internal/git.go +++ b/pkg/srpmproc/git.go @@ -18,7 +18,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -package internal +package srpmproc import ( "fmt" @@ -36,7 +36,7 @@ import ( "github.com/go-git/go-git/v5/plumbing" "github.com/go-git/go-git/v5/plumbing/object" "github.com/go-git/go-git/v5/storage/memory" - "github.com/rocky-linux/srpmproc/internal/data" + "github.com/rocky-linux/srpmproc/pkg/data" ) type remoteTarget struct { diff --git a/internal/gitrpm.go b/pkg/srpmproc/gitrpm.go similarity index 99% rename from internal/gitrpm.go rename to pkg/srpmproc/gitrpm.go index f8d2c72..b29d153 100644 --- a/internal/gitrpm.go +++ b/pkg/srpmproc/gitrpm.go @@ -18,7 +18,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -package internal +package srpmproc import ( "github.com/cavaliercoder/go-rpm" diff --git a/internal/mode.go b/pkg/srpmproc/mode.go similarity index 98% rename from internal/mode.go rename to pkg/srpmproc/mode.go index 92fc173..f4a5374 100644 --- a/internal/mode.go +++ b/pkg/srpmproc/mode.go @@ -18,4 +18,4 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -package internal +package srpmproc diff --git a/internal/patch.go b/pkg/srpmproc/patch.go similarity index 98% rename from internal/patch.go rename to pkg/srpmproc/patch.go index 3c9a4ba..6c92965 100644 --- a/internal/patch.go +++ b/pkg/srpmproc/patch.go @@ -18,7 +18,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -package internal +package srpmproc import ( "fmt" @@ -33,10 +33,10 @@ import ( "github.com/go-git/go-git/v5/config" "github.com/go-git/go-git/v5/plumbing" "github.com/go-git/go-git/v5/storage/memory" - "github.com/rocky-linux/srpmproc/internal/data" - "github.com/rocky-linux/srpmproc/internal/directives" "github.com/rocky-linux/srpmproc/modulemd" srpmprocpb "github.com/rocky-linux/srpmproc/pb" + "github.com/rocky-linux/srpmproc/pkg/data" + "github.com/rocky-linux/srpmproc/pkg/directives" "google.golang.org/protobuf/encoding/prototext" ) diff --git a/internal/process.go b/pkg/srpmproc/process.go similarity index 99% rename from internal/process.go rename to pkg/srpmproc/process.go index d0be336..9e0f433 100644 --- a/internal/process.go +++ b/pkg/srpmproc/process.go @@ -18,7 +18,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -package internal +package srpmproc import ( "encoding/hex" @@ -38,7 +38,7 @@ import ( "github.com/go-git/go-git/v5/plumbing" "github.com/go-git/go-git/v5/plumbing/object" "github.com/go-git/go-git/v5/storage/memory" - "github.com/rocky-linux/srpmproc/internal/data" + "github.com/rocky-linux/srpmproc/pkg/data" ) var tagImportRegex *regexp.Regexp diff --git a/internal/srpm.go b/pkg/srpmproc/srpm.go similarity index 98% rename from internal/srpm.go rename to pkg/srpmproc/srpm.go index 2066554..9711355 100644 --- a/internal/srpm.go +++ b/pkg/srpmproc/srpm.go @@ -18,7 +18,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -package internal +package srpmproc import ( "bytes" @@ -37,7 +37,7 @@ import ( "github.com/go-git/go-billy/v5/memfs" "github.com/go-git/go-git/v5" "github.com/go-git/go-git/v5/storage/memory" - "github.com/rocky-linux/srpmproc/internal/data" + "github.com/rocky-linux/srpmproc/pkg/data" ) type SrpmMode struct{}