add sourcing string to zshrc file

Author: bcaldwell

.circleci/config.yml

@@ -21,7 +21,7 @@ jobs:
 
       - setup_remote_docker
       - run: sudo apt install ruby
-      - run: sudo gem install ci-scripts
+      - run: sudo gem install ci-scripts bundler
 
       - run: ci-scripts go/test
       - run: bash <(curl -s https://codecov.io/bash)

cmd/devctl.go

@@ -85,7 +85,7 @@ func initConfig() {
 	devctlHomeFolder = path.Join(userHomeDir(), ".devctl")
 	_, folderExists := os.Stat(devctlHomeFolder)
 	if os.IsNotExist(folderExists) {
-		err := os.MkdirAll(devctlHomeFolder, os.ModePerm)
+		err := os.MkdirAll(devctlHomeFolder, 0644)
 		utilities.Check(err, "Creating folder "+devctlHomeFolder)
 	}
 

cmd/generate.go

@@ -48,10 +48,10 @@ var gitignoreCmd = &cobra.Command{
 		// get list of gitignore
 		printer.Info("Fetching gitignore list from github")
 		resp, err := http.Get("http://api.github.com/gitignore/templates")
-		defer resp.Body.Close()
 		if utilities.HandleError(err) {
 			return
 		}
+		defer resp.Body.Close()
 		availableTemplates := new([]string)
 		err = json.NewDecoder(resp.Body).Decode(availableTemplates)
 		if utilities.HandleError(err) {
@@ -82,10 +82,10 @@ var gitignoreCmd = &cobra.Command{
 			printer.Info("Fetching template for " + templateLanguage)
 
 			resp, err := http.Get("http://api.github.com/gitignore/templates/" + templateLanguage)
-			defer resp.Body.Close()
 			if utilities.HandleError(err) {
 				return
 			}
+			defer resp.Body.Close()
 
 			gitignore := new(Gitignore)
 			err = json.NewDecoder(resp.Body).Decode(gitignore)
@@ -106,11 +106,14 @@ var gitignoreCmd = &cobra.Command{
 
 			var fileData []byte
 			fileData, err = ioutil.ReadFile(fileName)
-			if utilities.HandleError(err) {
+			if utilities.HandleError(err, "Reading "+fileName) {
 				return
 			}
 			writeString := utilities.UniqueStringMerge(string(fileData), *(gitignore.Source))
 			err = ioutil.WriteFile(fileName, []byte(writeString), 0644)
+			if utilities.HandleError(err, "Appending source string to "+fileName) {
+				return
+			}
 		}
 	},
 }

cmd/setup.go

@@ -1,10 +1,13 @@
 package cmd
 
 import (
+	"fmt"
+	"io/ioutil"
 	"os"
 	"path"
 
 	"github.com/bcaldwell/devctl/postCommand"
+	printer "github.com/bcaldwell/go-printer"
 
 	"github.com/bcaldwell/devctl/plugins"
 	"github.com/bcaldwell/devctl/utilities"
@@ -31,6 +34,8 @@ func init() {
 }
 
 func setup(cmd *cobra.Command, args []string) {
+	printer.InfoLineTop()
+	// create devctl.sh file in devctl home folder (HOME/.devctl)
 	data, err := Asset("devctl.sh")
 	utilities.Check(err, "Fetching devctl.sh file contents")
 
@@ -42,11 +47,28 @@ func setup(cmd *cobra.Command, args []string) {
 	_, err = f.Write(data)
 	utilities.Check(err, "Writing contents to "+fileName)
 
-	// TODO: source file
+	profileFile := detectProfile()
+	profileFile = path.Join(os.Getenv("HOME"), profileFile)
+
+	devctlSourceString := fmt.Sprintf("[ -f %s ] && \\. %s # This loads devctl shell super powers", fileName, fileName)
+
+	fileData, err := ioutil.ReadFile(profileFile)
+	if utilities.HandleError(err) {
+		return
+	}
+	writeString := utilities.UniqueStringMerge(string(fileData), devctlSourceString)
+	err = ioutil.WriteFile(profileFile, []byte(writeString), 0644)
 
 	postCommand.RunCommand("source " + fileName)
 
+	printer.InfoBar(printer.ColoredString("{{green:%s}} Setup shell functions"), printer.SuccessIcon)
+
 	for _, i := range plugins.List {
 		i.Setup()
 	}
+	printer.InfoLineBottom()
+}
+
+func detectProfile() string {
+	return ".zshrc"
 }

plugins/node.go

@@ -25,15 +25,15 @@ func (n Node) String() string {
 func (n Node) Setup() {
 	isNvmInstalled := nvmInstalled()
 	if isNvmInstalled {
-		printer.Success("nvm already installed")
+		printer.InfoBar(printer.ColoredString("{{blue:%s}} nvm already installed"), printer.SuccessIcon)
 		return
 	}
 	resp, err := http.Get("https://raw.githubusercontent.com/creationix/nvm/v0.31.3/install.sh")
 	utilities.ErrorCheck(err, "nvm download")
 	defer resp.Body.Close()
 	body, err := ioutil.ReadAll(resp.Body)
 
-	printer.Info("Installing nvm")
+	printer.InfoBar("Installing nvm")
 	err = shell.Command("bash").SetInput(string(body)).Run()
 	utilities.ErrorCheck(err, "nvm install")
 }