feat(scale): rename command ps to scale without arg

CHANGELOG.md

@@ -22,6 +22,7 @@
 * Show the addon status on `scalingo addons` [#604](https://github.com/Scalingo/cli/pull/604)
 * Add informative error in case of container type error when scaling an application
   [602](https://github.com/Scalingo/cli/pull/602)
+* `ps` command is renamed `scale` [#631](https://github.com/Scalingo/cli/pull/631)
 
 ### 1.19.3
 

apps/containers.go

@@ -0,0 +1,58 @@
+package apps
+
+import (
+	"fmt"
+	"os"
+
+	"github.com/Scalingo/cli/config"
+	"github.com/olekukonko/tablewriter"
+	"gopkg.in/errgo.v1"
+)
+
+func ContainerTypes(app string) error {
+	c, err := config.ScalingoClient()
+	if err != nil {
+		return errgo.Notef(err, "fail to get Scalingo client to list container types")
+	}
+
+	containerTypes, err := c.AppsPs(app)
+	if err != nil {
+		return errgo.Notef(err, "fail to list the application container types")
+	}
+
+	t := tablewriter.NewWriter(os.Stdout)
+	t.SetHeader([]string{"Name", "Amount", "Size", "Command"})
+
+	hasAutoscaler := false
+	autoscalers, err := c.AutoscalersList(app)
+	if err != nil {
+		return errgo.Notef(err, "fail to list the autoscalers")
+	}
+
+	for _, containerType := range containerTypes {
+		name := containerType.Name
+
+		for _, a := range autoscalers {
+			if a.ContainerType == containerType.Name {
+				hasAutoscaler = true
+				name += " (*)"
+				break
+			}
+		}
+
+		amount := fmt.Sprintf("%d", containerType.Amount)
+		if containerType.Command != "" {
+			t.Append([]string{name, amount, containerType.Size, "`" + containerType.Command + "`"})
+		} else {
+			t.Append([]string{name, amount, containerType.Size, "-"})
+		}
+	}
+
+	t.Render()
+
+	if hasAutoscaler {
+		fmt.Println("  (*) has an autoscaler defined")
+	}
+
+	return nil
+}

apps/scale.go

@@ -23,10 +23,10 @@ type ScaleRes struct {
 
 func Scale(app string, sync bool, types []string) error {
 	var (
-		size        string
-		containers  []scalingo.ContainerType
-		modificator byte
-		err         error
+		size           string
+		containerTypes []scalingo.ContainerType
+		modificator    byte
+		err            error
 	)
 
 	c, err := config.ScalingoClient()
@@ -37,7 +37,7 @@ func Scale(app string, sync bool, types []string) error {
 	typesWithAutoscaler := []string{}
 	autoscalers, err := c.AutoscalersList(app)
 	if err != nil {
-		return errgo.NoteMask(err, "fail to list the autoscalers")
+		return errgo.Notef(err, "fail to list the autoscalers")
 	}
 
 	for _, t := range types {
@@ -56,12 +56,12 @@ func Scale(app string, sync bool, types []string) error {
 			if size != "" {
 				return errgo.Newf("%s is invalid, can't use relative modificator with size, change the size first", t)
 			}
-			if containers == nil {
-				containers, err = c.AppsPs(app)
+			if containerTypes == nil {
+				containerTypes, err = c.AppsPs(app)
 				if err != nil {
 					return errgo.Notef(err, "fail to get list of running containers")
 				}
-				debug.Println("get container list", containers)
+				debug.Println("get container list", containerTypes)
 			}
 		}
 
@@ -79,7 +79,7 @@ func Scale(app string, sync bool, types []string) error {
 
 		newContainerConfig := scalingo.ContainerType{Name: typeName, Size: size}
 		if modificator != 0 {
-			for _, container := range containers {
+			for _, container := range containerTypes {
 				if container.Name == typeName {
 					if modificator == '-' {
 						newContainerConfig.Amount = container.Amount - int(amount)
@@ -119,7 +119,7 @@ func Scale(app string, sync bool, types []string) error {
 				return formatContainerTypesError(c, app, reqestFailedError)
 			}
 
-			return errgo.Mask(err)
+			return errgo.Notef(err, "fail to scale the Scalingo application")
 		}
 		// If error is Payment Required and user tries to exceed its free trial
 		return utils.AskAndStopFreeTrial(c, func() error {
@@ -131,7 +131,7 @@ func Scale(app string, sync bool, types []string) error {
 	var scaleRes ScaleRes
 	err = json.NewDecoder(res.Body).Decode(&scaleRes)
 	if err != nil {
-		return errgo.Mask(err)
+		return errgo.Notef(err, "fail to decode API response to scale operation")
 	}
 
 	fmt.Printf("Your application is being scaled to:\n")
@@ -145,7 +145,7 @@ func Scale(app string, sync bool, types []string) error {
 
 	err = handleOperation(app, res)
 	if err != nil {
-		return errgo.Mask(err)
+		return errgo.Notef(err, "fail to handle the scale operation")
 	}
 
 	fmt.Println("Your application has been scaled.")

cmd/commands.go

@@ -105,7 +105,6 @@ var (
 		RunCommand,
 
 		// Apps Process Actions
-		psCommand,
 		scaleCommand,
 		RestartCommand,
 

cmd/scale.go

@@ -16,24 +16,24 @@ var (
 			cli.BoolFlag{Name: "synchronous, s", Usage: "Do the scaling synchronously", EnvVar: ""},
 		},
 		Usage: "Scale your application instantly",
-		Description: `Scale your application processes.
+		Description: `Scale your application processes. Without argument, this command lists the container types declared in your application.
    Example
      'scalingo --app my-app scale web:2 worker:1'
      'scalingo --app my-app scale web:1 worker:0'
      'scalingo --app my-app scale web:1:XL'
      'scalingo --app my-app scale web:+1 worker:-1'
      `,
 		Action: func(c *cli.Context) {
+			currentApp := appdetect.CurrentApp(c)
+
 			if len(c.Args()) == 0 {
-				err := cli.ShowCommandHelp(c, "scale")
+				err := apps.ContainerTypes(currentApp)
 				if err != nil {
 					errorQuit(err)
 				}
 				return
 			}
 
-			currentApp := appdetect.CurrentApp(c)
-
 			err := apps.Scale(currentApp, c.Bool("s"), c.Args())
 			if err != nil {
 				errorQuit(err)