use $HOME/.gmac as config directory

Author: nasa9084

commands/apply.go

@@ -4,12 +4,14 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"log"
+	"io"
+	"os"
 
 	"github.com/goccy/go-yaml"
 	"github.com/jessevdk/go-flags"
 
 	"github.com/nasa9084/gmac/gmail"
+	"github.com/nasa9084/gmac/log"
 )
 
 var applyCommand *flags.Command
@@ -19,22 +21,30 @@ func init() {
 }
 
 type ApplyCommand struct {
-	Target string `short:"f" long:"filename"`
+	Target string `short:"f" long:"filename" required:"yes"`
 }
 
 func (cmd *ApplyCommand) Execute([]string) error {
-	rc, err := openOrStdin(cmd.Target)
-	if err != nil {
-		return err
+	var r io.Reader
+	switch cmd.Target {
+	case "-":
+		r = os.Stdin
+	default:
+		f, err := os.Open(cmd.Target)
+		if err != nil {
+			return err
+		}
+		defer f.Close()
+
+		r = f
 	}
-	defer rc.Close()
 
 	var proxy struct {
 		Kind string         `yaml:"kind"`
 		Rest map[string]raw `yaml:",inline"`
 	}
 	log.Println("unmarshalYAML")
-	if err := yaml.NewDecoder(rc).Decode(&proxy); err != nil {
+	if err := yaml.NewDecoder(r).Decode(&proxy); err != nil {
 		return err
 	}
 	if proxy.Kind == "" {

commands/auth.go

@@ -6,12 +6,14 @@ import (
 	"encoding/json"
 	"fmt"
 	"io/ioutil"
-	"log"
 	"net/http"
+	"os"
+	"path/filepath"
 	"strconv"
 
 	"github.com/google/uuid"
 	"github.com/jessevdk/go-flags"
+	"github.com/nasa9084/gmac/log"
 	"golang.org/x/oauth2"
 )
 
@@ -46,12 +48,18 @@ func (cmd *AuthCommand) Execute(args []string) error {
 	if err != nil {
 		return err
 	}
-	fmt.Printf("Reflesh Token: %s\n", token.RefreshToken)
+	log.Printf("Reflesh Token: %s\n", token.RefreshToken)
 	var buf bytes.Buffer
 	if err := json.NewEncoder(&buf).Encode(token); err != nil {
 		return err
 	}
-	return ioutil.WriteFile("./token.json", buf.Bytes(), 0644)
+	if err := os.MkdirAll(configDir, 0755); err != nil {
+		return err
+	}
+	if err := ioutil.WriteFile(filepath.Join(configDir, "token.json"), buf.Bytes(), 0644); err != nil {
+		return err
+	}
+	return nil
 }
 
 func listenCallback(ctx context.Context, port int, csrfState string) <-chan string {
@@ -69,7 +77,7 @@ func oauthCallbackHandler(csrfState string) (<-chan string, http.HandlerFunc) {
 	future := make(chan string, 1)
 	return future, func(w http.ResponseWriter, r *http.Request) {
 		if r.FormValue("state") != csrfState {
-			log.Print("state mismatch")
+			log.Print("CSRF state mismatch")
 			w.WriteHeader(http.StatusForbidden)
 			return
 		}

commands/main.go

@@ -3,15 +3,22 @@ package commands
 import (
 	"fmt"
 	"os"
+	"path/filepath"
 
 	"github.com/jessevdk/go-flags"
+	"github.com/nasa9084/gmac/log"
 )
 
 var (
 	Version, Revision string
 )
 
 var parser = flags.NewParser(&Command{
+	Verbose: func() error {
+		log.SetVerbose(true)
+		return nil
+	},
+
 	ShowVersion: func() error {
 		fmt.Printf("Version: %s\nRevision: %s\n", Version, Revision)
 		return &flags.Error{
@@ -20,12 +27,24 @@ var parser = flags.NewParser(&Command{
 	},
 }, flags.HelpFlag)
 
+var configDir string
+
+func init() {
+	home, err := os.UserHomeDir()
+	if err != nil {
+		log.Print("WARN: cannot detect user home directory")
+	}
+	configDir = filepath.Join(home, ".gmac")
+}
+
 type Command struct {
 	OutputFormat string `short:"o" long:"output" choice:"yaml" choice:"wide"`
 
 	CredentialsFilePath string `short:"c" long:"credentials-file" description:"path to OAuth credentials file"`
 	RefreshToken        string `short:"t" long:"refresh-token" description:"OAuth reflesh token"`
 
+	Verbose func() error `long:"verbose" description:"show verbose log"`
+
 	ShowVersion func() error `short:"v" long:"version"`
 }
 

commands/util.go

@@ -7,13 +7,21 @@ import (
 	"io/ioutil"
 	"os"
 	"os/exec"
+	"path/filepath"
 	"runtime"
 
 	"golang.org/x/oauth2"
 	"golang.org/x/oauth2/google"
 	"google.golang.org/api/gmail/v1"
+
+	"github.com/nasa9084/gmac/log"
 )
 
+var oauthScope = []string{
+	gmail.GmailLabelsScope,
+	gmail.GmailSettingsBasicScope,
+}
+
 type raw []byte
 
 func (r *raw) UnmarshalYAML(data []byte) error {
@@ -24,37 +32,62 @@ func (r *raw) UnmarshalYAML(data []byte) error {
 	return nil
 }
 
-func openOrStdin(filename string) (io.ReadCloser, error) {
-	if filename == "-" {
-		return ioutil.NopCloser(os.Stdin), nil
-	}
-	return os.Open(filename)
-}
+func getOAuthConfig(credentialsFilepath string) (*oauth2.Config, error) {
+	defaultCredentialsFilepath := filepath.Join(configDir, "credentials.json")
 
-func getOAuthConfig(credentialsFilePath string) (*oauth2.Config, error) {
-	rc, err := openOrStdin(credentialsFilePath)
-	if err != nil {
-		return nil, err
+	var r io.Reader
+	switch credentialsFilepath {
+	case "-": // read from stdin
+		log.Vprint("read OAuth config from stdin")
+		r = os.Stdin
+	case "": // read from default config path
+		log.Vprintf("read OAuth config from %s", defaultCredentialsFilepath)
+		f, err := os.Open(defaultCredentialsFilepath)
+		if err != nil {
+			return nil, err
+		}
+		defer f.Close()
+
+		r = f
+	default: // read from specified filepath
+		log.Vprintf("read OAuthconfig from %s", credentialsFilepath)
+		f, err := os.Open(credentialsFilepath)
+		if err != nil {
+			return nil, err
+		}
+		defer f.Close()
+
+		r = f
 	}
-	defer rc.Close()
-	b, err := ioutil.ReadAll(rc)
+	b, err := ioutil.ReadAll(r)
 	if err != nil {
 		return nil, err
 	}
-	oauthConfig, err := google.ConfigFromJSON(b, gmail.GmailLabelsScope, gmail.GmailSettingsBasicScope)
+	oauthConfig, err := google.ConfigFromJSON(b, oauthScope...)
 	if err != nil {
 		return nil, err
 	}
+	if credentialsFilepath != "" {
+		log.Vprint("OAuth config is not read from config directory: save into config directory")
+		if err := os.MkdirAll(configDir, 0755); err != nil {
+			log.Printf("WARN: cannot create config directory: %s", configDir)
+		} else if err := ioutil.WriteFile(defaultCredentialsFilepath, b, 0644); err != nil {
+			log.Printf("WARN: %+v", err)
+		}
+	}
 	return oauthConfig, nil
 }
 
 func getToken(refreshToken string) (*oauth2.Token, error) {
 	if refreshToken != "" {
+		log.Vprint("refresh token is passed")
 		return &oauth2.Token{
 			RefreshToken: refreshToken,
 		}, nil
 	}
-	b, err := ioutil.ReadFile("./token.json")
+	tokenFilepath := filepath.Join(configDir, "token.json")
+	log.Vprintf("refresh token is not passed, read OAuth token from %s", tokenFilepath)
+	b, err := ioutil.ReadFile(tokenFilepath)
 	if err != nil {
 		return nil, err
 	}
@@ -67,6 +100,7 @@ func getToken(refreshToken string) (*oauth2.Token, error) {
 
 func open(url string) error {
 	var cmd string
+	log.Vprintf("detected OS: %s", runtime.GOOS)
 	switch runtime.GOOS {
 	case "darwin":
 		cmd = "open"

log/log.go

@@ -0,0 +1,44 @@
+package log
+
+import (
+	"log"
+	"os"
+	"sync"
+)
+
+var (
+	mu            sync.Mutex
+	isVerbose     bool
+	verboseLogger *log.Logger
+)
+
+func init() {
+	verboseLogger = log.New(os.Stderr, "", log.LstdFlags)
+}
+
+func SetVerbose(v bool) {
+	mu.Lock()
+	defer mu.Unlock()
+
+	isVerbose = v
+}
+
+var (
+	Fatal = log.Fatal
+
+	Print   = log.Print
+	Printf  = log.Printf
+	Println = log.Println
+)
+
+func Vprint(v ...interface{}) {
+	if isVerbose {
+		verboseLogger.Print(v...)
+	}
+}
+
+func Vprintf(format string, v ...interface{}) {
+	if isVerbose {
+		verboseLogger.Printf(format, v...)
+	}
+}

main.go

@@ -1,9 +1,8 @@
 package main
 
 import (
-	"log"
-
 	"github.com/nasa9084/gmac/commands"
+	"github.com/nasa9084/gmac/log"
 )
 
 func main() {