Prune dead code

Author: mschenk42

command/clean.go

@@ -62,16 +62,10 @@ func (c CleanCmd) Run(args []string) int {
 	}
 
 	if confirm {
-		var (
-			m   string
-			err error
-		)
-
-		if m, err = project.Clean(util.AfterNow(days), terminalOnly); err != nil {
+		if err := project.Clean(util.AfterNow(days), terminalOnly); err != nil {
 			c.Ui.Error(err.Error())
 			return 1
 		}
-		c.Ui.Output(m)
 	}
 	return 0
 }

project/project.go

@@ -255,27 +255,25 @@ func Uninitialize() (string, error) {
 }
 
 //Clean removes any event or metrics files from project in the current working directory
-func Clean(dr util.DateRange, terminalOnly bool) (string, error) {
+func Clean(dr util.DateRange, terminalOnly bool) error {
 	wd, err := os.Getwd()
 	if err != nil {
-		return "", err
+		return err
 	}
 
 	projRoot, err := scm.RootPath(wd)
 	if err != nil {
-		return "", fmt.Errorf(
-			"Unable to clean, Git repository not found in %s", projRoot)
+		return fmt.Errorf("Unable to clean, Git repository not found in %s", projRoot)
 	}
 
 	gtmPath := filepath.Join(projRoot, GTMDir)
 	if _, err := os.Stat(gtmPath); os.IsNotExist(err) {
-		return "", fmt.Errorf(
-			"Unable to clean GTM data, %s directory not found", gtmPath)
+		return fmt.Errorf("Unable to clean GTM data, %s directory not found", gtmPath)
 	}
 
 	files, err := ioutil.ReadDir(gtmPath)
 	if err != nil {
-		return "", err
+		return err
 	}
 	for _, f := range files {
 		if !strings.HasSuffix(f.Name(), ".event") &&
@@ -289,18 +287,21 @@ func Clean(dr util.DateRange, terminalOnly bool) (string, error) {
 		if terminalOnly && strings.HasSuffix(f.Name(), ".event") {
 			b, err := ioutil.ReadFile(fp)
 			if err != nil {
-				return "", err
+				return err
 			}
 			if !strings.Contains(string(b), "terminal.app") {
 				continue
 			}
 		}
 		if err := os.Remove(fp); err != nil {
-			return "", err
+			return err
 		}
 	}
+	return nil
+}
 
-	return "", nil
+func Stash() error {
+	return nil
 }
 
 // Paths returns the root git repo and gtm paths

project/project_test.go

@@ -266,7 +266,7 @@ func TestClean(t *testing.T) {
 	}
 
 	// lets only delete terminal events
-	_, err = Clean(util.AfterNow(0), true)
+	err = Clean(util.AfterNow(0), true)
 	files, err := ioutil.ReadDir(gtmPath)
 	if err != nil {
 		t.Fatalf("Want error nil got %s", err)
@@ -278,7 +278,7 @@ func TestClean(t *testing.T) {
 	}
 
 	// lets clean all events
-	_, err = Clean(util.AfterNow(0), false)
+	err = Clean(util.AfterNow(0), false)
 	files, err = ioutil.ReadDir(gtmPath)
 	if err != nil {
 		t.Fatalf("Want error nil got %s", err)