github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-19 01:06:27 +00:00
Code Issues Projects Releases Wiki Activity

Rename pkgsrc to pkglib

Browse Source 
Signed-off-by: Ian Campbell <ijc@docker.com>
This commit is contained in:
Ian Campbell 2017-10-06 13:38:37 +01:00
parent ba60937754
commit c84c997383
7 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/cmd/linuxkit/pkg_build.go
View File

@ -6,7 +6,7 @@ import (
"os"
"path/filepath"
"github.com/linuxkit/linuxkit/src/cmd/linuxkit/pkgsrc"
"github.com/linuxkit/linuxkit/src/cmd/linuxkit/pkglib"
)
func pkgBuild(args []string) {
@ -21,15 +21,15 @@ func pkgBuild(args []string) {
force := flags.Bool("force", false, "Force rebuild")
ps, err := pkgsrc.NewFromCLI(flags, args)
ps, err := pkglib.NewFromCLI(flags, args)
if err != nil {
fmt.Fprintf(os.Stderr, "%v\n", err)
os.Exit(1)
}
var opts []pkgsrc.BuildOpt
var opts []pkglib.BuildOpt
if *force {
opts = append(opts, pkgsrc.WithBuildForce())
opts = append(opts, pkglib.WithBuildForce())
}
if err := ps.Build(opts...); err != nil {
fmt.Fprintf(os.Stderr, "%v\n", err)

10
src/cmd/linuxkit/pkg_push.go
View File

@ -6,7 +6,7 @@ import (
"os"
"path/filepath"
"github.com/linuxkit/linuxkit/src/cmd/linuxkit/pkgsrc"
"github.com/linuxkit/linuxkit/src/cmd/linuxkit/pkglib"
)
func pkgPush(args []string) {
@ -21,16 +21,16 @@ func pkgPush(args []string) {
force := flags.Bool("force", false, "Force rebuild")
ps, err := pkgsrc.NewFromCLI(flags, args)
ps, err := pkglib.NewFromCLI(flags, args)
if err != nil {
fmt.Fprintf(os.Stderr, "%v\n", err)
os.Exit(1)
}
var opts []pkgsrc.BuildOpt
opts = append(opts, pkgsrc.WithBuildPush())
var opts []pkglib.BuildOpt
opts = append(opts, pkglib.WithBuildPush())
if *force {
opts = append(opts, pkgsrc.WithBuildForce())
opts = append(opts, pkglib.WithBuildForce())
}
if err := ps.Build(opts...); err != nil {

4
src/cmd/linuxkit/pkg_showtag.go
View File

@ -6,7 +6,7 @@ import (
"os"
"path/filepath"
"github.com/linuxkit/linuxkit/src/cmd/linuxkit/pkgsrc"
"github.com/linuxkit/linuxkit/src/cmd/linuxkit/pkglib"
)
func pkgShowTag(args []string) {
@ -19,7 +19,7 @@ func pkgShowTag(args []string) {
flags.PrintDefaults()
}
ps, err := pkgsrc.NewFromCLI(flags, args)
ps, err := pkglib.NewFromCLI(flags, args)
if err != nil {
fmt.Fprintf(os.Stderr, "%v\n", err)
os.Exit(1)

4
src/cmd/linuxkit/pkgsrc/build.go → src/cmd/linuxkit/pkglib/build.go
View File

@ -1,4 +1,4 @@
package pkgsrc
package pkglib
import (
"fmt"
@ -31,7 +31,7 @@ func WithBuildPush() BuildOpt {
}
// Build builds the package
func (ps PkgSrc) Build(bos ...BuildOpt) error {
func (ps Pkg) Build(bos ...BuildOpt) error {
var bo buildOpts
for _, fn := range bos {
if err := fn(&bo); err != nil {

2
src/cmd/linuxkit/pkgsrc/docker.go → src/cmd/linuxkit/pkglib/docker.go
View File

@ -1,4 +1,4 @@
package pkgsrc
package pkglib
// Thin wrappers around Docker CLI invocations

2
src/cmd/linuxkit/pkgsrc/git.go → src/cmd/linuxkit/pkglib/git.go
View File

@ -1,4 +1,4 @@
package pkgsrc
package pkglib
// Thin wrappers around git CLI invocations

42
src/cmd/linuxkit/pkgsrc/pkgsrc.go → src/cmd/linuxkit/pkglib/pkglib.go
View File

@ -1,4 +1,4 @@
package pkgsrc
package pkglib
import (
"flag"
@ -20,8 +20,8 @@ type pkgInfo struct {
Cache bool `yaml:"cache"`
}
// PkgSrc encapsulates information about a package's source
type PkgSrc struct {
// Pkg encapsulates information about a package's source
type Pkg struct {
// These correspond to pkgInfo fields
image string
org string
@ -38,8 +38,8 @@ type PkgSrc struct {
commitHash string
}
// NewFromCLI creates a PkgSrc from a set of CLI arguments. Calls fs.Parse()
func NewFromCLI(fs *flag.FlagSet, args []string) (PkgSrc, error) {
// NewFromCLI creates a Pkg from a set of CLI arguments. Calls fs.Parse()
func NewFromCLI(fs *flag.FlagSet, args []string) (Pkg, error) {
// Defaults
pi := pkgInfo{
Org: "linuxkit",
@ -71,16 +71,16 @@ func NewFromCLI(fs *flag.FlagSet, args []string) (PkgSrc, error) {
fs.Parse(args)
if fs.NArg() < 1 {
return PkgSrc{}, fmt.Errorf("A pkg directory is required")
return Pkg{}, fmt.Errorf("A pkg directory is required")
}
if fs.NArg() > 1 {
return PkgSrc{}, fmt.Errorf("Unknown extra arguments given: %s", fs.Args()[1:])
return Pkg{}, fmt.Errorf("Unknown extra arguments given: %s", fs.Args()[1:])
}
pkg := fs.Arg(0)
pkgPath, err := filepath.Abs(pkg)
if err != nil {
return PkgSrc{}, err
return Pkg{}, err
}
if hashPath == "" {
@ -88,11 +88,11 @@ func NewFromCLI(fs *flag.FlagSet, args []string) (PkgSrc, error) {
} else {
hashPath, err = filepath.Abs(hashPath)
if err != nil {
return PkgSrc{}, err
return Pkg{}, err
}
if !strings.HasPrefix(pkgPath, hashPath) {
return PkgSrc{}, fmt.Errorf("Hash path is not a prefix of the package path")
return Pkg{}, fmt.Errorf("Hash path is not a prefix of the package path")
}
// TODO(ijc) pkgPath and hashPath really ought to be in the same git tree too...
@ -100,14 +100,14 @@ func NewFromCLI(fs *flag.FlagSet, args []string) (PkgSrc, error) {
b, err := ioutil.ReadFile(filepath.Join(pkgPath, buildYML))
if err != nil {
return PkgSrc{}, err
return Pkg{}, err
}
if err := yaml.Unmarshal(b, &pi); err != nil {
return PkgSrc{}, err
return Pkg{}, err
}
if pi.Image == "" {
return PkgSrc{}, fmt.Errorf("Image field is required")
return Pkg{}, fmt.Errorf("Image field is required")
}
// Go's flag package provides no way to see if a flag was set
@ -128,16 +128,16 @@ func NewFromCLI(fs *flag.FlagSet, args []string) (PkgSrc, error) {
if hash == "" {
if hash, err = gitTreeHash(hashPath, hashCommit); err != nil {
return PkgSrc{}, err
return Pkg{}, err
}
}
dirty, err := gitIsDirty(hashPath, hashCommit)
if err != nil {
return PkgSrc{}, err
return Pkg{}, err
}
return PkgSrc{
return Pkg{
image: pi.Image,
org: pi.Org,
hash: hash,
@ -153,12 +153,12 @@ func NewFromCLI(fs *flag.FlagSet, args []string) (PkgSrc, error) {
}
// Hash returns the hash of the package
func (ps PkgSrc) Hash() string {
func (ps Pkg) Hash() string {
return ps.hash
}
// ReleaseTag returns the tag to use for a particular release of the package
func (ps PkgSrc) ReleaseTag(release string) (string, error) {
func (ps Pkg) ReleaseTag(release string) (string, error) {
if release == "" {
return "", fmt.Errorf("A release tag is required")
}
@ -170,7 +170,7 @@ func (ps PkgSrc) ReleaseTag(release string) (string, error) {
}
// Tag returns the tag to use for the package
func (ps PkgSrc) Tag() string {
func (ps Pkg) Tag() string {
tag := ps.org + "/" + ps.image + ":" + ps.hash
if ps.dirty {
tag += "-dirty"
@ -178,7 +178,7 @@ func (ps PkgSrc) Tag() string {
return tag
}
func (ps PkgSrc) archSupported(want string) bool {
func (ps Pkg) archSupported(want string) bool {
for _, supp := range ps.arches {
if supp == want {
return true
@ -187,7 +187,7 @@ func (ps PkgSrc) archSupported(want string) bool {
return false
}
func (ps PkgSrc) cleanForBuild() error {
func (ps Pkg) cleanForBuild() error {
if ps.commitHash != "HEAD" {
return fmt.Errorf("Cannot build from commit hash != HEAD")
}