Remove unused flags, add --format flag

Author: amitizle

.gitignore

@@ -1 +1,2 @@
 dist
+luas-cli

cmd/forecast.go

@@ -1,8 +1,9 @@
 package cmd
 
 import (
+	"encoding/json"
 	"github.com/amitizle/go-luas"
-	"github.com/amitizle/go-luas-cli/internal/output"
+	"github.com/amitizle/luas-cli/internal/output"
 	"github.com/spf13/cobra"
 	"os"
 )
@@ -31,15 +32,30 @@ func forecast(cmd *cobra.Command, args []string) {
 		output.Errorf("error getting forecast for stop %s, %v", stop.Name, err)
 		os.Exit(1)
 	}
-	output.Infof("Forecast for stop %s from %s\n\n%s\n",
-		stop.Name,
-		stopInfo.Created,
-		stopInfo.Message)
-	for _, direction := range stopInfo.Directions {
-		output.Infof("Direction: %s", direction.Name)
-		for _, tram := range direction.Trams {
-			output.Infof("Destination: %s, due in %s minutes", tram.Destination, tram.DueMins)
+	printOutput(cmd.Flag("format").Value.String(), stop, stopInfo)
+}
+
+func printOutput(format string, stop *luas.Stop, stopInfo *luas.StopInfo) {
+	switch format {
+	case "table":
+		output.Infof("Forecast for stop %s from %s\n\n%s\n",
+			stop.Name,
+			stopInfo.Created,
+			stopInfo.Message)
+		for _, direction := range stopInfo.Directions {
+			output.Infof("Direction: %s", direction.Name)
+			for _, tram := range direction.Trams {
+				output.Infof("Destination: %s, due in %s minutes", tram.Destination, tram.DueMins)
+			}
+			output.Infof("")
+		}
+	case "json":
+		jsonOutput, err := json.Marshal(stopInfo)
+		if err != nil {
+			output.Errorf("while generating json output: %v", err)
+			os.Exit(1)
 		}
-		output.Infof("")
+		output.NoFormat(string(jsonOutput))
+	default:
 	}
 }

cmd/luas.go

@@ -27,15 +27,8 @@ func Execute() {
 
 func init() {
 	cobra.OnInitialize(initConfig)
-
-	// Here you will define your flags and configuration settings.
-	// Cobra supports persistent flags, which, if defined here,
-	// will be global for your application.
-	luasCmd.PersistentFlags().StringVar(&cfgFile, "config", "", "config file (default is $HOME/.go-luas-cli.yaml)")
-
-	// Cobra also supports local flags, which will only run
-	// when this action is called directly.
-	luasCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
+	luasCmd.PersistentFlags().StringVar(&cfgFile, "config", "", "config file (default is $HOME/.luas.yaml)")
+	luasCmd.PersistentFlags().StringP("format", "f", "table", "output format (table/json)")
 }
 
 // initConfig reads in config file and ENV variables if set.
@@ -51,9 +44,9 @@ func initConfig() {
 			os.Exit(1)
 		}
 
-		// Search config in home directory with name ".go-luas-cli" (without extension).
+		// Search config in home directory with name ".luas" (without extension).
 		viper.AddConfigPath(home)
-		viper.SetConfigName(".go-luas-cli")
+		viper.SetConfigName(".luas")
 	}
 
 	viper.AutomaticEnv() // read in environment variables that match

internal/output/output.go

@@ -28,3 +28,11 @@ func Warn(line string) {
 func Warnf(line string, args ...interface{}) {
 	Warn(fmt.Sprintf(line, args...))
 }
+
+func NoFormat(line string) {
+	fmt.Println(line)
+}
+
+func NoFormatf(line string, args ...interface{}) {
+	NoFormat(fmt.Sprintf(line, args...))
+}

main.go

@@ -1,6 +1,6 @@
 package main
 
-import "github.com/amitizle/go-luas-cli/cmd"
+import "github.com/amitizle/luas-cli/cmd"
 
 func main() {
 	cmd.Execute()