Merge pull request #5 from AlexsanderHamir/refactors

Refactors

Author: AlexsanderHamir

.gitignore

@@ -1,5 +1,3 @@
 tasks.md
-*.out
-*.prof
 *prof
 /Enviroment*/

collector/api.go

@@ -41,9 +41,10 @@ func RunCollector(files []string, tag string) error {
 	}
 
 	for _, binaryFilePath := range files {
-		fileName := strings.TrimSuffix(binaryFilePath, filepath.Ext(binaryFilePath))
-		profilepath := path.Join(tagDir, fileName)
-		if err = ensureDirExists(profilepath); err != nil {
+		binaryDirName := filepath.Base(binaryFilePath)
+		fileName := strings.TrimSuffix(binaryDirName, filepath.Ext(binaryDirName))
+		profileDirPath := path.Join(tagDir, fileName)
+		if err = ensureDirExists(profileDirPath); err != nil {
 			return err
 		}
 
@@ -54,7 +55,7 @@ func RunCollector(files []string, tag string) error {
 			}
 		}
 
-		outputTextFilePath := path.Join(profilepath, fileName+"."+shared.TextExtension)
+		outputTextFilePath := path.Join(profileDirPath, fileName+"."+shared.TextExtension)
 		if err = GenerateProfileTextOutput(binaryFilePath, outputTextFilePath); err != nil {
 			return err
 		}
@@ -65,7 +66,7 @@ func RunCollector(files []string, tag string) error {
 			return fmt.Errorf("failed to extract function names: %w", err)
 		}
 
-		functionDir := path.Join(profilepath, "functions")
+		functionDir := path.Join(profileDirPath, "functions")
 		if err = ensureDirExists(functionDir); err != nil {
 			return err
 		}

tests/assets/block.out

@@ -1,10 +1,15 @@
 package tests
 
 import (
+	"bytes"
 	"fmt"
+	"os"
+	"os/exec"
+	"path"
 	"testing"
 
 	"github.com/AlexsanderHamir/prof/config"
+	"github.com/AlexsanderHamir/prof/shared"
 )
 
 func TestConfig(t *testing.T) {
@@ -27,8 +32,6 @@ func TestConfig(t *testing.T) {
 			},
 		}
 
-		fmt.Println(defaultRunCmd())
-
 		testArgs := &TestArgs{
 			specifiedFiles:          specifiedFiles,
 			cfg:                     cfg,
@@ -296,3 +299,52 @@ func TestCommandValidation(t *testing.T) {
 		testConfigScenario(t, testArgs)
 	})
 }
+
+func TestManualCommand(t *testing.T) {
+	root, err := getProjectRoot()
+	if err != nil {
+		t.Log(err)
+	}
+	binaryPath := path.Join(root, testDirName, "prof")
+
+	buildProf(t, binaryPath, root)
+
+	t.Cleanup(func() {
+		benchPath := path.Join(root, testDirName, shared.MainDirOutput)
+		if err = os.RemoveAll(benchPath); err != nil {
+			t.Logf("Failed to clean up bench: %v", err)
+		}
+
+		if err = os.Remove("prof"); err != nil {
+			t.Logf("failed to clean prof binary: %s", err)
+		}
+	})
+
+	label := "BasicRun"
+	t.Run(label, func(t *testing.T) {
+		args := []string{
+			"manual",
+			"--tag", tag,
+			"assets/cpu.out",
+			"assets/memory.out",
+			"assets/block.out",
+			"assets/mutex.out",
+		}
+
+		cmd := exec.Command("./prof", args...)
+		cmd.Dir = path.Join(root, testDirName)
+
+		var stdout, stderr bytes.Buffer
+		cmd.Stdout = &stdout
+		cmd.Stderr = &stderr
+
+		err = cmd.Run()
+		if err != nil {
+			t.Error(err)
+		}
+
+		if stdout.Len() > 0 {
+			fmt.Println(stdout.String())
+		}
+	})
+}

tests/assets/cpu.out

@@ -436,3 +436,14 @@ func defaultRunCmd() []string {
 		"--tag", tag,
 	}
 }
+
+func buildProf(t *testing.T, outputPath, root string) {
+	cmdProfDir := filepath.Join(root, "cmd", "prof")
+	buildCmd := exec.Command("go", "build", "-o", outputPath, ".")
+	buildCmd.Dir = cmdProfDir
+
+	buildOutput, err := buildCmd.CombinedOutput()
+	if err != nil {
+		t.Fatalf("failed to build prof binary: %v\nOutput: %s", err, buildOutput)
+	}
+}