Merge remote-tracking branch 'gojek/master'

cmd/list/lister.go

@@ -7,6 +7,7 @@ import (
 	"github.com/gojektech/proctor/daemon"
 	"github.com/gojektech/proctor/io"
 	"github.com/spf13/cobra"
+	"github.com/gojektech/proctor/utility/sort"
 )
 
 func NewCmd(printer io.Printer, proctorDClient daemon.Client) *cobra.Command {
@@ -21,8 +22,8 @@ func NewCmd(printer io.Printer, proctorDClient daemon.Client) *cobra.Command {
 				printer.Println(err.Error(), color.FgRed)
 				return
 			}
-
 			printer.Println("List of Procs:\n", color.FgGreen)
+			sort.Procs(procList)
 
 			for _, proc := range procList {
 				printer.Println(fmt.Sprintf("%-40s %-100s", proc.Name, proc.Description), color.Reset)

cmd/list/lister_test.go

@@ -54,7 +54,6 @@ func (s *ListCmdTestSuite) TestListCmdRun() {
 	s.mockPrinter.On("Println", fmt.Sprintf("%-40s %-100s", procOne.Name, procOne.Description), color.Reset).Once()
 	s.mockPrinter.On("Println", fmt.Sprintf("%-40s %-100s", procTwo.Name, procTwo.Description), color.Reset).Once()
 	s.mockPrinter.On("Println", "\nFor detailed information of any proc, run:\nproctor describe <proc_name>", color.FgGreen).Once()
-
 	s.testListCmd.Run(&cobra.Command{}, []string{})
 
 	s.mockProctorDClient.AssertExpectations(s.T())

utility/sort/sort.go

@@ -0,0 +1,12 @@
+package sort
+
+import (
+	"github.com/gojektech/proctor/proctord/jobs/metadata"
+	"sort"
+)
+
+func Procs(procList []metadata.Metadata) {
+	sort.Slice(procList, func(i, j int) bool {
+		return procList[i].Name < procList[j].Name
+	})
+}

utility/sort/sort_test.go

@@ -0,0 +1,19 @@
+package sort
+
+import (
+	"github.com/gojektech/proctor/proctord/jobs/metadata"
+	"github.com/stretchr/testify/assert"
+	"testing"
+)
+
+func TestSorting(t *testing.T) {
+	procOne := metadata.Metadata{Name: "one"}
+	procTwo := metadata.Metadata{Name: "two"}
+	procThree := metadata.Metadata{Name: "three"}
+	procList := []metadata.Metadata{procThree, procTwo, procOne}
+	expectedProcList := []metadata.Metadata{procOne, procThree, procTwo}
+
+	Procs(procList)
+
+	assert.Equal(t, expectedProcList, procList)
+}