move cmd package

Author: mvrahden

Makefile

@@ -7,7 +7,7 @@ dep:
 	go mod verify
 
 build: dep
-	go build -o bin/shamir cli/main.go
+	go build -a -ldflags="-w -s" -o ./bin/shamir ./cmd/shamir/.
 
 .PHONY: build
 

cli/main.go

@@ -1,4 +1,4 @@
-package cmd
+package main
 
 import (
 	"bufio"

cli/cmd/combine.go cmd/shamir/combine.gocli/cmd/combine.go renamed to cmd/shamir/combine.go

@@ -1,4 +1,4 @@
-package cmd
+package main
 
 import (
 	"fmt"
@@ -13,6 +13,10 @@ var RootCmd = &cobra.Command{
 	Use: "shamir",
 }
 
+func main() {
+	Execute()
+}
+
 func Execute() {
 	if err := RootCmd.Execute(); err != nil {
 		fmt.Println(err)

cli/cmd/root.go cmd/shamir/shamir.gocli/cmd/root.go renamed to cmd/shamir/shamir.go

@@ -0,0 +1,45 @@
+package main_test
+
+import (
+	"os"
+	"testing"
+
+	main "github.com/mvrahden/go-shamir/cmd/shamir"
+)
+
+func setStdinAndCleanup(t *testing.T) {
+	t.Helper()
+	newStdin, err := os.CreateTemp("", "input-1")
+	if err != nil {
+		t.Fatalf("failed writing to stdin: %s", err)
+	}
+	newStderr, err := os.CreateTemp("", "output-1")
+	if err != nil {
+		t.Fatalf("failed writing to stdin: %s", err)
+	}
+	oldStdin := os.Stdin
+	oldStderr := os.Stderr
+	t.Cleanup(func() {
+		os.Stdin = oldStdin
+		os.Stderr = oldStderr
+		os.Remove(newStdin.Name())
+		os.Remove(newStderr.Name())
+	})
+	os.Stdin = newStdin
+	os.Stderr = newStderr
+}
+
+func Test(t *testing.T) {
+	os.Args = []string{"cmd", "split", "-p", "4", "-t", "2"}
+	setStdinAndCleanup(t)
+
+	_, err := os.Stdin.Write([]byte(`very very secret`))
+	if err != nil {
+		t.Fatalf("failed writing to stdin: %s", err)
+	}
+	_, err = os.Stdin.Seek(0, 0)
+	if err != nil {
+		t.Fatalf("failed resetting pointer of stdin: %s", err)
+	}
+	main.Execute()
+}

cmd/shamir/shamir_test.go

@@ -1,8 +1,8 @@
-package cmd
+package main
 
 import (
 	"fmt"
-	"io/ioutil"
+	"io"
 	"os"
 
 	"github.com/hashicorp/vault/shamir"
@@ -28,7 +28,7 @@ func init() {
 }
 
 func runSplit(cmd *cobra.Command, args []string) {
-	secretBuf, err := ioutil.ReadAll(os.Stdin)
+	secretBuf, err := io.ReadAll(os.Stdin)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "Failed to read stdin: %v\n", err)
 		os.Exit(1)