add add command (#12)

cmd/add.go

@@ -0,0 +1,51 @@
+package cmd
+
+import (
+	"fmt"
+	"log"
+	"path/filepath"
+	"strings"
+
+	"github.com/Marcusk19/bender/tools"
+	"github.com/spf13/cobra"
+	"github.com/spf13/viper"
+)
+
+func init() {
+  RootCmd.AddCommand(addCommand)
+}
+
+var addCommand = &cobra.Command {
+  Use: "add",
+  Short: "Adds config to be tracked by bender",
+  Long: "TODO: add longer description", // TODO add more description
+  Run: runAddCommand,
+}
+
+func runAddCommand(cmd *cobra.Command, args []string) {
+  fs := FileSystem
+
+  if len(args) <= 0 {
+    fmt.Println("ERROR: requires at least one argument")
+    return
+  }
+
+  configSrc := args[0]
+  dirs := strings.Split(configSrc, "/")
+  name := dirs[len(dirs) - 1]
+  viper.Set(name, configSrc)
+  viper.WriteConfig()
+
+  dotfileDest := filepath.Join(DotfilePath, name)
+
+  if DryRun {
+    fmt.Printf("Will copy %s -> %s \n", configSrc, dotfileDest)
+    return
+  }
+  
+  err := tools.CopyDir(fs, configSrc, dotfileDest)
+  if err != nil {
+    log.Fatal(err)
+  }
+  fmt.Printf("Copied %s -> %s\n", configSrc, dotfileDest)
+}

cmd/init.go

@@ -63,16 +63,19 @@ func runInitCommand(cmd *cobra.Command, args []string) {
     log.Fatalf("Unable to create dotfile structure: %s", error.Error(err))
   }
 
-  _, err = fs.Create(path.Join(DotfilePath, "bender/bender.yml"))
+  _, err = fs.Create(path.Join(DotfilePath, "bender/config"))
   if err != nil {
     panic(fmt.Errorf("Unable to create config file %w", err))
   }
 
+  viper.WriteConfig()
+
   if (viper.Get("testing") != "true"){
     _, err = git.PlainInit(DotfilePath, false)
     if err != nil {
       log.Fatal(err)
     }
   }
+
   fmt.Fprintf(cmd.OutOrStdout(), "Successfully created dotfiles repository\n")
 }

cmd/link.go

@@ -14,11 +14,8 @@ var linkCommand = &cobra.Command {
   Run: runLinkCommand,
 }
 
-var DryRun bool
-
 func init() {
   RootCmd.AddCommand(linkCommand)
-  linkCommand.Flags().BoolVarP(&DryRun, "dry-run", "d", false, "Only output which symlinks will be created")
 }
 
 func runLinkCommand(cmd *cobra.Command, args []string) {

cmd/root.go

@@ -33,6 +33,7 @@ func Execute() {
 
 var DotfilePath string
 var ConfigPath string
+var DryRun bool
 
 var FileSystem afero.Fs
 
@@ -56,13 +57,14 @@ func init() {
     defaultConfPath,
     "Path pointing to config directory",
   )
+  RootCmd.PersistentFlags().BoolVarP(&DryRun, "dry-run", "d", false, "Only output which symlinks will be created")
   viper.BindPFlag("dotfile-path", RootCmd.PersistentFlags().Lookup("dotfile-path"))
   viper.BindPFlag("config-path", RootCmd.PersistentFlags().Lookup("config-path"))
 
   viper.BindEnv("testing")
   viper.SetDefault("testing", false)
 
-  viper.SetConfigName("bender.yml")
+  viper.SetConfigName("config")
   viper.SetConfigType("yaml")
   viper.AddConfigPath(filepath.Join(defaultDotPath, "bender"))
   viper.AddConfigPath("./bender")

test/init_test.go

@@ -26,7 +26,7 @@ func TestInitCommand(t *testing.T) {
 
   homedir := "bender_test/"
 
-  _, err := afero.ReadFile(fs, filepath.Join(homedir, ".dotfiles/bender/bender.yml")) 
+  _, err := afero.ReadFile(fs, filepath.Join(homedir, ".dotfiles/bender/config")) 
   if err != nil {
     t.Error(err.Error())
   }

tools/copy.go

@@ -34,6 +34,7 @@ func CopyFile(os afero.Fs, srcFile, destFile string) error{
 
   destination, err := os.Create(destFile)
   if err != nil {
+    fmt.Printf("Error creating destination file %s\n", destFile)
     return err
   }
   defer destination.Close()
@@ -44,6 +45,7 @@ func CopyFile(os afero.Fs, srcFile, destFile string) error{
 }
 
 func CopyDir(os afero.Fs, srcDir, destDir string) error {
+  os.Mkdir(destDir, 0755)
   entries, err := afero.ReadDir(os, srcDir)
   if err != nil {
     return err