extracted logging into package

cmd/commands/api/api.go

@@ -3,6 +3,7 @@ package api
 import (
 	"bytes"
 	"fmt"
+	"github.com/craftamap/bb/util/logging"
 	"io/ioutil"
 	"net/http"
 	"os"
@@ -46,7 +47,7 @@ func Add(rootCmd *cobra.Command, globalOpts *options.GlobalOptions) {
 
 			req, err := http.NewRequest(Method, url, bytes.NewBufferString(reqBody))
 			if err != nil {
-				fmt.Printf("%s%s%s\n", aurora.Red(":: "), aurora.Bold("An error occurred: "), err)
+				logging.Error(err)
 				return
 			}
 			req.SetBasicAuth(globalOpts.Client.Username, globalOpts.Client.Password)
@@ -59,15 +60,15 @@ func Add(rootCmd *cobra.Command, globalOpts *options.GlobalOptions) {
 			}
 			response, err := client.Do(req)
 			if err != nil {
-				fmt.Printf("%s%s%s\n", aurora.Red(":: "), aurora.Bold("An error occurred: "), err)
+				logging.Error(err)
 				return
 			}
 
 			defer response.Body.Close()
 
 			resBody, err := ioutil.ReadAll(response.Body)
 			if err != nil {
-				fmt.Printf("%s%s%s\n", aurora.Red(":: "), aurora.Bold("An error occurred: "), err)
+				logging.Error(err)
 				return
 			}
 

cmd/commands/auth/#/#.go

@@ -2,6 +2,7 @@ package login
 
 import (
 	"fmt"
+	"github.com/craftamap/bb/util/logging"
 
 	"github.com/AlecAivazis/survey/v2"
 	"github.com/craftamap/bb/cmd/options"
@@ -21,7 +22,7 @@ func Add(authCmd *cobra.Command, globalOpts *options.GlobalOptions) {
 				cont := false
 				err := survey.AskOne(&survey.Confirm{Message: "Do you want to overwrite this?"}, &cont)
 				if err != nil {
-					fmt.Printf("%s%s%s\n", aurora.Red(":: "), aurora.Bold("An error occurred: "), err)
+					logging.Error(err)
 					return
 				}
 
@@ -30,9 +31,9 @@ func Add(authCmd *cobra.Command, globalOpts *options.GlobalOptions) {
 				}
 			}
 
-			fmt.Println(aurora.Green("::"), "In order to use bb, you need to create an app password for bitbucket.org. Navigate to")
-			fmt.Println(aurora.Green("::"), aurora.Index(242, "https://bitbucket.org/account/settings/app-passwords/"))
-			fmt.Println(aurora.Green("::"), "And create an app password for your account with the required permissions.")
+			logging.Success("In order to use bb, you need to create an app password for bitbucket.org. Navigate to")
+			logging.Success(aurora.Index(242, "https://bitbucket.org/account/settings/app-passwords/"))
+			logging.Success("And create an app password for your account with the required permissions.")
 
 			answers := struct {
 				Username string
@@ -55,7 +56,7 @@ func Add(authCmd *cobra.Command, globalOpts *options.GlobalOptions) {
 			}, &answers)
 
 			if err != nil {
-				fmt.Printf("%s%s%s\n", aurora.Red(":: "), aurora.Bold("An error occurred: "), err)
+				logging.Error(err)
 				return
 			}
 
@@ -64,11 +65,11 @@ func Add(authCmd *cobra.Command, globalOpts *options.GlobalOptions) {
 
 			err = viper.WriteConfig()
 			if err != nil {
-				fmt.Printf("%s%s%s\n", aurora.Red(":: "), aurora.Bold("An error occurred: "), err)
+				logging.Error(err)
 				return
 			}
 
-			fmt.Println(aurora.Green("::"), "Stored credentials successfully to", viper.ConfigFileUsed())
+			logging.Success(fmt.Sprint("Stored credentials successfully to", viper.ConfigFileUsed()))
 		},
 	}
 

cmd/commands/downloads/download/download.go

@@ -3,6 +3,7 @@ package download
 import (
 	"crypto/rand"
 	"fmt"
+	"github.com/craftamap/bb/util/logging"
 	"io"
 	"math/big"
 	"net/http"
@@ -60,7 +61,7 @@ func Add(prCmd *cobra.Command, globalOpts *options.GlobalOptions) {
 			if dir != "" {
 				info, err := os.Stat(dir)
 				if err != nil {
-					fmt.Printf("%s%s%s\n", aurora.Red(":: "), aurora.Bold("An error occurred: "), err)
+					logging.Error(err)
 					return
 				}
 				if !info.IsDir() {
@@ -87,51 +88,51 @@ func Add(prCmd *cobra.Command, globalOpts *options.GlobalOptions) {
 			c := globalOpts.Client
 			bbrepo := globalOpts.BitbucketRepo
 
-			fmt.Printf("%s%s\n", aurora.Green(":: "), "Getting all downloads")
+			logging.Success("Getting all downloads")
 
 			downloads, err := c.GetDownloads(bbrepo.RepoOrga, bbrepo.RepoSlug)
 			if err != nil {
-				fmt.Printf("%s%s%s\n", aurora.Red(":: "), aurora.Bold("An error occurred: "), err)
+				logging.Error(err)
 				return
 			}
 
 			downloadMap := downloadsToMap(downloads)
 			dwnld, ok := downloadMap[remoteName]
 			if !ok {
-				fmt.Printf("%s%s%s\n", aurora.Red(":: "), aurora.Bold("An error occurred: "), err)
+				logging.Error(err)
 				return
 			}
 
 			downloadLink := dwnld.Links["self"].Href
 
-			fmt.Printf("%s%s\n", aurora.Green(":: "), fmt.Sprintf("Downloading file from %s", downloadLink))
+			logging.Success(fmt.Sprintf("Downloading file from %s", downloadLink))
 
 			req, err := http.NewRequest("GET", downloadLink, strings.NewReader(""))
 			if err != nil {
-				fmt.Printf("%s%s%s\n", aurora.Red(":: "), aurora.Bold("An error occurred: "), err)
+				logging.Error(err)
 				return
 			}
 			req.SetBasicAuth(c.Username, c.Password)
 			resp, err := http.DefaultClient.Do(req)
 			if err != nil {
-				fmt.Printf("%s%s%s\n", aurora.Red(":: "), aurora.Bold("An error occurred: "), err)
+				logging.Error(err)
 				return
 			}
 			defer resp.Body.Close()
 
-			fmt.Printf("%s%s\n", aurora.Green(":: "), "Downloaded!")
-			fmt.Printf("%s%s\n", aurora.Green(":: "), fmt.Sprintf("Saving file to %s", storagePath))
+			logging.Success("Downloaded!")
+			logging.Success(fmt.Sprintf("Saving file to %s", storagePath))
 
 			out, err := os.Create(storagePath)
 			if err != nil {
-				fmt.Printf("%s%s%s\n", aurora.Red(":: "), aurora.Bold("An error occurred: "), err)
+				logging.Error(err)
 				return
 			}
 			defer out.Close()
 
 			_, err = io.Copy(out, resp.Body)
 			if err != nil {
-				fmt.Printf("%s%s%s\n", aurora.Red(":: "), aurora.Bold("An error occurred: "), err)
+				logging.Error(err)
 				return
 			}
 		},

cmd/commands/downloads/list/list.go

@@ -2,6 +2,7 @@ package list
 
 import (
 	"fmt"
+	"github.com/craftamap/bb/util/logging"
 
 	"github.com/craftamap/bb/cmd/options"
 	"github.com/dustin/go-humanize"
@@ -28,14 +29,14 @@ func Add(downloadsCmd *cobra.Command, globalOpts *options.GlobalOptions) {
 			if Web {
 				err := browser.OpenURL(fmt.Sprintf("https://bitbucket.org/%s/%s/downloads", bbrepo.RepoOrga, bbrepo.RepoSlug))
 				if err != nil {
-					fmt.Printf("%s%s%s\n", aurora.Red(":: "), aurora.Bold("An error occurred: "), err)
+					logging.Error(err)
 					return
 				}
 				return
 			}
 			downloads, err := c.GetDownloads(bbrepo.RepoOrga, bbrepo.RepoSlug)
 			if err != nil {
-				fmt.Printf("%s%s%s\n", aurora.Red(":: "), aurora.Bold("An error occurred: "), err)
+				logging.Error(err)
 				return
 			}
 

cmd/commands/downloads/upload/upload.go

@@ -2,11 +2,11 @@ package upload
 
 import (
 	"fmt"
+	"github.com/craftamap/bb/util/logging"
 	"os"
 	"path/filepath"
 
 	"github.com/craftamap/bb/cmd/options"
-	"github.com/logrusorgru/aurora"
 	"github.com/spf13/cobra"
 )
 
@@ -22,31 +22,31 @@ func Add(downloadsCmd *cobra.Command, globalOpts *options.GlobalOptions) {
 			bbrepo := globalOpts.BitbucketRepo
 
 			if len(args) == 0 {
-				fmt.Printf("%s%s%s\n", aurora.Yellow(":: "), aurora.Bold("Warning: "), "No file specified")
+				logging.Warning("No file specified")
 				return
 			}
 
 			fpath := args[0]
 			fmt.Println(fpath)
 
 			if _, err := os.Stat(fpath); os.IsNotExist(err) {
-				fmt.Printf("%s%s%s\n", aurora.Red(":: "), aurora.Bold("An error occurred: "), err)
+				logging.Error(err)
 				return
 			}
-			fmt.Printf("%s Uploading file %s\n", aurora.Green(":: "), filepath.Base(fpath))
+			logging.Success(fmt.Sprintf("Uploading file %s", filepath.Base(fpath)))
 
 			_, err := c.UploadDownload(bbrepo.RepoOrga, bbrepo.RepoSlug, fpath)
 			if err != nil {
-				fmt.Printf("%s%s%s\n", aurora.Red(":: "), aurora.Bold("An error occurred: "), err)
+				logging.Error(err)
 				return
 			}
 
 			//if err != nil {
-			//	fmt.Printf("%s%s%s\n", aurora.Red(":: "), aurora.Bold("An error occurred: "), err)
+			//	logging.Error(err)
 			//	return
 			//}
 
-			fmt.Printf("%s Uploaded file %s\n", aurora.Green(":: "), filepath.Base(fpath))
+			logging.Success(fmt.Sprintf("Uploaded file %s\n", filepath.Base(fpath)))
 		},
 	}
 

cmd/commands/pipelines/list/list.go

@@ -2,6 +2,7 @@ package list
 
 import (
 	"fmt"
+	"github.com/craftamap/bb/util/logging"
 	"strings"
 
 	"github.com/craftamap/bb/cmd/options"
@@ -31,7 +32,7 @@ func Add(pipelinesCmd *cobra.Command, globalOpts *options.GlobalOptions) {
 
 			pipelines, err := c.PipelineList(bbrepo.RepoOrga, bbrepo.RepoSlug)
 			if err != nil {
-				fmt.Printf("%s%s%s\n", aurora.Red(":: "), aurora.Bold("An error occurred: "), err)
+				logging.Error(err)
 				return
 			}
 			if len(*pipelines) == 0 {

cmd/commands/pipelines/logs/logs.go

@@ -2,6 +2,7 @@ package logs
 
 import (
 	"fmt"
+	"github.com/craftamap/bb/util/logging"
 	"strconv"
 	"strings"
 
@@ -29,17 +30,17 @@ func Add(pipelinesCmd *cobra.Command, globalOpts *options.GlobalOptions) {
 			}
 			pipelineID, err := strconv.Atoi(strings.Replace(args[0], "#", "", 1))
 			if err != nil {
-				fmt.Printf("%s%s%s\n", aurora.Red(":: "), aurora.Bold("An error occurred: "), err)
+				logging.Error(err)
 				return
 			}
 			steps, err := c.PipelineStepsList(bbrepo.RepoOrga, bbrepo.RepoSlug, strconv.Itoa(pipelineID))
 			if err != nil {
-				fmt.Printf("%s%s%s\n", aurora.Red(":: "), aurora.Bold("An error occurred: "), err)
+				logging.Error(err)
 				return
 			}
 
 			for _, step := range *steps {
-				fmt.Println(aurora.Green("::"), aurora.Bold("step name:"), step.Name)
+				logging.Success(fmt.Sprint(aurora.Bold("step name:"), step.Name))
 				log, _ := c.PipelinesLogs(bbrepo.RepoOrga, bbrepo.RepoSlug, strconv.Itoa(pipelineID), step.UUID)
 				fmt.Println(log)
 			}

cmd/commands/pipelines/view/view.go

@@ -2,6 +2,7 @@ package view
 
 import (
 	"fmt"
+	"github.com/craftamap/bb/util/logging"
 	"strconv"
 	"strings"
 
@@ -37,19 +38,19 @@ func Add(pipelinesCmd *cobra.Command, globalOpts *options.GlobalOptions) {
 			}
 			pipelineID, err := strconv.Atoi(strings.Replace(args[0], "#", "", 1))
 			if err != nil {
-				fmt.Printf("%s%s%s\n", aurora.Red(":: "), aurora.Bold("An error occurred: "), err)
+				logging.Error(err)
 				return
 			}
 
 			pipeline, err := c.PipelineGet(bbrepo.RepoOrga, bbrepo.RepoSlug, strconv.Itoa(pipelineID))
 			if err != nil {
-				fmt.Printf("%s%s%s\n", aurora.Red(":: "), aurora.Bold("An error occurred: "), err)
+				logging.Error(err)
 				return
 			}
 
 			steps, err := c.PipelineStepsList(bbrepo.RepoOrga, bbrepo.RepoSlug, strconv.Itoa(pipelineID))
 			if err != nil {
-				fmt.Printf("%s%s%s\n", aurora.Red(":: "), aurora.Bold("An error occurred: "), err)
+				logging.Error(err)
 				return
 			}