Merge pull request #361 from vdemeester/fix-master-ps-order

Fixing InfoSet String methods order

Author: vdemeester

cli/app/app.go

@@ -32,6 +32,7 @@ func BeforeApp(c *cli.Context) error {
 	if c.GlobalBool("verbose") {
 		logrus.SetLevel(logrus.DebugLevel)
 	}
+
 	if version.ShowWarning() {
 		logrus.Warning("Note: This is an experimental alternate implementation of the Compose CLI (https://github.com/docker/compose)")
 	}
@@ -52,11 +53,15 @@ func WithProject(factory ProjectFactory, action ProjectAction) func(context *cli
 // ProjectPs lists the containers.
 func ProjectPs(p project.APIProject, c *cli.Context) error {
 	qFlag := c.Bool("q")
-	allInfo, err := p.Ps(context.Background(), qFlag, c.Args()...)
+	allInfo, err := p.Ps(context.Background(), c.Args()...)
 	if err != nil {
 		return cli.NewExitError(err.Error(), 1)
 	}
-	os.Stdout.WriteString(allInfo.String(!qFlag))
+	columns := []string{"Name", "Command", "State", "Ports"}
+	if qFlag {
+		columns = []string{"Id"}
+	}
+	os.Stdout.WriteString(allInfo.String(columns, !qFlag))
 	return nil
 }
 

docker/container/container.go

@@ -65,7 +65,7 @@ func NewInspected(client client.ContainerAPIClient, container *types.ContainerJS
 }
 
 // Info returns info about the container, like name, command, state or ports.
-func (c *Container) Info(ctx context.Context, qFlag bool) (project.Info, error) {
+func (c *Container) Info(ctx context.Context) (project.Info, error) {
 	infos, err := ListByFilter(ctx, c.client, map[string][]string{
 		"name": {c.container.Name},
 	})
@@ -75,14 +75,11 @@ func (c *Container) Info(ctx context.Context, qFlag bool) (project.Info, error)
 	info := infos[0]
 
 	result := project.Info{}
-	if qFlag {
-		result["Id"] = c.container.ID
-	} else {
-		result["Name"] = name(info.Names)
-		result["Command"] = info.Command
-		result["State"] = info.Status
-		result["Ports"] = portString(info.Ports)
-	}
+	result["Id"] = c.container.ID
+	result["Name"] = name(info.Names)
+	result["Command"] = info.Command
+	result["State"] = info.Status
+	result["Ports"] = portString(info.Ports)
 
 	return result, nil
 }

docker/service.go

@@ -290,15 +290,15 @@ func (s *Service) Run(ctx context.Context, commandParts []string, options option
 
 // Info implements Service.Info. It returns an project.InfoSet with the containers
 // related to this service (can be multiple if using the scale command).
-func (s *Service) Info(ctx context.Context, qFlag bool) (project.InfoSet, error) {
+func (s *Service) Info(ctx context.Context) (project.InfoSet, error) {
 	result := project.InfoSet{}
 	containers, err := s.collectContainers(ctx)
 	if err != nil {
 		return nil, err
 	}
 
 	for _, c := range containers {
-		info, err := c.Info(ctx, qFlag)
+		info, err := c.Info(ctx)
 		if err != nil {
 			return nil, err
 		}

project/empty.go

@@ -77,7 +77,7 @@ func (e *EmptyService) Scale(ctx context.Context, count int, timeout int) error
 }
 
 // Info implements Service.Info but does nothing.
-func (e *EmptyService) Info(ctx context.Context, qFlag bool) (InfoSet, error) {
+func (e *EmptyService) Info(ctx context.Context) (InfoSet, error) {
 	return InfoSet{}, nil
 }
 
@@ -133,7 +133,7 @@ func (e *EmptyNetworks) Initialize(ctx context.Context) error {
 	return nil
 }
 
-// Initialize implements Networks.Remove but does nothing.
+// Remove implements Networks.Remove but does nothing.
 func (e *EmptyNetworks) Remove(ctx context.Context) error {
 	return nil
 }

project/info.go

@@ -12,35 +12,35 @@ type InfoSet []Info
 // Info holds a list of InfoPart.
 type Info map[string]string
 
-func (infos InfoSet) String(titleFlag bool) string {
+func (infos InfoSet) String(columns []string, titleFlag bool) string {
 	//no error checking, none of this should fail
 	buffer := bytes.NewBuffer(make([]byte, 0, 1024))
 	tabwriter := tabwriter.NewWriter(buffer, 4, 4, 2, ' ', 0)
 
 	first := true
 	for _, info := range infos {
 		if first && titleFlag {
-			writeLine(tabwriter, true, info)
+			writeLine(tabwriter, columns, true, info)
 		}
 		first = false
-		writeLine(tabwriter, false, info)
+		writeLine(tabwriter, columns, false, info)
 	}
 
 	tabwriter.Flush()
 	return buffer.String()
 }
 
-func writeLine(writer io.Writer, key bool, info Info) {
+func writeLine(writer io.Writer, columns []string, key bool, info Info) {
 	first := true
-	for k, v := range info {
+	for _, column := range columns {
 		if !first {
 			writer.Write([]byte{'\t'})
 		}
 		first = false
 		if key {
-			writer.Write([]byte(k))
+			writer.Write([]byte(column))
 		} else {
-			writer.Write([]byte(v))
+			writer.Write([]byte(info[column]))
 		}
 	}
 

project/interface.go

@@ -21,7 +21,7 @@ type APIProject interface {
 	Kill(ctx context.Context, signal string, services ...string) error
 	Log(ctx context.Context, follow bool, services ...string) error
 	Pause(ctx context.Context, services ...string) error
-	Ps(ctx context.Context, onlyID bool, services ...string) (InfoSet, error)
+	Ps(ctx context.Context, services ...string) (InfoSet, error)
 	// FIXME(vdemeester) we could use nat.Port instead ?
 	Port(ctx context.Context, index int, protocol, serviceName, privatePort string) (string, error)
 	Pull(ctx context.Context, services ...string) error

project/project.go

@@ -444,15 +444,15 @@ func (p *Project) Port(ctx context.Context, index int, protocol, serviceName, pr
 }
 
 // Ps list containers for the specified services.
-func (p *Project) Ps(ctx context.Context, onlyID bool, services ...string) (InfoSet, error) {
+func (p *Project) Ps(ctx context.Context, services ...string) (InfoSet, error) {
 	allInfo := InfoSet{}
 	for _, name := range p.ServiceConfigs.Keys() {
 		service, err := p.CreateService(name)
 		if err != nil {
 			return nil, err
 		}
 
-		info, err := service.Info(ctx, onlyID)
+		info, err := service.Info(ctx)
 		if err != nil {
 			return nil, err
 		}

project/service.go

@@ -16,7 +16,7 @@ type Service interface {
 	Create(ctx context.Context, options options.Create) error
 	Delete(ctx context.Context, options options.Delete) error
 	Events(ctx context.Context, messages chan events.ContainerEvent) error
-	Info(ctx context.Context, qFlag bool) (InfoSet, error)
+	Info(ctx context.Context) (InfoSet, error)
 	Log(ctx context.Context, follow bool) error
 	Kill(ctx context.Context, signal string) error
 	Pause(ctx context.Context) error