Merge pull request #190 from smacker/fix_workdirs_cmd

Fix workdirs sub-command without active workdir

cmd/sourced/cmd/workdirs.go

@@ -2,6 +2,7 @@ package cmd
 
 import (
 	"fmt"
+	"os"
 
 	"github.com/src-d/sourced-ce/cmd/sourced/compose/workdir"
 )
@@ -21,13 +22,17 @@ func (c *workdirsCmd) Execute(args []string) error {
 		return err
 	}
 
+	// active directory not necessary exists
+	var activePath = ""
 	active, err := workdirHandler.Active()
-	if err != nil {
+	if err == nil {
+		activePath = active.Path
+	} else if !isNotExist(err) {
 		return err
 	}
 
 	for _, wd := range wds {
-		if wd.Path == active.Path {
+		if wd.Path == activePath {
 			fmt.Printf("* %s\n", wd.Name)
 		} else {
 			fmt.Printf("  %s\n", wd.Name)
@@ -40,3 +45,19 @@ func (c *workdirsCmd) Execute(args []string) error {
 func init() {
 	rootCmd.AddCommand(&workdirsCmd{})
 }
+
+func isNotExist(err error) bool {
+	if os.IsNotExist(err) {
+		return true
+	}
+
+	if cause, ok := err.(causer); ok {
+		return isNotExist(cause.Cause())
+	}
+
+	return false
+}
+
+type causer interface {
+	Cause() error
+}

cmd/sourced/compose/workdir/handler.go

@@ -78,7 +78,7 @@ func (h *Handler) Active() (*Workdir, error) {
 
 	resolvedPath, err := filepath.EvalSymlinks(path)
 	if os.IsNotExist(err) {
-		return nil, ErrMalformed.New("active", err)
+		return nil, ErrMalformed.Wrap(err, "active")
 	}
 
 	return h.builder.build(resolvedPath)
@@ -105,7 +105,7 @@ func (h *Handler) List() ([]*Workdir, error) {
 	})
 
 	if os.IsNotExist(err) {
-		return nil, ErrMalformed.New(h.workdirsPath, err)
+		return nil, ErrMalformed.Wrap(err, h.workdirsPath)
 	}
 
 	if err != nil {
@@ -131,16 +131,16 @@ func (h *Handler) List() ([]*Workdir, error) {
 func (h *Handler) Validate(w *Workdir) error {
 	pointedDir, err := filepath.EvalSymlinks(w.Path)
 	if err != nil {
-		return ErrMalformed.New(w.Path, "is not a directory")
+		return ErrMalformed.Wrap(fmt.Errorf("is not a directory"), w.Path)
 	}
 
 	if info, err := os.Lstat(pointedDir); err != nil || !info.IsDir() {
-		return ErrMalformed.New(pointedDir, "is not a directory")
+		return ErrMalformed.Wrap(fmt.Errorf("is not a directory"), pointedDir)
 	}
 
 	for _, f := range RequiredFiles {
 		if !hasContent(pointedDir, f) {
-			return ErrMalformed.New(pointedDir, fmt.Sprintf("%s not found", f))
+			return ErrMalformed.Wrap(fmt.Errorf("%s not found", f), pointedDir)
 		}
 	}
 

cmd/sourced/compose/workdir/workdir.go

@@ -24,7 +24,7 @@ var (
 	OptionalFiles = []string{"docker-compose.override.yml"}
 
 	// ErrMalformed is the returned error when the workdir is wrong
-	ErrMalformed = goerrors.NewKind("workdir %s is not valid: %s")
+	ErrMalformed = goerrors.NewKind("workdir %s is not valid")
 )
 
 // Type defines the type of the workdir