Merge pull request #22 from ad-freiburg/save_and_load

Support for wharfer load/save fixes #21

go.mod

@@ -1,3 +1,5 @@
 module github.com/ad-freiburg/wharfer
 
 require github.com/docker/docker v1.13.1
+
+go 1.13

main.go

@@ -26,6 +26,8 @@ var runCmd wrap.Run
 var psCmd wrap.Ps
 var killCmd wrap.Kill
 var rmCmd wrap.Rm
+var loadCmd wrap.Load
+var saveCmd wrap.Save
 var logsCmd wrap.Logs
 var pullCmd wrap.Pull
 var imagesCmd wrap.Images
@@ -40,6 +42,8 @@ func init() {
  runCmd.InitFlags()
  psCmd.InitFlags()
  killCmd.InitFlags()
+ loadCmd.InitFlags()
+ saveCmd.InitFlags()
  logsCmd.InitFlags()
  rmCmd.InitFlags()
  pullCmd.InitFlags()
@@ -62,6 +66,8 @@ func main() {
  fmt.Fprintln(os.Stderr, "\tps")
  fmt.Fprintln(os.Stderr, "\tkill")
  fmt.Fprintln(os.Stderr, "\trm")
+ fmt.Fprintln(os.Stderr, "\tload")
+ fmt.Fprintln(os.Stderr, "\tsave")
  fmt.Fprintln(os.Stderr, "\tlogs")
  fmt.Fprintln(os.Stderr, "\tpull")
  fmt.Fprintln(os.Stderr, "\timages")
@@ -81,6 +87,10 @@ func main() {
  args = killCmd.ParseToArgs(os.Args[2:])
  case "rm":
  args = rmCmd.ParseToArgs(os.Args[2:])
+ case "save":
+ args = saveCmd.ParseToArgs(os.Args[2:])
+ case "load":
+ args = loadCmd.ParseToArgs(os.Args[2:])
  case "logs":
  args = logsCmd.ParseToArgs(os.Args[2:])
  case "ps":

wrap/load.go

@@ -0,0 +1,44 @@
+package wrap
+
+import (
+ "flag"
+ "os"
+)
+
+type Load struct {
+ Cmd *flag.FlagSet
+ Input string
+ Quiet bool
+}
+
+func (load *Load) InitFlags() {
+ const inputUsage = "Read from tar archive file, instead of STDIN"
+ load.Cmd = flag.NewFlagSet("load", flag.ExitOnError)
+ load.Cmd.StringVar(&load.Input, "input", "", inputUsage)
+ load.Cmd.StringVar(&load.Input, "i", "", inputUsage+" (shorthand)")
+ load.Cmd.BoolVar(&load.Quiet, "quiet", false, "Supress output")
+ load.Cmd.BoolVar(&load.Quiet, "q", false, "Supress output (shorthand)")
+}
+
+func (load *Load) ParseToArgs(rawArgs []string) []string {
+ if err := load.Cmd.Parse(rawArgs); err != nil {
+ // Only returns an error if the Usage was shown
+ os.Exit(0)
+ }
+ args := []string{"load"}
+ if load.Input != "" {
+ args = append(args, "--input", load.Input)
+ }
+
+ if load.Quiet {
+ args = append(args, "--quiet")
+ }
+
+ if load.Cmd.NArg() > 0 {
+ // add -- to make sure additional arguments are not interpreted as
+ // potentially harmful flags. Here this is the PATH
+ args = append(args, "--")
+ args = append(args, load.Cmd.Args()...)
+ }
+ return args
+}

wrap/save.go

@@ -0,0 +1,37 @@
+package wrap
+
+import (
+ "flag"
+ "os"
+)
+
+type Save struct {
+ Cmd *flag.FlagSet
+ Output string
+}
+
+func (save *Save) InitFlags() {
+ const outputUsage = "Write to a file, instead of STDOUT"
+ save.Cmd = flag.NewFlagSet("save", flag.ExitOnError)
+ save.Cmd.StringVar(&save.Output, "output", "", outputUsage)
+ save.Cmd.StringVar(&save.Output, "o", "", outputUsage+" (shorthand)")
+}
+
+func (save *Save) ParseToArgs(rawArgs []string) []string {
+ if err := save.Cmd.Parse(rawArgs); err != nil {
+ // Only returns an error if the Usage was shown
+ os.Exit(0)
+ }
+ args := []string{"save"}
+ if save.Output != "" {
+ args = append(args, "--output", save.Output)
+ }
+
+ if save.Cmd.NArg() > 0 {
+ // add -- to make sure additional arguments are not interpreted as
+ // potentially harmful flags. Here this is the container to kill
+ args = append(args, "--")
+ args = append(args, save.Cmd.Args()...)
+ }
+ return args
+}