Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions cmd/commit.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import (
"github.com/sirupsen/logrus"
"github.com/spf13/cast"
"github.com/spf13/cobra"
"github.com/spf13/viper"

"github.com/marstr/baronial/internal/index"
)
Expand Down Expand Up @@ -141,6 +142,24 @@ var commitCmd = &cobra.Command{
ctx, cancel := RootContext(cmd)
defer cancel()

commitTransactionFromFlags.Committer.FullName = viper.GetString("user.name")
commitTransactionFromFlags.Committer.Email = viper.GetString("user.email")

reqConfigMissing := false
if commitTransactionFromFlags.Committer.FullName == "" {
logrus.Error("config user.name is missing")
reqConfigMissing = true
}

if commitTransactionFromFlags.Committer.Email == "" {
logrus.Error("config user.email is missing")
reqConfigMissing = true
}

if reqConfigMissing {
logrus.Fatal(("one or more pieces of required configuration is missing."))
}

targetDir, err := index.RootDirectory(".")
if err != nil {
logrus.Fatal(err)
Expand Down
7 changes: 4 additions & 3 deletions cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -116,15 +116,16 @@ func initConfig() {
os.Exit(1)
}

// Search config in home directory with name ".baronial" (without extension).
// Search config in home directory with name ".baronialconf" (without extension).
viper.AddConfigPath(home)
viper.SetConfigName(".baronial")
viper.SetConfigName(".baronialconf")
viper.SetConfigType("yaml")
}

viper.AutomaticEnv() // read in environment variables that match

// If a config file is found, read it in.
if err := viper.ReadInConfig(); err == nil {
fmt.Println("Using config file:", viper.ConfigFileUsed())
logrus.Info("Using config file:", viper.ConfigFileUsed())
}
}
6 changes: 6 additions & 0 deletions internal/format/transaction.go
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,12 @@ func PrettyPrintTransaction(
return err
}
}
if !subject.Committer.Equal(envelopes.User{}) {
_, err = fmt.Fprintf(output, "Committer: \t%s (%s)\n", subject.Committer.FullName, subject.Committer.Email)
if err != nil {
return err
}
}
_, err = fmt.Fprintf(output, "Merchant:\t%s\n", subject.Merchant)
if err != nil {
return err
Expand Down
Loading