Resolves hyperledger#271, info command now output information

about the stack not container.

Signed-off-by: tobigiwa

Author: tobyweb3x

cmd/info.go

@@ -19,6 +19,7 @@ package cmd
 import (
 	"context"
 	"fmt"
+	"strings"
 
 	"github.com/hyperledger/firefly-cli/internal/docker"
 	"github.com/hyperledger/firefly-cli/internal/log"
@@ -30,7 +31,7 @@ var infoCmd = &cobra.Command{
 	Use:   "info <stack_name>",
 	Short: "Get info about a stack",
 	Long: `Get info about a stack such as each container name
-	and image version.`,
+	and image version. If non is given, it run the "info" command for all stack on the local machine.`,
 	RunE: func(cmd *cobra.Command, args []string) error {
 		ctx := log.WithVerbosity(context.Background(), verbose)
 		ctx = context.WithValue(ctx, docker.CtxIsLogCmdKey{}, true)
@@ -42,17 +43,33 @@ var infoCmd = &cobra.Command{
 		}
 		ctx = context.WithValue(ctx, docker.CtxComposeVersionKey{}, version)
 
-		stackManager := stacks.NewStackManager(ctx)
-		if len(args) == 0 {
-			return fmt.Errorf("no stack specified")
+		allStacks, err := stacks.ListStacks()
+		if err != nil {
+			return err
 		}
-		stackName := args[0]
 
-		if err := stackManager.LoadStack(stackName); err != nil {
-			return err
+		if len(args) > 0 {
+			namedStacks := make([]string, 0, len(args))
+			for _, stackName := range args {
+				if contains(allStacks, strings.TrimSpace(stackName)) {
+					namedStacks = append(namedStacks, stackName)
+				} else {
+					fmt.Printf("stack name - %s, is not present on your local machine. Run `ff ls` to see all available stacks.\n", stackName)
+				}
+			}
+
+			allStacks = namedStacks // replace only the user specified stacks in the slice instead.
 		}
-		if err := stackManager.PrintStackInfo(); err != nil {
-			return err
+
+		stackManager := stacks.NewStackManager(ctx)
+		for _, stackName := range allStacks {
+			if err := stackManager.LoadStack(stackName); err != nil {
+				return err
+			}
+
+			if err := stackManager.PrintStacksInfo(); err != nil {
+				return err
+			}
 		}
 		return nil
 	},

cmd/ps.go

@@ -19,7 +19,8 @@ var psCmd = &cobra.Command{
 	Short: "Returns information on running stacks",
 	Long: `ps returns currently running stacks on your local machine.
 	
-	It also takes a continuous list of whitespace optional arguement - stack name.`,
+	It also takes a continuous list of whitespace optional arguement - stack name. If non
+	is given, it run the "ps" command for all stack on the local machine.`,
 	Aliases: []string{"process"},
 	RunE: func(cmd *cobra.Command, args []string) error {
 

internal/stacks/stack_manager.go

@@ -1091,6 +1091,39 @@ func replaceVersions(oldManifest, newManifest *types.VersionManifest, filename s
 	return ioutil.WriteFile(filename, []byte(s), 0755)
 }
 
+// initTabwriter takes the stackManger, the format of the Header row and a variadic arguement
+// of strings (Headers) that is expected to comply with the Header format. It returns a Writer with sane defaults
+// to write the body row.
+func initTabwriter(s *StackManager, formatHeader string, headers ...interface{}) *tabwriter.Writer {
+	w := new(tabwriter.Writer)
+	w.Init(os.Stdout, 8, 8, 8, ' ', 0)
+	s.once.Do(func() {
+		fmt.Fprintf(w, formatHeader, headers...)
+	})
+	return w
+}
+// PrintStacksInfo prints to os.Stdout information about the stack.
+func (s *StackManager) PrintStacksInfo() error {
+	formatHeader := "%-15s %-22s %-10s %-20s %-25s\n"
+	formatBody := "  %-18s %-18s %-7s %-14s %-20s\n"
+
+	w := initTabwriter(s, formatHeader, "STACK-NAME", "BLOCKCHAIN-PROVIDER", "MEMBERS", "STATUS", "DOCKER COMPOSE DIR")
+
+	status, err := isRunning(s)
+	if err != nil {
+		return err
+	}
+
+	if status {
+		fmt.Fprintf(w, formatBody, s.Stack.Name, s.Stack.BlockchainProvider, fmt.Sprint(len(s.Stack.Members)), "running", filepath.Join(s.Stack.StackDir, "docker-compose.yml"))
+	} else {
+		fmt.Fprintf(w, formatBody, s.Stack.Name, s.Stack.BlockchainProvider, fmt.Sprint(len(s.Stack.Members)), "not_running", filepath.Join(s.Stack.StackDir, "docker-compose.yml"))
+	}
+	fmt.Fprintln(w)
+	w.Flush()
+
+	return nil
+}
 func (s *StackManager) PrintStackInfo() error {
 	fmt.Print("\n")
 	if err := s.runDockerComposeCommand("images"); err != nil {
@@ -1106,31 +1139,40 @@ func (s *StackManager) PrintStackInfo() error {
 
 // IsRunning prints to the stdout, the stack name and it status as "running" or "not_running".
 func (s *StackManager) IsRunning() error {
-	output, err := docker.RunDockerComposeCommandReturnsStdout(s.Stack.StackDir, "ps")
+	formatHeader := " %-15s %-20s\n"
+	formatBody := "  %-13s %-20s"
+
+	w := initTabwriter(s, formatHeader, "STACK-NAME", "STATUS")
+
+	status, err := isRunning(s)
 	if err != nil {
 		return err
 	}
 
-	formatHeader := "\n %s\t%s\t  "
-	formatBody := "\n %s\t%s\t"
-
-	w := new(tabwriter.Writer)
-	w.Init(os.Stdout, 8, 8, 8, '\t', 0)
-
-	s.once.Do(func() {
-		fmt.Fprintf(w, formatHeader, "STACK", "STATUS")
-	})
-
-	if strings.Contains(string(output), s.Stack.Name) { // if the output contains the stack name, it means the container is running.
+	if status {
 		fmt.Fprintf(w, formatBody, s.Stack.Name, "running")
 	} else {
 		fmt.Fprintf(w, formatBody, s.Stack.Name, "not_running")
 	}
 	fmt.Fprintln(w)
 	w.Flush()
+
 	return nil
 }
 
+// isRunning returns true if a stack on the local machine is currently running, otherwise false.
+func isRunning(s *StackManager) (bool, error) {
+	output, err := docker.RunDockerComposeCommandReturnsStdout(s.Stack.StackDir, "ps")
+	if err != nil {
+		return false, err
+	}
+	if strings.Contains(string(output), s.Stack.Name) { // from running `docker compose ps`, if the output contains the stack name, it means the container is running.
+		return true, nil
+	}
+
+	return false, nil
+}
+
 func (s *StackManager) disableFireflyCoreContainers() error {
 	compose := s.buildDockerCompose()
 	for _, member := range s.Stack.Members {