Skip to content

Commit

Permalink
enhancement: expose srpmproc library
Browse files Browse the repository at this point in the history
  • Loading branch information
@mstg
mstg committed Aug 19, 2021
1 parent f71605a commit 7d84156
Show file tree
Hide file tree
Showing 23 changed files with 31 additions and 32 deletions.
5 changes: 2 additions & 3 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
# Dependency directories (remove the comment below to include it)
# vendor/
testdata
srpmproc
/srpmproc
.idea
dist/
dist/
/dist/
2 changes: 1 addition & 1 deletion cmd/srpmproc/fetch.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
18 changes: 9 additions & 9 deletions cmd/srpmproc/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ package main

import (
"fmt"
"github.com/rocky-linux/srpmproc/pkg/srpmproc"
"log"
"os"
"os/user"
Expand All @@ -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"
)

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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,
Expand Down
0 internal/blob/blob.go → pkg/blob/blob.go
View file
File renamed without changes.
0 internal/blob/file/file.go → pkg/blob/file/file.go
View file
File renamed without changes.
0 internal/blob/gcs/gcs.go → pkg/blob/gcs/gcs.go
View file
File renamed without changes.
0 internal/blob/s3/s3.go → pkg/blob/s3/s3.go
View file
File renamed without changes.
0 internal/data/import.go → pkg/data/import.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion internal/data/process.go → pkg/data/process.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
0 internal/data/utils.go → pkg/data/utils.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion internal/directives/add.go → pkg/directives/add.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion internal/directives/delete.go → pkg/directives/delete.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion internal/directives/directives.go → pkg/directives/directives.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion internal/directives/lookaside.go → pkg/directives/lookaside.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion internal/directives/patch.go → pkg/directives/patch.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion internal/directives/replace.go → pkg/directives/replace.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion internal/directives/spec_change.go → pkg/directives/spec_change.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
4 changes: 2 additions & 2 deletions internal/git.go → pkg/srpmproc/git.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion internal/gitrpm.go → pkg/srpmproc/gitrpm.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion internal/mode.go → pkg/srpmproc/mode.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 3 additions & 3 deletions internal/patch.go → pkg/srpmproc/patch.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
)

Expand Down
4 changes: 2 additions & 2 deletions internal/process.go → pkg/srpmproc/process.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions internal/srpm.go → pkg/srpmproc/srpm.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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{}
Expand Down

0 comments on commit 7d84156

Please sign in to comment.