Merge pull request weaveworks#36 from weaveworks/wcloud-service-flags

Add wcloud deploy --service flag

.gitignore

@@ -2,5 +2,6 @@ cover/cover
 socks/proxy
 socks/image.tar
 runner/runner
+cmd/wcloud/wcloud
 *.pyc
 *~

circle.yml

@@ -20,4 +20,5 @@ test:
     - cd $SRCDIR/cover; make
     - cd $SRCDIR/socks; make
     - cd $SRCDIR/runner; make
+    - cd $SRCDIR/cmd/wcloud; make
 

cmd/wcloud/Makefile

@@ -0,0 +1,11 @@
+.PHONY: all clean
+
+all: wcloud
+
+wcloud: *.go
+	go get ./$(@D)
+	go build -o $@ ./$(@D)
+
+clean:
+	rm -rf wcloud
+	go clean ./...

cmd/wcloud/cli.go

@@ -16,6 +16,19 @@ import (
 	"gopkg.in/yaml.v2"
 )
 
+// ArrayFlags allows you to collect repeated flags
+type ArrayFlags []string
+
+func (a *ArrayFlags) String() string {
+	return strings.Join(*a, ",")
+}
+
+// Set implements flags.Value
+func (a *ArrayFlags) Set(value string) error {
+	*a = append(*a, value)
+	return nil
+}
+
 func env(key, def string) string {
 	if val, ok := os.LookupEnv(key); ok {
 		return val
@@ -66,7 +79,9 @@ func deploy(c Client, args []string) {
 	var (
 		flags    = flag.NewFlagSet("", flag.ContinueOnError)
 		username = flags.String("u", "", "Username to report to deploy service (default with be current user)")
+		services ArrayFlags
 	)
+	flag.Var(&services, "service", "Service to update (can be repeated)")
 	if err := flags.Parse(args); err != nil {
 		usage()
 		return
@@ -90,9 +105,10 @@ func deploy(c Client, args []string) {
 		*username = user.Username
 	}
 	deployment := Deployment{
-		ImageName:      parts[0],
-		Version:        parts[1],
-		TriggeringUser: *username,
+		ImageName:        parts[0],
+		Version:          parts[1],
+		TriggeringUser:   *username,
+		IntendedServices: services,
 	}
 	if err := c.Deploy(deployment); err != nil {
 		fmt.Println(err.Error())

cmd/wcloud/types.go

@@ -13,7 +13,8 @@ type Deployment struct {
 	Priority  int       `json:"priority"`
 	State     string    `json:"status"`
 
-	TriggeringUser string `json:"triggering_user"`
+	TriggeringUser   string   `json:"triggering_user"`
+	IntendedServices []string `json:"intended_services"`
 }
 
 // Config for the deployment system for a user.