use stdout and stderr for cli

front-matter · May 14, 2024 · 37eea28 · 37eea28
1 parent 851d6bc
commit 37eea28
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 26 deletions.
diff --git a/cmd/convert.go b/cmd/convert.go
@@ -66,12 +66,12 @@ commonmeta 10.5555/12345678`,
 			var ok bool
 			doi, ok := doiutils.ValidateDOI(input)
 			if !ok {
-				fmt.Println("Please provide a valid DOI from Crossref or Datacite")
+				cmd.PrintErr("Please provide a valid DOI from Crossref or Datacite")
 				return
 			}
 			from, ok = doiutils.GetDOIRA(doi)
 			if !ok {
-				fmt.Println("Please provide a valid DOI from Crossref or Datacite")
+				cmd.PrintErr("Please provide a valid DOI from Crossref or Datacite")
 				return
 			}
 			from = strings.ToLower(from)
@@ -100,7 +100,7 @@ commonmeta 10.5555/12345678`,
 			} else if from == "datacite" {
 				data, err = datacite.Load(str)
 			} else {
-				fmt.Println("Please provide a valid input")
+				cmd.PrintErr("Please provide a valid input")
 				return
 			}
 		}
@@ -126,19 +126,19 @@ commonmeta 10.5555/12345678`,
 		}
 
 		if err != nil {
-			fmt.Println(err)
+			cmd.PrintErr(err)
 		}
 
 		if to == "crossrefxml" {
-			fmt.Printf("%s\n", output)
+			cmd.Printf("%s\n", output)
 		} else {
 			var out bytes.Buffer
 			json.Indent(&out, output, "", "  ")
-			fmt.Println(out.String())
+			cmd.Println(out.String())
 		}
 
 		if jsErr != nil {
-			fmt.Println(jsErr)
+			cmd.PrintErr(jsErr)
 		}
 	},
 }

diff --git a/cmd/encode.go b/cmd/encode.go
@@ -24,11 +24,11 @@ var encodeCmd = &cobra.Command{
 		input := args[0]
 		prefix, ok := doiutils.ValidatePrefix(input)
 		if !ok {
-			fmt.Println("Invalid prefix")
+			cmd.PrintErr("Invalid prefix")
 			return
 		}
 		doi := utils.EncodeDOI(prefix)
-		fmt.Println(doi)
+		cmd.Println(doi)
 	},
 }
 

diff --git a/cmd/list.go b/cmd/list.go
@@ -65,7 +65,7 @@ var listCmd = &cobra.Command{
 		if input != "" {
 			_, err = os.Stat(input)
 			if err != nil {
-				fmt.Printf("File not found: %s", input)
+				cmd.PrintErrf("File not found: %s", input)
 				return
 			}
 			str = input
@@ -85,7 +85,7 @@ var listCmd = &cobra.Command{
 			data, err = datacite.FetchAll(number, sample)
 		}
 		if err != nil {
-			fmt.Println(err)
+			cmd.PrintErr(err)
 		}
 
 		var output []byte
@@ -109,19 +109,19 @@ var listCmd = &cobra.Command{
 		}
 
 		if err != nil {
-			fmt.Println(err)
+			cmd.PrintErr(err)
 		}
 
 		if to == "crossrefxml" {
 			fmt.Printf("%s\n", output)
 		} else {
 			var out bytes.Buffer
 			json.Indent(&out, output, "", "  ")
-			fmt.Println(out.String())
+			cmd.Println(out.String())
 		}
 
 		if jsErr != nil {
-			fmt.Println(jsErr)
+			cmd.PrintErr(jsErr)
 		}
 	},
 }

diff --git a/cmd/root.go b/cmd/root.go
@@ -33,7 +33,7 @@ func Execute() {
 }
 
 func init() {
-	rootCmd.PersistentFlags().StringP("from", "f", "crossref", "the format to convert from")
+	rootCmd.PersistentFlags().StringP("from", "f", "commonmeta", "the format to convert from")
 	rootCmd.PersistentFlags().StringP("to", "t", "commonmeta", "the format to convert to")
 
 	rootCmd.PersistentFlags().IntP("number", "n", 10, "number of results")

diff --git a/cmd/sample.go b/cmd/sample.go
@@ -72,14 +72,14 @@ var sampleCmd = &cobra.Command{
 		}
 
 		if err != nil {
-			fmt.Println(err)
+			cmd.PrintErr(err)
 		}
 		var out bytes.Buffer
 		json.Indent(&out, output, "", "  ")
-		fmt.Println(out.String())
+		cmd.Println(out.String())
 
 		if jsErr != nil {
-			fmt.Println(jsErr)
+			cmd.PrintErr(jsErr)
 		}
 	},
 }

diff --git a/cmd/updateGhostAPI.go b/cmd/updateGhostAPI.go
@@ -4,8 +4,6 @@ Copyright © 2024 Front Matter <[email protected]>
 package cmd
 
 import (
-	"fmt"
-
 	"github.com/front-matter/commonmeta/ghost"
 	"github.com/spf13/cobra"
 )
@@ -22,17 +20,17 @@ This application is a tool to generate the needed files
 to quickly create a Cobra application.`,
 	Run: func(cmd *cobra.Command, args []string) {
 		if len(args) == 0 {
-			fmt.Println("Please provide an input")
+			cmd.PrintErr("Please provide an input")
 			return
 		}
 		id := args[0]
 		apiKey, _ := cmd.Flags().GetString("api-key")
 		apiURL, _ := cmd.Flags().GetString("api-url")
 		output, err := ghost.UpdateGhostPost(id, apiKey, apiURL)
 		if err != nil {
-			fmt.Println(err)
+			cmd.PrintErr(err)
 		}
-		fmt.Println(output)
+		rootCmd.Println(output)
 	},
 }
 

diff --git a/cmd/version.go b/cmd/version.go
@@ -4,8 +4,6 @@ Copyright © 2024 Front Matter <[email protected]>
 package cmd
 
 import (
-	"fmt"
-
 	"github.com/spf13/cobra"
 )
 
@@ -15,7 +13,7 @@ var versionCmd = &cobra.Command{
 	Short: "Print the version number of commonmeta",
 	Long:  `All software has versions. This is commonmeta's`,
 	Run: func(cmd *cobra.Command, args []string) {
-		fmt.Println("Commonmeta v0.3.8 -- HEAD")
+		cmd.Println("Commonmeta v0.3.9 -- HEAD")
 	},
 }