Merge pull request docker-archive-public#103 from ggiamarchi/machine-name-optional

bfirsh · bfirsh · commit da95ea39688c · 2014-12-15T17:53:30.000Z
Make machine name optional in CLI
diff --git a/commands.go b/commands.go
@@ -129,21 +129,7 @@ var Commands = []cli.Command{
 		Name:  "inspect",
 		Usage: "Inspect information about a machine",
 		Action: func(c *cli.Context) {
-			name := c.Args().First()
-
-			if name == "" {
-				cli.ShowCommandHelp(c, "inspect")
-				os.Exit(1)
-			}
-
-			store := NewStore()
-			host, err := store.Load(name)
-			if err != nil {
-				log.Errorf("error loading data")
-				os.Exit(1)
-			}
-
-			prettyJson, err := json.MarshalIndent(host, "", "    ")
+			prettyJson, err := json.MarshalIndent(getHost(c), "", "    ")
 			if err != nil {
 				log.Error("error with json")
 				os.Exit(1)
@@ -156,37 +142,7 @@ var Commands = []cli.Command{
 		Name:  "ip",
 		Usage: "Get the IP address of a machine",
 		Action: func(c *cli.Context) {
-			name := c.Args().First()
-
-			if name == "" {
-				cli.ShowCommandHelp(c, "ip")
-				os.Exit(1)
-			}
-
-			var (
-				err   error
-				host  *Host
-				store = NewStore()
-			)
-
-			if name != "" {
-				host, err = store.Load(name)
-				if err != nil {
-					log.Errorf("error unable to load data")
-					os.Exit(1)
-				}
-			} else {
-				host, err = store.GetActive()
-				if err != nil {
-					log.Errorf("error")
-					os.Exit(1)
-				}
-				if host == nil {
-					os.Exit(1)
-				}
-			}
-
-			ip, err := host.Driver.GetIP()
+			ip, err := getHost(c).Driver.GetIP()
 			if err != nil {
 				log.Errorf("error unable to get IP")
 				os.Exit(1)
@@ -199,22 +155,7 @@ var Commands = []cli.Command{
 		Name:  "kill",
 		Usage: "Kill a machine",
 		Action: func(c *cli.Context) {
-			name := c.Args().First()
-
-			if name == "" {
-				cli.ShowCommandHelp(c, "kill")
-				os.Exit(1)
-			}
-
-			store := NewStore()
-
-			host, err := store.Load(name)
-			if err != nil {
-				log.Errorf("error unable to load data")
-				os.Exit(1)
-			}
-
-			host.Driver.Kill()
+			getHost(c).Driver.Kill()
 		},
 	},
 	{
@@ -291,21 +232,7 @@ var Commands = []cli.Command{
 		Name:  "restart",
 		Usage: "Restart a machine",
 		Action: func(c *cli.Context) {
-			name := c.Args().First()
-			if name == "" {
-				cli.ShowCommandHelp(c, "restart")
-				os.Exit(1)
-			}
-
-			store := NewStore()
-
-			host, err := store.Load(name)
-			if err != nil {
-				log.Errorf("error unable to load data")
-				os.Exit(1)
-			}
-
-			host.Driver.Restart()
+			getHost(c).Driver.Restart()
 		},
 	},
 	{
@@ -398,110 +325,28 @@ var Commands = []cli.Command{
 		Name:  "start",
 		Usage: "Start a machine",
 		Action: func(c *cli.Context) {
-			name := c.Args().First()
-			store := NewStore()
-
-			if name == "" {
-				host, err := store.GetActive()
-				if err != nil {
-					log.Errorf("error unable to get active host")
-					os.Exit(1)
-				}
-
-				name = host.Name
-			}
-
-			host, err := store.Load(name)
-			if err != nil {
-				log.Errorf("error unable to load data")
-				os.Exit(1)
-			}
-
-			host.Start()
+			getHost(c).Start()
 		},
 	},
 	{
 		Name:  "stop",
 		Usage: "Stop a machine",
 		Action: func(c *cli.Context) {
-			name := c.Args().First()
-			store := NewStore()
-
-			if name == "" {
-				host, err := store.GetActive()
-				if err != nil {
-					log.Errorf("error unable to get active host")
-					os.Exit(1)
-				}
-
-				name = host.Name
-			}
-
-			host, err := store.Load(name)
-			if err != nil {
-				log.Errorf("error unable to load data")
-				os.Exit(1)
-			}
-
-			host.Stop()
+			getHost(c).Stop()
 		},
 	},
 	{
 		Name:  "upgrade",
 		Usage: "Upgrade a machine to the latest version of Docker",
 		Action: func(c *cli.Context) {
-			name := c.Args().First()
-			store := NewStore()
-
-			if name == "" {
-				host, err := store.GetActive()
-				if err != nil {
-					log.Errorf("error unable to get active host")
-					os.Exit(1)
-				}
-
-				name = host.Name
-			}
-
-			host, err := store.Load(name)
-			if err != nil {
-				log.Errorf("error unable to load host")
-				os.Exit(1)
-			}
-
-			host.Driver.Upgrade()
+			getHost(c).Driver.Upgrade()
 		},
 	},
 	{
 		Name:  "url",
 		Usage: "Get the URL of a machine",
 		Action: func(c *cli.Context) {
-			name := c.Args().First()
-
-			var (
-				err   error
-				host  *Host
-				store = NewStore()
-			)
-
-			if name != "" {
-				host, err = store.Load(name)
-				if err != nil {
-					log.Errorf("error unable to load data")
-					os.Exit(1)
-				}
-			} else {
-				host, err = store.GetActive()
-				if err != nil {
-					log.Errorf("error unable to get active host")
-					os.Exit(1)
-				}
-				if host == nil {
-					os.Exit(1)
-				}
-			}
-
-			url, err := host.GetURL()
+			url, err := getHost(c).GetURL()
 			if err != nil {
 				log.Errorf("error unable to get url for host")
 				os.Exit(1)
@@ -511,3 +356,25 @@ var Commands = []cli.Command{
 		},
 	},
 }
+
+func getHost(c *cli.Context) *Host {
+	name := c.Args().First()
+	store := NewStore()
+
+	if name == "" {
+		host, err := store.GetActive()
+		if err != nil {
+			log.Errorf("error unable to get active host")
+			os.Exit(1)
+		}
+		name = host.Name
+	}
+
+	host, err := store.Load(name)
+	if err != nil {
+		log.Errorf("error unable to load host")
+		os.Exit(1)
+	}
+
+	return host
+}
