2 files changed, 193 insertions, 0 deletions
diff --git a/cmd/podmanV2/system/info.go b/cmd/podmanV2/system/info.go
new file mode 100644
index 000000000..69b2871b7
--- /dev/null
+++ b/cmd/podmanV2/system/info.go
@@ -0,0 +1,74 @@
+package system
+
+import (
+	"encoding/json"
+	"fmt"
+	"os"
+	"text/template"
+
+	"github.com/containers/libpod/cmd/podmanV2/registry"
+	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/spf13/cobra"
+	"gopkg.in/yaml.v2"
+)
+
+var (
+	infoDescription = `Display information pertaining to the host, current storage stats, and build of podman.
+
+  Useful for the user and when reporting issues.
+`
+	infoCommand = &cobra.Command{
+		Use:     "info",
+		Args:    cobra.NoArgs,
+		Long:    infoDescription,
+		Short:   "Display podman system information",
+		PreRunE: preRunE,
+		RunE:    info,
+		Example: `podman info`,
+	}
+)
+
+var (
+	inFormat string
+	debug    bool
+)
+
+func init() {
+	registry.Commands = append(registry.Commands, registry.CliCommand{
+		Mode:    []entities.EngineMode{entities.ABIMode, entities.TunnelMode},
+		Command: infoCommand,
+	})
+	flags := infoCommand.Flags()
+	flags.BoolVarP(&debug, "debug", "D", false, "Display additional debug information")
+	flags.StringVarP(&inFormat, "format", "f", "", "Change the output format to JSON or a Go template")
+}
+
+func info(cmd *cobra.Command, args []string) error {
+	info, err := registry.ContainerEngine().Info(registry.GetContext())
+	if err != nil {
+		return err
+	}
+
+	if inFormat == "json" {
+		b, err := json.MarshalIndent(info, "", "  ")
+		if err != nil {
+			return err
+		}
+		fmt.Println(string(b))
+		return nil
+	}
+	if !cmd.Flag("format").Changed {
+		b, err := yaml.Marshal(info)
+		if err != nil {
+			return err
+		}
+		fmt.Println(string(b))
+		return nil
+	}
+	tmpl, err := template.New("info").Parse(inFormat)
+	if err != nil {
+		return err
+	}
+	err = tmpl.Execute(os.Stdout, info)
+	return err
+}
diff --git a/cmd/podmanV2/system/version.go b/cmd/podmanV2/system/version.go
new file mode 100644
index 000000000..e8002056b
--- /dev/null
+++ b/cmd/podmanV2/system/version.go
@@ -0,0 +1,119 @@
+package system
+
+import (
+	"fmt"
+	"io"
+	"os"
+	"strings"
+	"text/tabwriter"
+	"time"
+
+	"github.com/containers/buildah/pkg/formats"
+	"github.com/containers/libpod/cmd/podmanV2/registry"
+	"github.com/containers/libpod/libpod/define"
+	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/pkg/errors"
+	"github.com/spf13/cobra"
+)
+
+var (
+	versionCommand = &cobra.Command{
+		Use:               "version",
+		Args:              cobra.NoArgs,
+		Short:             "Display the Podman Version Information",
+		RunE:              version,
+		PersistentPreRunE: preRunE,
+	}
+	format string
+)
+
+type versionStruct struct {
+	Client define.Version
+	Server define.Version
+}
+
+func init() {
+	registry.Commands = append(registry.Commands, registry.CliCommand{
+		Mode:    []entities.EngineMode{entities.ABIMode, entities.TunnelMode},
+		Command: versionCommand,
+	})
+	flags := versionCommand.Flags()
+	flags.StringVarP(&format, "format", "f", "", "Change the output format to JSON or a Go template")
+}
+
+func version(cmd *cobra.Command, args []string) error {
+	var (
+		v   versionStruct
+		err error
+	)
+	v.Client, err = define.GetVersion()
+	if err != nil {
+		return errors.Wrapf(err, "unable to determine version")
+	}
+	// TODO we need to discuss how to implement
+	// this more. current endpoints dont have a
+	// version endpoint.  maybe we use info?
+	//if remote {
+	//	v.Server, err = getRemoteVersion(c)
+	//	if err != nil {
+	//		return err
+	//	}
+	//} else {
+	v.Server = v.Client
+	//}
+
+	versionOutputFormat := format
+	if versionOutputFormat != "" {
+		if strings.Join(strings.Fields(versionOutputFormat), "") == "{{json.}}" {
+			versionOutputFormat = formats.JSONString
+		}
+		var out formats.Writer
+		switch versionOutputFormat {
+		case formats.JSONString:
+			out = formats.JSONStruct{Output: v}
+			return out.Out()
+		default:
+			out = formats.StdoutTemplate{Output: v, Template: versionOutputFormat}
+			err := out.Out()
+			if err != nil {
+				// On Failure, assume user is using older version of podman version --format and check client
+				out = formats.StdoutTemplate{Output: v.Client, Template: versionOutputFormat}
+				if err1 := out.Out(); err1 != nil {
+					return err
+				}
+			}
+		}
+		return nil
+	}
+	w := tabwriter.NewWriter(os.Stdout, 0, 0, 2, ' ', 0)
+	defer w.Flush()
+
+	if registry.IsRemote() {
+		if _, err := fmt.Fprintf(w, "Client:\n"); err != nil {
+			return err
+		}
+		formatVersion(w, v.Client)
+		if _, err := fmt.Fprintf(w, "\nServer:\n"); err != nil {
+			return err
+		}
+		formatVersion(w, v.Server)
+	} else {
+		formatVersion(w, v.Client)
+	}
+	return nil
+}
+
+func formatVersion(writer io.Writer, version define.Version) {
+	fmt.Fprintf(writer, "Version:\t%s\n", version.Version)
+	fmt.Fprintf(writer, "RemoteAPI Version:\t%d\n", version.RemoteAPIVersion)
+	fmt.Fprintf(writer, "Go Version:\t%s\n", version.GoVersion)
+	if version.GitCommit != "" {
+		fmt.Fprintf(writer, "Git Commit:\t%s\n", version.GitCommit)
+	}
+	// Prints out the build time in readable format
+	if version.Built != 0 {
+		fmt.Fprintf(writer, "Built:\t%s\n", time.Unix(version.Built, 0).Format(time.ANSIC))
+	}
+
+	fmt.Fprintf(writer, "OS/Arch:\t%s\n", version.OsArch)
+}