Merge pull request #214 from cmbahadir/singlePullRequest

Added Index numbers for compose files to be used in "compose list/set"

Author: smacker

.gitignore

@@ -1,2 +1,2 @@
 .ci/
-build/
+build/

cmd/sourced/cmd/compose.go

@@ -2,6 +2,7 @@ package cmd
 
 import (
 	"fmt"
+	"strconv"
 
 	composefile "github.com/src-d/sourced-ce/cmd/sourced/compose/file"
 
@@ -51,7 +52,8 @@ func (c *composeListCmd) Execute(args []string) error {
 		return err
 	}
 
-	for _, file := range files {
+	for index, file := range files {
+		fmt.Printf("[%d]", index)
 		if file == active {
 			fmt.Printf("* %s\n", file)
 		} else {
@@ -66,16 +68,34 @@ type composeSetDefaultCmd struct {
 	Command `name:"set" short-description:"Set the active docker compose file" long-description:"Set the active docker compose file"`
 
 	Args struct {
-		Version string `positional-arg-name:"version" description:"Either a revision (tag, full sha1) or a URL to a docker-compose.yml file"`
+		File string `positional-arg-name:"index/name" description:"Provide name or index of compose file on 'sourced compose list'"`
 	} `positional-args:"yes" required:"yes"`
 }
 
 func (c *composeSetDefaultCmd) Execute(args []string) error {
-	err := composefile.SetActive(c.Args.Version)
+	files, err := composefile.List()
+
 	if err != nil {
 		return err
 	}
 
+	index, err := strconv.Atoi(c.Args.File)
+
+	if err == nil {
+		if index >= 0 && index < len(files) {
+			active := files[index]
+			err = composefile.SetActive(active)
+		} else {
+			return fmt.Errorf("File not found with provided index check the output of 'sourced compose list'")
+		}
+
+	} else if err != nil {
+		err := composefile.SetActive(c.Args.File)
+		if err != nil {
+			return err
+		}
+	}
+
 	fmt.Println("Active docker compose file was changed successfully.")
 	fmt.Println("To update your current installation use `sourced restart`")
 	return nil

test/common.go

@@ -54,7 +54,8 @@ func (s *IntegrationSuite) SetupTest() {
 	p, _ := filepath.Abs(filepath.FromSlash("../docker-compose.yml"))
 	os.Symlink(p, filepath.Join(s.sourcedDir, "compose-files", "local", "docker-compose.yml"))
 
-	r := s.RunCommand("compose", "set", "local")
+	//"0" refers to local
+	r := s.RunCommand("compose", "set", "0")
 	s.Require().NoError(r.Error, r.Combined())
 }
 

test/init_local_test.go

@@ -7,8 +7,10 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
+	"strings"
 	"testing"
 
+	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 )
@@ -41,6 +43,60 @@ func (s *InitLocalTestSuite) TestWithInvalidWorkdir() {
 	)
 }
 
+func (s *InitLocalTestSuite) TestListComposeFiles() {
+	list := "list"
+	s.T().Run(list, func(t *testing.T) {
+		assert := assert.New(t)
+
+		r := s.RunCommand("compose", list)
+		stdOut := r.Stdout()
+		check := strings.Contains(stdOut, "[0]  local")
+		assert.True(check)
+	})
+}
+
+func (s *InitLocalTestSuite) TestSetComposeFile() {
+	set := "set"
+	s.T().Run(set, func(t *testing.T) {
+		assert := assert.New(t)
+
+		r := s.RunCommand("compose", set, "0")
+		stdOut := r.Stdout()
+		check := strings.Contains(stdOut, "Active docker compose file was changed successfully")
+		assert.True(check)
+	})
+}
+
+func (s *InitLocalTestSuite) TestSetComposeFilIndexOutOfRange() {
+	set := "set"
+	s.T().Run(set, func(t *testing.T) {
+		assert := assert.New(t)
+
+		r := s.RunCommand("compose", set, "5")
+		stdErr := r.Stderr()
+		check := strings.Contains(stdErr, "File not found with provided index check the output of 'sourced compose list'")
+		assert.True(check)
+	})
+}
+
+func (s *InitLocalTestSuite) TestSetComposeNotFound() {
+	require := s.Require()
+	r := s.RunCommand("compose", "set", "NotFound")
+	require.Error(r.Error)
+}
+
+func (s *InitLocalTestSuite) TestSetComposeFilesWithStringIndex() {
+	set := "set"
+	s.T().Run(set, func(t *testing.T) {
+		assert := assert.New(t)
+
+		r := s.RunCommand("compose", set, "local")
+		stdOut := r.Stdout()
+		check := strings.Contains(stdOut, "Active docker compose file was changed successfully")
+		assert.True(check)
+	})
+}
+
 func (s *InitLocalTestSuite) TestChangeWorkdir() {
 	req := s.Require()