Merge pull request #6 from GustavoCaso/remove-program-package-complexity

Remove program package complexity

Author: GustavoCaso

cmd/meeseeks/run.go

@@ -130,8 +130,19 @@ func startServer(ctx context.Context, cfg *config.Config, sockPath string) (*ser
 			return nil, fmt.Errorf("failed to create program %s: %w", programConfig.Name, err)
 		}
 
-		if addErr := s.AddProgram(prog); addErr != nil {
-			return nil, fmt.Errorf("failed to add program %s: %w", programConfig.Name, addErr)
+		// Check if this program has an interval - pass it to AddProgram
+		if programConfig.Interval != "" {
+			interval, intervalErr := programConfig.GetInterval()
+			if intervalErr != nil {
+				return nil, fmt.Errorf("failed to parse interval for program %s: %w", programConfig.Name, intervalErr)
+			}
+			if addErr := s.AddProgram(prog, interval); addErr != nil {
+				return nil, fmt.Errorf("failed to add scheduled program %s: %w", programConfig.Name, addErr)
+			}
+		} else {
+			if addErr := s.AddProgram(prog); addErr != nil {
+				return nil, fmt.Errorf("failed to add program %s: %w", programConfig.Name, addErr)
+			}
 		}
 	}
 

cmd/meeseeks/status_test.go

@@ -17,15 +17,15 @@ func TestStatusCommand(t *testing.T) {
 			name:         "status format table",
 			args:         []string{"status"},
 			expectedExit: 0,
-			shouldContain: `NAME                RUNS  SUCCESS  FAILED  RUNNING  INTERVAL  STATUS
-----                ----  -------  ------  -------  --------  ------
-test-echo-detached  1     0        0       1        no        running`,
+			shouldContain: `NAME                SUCCESS  FAILED  INTERVAL  STATUS
+----                -------  ------  --------  ------
+test-echo-detached  0        0       no        running`,
 		},
 		{
 			name:          "status format table single program",
 			args:          []string{"status", "test-echo-detached"},
 			expectedExit:  0,
-			shouldContain: `test-echo-detached  1     0        0       1        no        running`,
+			shouldContain: `test-echo-detached  0        0       no        running`,
 		},
 		{
 			name:          "status format json",

cmd/meeseeks/utils.go

@@ -9,6 +9,7 @@ import (
 	"text/tabwriter"
 
 	"github.com/GustavoCaso/meeseeks/internal/config"
+	"github.com/GustavoCaso/meeseeks/pkg/meeseeks"
 	"github.com/GustavoCaso/meeseeks/pkg/program"
 )
 
@@ -70,14 +71,6 @@ func createProgramFromConfig(pc config.ProgramConfig) (program.Program, error) {
 		opts = append(opts, program.KeepStdinOpen())
 	}
 
-	if pc.Interval != "" {
-		interval, err := pc.GetInterval()
-		if err != nil {
-			return nil, fmt.Errorf("invalid interval: %w", err)
-		}
-		opts = append(opts, program.Interval(interval))
-	}
-
 	if pc.Stdout != "" {
 		file, err := os.OpenFile(pc.Stdout, os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0600)
 		if err != nil {
@@ -102,9 +95,9 @@ func formatStatisticsAsTable(data any, programName string) error {
 	if err != nil {
 		return fmt.Errorf("failed to marshal data: %w", err)
 	}
-	programStatistics := []program.Statistics{}
+	programStatistics := []meeseeks.Statistics{}
 	if programName != "" {
-		var programStatistic = program.Statistics{}
+		var programStatistic = meeseeks.Statistics{}
 
 		err = json.Unmarshal(jsonBytes, &programStatistic)
 		if err != nil {
@@ -113,7 +106,7 @@ func formatStatisticsAsTable(data any, programName string) error {
 
 		programStatistics = append(programStatistics, programStatistic)
 	} else {
-		var programsStatistic = []program.Statistics{}
+		var programsStatistic = []meeseeks.Statistics{}
 
 		err = json.Unmarshal(jsonBytes, &programsStatistic)
 		if err != nil {
@@ -124,26 +117,19 @@ func formatStatisticsAsTable(data any, programName string) error {
 	}
 
 	w := tabwriter.NewWriter(os.Stdout, 0, 0, 2, ' ', 0)
-	fmt.Fprintf(w, "NAME\tRUNS\tSUCCESS\tFAILED\tRUNNING\tINTERVAL\tSTATUS\n")
-	fmt.Fprintf(w, "----\t----\t-------\t------\t-------\t--------\t------\n")
+	fmt.Fprintf(w, "NAME\tSUCCESS\tFAILED\tINTERVAL\tSTATUS\n")
+	fmt.Fprintf(w, "----\t-------\t------\t--------\t------\n")
 
 	for _, stats := range programStatistics {
 		name := stats.ProgramName
-		totalRuns := stats.TotalRuns
 		successful := stats.Successful
 		failed := stats.Failed
-		running := stats.Running
 		interval := "no"
-		if stats.HasInterval {
-			interval = stats.Interval.String()
-		}
 
-		fmt.Fprintf(w, "%s\t%d\t%d\t%d\t%d\t%s\t%s\n",
+		fmt.Fprintf(w, "%s\t%d\t%d\t%s\t%s\n",
 			truncateString(name, 20),
-			totalRuns,
 			successful,
 			failed,
-			running,
 			truncateString(interval, 10),
 			stats.State)
 	}

cmd/meeseeks/utils_test.go

@@ -45,16 +45,6 @@ func TestCreateProgramFromConfig(t *testing.T) {
 			},
 			expectedName: "test-interval",
 		},
-		{
-			name: "program with invalid interval",
-			config: config.ProgramConfig{
-				Name:     "test-invalid",
-				Command:  "echo",
-				Interval: "invalid-duration",
-			},
-			expectError:  true,
-			errorMessage: "invalid interval",
-		},
 	}
 
 	for _, tt := range tests {

internal/server/server.go

@@ -109,8 +109,8 @@ func (s *Server) Stop() error {
 	return errors.Join(errs...)
 }
 
-func (s *Server) AddProgram(prog program.Program) error {
-	return s.meeseeks.AddProgram(prog)
+func (s *Server) AddProgram(prog program.Program, interval ...time.Duration) error {
+	return s.meeseeks.AddProgram(prog, interval...)
 }
 
 func (s *Server) StartPrograms(ctx context.Context) {