Collapse command should print the tree in YAML

cmd/collapse.go

@@ -3,6 +3,7 @@ package cmd
 import (
 	"github.com/circleci/circleci-cli/filetree"
 	"github.com/spf13/cobra"
+	yaml "gopkg.in/yaml.v2"
 )
 
 var collapseCommand = &cobra.Command{
@@ -21,8 +22,12 @@ func init() {
 func collapse(cmd *cobra.Command, args []string) {
 	tree, err := filetree.NewTree(root)
 	if err != nil {
-		Logger.FatalOnError("An error occurred", err)
+		Logger.FatalOnError("An error occurred trying to build the tree", err)
 	}
 
-	Logger.Prettyify(tree)
+	y, err := yaml.Marshal(&tree)
+	if err != nil {
+		Logger.FatalOnError("Failed trying to marshal the tree to YAML ", err)
+	}
+	Logger.Infof("%s\n", string(y))
 }

filetree/filetree.go

@@ -1,10 +1,10 @@
 package filetree
 
 import (
-	"fmt"
 	"io/ioutil"
 	"os"
 	"path/filepath"
+	"regexp"
 
 	"github.com/mitchellh/mapstructure"
 	yaml "gopkg.in/yaml.v2"
@@ -107,11 +107,19 @@ func NewTree(root string) (*Node, error) {
 			return err
 		}
 
+		// Skip any dotfiles automatically
+		re := regexp.MustCompile(`^\..+`)
+		if re.MatchString(info.Name()) {
+			// Turn off logging to stdout in this package
+			// fmt.Printf("Skipping: %+v\n", info.Name())
+			return filepath.SkipDir
+		}
+
 		// check if file is in exclude slice and skip it
 		// need to pass this in as an array
 		exclude := []string{"path/to/skip"}
 		if excluded(exclude, path) {
-			fmt.Printf("skipping: %+v \n", info.Name())
+			//fmt.Printf("skipping: %+v \n", info.Name())
 			return filepath.SkipDir
 		}
 

filetree/filetree_test.go

@@ -90,6 +90,35 @@ sub_dir:
     foo:
       bar:
         baz
+`))
+		})
+	})
+
+	Describe("MarshalYAML", func() {
+		var subDir, subDirFile, emptyDir string
+
+		BeforeEach(func() {
+			subDir = filepath.Join(tempRoot, "sub_dir")
+			subDirFile = filepath.Join(tempRoot, "sub_dir", "sub_dir_file.yml")
+			emptyDir = filepath.Join(tempRoot, "empty_dir")
+
+			Expect(os.Mkdir(subDir, 0700)).To(Succeed())
+			Expect(ioutil.WriteFile(subDirFile, []byte("foo:\n  bar:\n    baz"), 0600)).To(Succeed())
+			Expect(os.Mkdir(emptyDir, 0700)).To(Succeed())
+
+		})
+		It("renders to YAML", func() {
+			tree, err := filetree.NewTree(tempRoot)
+			Expect(err).ToNot(HaveOccurred())
+
+			out, err := yaml.Marshal(tree)
+			Expect(err).ToNot(HaveOccurred())
+			Expect(out).To(MatchYAML(`empty_dir: null
+sub_dir:
+  sub_dir_file.yml:
+    foo:
+      bar:
+        baz
 `))
 		})
 	})