cli revision

Author: mcuadros

cli/cmd_containers.go

@@ -5,27 +5,31 @@ import (
 	"strings"
 	"time"
 
-	"github.com/mcuadros/dockership/core"
-
 	"github.com/docker/docker/pkg/units"
 	"github.com/mitchellh/cli"
 	"github.com/stevedomin/termtable"
 )
 
-type CmdContainers struct{}
+type CmdContainers struct{ cmd }
 
 func NewCmdContainers() (cli.Command, error) {
 	return &CmdContainers{}, nil
 }
 
 func (c *CmdContainers) Run(args []string) int {
-	var config core.Config
-	config.LoadFile("config.ini")
+	c.buildFlags(c)
+	if err := c.parse(args); err != nil {
+		return 1
+	}
 
 	table := termtable.NewTable(nil, &termtable.TableOptions{Padding: 3})
 	table.SetHeader([]string{"Enviroment", "Repository", "Commit", "Container ID", "Created", "Command", "Status", "Ports"})
 
-	for _, p := range config.Projects {
+	for name, p := range c.config.Projects {
+		if c.project != "" && c.project != name {
+			continue
+		}
+
 		l, err := p.List()
 		if err != nil {
 			continue

cli/cmd_deploy.go

@@ -1,52 +1,53 @@
 package main
 
 import (
-	"flag"
+	"fmt"
 	"strings"
 
-	"github.com/mcuadros/dockership/core"
 	. "github.com/mcuadros/dockership/logger"
 
 	"github.com/mitchellh/cli"
 )
 
 type CmdDeploy struct {
-	config *core.Config
+	enviroment string
+	force      bool
+	cmd
 }
 
 func NewCmdDeploy() (cli.Command, error) {
-	var config core.Config
-	if err := config.LoadFile("config.ini"); err != nil {
-		Critical(err.Error(), "file", "config.ini")
-	}
+	return &CmdDeploy{}, nil
+}
+
+func (c *CmdDeploy) parse(args []string) error {
+	c.flags.StringVar(&c.enviroment, "env", "", "")
+	c.flags.BoolVar(&c.force, "force", false, "")
+	err := c.cmd.parse(args)
+
+	fmt.Println(args)
 
-	return &CmdDeploy{config: &config}, nil
+	return err
 }
 
 func (c *CmdDeploy) Run(args []string) int {
-	var project, enviroment string
-	var force bool
-	cmdFlags := flag.NewFlagSet("deploy", flag.ContinueOnError)
-	cmdFlags.StringVar(&project, "project", "", "")
-	cmdFlags.StringVar(&enviroment, "env", "", "")
-	cmdFlags.BoolVar(&force, "force", false, "")
-	if err := cmdFlags.Parse(args); err != nil {
+	c.buildFlags(c)
+	if err := c.parse(args); err != nil {
 		return 1
 	}
 
-	if p, ok := c.config.Projects[project]; ok {
-		Info("Starting deploy", "project", p, "enviroment", enviroment, "force", force)
-		_, err := p.Deploy(enviroment, force)
+	if p, ok := c.config.Projects[c.project]; ok {
+		Info("Starting deploy", "project", p, "enviroment", c.enviroment, "force", c.force)
+		_, err := p.Deploy(c.enviroment, c.force)
 		if err != nil {
-			Critical(err.Error(), "project", project)
+			Critical(err.Error(), "project", c.project)
 			return 1
 		}
 
-		Info("Deploy success", "project", p, "enviroment", enviroment)
+		Info("Deploy success", "project", p, "enviroment", c.enviroment)
 		return 0
 	}
 
-	Critical("Unable to find project", "project", project)
+	Critical("Unable to find project", "project", c.project)
 
 	return 1
 }

cli/cmd_status.go

@@ -1,40 +1,30 @@
 package main
 
 import (
-	"flag"
 	"fmt"
 	"strings"
 
-	"github.com/mcuadros/dockership/core"
-
 	"github.com/mitchellh/cli"
 	"github.com/stevedomin/termtable"
 )
 
-type CmdStatus struct {
-	config *core.Config
-}
+type CmdStatus struct{ cmd }
 
 func NewCmdStatus() (cli.Command, error) {
-	var config core.Config
-	config.LoadFile("config.ini")
-
-	return &CmdStatus{config: &config}, nil
+	return &CmdStatus{}, nil
 }
 
 func (c *CmdStatus) Run(args []string) int {
-	var project string
-	cmdFlags := flag.NewFlagSet("status", flag.ContinueOnError)
-	cmdFlags.StringVar(&project, "project", "", "")
-	if err := cmdFlags.Parse(args); err != nil {
+	c.buildFlags(c)
+	if err := c.parse(args); err != nil {
 		return 1
 	}
 
 	table := termtable.NewTable(nil, &termtable.TableOptions{Padding: 3})
 	table.SetHeader([]string{"Enviroment", "Project", "Last Commit", "Containers", "Status"})
 
 	for name, p := range c.config.Projects {
-		if project != "" && project != name {
+		if c.project != "" && c.project != name {
 			continue
 		}
 

cli/main.go

@@ -1,13 +1,17 @@
 package main
 
 import (
+	"flag"
 	"os"
 
+	"github.com/mcuadros/dockership/core"
 	. "github.com/mcuadros/dockership/logger"
 
 	"github.com/mitchellh/cli"
 )
 
+const DEFAULT_CONFIG = "config.ini"
+
 func main() {
 	c := cli.NewCLI("dockership", "0.0.1")
 	c.Args = os.Args[1:]
@@ -24,3 +28,37 @@ func main() {
 
 	os.Exit(exitStatus)
 }
+
+type cmd struct {
+	configFile string
+	project    string
+	config     core.Config
+	flags      *flag.FlagSet
+}
+
+func (c *cmd) loadConfig() {
+	if err := c.config.LoadFile(c.configFile); err != nil {
+		Critical(err.Error(), "file", c.configFile)
+	}
+}
+
+func (c *cmd) buildFlags(child cli.Command) {
+	c.flags = flag.NewFlagSet("set", flag.ContinueOnError)
+	c.flags.StringVar(&c.configFile, "config", DEFAULT_CONFIG, "")
+	c.flags.StringVar(&c.project, "project", "", "")
+	c.flags.Usage = func() { child.Help() }
+}
+
+func (c *cmd) parse(args []string) error {
+	if err := c.flags.Parse(args); err != nil {
+		return err
+	}
+
+	c.loadConfig()
+
+	if _, ok := c.config.Projects[c.project]; !ok {
+		Critical("Unknown project", "project", c.project)
+	}
+
+	return nil
+}