Change input-file option name to delta-file

cmd/config.go

@@ -21,7 +21,7 @@ type Config struct {
 	KeyPositions  []int
 	Encoder       string
 	Base          string
-	Input         string
+	Delta         string
 	Additions     string
 	Modifications string
 }
@@ -42,12 +42,12 @@ func (c Config) GetEncoder() encoder.Encoder {
 	}
 }
 
-func (c Config) GetBase() io.Reader {
+func (c Config) GetBaseReader() io.Reader {
 	return getReader(c.Base)
 }
 
-func (c Config) GetInput() io.Reader {
-	return getReader(c.Input)
+func (c Config) GetDeltaReader() io.Reader {
+	return getReader(c.Delta)
 }
 
 func (c Config) AdditionsWriter() io.WriteCloser {

cmd/config_test.go

@@ -22,19 +22,3 @@ func TestGetKeyPositions(t *testing.T) {
 	config = Config{KeyPositions: []int{}}
 	assert.Equal(t, []int{0}, config.GetKeyPositions())
 }
-
-// func TestReader(t *testing.T) {
-// config := Config{Base: "STDIN"}
-// assert.Equal(t, os.Stdin, config.GetReader())
-//
-// config = Config{Base: "-"}
-// assert.Equal(t, os.Stdin, config.GetReader())
-// }
-
-// func TestWriter(t *testing.T) {
-// config := Config{Base: "STDOUT"}
-// assert.Equal(t, os.Stdout, config.GetWriter())
-//
-// config = Config{Base: "-"}
-// assert.Equal(t, os.Stdout, config.GetWriter())
-// }

cmd/root.go

@@ -33,11 +33,9 @@ var cfgFile string
 
 // rootCmd represents the base command when called without any subcommands
 var rootCmd = &cobra.Command{
-	Use:   "csv-digest",
-	Short: "Takes in a csv and creates a digest of each line",
-	Long: `Takes a Csv file and creates a digest for each line.
-The tool can output to stdout or a file in plaintext.
-It can also serialize the output as a binary file for any other go program to consume directly`,
+	Use:   "csv-diff",
+	Short: "A CSV diff tool",
+	Long:  "Differentiates two csv files and finds out the additions and modifications",
 	// Uncomment the following line if your bare application
 	// has an action associated with it:
 	// Run: func(cmd *cobra.Command, args []string) {

cmd/digest.go → cmd/run.go

@@ -29,13 +29,10 @@ import (
 
 // digestCmd represents the digest command
 var digestCmd = &cobra.Command{
-	Use:   "digest <csv-file>",
-	Short: "Takes in a csv and creates a digest of each line",
-	Long: `Takes a Csv file and creates a digest for each line.
-The tool can output to stdout or a file in plaintext.
-It can also serialize the output as a binary file for any other go program to consume directly`,
+	Use:   "run",
+	Short: "run diff between base-csv and delta-csv",
 	Run: func(cmd *cobra.Command, args []string) {
-		runDigest()
+		run()
 	},
 }
 
@@ -56,19 +53,19 @@ func init() {
 	// is called directly, e.g.:
 	// digestCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
 
-	digestCmd.Flags().StringVarP(&config.Base, "base", "b", "", "Input csv to be used as base")
-	digestCmd.Flags().StringVarP(&config.Input, "input", "i", "", "The new csv file on which diff should be done")
+	digestCmd.Flags().StringVarP(&config.Base, "base", "b", "", "The base csv file")
+	digestCmd.Flags().StringVarP(&config.Delta, "delta", "d", "", "The delta csv file")
 	digestCmd.Flags().StringVarP(&config.Encoder, "encoder", "e", "json", "Encoder to use to output the digest. Available Encoders: "+strings.Join(GetEncoders(), ","))
 	digestCmd.Flags().IntSliceVarP(&config.KeyPositions, "key-positions", "k", []int{0}, "Primary key positions of the Input CSV as comma separated values Eg: 1,2")
 	digestCmd.Flags().BoolVarP(&debug, "debug", "", false, "Debug mode")
 	digestCmd.Flags().StringVarP(&config.Additions, "additions", "a", "STDOUT", "Output stream for the additions in delta file")
 	digestCmd.Flags().StringVarP(&config.Modifications, "modifications", "m", "STDOUT", "Output stream for the modifications in delta file")
 
 	digestCmd.MarkFlagRequired("base")
-	digestCmd.MarkFlagRequired("input")
+	digestCmd.MarkFlagRequired("delta")
 }
 
-func runDigest() {
+func run() {
 	if str, err := json.Marshal(config); err == nil && debug {
 		fmt.Println(string(str))
 	} else if err != nil {
@@ -78,14 +75,14 @@ func runDigest() {
 	baseConfig := digest.DigestConfig{
 		KeyPositions: config.GetKeyPositions(),
 		Encoder:      config.GetEncoder(),
-		Reader:       config.GetBase(),
+		Reader:       config.GetBaseReader(),
 		Writer:       os.Stdout,
 	}
 
-	inputConfig := digest.DigestConfig{
+	deltaConfig := digest.DigestConfig{
 		KeyPositions: config.GetKeyPositions(),
 		Encoder:      config.GetEncoder(),
-		Reader:       config.GetInput(),
+		Reader:       config.GetDeltaReader(),
 		Writer:       os.Stdout,
 		SourceMap:    true,
 	}
@@ -98,7 +95,7 @@ func runDigest() {
 	go generateInBackground("base", baseConfig, &wg, baseChannel)
 
 	wg.Add(1)
-	go generateInBackground("delta", inputConfig, &wg, deltaChannel)
+	go generateInBackground("delta", deltaConfig, &wg, deltaChannel)
 
 	wg.Add(1)
 	go compareInBackgroud(baseChannel, deltaChannel, &wg)