working version of update command args

Author: smothiki

updatectl/instance.go

@@ -44,26 +44,10 @@ var (
 		Usage:   "[OPTION]...",
 		Summary: "Operations to view instances.",
 		Subcommands: []*Command{
-			cmdInstanceListUpdates,
-			cmdInstanceListAppVersions,
 			cmdInstanceDeis,
 		},
 	}
 
-	cmdInstanceListUpdates = &Command{
-		Name:        "instance list-updates",
-		Usage:       "[OPTION]...",
-		Description: "Generates a list of instance updates.",
-		Run:         instanceListUpdates,
-	}
-
-	cmdInstanceListAppVersions = &Command{
-		Name:        "instance list-app-versions",
-		Usage:       "[OPTION]...",
-		Description: "Generates a list of apps/versions with instance count.",
-		Run:         instanceListAppVersions,
-	}
-
 	cmdInstanceDeis = &Command{
 		Name:        "instance deis",
 		Usage:       "[OPTION]...",
@@ -73,16 +57,6 @@ var (
 )
 
 func init() {
-	cmdInstanceListUpdates.Flags.StringVar(&instanceFlags.groupId, "group-id", "Group id", "Group id")
-	cmdInstanceListUpdates.Flags.StringVar(&instanceFlags.appId, "app-id", "App id", "App id")
-	cmdInstanceListUpdates.Flags.Int64Var(&instanceFlags.start, "start", 0, "Start date filter")
-	cmdInstanceListUpdates.Flags.Int64Var(&instanceFlags.end, "end", 0, "End date filter")
-
-	cmdInstanceListAppVersions.Flags.StringVar(&instanceFlags.groupId, "group-id", "Group id", "Group id")
-	cmdInstanceListAppVersions.Flags.StringVar(&instanceFlags.appId, "app-id", "App id", "App id")
-	cmdInstanceListAppVersions.Flags.Int64Var(&instanceFlags.start, "start", 0, "Start date filter")
-	cmdInstanceListAppVersions.Flags.Int64Var(&instanceFlags.end, "end", 0, "End date filter")
-
 	cmdInstanceDeis.Flags.BoolVar(&instanceFlags.verbose, "verbose", false, "Print out the request bodies")
 	cmdInstanceDeis.Flags.IntVar(&instanceFlags.clientsPerApp, "clients-per-app", 1, "Number of fake fents per appid.")
 	cmdInstanceDeis.Flags.IntVar(&instanceFlags.minSleep, "min-sleep", 5, "Minimum time between update checks.")
@@ -98,63 +72,6 @@ func init() {
 	cmdInstanceDeis.Flags.StringVar(&instanceFlags.version, "version", os.Getenv("DEISCTL_APP_VERSION"), "Version to report.")
 }
 
-func instanceListUpdates(args []string, service *update.Service, out *tabwriter.Writer) int {
-	call := service.Clientupdate.List()
-	call.DateStart(instanceFlags.start)
-	call.DateEnd(instanceFlags.end)
-	if instanceFlags.groupId != "" {
-		call.GroupId(instanceFlags.groupId)
-	}
-	if instanceFlags.groupId != "" {
-		call.AppId(instanceFlags.appId)
-	}
-	list, err := call.Do()
-
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	fmt.Fprintln(out, "AppID\tClientID\tVersion\tLastSeen\tGroup\tStatus\tOEM")
-	for _, cl := range list.Items {
-		fmt.Fprintf(out, "%s\t%s\t%s\t%s\t%s\t%s\t%s\n", cl.AppId,
-			cl.ClientId, cl.Version, cl.LastSeen, cl.GroupId,
-			cl.Status, cl.Oem)
-	}
-	out.Flush()
-	return OK
-}
-
-func instanceListAppVersions(args []string, service *update.Service, out *tabwriter.Writer) int {
-	call := service.Appversion.List()
-
-	if instanceFlags.groupId != "" {
-		call.GroupId(instanceFlags.groupId)
-	}
-	if instanceFlags.appId != "" {
-		call.AppId(instanceFlags.appId)
-	}
-	if instanceFlags.start != 0 {
-		call.DateStart(instanceFlags.start)
-	}
-
-	if instanceFlags.end != 0 {
-		call.DateEnd(instanceFlags.end)
-	}
-
-	list, err := call.Do()
-
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	fmt.Fprintln(out, "AppID\tGroupID\tVersion\tClients")
-	for _, cl := range list.Items {
-		fmt.Fprintf(out, "%s\t%s\t%s\t%d\n", cl.AppId, cl.GroupId, cl.Version, cl.Count)
-	}
-	out.Flush()
-	return OK
-}
-
 //+ downloadDir + "deis.tar.gz"
 
 type serverConfig struct {

updatectl/update.go

@@ -154,6 +154,7 @@ func findCommand(search string, args []string, commands []*Command) (cmd *Comman
 	if len(args) < 1 {
 		return
 	}
+	//fmt.Println(args)
 	if search == "" {
 		search = args[0]
 	} else {
@@ -169,6 +170,7 @@ func findCommand(search string, args []string, commands []*Command) (cmd *Comman
 			}
 			if len(cmd.Subcommands) != 0 {
 				subArgs := cmd.Flags.Args()
+				fmt.Println(subArgs)
 				var subCmd *Command
 				subCmd, name = findCommand(search, subArgs, cmd.Subcommands)
 				if subCmd != nil {
@@ -182,20 +184,9 @@ func findCommand(search string, args []string, commands []*Command) (cmd *Comman
 }
 
 func Update(Args []string) {
-	globalFlagSet.Parse(Args[2:])
+	globalFlagSet.Parse(Args)
 	var args = globalFlagSet.Args()
-	/*
-		if globalFlags.Version {
-			printVersion(out)
-			os.Exit(OK)
-		}
-
-		if globalFlags.Help {
-			printGlobalUsage()
-			os.Exit(OK)
-		}*/
 
-	// no command specified - trigger help
 	if len(args) < 1 {
 		args = append(args, "help")
 	}
@@ -207,15 +198,17 @@ func Update(Args []string) {
 		fmt.Printf("Run '%v help' for usage.\n", cliName)
 		os.Exit(ERROR_NO_COMMAND)
 	}
-
+	fmt.Println(cmd)
 	if cmd.Run == nil {
 		//	printCommandUsage(cmd)
 		os.Exit(ERROR_USAGE)
 	} else {
+		fmt.Println("inside run")
 		exit := handle(cmd.Run)(&cmd.Flags)
 		if exit == ERROR_USAGE {
 			//	printCommandUsage(cmd)
 		}
+		fmt.Println("exiting")
 		os.Exit(exit)
 	}
 }