Move to cobra for CLI parsing. jaas is now jaas run

Signed-off-by: Alex Ellis <[email protected]>

Author: alexellis

CONTRIBUTING.md

@@ -12,6 +12,8 @@ This is the contribution process for this repo.
  * Please link to the bug and explain how you tested the change
 * I'll merge after reviewing/testing
 
+> Note: Dependencies are vendored with [vndr](https://github.com/LK4D4/vndr/blob/master/README.md)
+
 ### License
 
 This project is licensed under the MIT License.
@@ -21,7 +23,7 @@ This project is licensed under the MIT License.
 Please add a Copyright notice to new files you add where this is not already present:
 
 ```
-// Copyright (c) OpenFaaS Project 2017. All rights reserved.
+// Copyright (c) Alex Ellis 2017-2018. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 ```
 

Dockerfile

@@ -2,13 +2,12 @@ FROM golang:1.9.2 as build
 
 MAINTAINER [email protected]
 
-RUN mkdir -p /go/src/github.com/alexellis2/jaas
-WORKDIR /go/src/github.com/alexellis2/jaas
+RUN mkdir -p /go/src/github.com/alexellis/jaas
+WORKDIR /go/src/github.com/alexellis/jaas
 
-COPY app.go         .
-COPY show_tasks.go  .
-COPY poll.go        .
-COPY vendor vendor
+COPY vendor     vendor
+COPY cmd        cmd
+COPY main.go    .
 
 RUN CGO_ENABLED=0 GOOS=linux go build -a -ldflags "-s -w" -installsuffix cgo -o /root/jaas
 

README.md

@@ -46,10 +46,10 @@ Now test `jaas` with `jaas --help`
 
 ### Running a task / batch job / one-shot container
 
-* Run your first one-shot container:
+* Run your first one-shot container with `jaas run`:
 
 ```
-# jaas -rm -image alexellis2/cows:latest
+# jaas run -r --image alexellis2/cows:latest
 ```
 
 The `-rm` flag removes the Swarm service that was used to run your container.
@@ -58,18 +58,18 @@ The `-rm` flag removes the Swarm service that was used to run your container.
 
 * Hiding logs
 
-If you aren't interested in the output logs then run it with the `--showlogs=false` override:
+If you aren't interested in the output logs then run it with the `--show-logs=false` override:
 
 ```
-# jaas -image alexellis2/cows:latest --showlogs=false
+# jaas run --image alexellis2/cows:latest --show-logs=false
 ```
 
 * Removing service after completion
 
-To remove the service after it completes, run with the `-rm` flag:
+To remove the service after it completes, run with the `--remove` or `-r` flag:
 
 ```
-# jaas -image alexellis2/href-counter:latest --env url=http://blog.alexellis.io/ --showlogs=true
+# jaas run --image alexellis2/href-counter:latest --env url=http://blog.alexellis.io/
 
 Service created: peaceful_shirley (uva6bcqyubm1b4c80dghjhb44)
 ID:  uva6bcqyubm1b4c80dghjhb44  Update at:  2017-03-14 22:19:54.381973142 +0000 UTC
@@ -78,7 +78,6 @@ ID:  uva6bcqyubm1b4c80dghjhb44  Update at:  2017-03-14 22:19:54.381973142 +0000
 Exit code: 0
 State: complete
 
-
 Printing service logs
 ?2017-03-14T22:19:55.660902727Z com.docker.swarm.node.id=b2dqydhfavwezorhkqi11f962,com.docker.swarm.service.id=uva6bcqyubm1b4c80dghjhb44,com.docker.swarm.task.id=yruxuawdipz2v5n0wvvm8ib0r {"internal":42,"external":2}
 
@@ -115,7 +114,7 @@ You can also run `jaas` in a container, but the syntax becomes slightly more ver
 
 ```
 # docker run -ti -v /var/run/docker.sock:/var/run/docker.sock \
-  alexellis2/jaas -image alexellis2/cows:latest
+  alexellis2/jaas run --image alexellis2/cows:latest
 ```
 
 ### Roadmap:
@@ -125,10 +124,12 @@ Here are several features / enhancements on the roadmap, please make additional
 * [x] Optionally delete service after fetching exit code/logs
 * [x] Support passing environmental variables
 * [x] Support private registry auth via `-registryAuth` flag
+* [x] Move to cobra flags/args package for CLI
+* [x] Support constraints on where to run tasks
 
 Todo:
 
-* [ ] Support constraints on where to run tasks
+* [ ] Move vendoring tool to `dep`
 * [ ] Support optional secrets through CLI flag
 * [ ] Validation around images which are not in local library
 * [ ] Extract stdout/stderr etc from logs in human readable format similar to `docker logs`

README_RPI.md

@@ -8,7 +8,7 @@ This tool will work on the Raspberry Pi / an ARM v6/7 - either running with Go d
 Running:
 
 ```
-$ docker run -ti -v /var/run/docker.sock:/var/run/docker.sock alexellis2/jaas-armhf ./jaas --showlogs=false -env url=http://www.alexellis.io -image=alexellis2/href-counter-armhf
+$ docker run -ti -v /var/run/docker.sock:/var/run/docker.sock alexellis2/jaas-armhf ./jaas run --showlogs=false --env url=http://www.alexellis.io --image=alexellis2/href-counter-armhf
 ```
 
 Building:

app.go

@@ -0,0 +1,40 @@
+// Copyright (c) Alex Ellis 2017-2018. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+package cmd
+
+import (
+	"fmt"
+	"os"
+	"strings"
+
+	"github.com/spf13/cobra"
+)
+
+// Execute run the root cobra command
+func Execute() {
+	if err := rootCmd.Execute(); err != nil {
+		e := err.Error()
+		fmt.Println(strings.ToUpper(e[:1]) + e[1:])
+		os.Exit(1)
+	}
+}
+
+var rootCmd = &cobra.Command{
+	Use:   "jaas",
+	Short: "Run an ad-hoc command",
+	Long: `
+Run ad-hoc commands`,
+	RunE: executeRoot,
+}
+
+func executeRoot(cmd *cobra.Command, args []string) error {
+	fmt.Printf("JaaS!")
+	cmd.Help()
+
+	return nil
+}
+
+func init() {
+
+}