Merge pull request #5 from smlx/fix-end-ignore

Handle ending timesheet with an ignore block

internal/parse/fsm.go

@@ -112,5 +112,9 @@ var timesheetTransitions = []fsm.Transition{
 		Src:   gotImplicitIssue,
 		Event: eof,
 		Dst:   end,
+	}, {
+		Src:   start,
+		Event: eof,
+		Dst:   end,
 	},
 }

internal/parse/parse.go

@@ -154,7 +154,10 @@ func Input(r io.Reader, c *config.Config) (map[string][]Worklog, error) {
 			},
 		},
 		end: {
-			func(e fsm.Event, _ fsm.State) error {
+			func(_ fsm.Event, s fsm.State) error {
+				if s == start {
+					return nil
+				}
 				addWorklog(worklogs, &timesheet)
 				return nil
 			},

internal/parse/parse_test.go

@@ -270,6 +270,34 @@ func TestParseInput(t *testing.T) {
 				},
 			},
 		},
+		"worklog2": {
+			input: &parseInput{
+				dataFile: "testdata/worklog2",
+				config: &config.Config{
+					Issues: []config.Issue{
+						{
+							ID: "ADMIN-1",
+							Regexes: wrapRegexes([]string{
+								"^admin$",
+							}),
+						},
+					},
+					Ignore: wrapRegexes([]string{
+						"^lunch$",
+					}),
+				},
+			},
+			expect: map[string][]parse.Worklog{
+				"ADMIN-1": {
+					{
+						Started: time.Date(now.Year(), now.Month(), now.Day(), 9, 0, 0,
+							0, now.Location()),
+						Duration: 45 * time.Minute,
+						Comment:  "",
+					},
+				},
+			},
+		},
 	}
 	for name, tc := range testCases {
 		t.Run(name, func(tt *testing.T) {

internal/parse/testdata/worklog2

@@ -0,0 +1,4 @@
+0900-0945
+admin
+1200-1300
+lunch