Merge pull request #54 from bacongobbler/deisctl-fixes

minor bugfixes

Author: Matthew Fisher

Makefile

@@ -23,8 +23,8 @@ setup-gotools:
 	go get -v github.com/golang/lint/golint
 
 test-style:
-	go vet -x ./...
-	-golint *.go client/ cmd/ config/ constant/ hooks/ lock/ systemd/ units/ update/ utils/
+	go vet ./...
+	-golint *.go client/*.go cmd/*.go config/*.go constant/*.go lock/*.go update/*.go utils/*.go
 
 test: test-style
 	godep go test -v -cover ./...

client/destroy.go

@@ -9,6 +9,10 @@ import (
 
 // Destroy units for a given target
 func (c *FleetClient) Destroy(target string) (err error) {
+	// check if the unit exists
+	if _, err := c.Units(target); err != nil {
+		return err
+	}
 	component, num, err := splitTarget(target)
 	if err != nil {
 		return

client/unit.go

@@ -40,6 +40,9 @@ func (c *FleetClient) Units(target string) (units []string, err error) {
 			units = append(units, u.Name)
 		}
 	}
+	if len(units) == 0 {
+		err = fmt.Errorf("could not find unit: %s", target)
+	}
 	return
 }
 

deisctl.go

@@ -70,13 +70,8 @@ Options:
   --tunnel=<host>             establish an SSH tunnel for communication with fleet and etcd [default: ]
   --request-timeout=<secs>    amount of time to allow a single request before considering it failed. [default: 3.0]
 `
-	// special handling for version
-	if len(os.Args) == 2 && os.Args[1] == "--version" {
-		fmt.Println(Version)
-		os.Exit(0)
-	}
 	// parse command-line arguments
-	args, err := docopt.Parse(usage, nil, true, "", true)
+	args, err := docopt.Parse(usage, nil, true, Version, true)
 	if err != nil {
 		exit(err, 2)
 	}