Merge pull request #7 from jianxiaoguo/master

feat(ps):add ps:stop/start command

Author: duanhongyi

api/ps.go

@@ -10,11 +10,12 @@ type ProcessType map[string]string
 
 // Pods defines the structure of a process.
 type Pods struct {
-	Release string    `json:"release"`
-	Type    string    `json:"type"`
-	Name    string    `json:"name"`
-	State   string    `json:"state"`
-	Started time.Time `json:"started"`
+	Release  string    `json:"release,omitempty"`
+	Type     string    `json:"type,omitempty"`
+	Name     string    `json:"name,omitempty"`
+	State    string    `json:"state,omitempty"`
+	Started  time.Time `json:"started,omitempty"`
+	Replicas int       `json:"replicas,omitempty"`
 }
 
 // PodsList defines a collection of app pods.
@@ -28,11 +29,18 @@ func (p PodsList) Less(i, j int) bool { return p[i].Name < p[j].Name }
 type PodType struct {
 	Type     string
 	PodsList PodsList
+	Replicas int
+	Status   string
 }
 
 // PodTypes holds groups of pods organized by type.
 type PodTypes []PodType
 
+// Start is the definition of POST /v2/apps/<app_id>/stop or POST /v2/apps/<app_id>/start.
+type Types struct {
+	Types []string `json:"types,omitempty"`
+}
+
 func (p PodTypes) Len() int           { return len(p) }
 func (p PodTypes) Swap(i, j int)      { p[i], p[j] = p[j], p[i] }
 func (p PodTypes) Less(i, j int) bool { return p[i].Type < p[j].Type }

api/ps_test.go

@@ -9,10 +9,10 @@ import (
 
 func TestPodsListSorted(t *testing.T) {
 	pods := PodsList{
-		{"", "web", "web.fsdfgh4", "up", time.Time{}},
-		{"", "web", "web.asdfgh1", "up", time.Time{}},
-		{"", "web", "web.csdfgh3", "up", time.Time{}},
-		{"", "web", "web.bsdfgh2", "up", time.Time{}},
+		{"", "web", "web.fsdfgh4", "up", time.Time{}, 4},
+		{"", "web", "web.asdfgh1", "up", time.Time{}, 4},
+		{"", "web", "web.csdfgh3", "up", time.Time{}, 4},
+		{"", "web", "web.bsdfgh2", "up", time.Time{}, 4},
 	}
 
 	sort.Sort(pods)
@@ -28,9 +28,9 @@ func TestPodsListSorted(t *testing.T) {
 
 func TestPodTypesSorted(t *testing.T) {
 	podTypes := PodTypes{
-		{"worker", PodsList{}},
-		{"web", PodsList{}},
-		{"clock", PodsList{}},
+		{"worker", PodsList{}, 4, "started"},
+		{"web", PodsList{}, 4, "started"},
+		{"clock", PodsList{}, 4, "started"},
 	}
 
 	sort.Sort(podTypes)

ps/ps.go

@@ -44,6 +44,40 @@ func Scale(c *drycc.Client, appID string, targets map[string]int) error {
 	return err
 }
 
+// Stop decreases an app's processes to 0. The processes are specified in the target argument
+func Stop(c *drycc.Client, appID string, targets map[string][]string) error {
+	u := fmt.Sprintf("/v2/apps/%s/stop/", appID)
+
+	body, err := json.Marshal(targets)
+
+	if err != nil {
+		return err
+	}
+
+	res, err := c.Request("POST", u, body)
+	if err == nil {
+		return res.Body.Close()
+	}
+	return err
+}
+
+// Start increases an app's processes to setting. The processes are specified in the target argument
+func Start(c *drycc.Client, appID string, targets map[string][]string) error {
+	u := fmt.Sprintf("/v2/apps/%s/start/", appID)
+
+	body, err := json.Marshal(targets)
+
+	if err != nil {
+		return err
+	}
+
+	res, err := c.Request("POST", u, body)
+	if err == nil {
+		return res.Body.Close()
+	}
+	return err
+}
+
 // Restart restarts an app's processes. To restart all app processes, pass empty strings for
 // procType and name. To restart an specific process, pass an procType by leave name empty.
 // To restart a specific instance, pass a procType and a name.
@@ -84,16 +118,26 @@ func ByType(processes api.PodsList) api.PodTypes {
 		for i, pt := range pts {
 			if pt.Type == process.Type {
 				exists = true
-				pts[i].PodsList = append(pts[i].PodsList, process)
+				if process.Name != "" {
+					pts[i].PodsList = append(pts[i].PodsList, process)
+				}
 				break
 			}
 		}
 
 		// Is processtype for process doesn't exist, create a new one
 		if !exists {
+			p := api.PodsList{}
+			status := "stopped"
+			if process.Name != "" {
+				p = api.PodsList{process}
+				status = "started"
+			}
 			pts = append(pts, api.PodType{
 				Type:     process.Type,
-				PodsList: api.PodsList{process},
+				PodsList: p,
+				Replicas: process.Replicas,
+				Status:   status,
 			})
 		}
 	}