Default tree refactoring to use file manager of package stream

cmd/main.go

@@ -125,7 +125,7 @@ func buildCommands() *cobra.Command {
 	ctxFindRemover := rcontext.NewFindRemover(ritchieHomeDir, ctxFinder, ctxRemover)
 	credSetter := credential.NewSetter(ritchieHomeDir, ctxFinder)
 	credFinder := credential.NewFinder(ritchieHomeDir, ctxFinder, fileManager)
-	treeManager := tree.NewTreeManager(ritchieHomeDir, repoLister, api.CoreCmds)
+	treeManager := tree.NewTreeManager(ritchieHomeDir, repoLister, api.CoreCmds, fileManager)
 	credSettings := credential.NewSettings(fileManager, dirManager, userHomeDir)
 	autocompleteGen := autocomplete.NewGenerator(treeManager)
 	credResolver := envcredential.NewResolver(credFinder, credSetter, inputPassword)

pkg/autocomplete/generator_test.go

@@ -32,6 +32,16 @@ func (repoListerMock) List() (formula.Repos, error) {
 	return formula.Repos{}, nil
 }
 
+type FileReadExisterMock struct{}
+
+func (m FileReadExisterMock) Read(path string) ([]byte, error) {
+	return []byte("some data"), nil
+}
+
+func (m FileReadExisterMock) Exists(path string) bool {
+	return false
+}
+
 func TestGenerate(t *testing.T) {
 	type in struct {
 		shell ShellName
@@ -41,7 +51,7 @@ func TestGenerate(t *testing.T) {
 		err error
 	}
 
-	treeMan := tree.NewTreeManager("../../testdata", repoListerMock{}, api.Commands{})
+	treeMan := tree.NewTreeManager("../../testdata", repoListerMock{}, api.Commands{}, FileReadExisterMock{})
 	autocomplete := NewGenerator(treeMan)
 
 	tests := []struct {

pkg/formula/creator/creator_test.go

@@ -52,7 +52,7 @@ func TestCreator(t *testing.T) {
 	_ = dirManager.Remove(resultDir)
 	_ = dirManager.Create(resultDir)
 
-	treeMan := tree.NewTreeManager("../../testdata", repoListerMock{}, api.CoreCmds)
+	treeMan := tree.NewTreeManager("../../testdata", repoListerMock{}, api.CoreCmds, FileReadExisterMock{})
 
 	tplM := template.NewManager("../../../testdata", dirManager)
 
@@ -198,3 +198,13 @@ type repoListerMock struct{}
 func (repoListerMock) List() (formula.Repos, error) {
 	return formula.Repos{}, nil
 }
+
+type FileReadExisterMock struct{}
+
+func (m FileReadExisterMock) Read(path string) ([]byte, error) {
+	return []byte("some data"), nil
+}
+
+func (m FileReadExisterMock) Exists(path string) bool {
+	return false
+}

pkg/formula/tree/default_tree.go

@@ -19,11 +19,10 @@ package tree
 import (
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
 
 	"github.com/ZupIT/ritchie-cli/pkg/api"
-	"github.com/ZupIT/ritchie-cli/pkg/file/fileutil"
 	"github.com/ZupIT/ritchie-cli/pkg/formula"
+	"github.com/ZupIT/ritchie-cli/pkg/stream"
 )
 
 const (
@@ -37,10 +36,11 @@ type Manager struct {
 	ritchieHome string
 	repoLister  formula.RepositoryLister
 	coreCmds    []api.Command
+	file        stream.FileReadExister
 }
 
-func NewTreeManager(ritchieHome string, rl formula.RepositoryLister, coreCmds []api.Command) Manager {
-	return Manager{ritchieHome: ritchieHome, repoLister: rl, coreCmds: coreCmds}
+func NewTreeManager(ritchieHome string, rl formula.RepositoryLister, coreCmds []api.Command, file stream.FileReadExister) Manager {
+	return Manager{ritchieHome: ritchieHome, repoLister: rl, coreCmds: coreCmds, file: file}
 }
 
 func (d Manager) Tree() (map[string]formula.Tree, error) {
@@ -116,21 +116,22 @@ func (d Manager) MergedTree(core bool) formula.Tree {
 
 func (d Manager) localTree() (formula.Tree, error) {
 	treeCmdFile := fmt.Sprintf(treeLocalCmdPattern, d.ritchieHome)
-	return loadTree(treeCmdFile)
+	return d.loadTree(treeCmdFile)
 }
 
 func (d Manager) treeByRepo(repoName formula.RepoName) (formula.Tree, error) {
 	treeCmdFile := fmt.Sprintf(treeRepoCmdPattern, d.ritchieHome, repoName)
-	return loadTree(treeCmdFile)
+	return d.loadTree(treeCmdFile)
 }
 
-func loadTree(treeCmdFile string) (formula.Tree, error) {
+func (d Manager) loadTree(treeCmdFile string) (formula.Tree, error) {
 	tree := formula.Tree{}
-	if !fileutil.Exists(treeCmdFile) {
+
+	if !d.file.Exists(treeCmdFile) {
 		return tree, nil
 	}
 
-	treeFile, err := ioutil.ReadFile(treeCmdFile)
+	treeFile, err := d.file.Read(treeCmdFile)
 	if err != nil {
 		return tree, err
 	}