Merge pull request #34 from krallin/fix-bad-shorthand-parse

Fix bad shorthand parse
aptible · Aug 1, 2018 · 0ce2c75 · 0ce2c75
2 parents 2cf5742 + 4d5c9b9
commit 0ce2c75
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 9 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -23,7 +23,8 @@
 
 [[constraint]]
   name = "github.com/gorhill/cronexpr"
-  version = "~1.0.0"
+  branch = "strict"
+  source = "github.com/krallin/cronexpr"
 
 [[constraint]]
   name = "github.com/sirupsen/logrus"

diff --git a/crontab/crontab.go b/crontab/crontab.go
@@ -36,7 +36,7 @@ func parseJobLine(line string) (*CrontabLine, error) {
 		// TODO: Should receive a logger?
 		logrus.Debugf("try parse(%d): %s[0:%d] = %s", count, line, scheduleEnds, line[0:scheduleEnds])
 
-		expr, err := cronexpr.Parse(line[:scheduleEnds])
+		expr, err := cronexpr.ParseStrict(line[:scheduleEnds])
 
 		if err != nil {
 			continue

diff --git a/crontab/crontab_test.go b/crontab/crontab_test.go
@@ -229,6 +229,24 @@ var parseCrontabTestCases = []struct {
 		},
 	},
 
+	{
+		"@hourly foo1 foo2 foo3 foo4 foo5 foo6",
+		&Crontab{
+			Context: &Context{
+				Shell:   "/bin/sh",
+				Environ: map[string]string{},
+			},
+			Jobs: []*Job{
+				{
+					CrontabLine: CrontabLine{
+						Schedule: "@hourly",
+						Command:  "foo1 foo2 foo3 foo4 foo5 foo6",
+					},
+				},
+			},
+		},
+	},
+
 	// Failure cases
 	{"* foo \n", nil},
 	{"* some * * *  more\n", nil},