Merge pull request #33 from leonklingele/move-commands-to-package

Move commands to 'commands' package

Author: bndw

add.go renamed to commands/add.go

@@ -1,4 +1,4 @@
-package main
+package commands
 
 import (
 	"fmt"
@@ -11,7 +11,7 @@ const (
 	passwordLength = 25
 )
 
-func addCommand(args ...string) int {
+func AddCommand(args ...string) int {
 	safe, err := loadSafe()
 	if err != nil {
 		return handleError(err)

cat.go renamed to commands/cat.go

@@ -1,12 +1,12 @@
-package main
+package commands
 
 import (
 	"fmt"
 
 	"github.com/bndw/pick/utils"
 )
 
-func catCommand(args ...string) int {
+func CatCommand(args ...string) int {
 	safe, err := loadSafe()
 	if err != nil {
 		return handleError(err)

copy.go renamed to commands/copy.go

@@ -1,6 +1,6 @@
-package main
+package commands
 
-func copyCommand(args ...string) int {
+func CopyCommand(args ...string) int {
 	safe, err := loadSafe()
 	if err != nil {
 		return handleError(err)

export.go renamed to commands/export.go

@@ -1,12 +1,12 @@
-package main
+package commands
 
 import (
 	"fmt"
 
 	"github.com/bndw/pick/utils"
 )
 
-func exportCommand(args ...string) int {
+func ExportCommand(args ...string) int {
 	safe, err := loadSafe()
 	if err != nil {
 		return handleError(err)

list.go renamed to commands/list.go

@@ -1,11 +1,11 @@
-package main
+package commands
 
 import (
 	"fmt"
 	"sort"
 )
 
-func listCommand(args ...string) int {
+func ListCommand(args ...string) int {
 	safe, err := loadSafe()
 	if err != nil {
 		return handleError(err)

remove.go renamed to commands/remove.go

@@ -1,8 +1,8 @@
-package main
+package commands
 
 import "fmt"
 
-func removeCommand(args ...string) int {
+func RemoveCommand(args ...string) int {
 	safe, err := loadSafe()
 	if err != nil {
 		return handleError(err)

util.go renamed to commands/util.go

@@ -1,4 +1,4 @@
-package main
+package commands
 
 import (
 	"fmt"

main.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/bndw/pick/commands"
 	"github.com/spf13/cobra"
 )
 
@@ -13,7 +14,7 @@ var cmdAdd = &cobra.Command{
 	Long: `The add command is used to add a new credential.
             `,
 	Run: func(cmd *cobra.Command, args []string) {
-		os.Exit(addCommand(args...))
+		os.Exit(commands.AddCommand(args...))
 	},
 }
 
@@ -28,7 +29,7 @@ var cmdCat = &cobra.Command{
 			os.Exit(1)
 		}
 
-		os.Exit(catCommand(args...))
+		os.Exit(commands.CatCommand(args...))
 	},
 }
 
@@ -44,7 +45,7 @@ to the clipboard.
 			os.Exit(1)
 		}
 
-		os.Exit(copyCommand(args...))
+		os.Exit(commands.CopyCommand(args...))
 	},
 }
 
@@ -55,7 +56,7 @@ var cmdExport = &cobra.Command{
 format.
             `,
 	Run: func(cmd *cobra.Command, args []string) {
-		os.Exit(exportCommand(args...))
+		os.Exit(commands.ExportCommand(args...))
 	},
 }
 
@@ -65,7 +66,7 @@ var cmdList = &cobra.Command{
 	Long: `The list command is used to list the saved credentials.
             `,
 	Run: func(cmd *cobra.Command, args []string) {
-		os.Exit(listCommand(args...))
+		os.Exit(commands.ListCommand(args...))
 	},
 }
 
@@ -75,7 +76,7 @@ var cmdRemove = &cobra.Command{
 	Long: `The remove command is used to remove a saved credential.
             `,
 	Run: func(cmd *cobra.Command, args []string) {
-		os.Exit(removeCommand(args...))
+		os.Exit(commands.RemoveCommand(args...))
 	},
 }