Revert "Revert "Add check to see if dep ensure created the vendor d…

…irectory""

This reverts commit 2d90201.

cmd/ensure.go

@@ -13,6 +13,7 @@ import (
 	"syscall"
 
 	"github.com/BurntSushi/toml"
+	"github.com/GetStream/vg/internal/utils"
 	"github.com/GetStream/vg/internal/workspace"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
@@ -110,6 +111,17 @@ This command requires that dep is installed in $PATH. `,
 			return errors.WithStack(err)
 		}
 
+		exists, err := utils.VendorExists()
+		if err != nil {
+			return err
+		}
+
+		if !exists {
+			fmt.Fprintln(os.Stderr, "ERROR: The vendor directory was not created by the dep ensure command.")
+			fmt.Fprintln(os.Stderr, "ERROR: This means the workspace content won't be changed")
+			os.Exit(1)
+		}
+
 		err = ws.ClearSrc()
 		if err != nil {
 			return errors.Wrap(err, "Couldn't clear the src path of the active workspace")

cmd/initSettings.go

@@ -49,14 +49,8 @@ var initSettingsCmd = &cobra.Command{
 			return errors.WithStack(err)
 		}
 
-		// Check if it's a new workspace. Only continue if this is the case or
-		// if force is set.
-		_, err = os.Stat(ws.Path())
-		if err != nil {
-			if !os.IsNotExist(err) {
-				return errors.WithStack(err)
-			}
-		} else if !force {
+		exists, err := utils.DirExists(ws.Path())
+		if !exists && !force {
 			return nil
 		}
 

cmd/moveVendor.go

@@ -6,6 +6,7 @@ package cmd
 import (
 	"os"
 
+	"github.com/GetStream/vg/internal/utils"
 	"github.com/GetStream/vg/internal/workspace"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
@@ -27,9 +28,13 @@ based project in your workspace do this:
 		if err != nil {
 			return err
 		}
-		_, err = os.Stat("vendor")
+
+		exist, err := utils.VendorExists()
 		if err != nil {
-			return errors.Wrap(err, "Something is wrong with the vendor directory")
+			return err
+		}
+		if !exist {
+			return errors.New("No vendor directory is present")
 		}
 
 		err = ws.ClearSrc()

internal/utils/utils.go

@@ -8,6 +8,8 @@ import (
 	"path/filepath"
 	"runtime"
 	"strings"
+
+	"github.com/pkg/errors"
 )
 
 func ReplaceHomeDir(path string) string {
@@ -52,6 +54,25 @@ func OriginalGopath() string {
 	return gopath
 }
 
+// exists returns whether the given file or directory exists or not
+func DirExists(path string) (bool, error) {
+	info, err := os.Stat(path)
+	if err == nil {
+		if info.IsDir() {
+			return false, errors.Errorf("%q is not a directory", path)
+		}
+		return true, nil
+	}
+	if os.IsNotExist(err) {
+		return false, nil
+	}
+	return false, errors.Wrapf(err, "error occured when checking if directory %q exists", path)
+}
+
+func VendorExists() (bool, error) {
+	return DirExists("vendor")
+}
+
 func CurrentGopath() string {
 	gopath := os.Getenv("GOPATH")
 	if gopath == "" {