merging of subcommands

Signed-off-by: zhouhao <[email protected]>

Author: zhouhao

.gitignore

@@ -1,3 +1 @@
-/oci-create-runtime-bundle
-/oci-unpack
-/oci-image-validate
+/oci-image-tool

.travis.yml

@@ -21,4 +21,4 @@ script:
   - make lint
   - make check-license
   - make test
-  - make tools
+  - make oci-image-tool

Makefile

@@ -8,13 +8,12 @@ TOOLS := \
 	oci-create-runtime-bundle \
 	oci-image-validate \
 	oci-unpack
-
 default: help
 
 help:
 	@echo "Usage: make <target>"
 	@echo
-	@echo " * 'tools' - Build the oci image tools binaries"
+	@echo " * 'oci-image-tool' - Build the oci-image-tool binary"
 	@echo " * 'check-license' - Check license headers in source files"
 	@echo " * 'lint' - Execute the source code linter"
 	@echo " * 'test' - Execute the unit tests"
@@ -24,10 +23,8 @@ check-license:
 	@echo "checking license headers"
 	@./.tool/check-license
 
-tools: $(TOOLS)
-
-$(TOOLS): oci-%:
-	go build -ldflags "-X main.gitCommit=${COMMIT}" ./cmd/$@
+oci-image-tool:
+	go build ./cmd/oci-image-tool
 
 lint:
 	@echo "checking lint"
@@ -73,11 +70,11 @@ install.tools: .install.gitvalidation .install.glide .install.glide-vc .install.
 	gometalinter --install --update
 
 clean:
-	rm -rf *~ $(OUTPUT_DIRNAME) $(TOOLS)
+	rm -rf *~ $(OUTPUT_DIRNAME)
+	rm -fr oci-image-tool
 
 .PHONY: \
-	tools \
-	$(TOOLS) \
+	oci-image-tool \
 	check-license \
 	clean \
 	lint \

cmd/oci-create-runtime-bundle/main.go renamed to cmd/oci-image-tool/create-runtime-bundle.go

@@ -20,15 +20,10 @@ import (
 	"os"
 	"strings"
 
-	specs "github.com/opencontainers/image-spec/specs-go"
 	"github.com/opencontainers/image-tools/image"
 	"github.com/spf13/cobra"
 )
 
-// gitCommit will be the hash that the binary was built from
-// and will be populated by the Makefile
-var gitCommit = ""
-
 // supported bundle types
 var bundleTypes = []string{
 	image.TypeImageLayout,
@@ -44,25 +39,14 @@ type bundleCmd struct {
 	version bool
 }
 
-func main() {
-	stdout := log.New(os.Stdout, "", 0)
-	stderr := log.New(os.Stderr, "", 0)
-
-	cmd := newBundleCmd(stdout, stderr)
-	if err := cmd.Execute(); err != nil {
-		stderr.Println(err)
-		os.Exit(1)
-	}
-}
-
 func newBundleCmd(stdout, stderr *log.Logger) *cobra.Command {
 	v := &bundleCmd{
 		stdout: stdout,
 		stderr: stderr,
 	}
 
 	cmd := &cobra.Command{
-		Use:   "oci-create-runtime-bundle [src] [dest]",
+		Use:   "create-runtime-bundle [src] [dest]",
 		Short: "Create an OCI image runtime bundle",
 		Long:  `Creates an OCI image runtime bundle at the destination directory [dest] from an OCI image present at [src].`,
 		Run:   v.Run,
@@ -105,12 +89,6 @@ It is strongly recommended to keep the default value.`,
 }
 
 func (v *bundleCmd) Run(cmd *cobra.Command, args []string) {
-	if v.version {
-		v.stdout.Printf("commit: %s", gitCommit)
-		v.stdout.Printf("spec: %s", specs.Version)
-		os.Exit(0)
-
-	}
 	if len(args) != 2 {
 		v.stderr.Print("both src and dest must be provided")
 		if err := cmd.Usage(); err != nil {

cmd/oci-image-tool/main.go

@@ -0,0 +1,41 @@
+// Copyright 2016 The Linux Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"log"
+	"os"
+
+	"github.com/spf13/cobra"
+)
+
+func main() {
+	cmd := &cobra.Command{
+		Use:   "oci-image-tool",
+		Short: "A tool for working with OCI images",
+	}
+
+	stdout := log.New(os.Stdout, "", 0)
+	stderr := log.New(os.Stderr, "", 0)
+
+	cmd.AddCommand(newValidateCmd(stdout, stderr))
+	cmd.AddCommand(newUnpackCmd(stdout, stderr))
+	cmd.AddCommand(newBundleCmd(stdout, stderr))
+
+	if err := cmd.Execute(); err != nil {
+		stderr.Println(err)
+		os.Exit(1)
+	}
+}

cmd/oci-create-runtime-bundle/oci-create-runtime-bundle.1.md renamed to cmd/oci-image-tool/man/oci-create-runtime-bundle.1.md

@@ -20,15 +20,10 @@ import (
 	"os"
 	"strings"
 
-	specs "github.com/opencontainers/image-spec/specs-go"
 	"github.com/opencontainers/image-tools/image"
 	"github.com/spf13/cobra"
 )
 
-// gitCommit will be the hash that the binary was built from
-// and will be populated by the Makefile
-var gitCommit = ""
-
 // supported unpack types
 var unpackTypes = []string{
 	image.TypeImageLayout,
@@ -43,17 +38,6 @@ type unpackCmd struct {
 	version bool
 }
 
-func main() {
-	stdout := log.New(os.Stdout, "", 0)
-	stderr := log.New(os.Stderr, "", 0)
-
-	cmd := newUnpackCmd(stdout, stderr)
-	if err := cmd.Execute(); err != nil {
-		stderr.Println(err)
-		os.Exit(1)
-	}
-}
-
 func newUnpackCmd(stdout, stderr *log.Logger) *cobra.Command {
 	v := &unpackCmd{
 		stdout: stdout,
@@ -98,12 +82,6 @@ func newUnpackCmd(stdout, stderr *log.Logger) *cobra.Command {
 }
 
 func (v *unpackCmd) Run(cmd *cobra.Command, args []string) {
-	if v.version {
-		v.stdout.Printf("commit: %s", gitCommit)
-		v.stdout.Printf("spec: %s", specs.Version)
-		os.Exit(0)
-	}
-
 	if len(args) != 2 {
 		v.stderr.Print("both src and dest must be provided")
 		if err := cmd.Usage(); err != nil {

cmd/oci-image-validate/oci-image-validate.1.md renamed to cmd/oci-image-tool/man/oci-image-validate.1.md

@@ -21,16 +21,11 @@ import (
 	"strings"
 
 	"github.com/opencontainers/image-spec/schema"
-	specs "github.com/opencontainers/image-spec/specs-go"
 	"github.com/opencontainers/image-tools/image"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 )
 
-// gitCommit will be the hash that the binary was built from
-// and will be populated by the Makefile
-var gitCommit = ""
-
 // supported validation types
 var validateTypes = []string{
 	image.TypeImageLayout,
@@ -48,25 +43,14 @@ type validateCmd struct {
 	version bool
 }
 
-func main() {
-	stdout := log.New(os.Stdout, "", 0)
-	stderr := log.New(os.Stderr, "", 0)
-
-	cmd := newValidateCmd(stdout, stderr)
-	if err := cmd.Execute(); err != nil {
-		stderr.Println(err)
-		os.Exit(1)
-	}
-}
-
 func newValidateCmd(stdout, stderr *log.Logger) *cobra.Command {
 	v := &validateCmd{
 		stdout: stdout,
 		stderr: stderr,
 	}
 
 	cmd := &cobra.Command{
-		Use:   "oci-image-validate FILE...",
+		Use:   "validate FILE...",
 		Short: "Validate one or more image files",
 		Run:   v.Run,
 	}
@@ -102,12 +86,6 @@ func newValidateCmd(stdout, stderr *log.Logger) *cobra.Command {
 }
 
 func (v *validateCmd) Run(cmd *cobra.Command, args []string) {
-	if v.version {
-		v.stdout.Printf("commit: %s", gitCommit)
-		v.stdout.Printf("spec: %s", specs.Version)
-		os.Exit(0)
-	}
-
 	if len(args) < 1 {
 		v.stderr.Printf("no files specified")
 		if err := cmd.Usage(); err != nil {