Merge pull request #125 from dokku/handle-whitespace

feat: handle case where the delimiter is preceeded by whitespace

fixtures/comments.Procfile

@@ -4,7 +4,7 @@
 
 # Procfile for development using the new threaded worker (scheduler, twitter stream and delayed job)
 cron: node worker.js
-web: node web.js # testing inline comment
+web   : node web.js # testing inline comment
 wor-ker: node worker.js
 # -wor-ker2: node worker.js
 # -wor-ker_2: node worker.js

procfile/parse.go

@@ -34,8 +34,8 @@ func ParseFormation(formation string) (map[string]FormationEntry, error) {
 // ParseProcfile parses text as a procfile and returns a list of procfile entries
 func ParseProcfile(text string, delimiter string, strict bool) ([]ProcfileEntry, error) {
 	var entries []ProcfileEntry
-	reCmd, _ := regexp.Compile(`^([a-z0-9]([-a-z0-9]*[a-z0-9])?)` + delimiter + `\s*(.+)$`)
-	reOldCmd, _ := regexp.Compile(`^([A-Za-z0-9_-]+)` + delimiter + `\s*(.+)$`)
+	reCmd, _ := regexp.Compile(`^([a-z0-9]([-a-z0-9]*[a-z0-9])?)\s*` + delimiter + `\s*(.+)$`)
+	reOldCmd, _ := regexp.Compile(`^([A-Za-z0-9_-]+)\s*` + delimiter + `\s*(.+)$`)
 
 	reComment, _ := regexp.Compile(`^(.*)\s#.+$`)
 	reForwardslashComment, _ := regexp.Compile(`^(.*)\s//.+$`)

test.bats

@@ -28,6 +28,12 @@ custom
 release
 web
 wor-ker"
+
+  run $PROCFILE_BIN show -P fixtures/comments.Procfile -p web
+  echo "output: $output"
+  echo "status: $status"
+  [[ "$status" -eq 0 ]]
+  assert_output "node web.js"
 }
 
 @test "[lax] forwardslash-comments" {
@@ -183,8 +189,8 @@ flunk() {
 assert_equal() {
   if [[ "$1" != "$2" ]]; then
     {
-      echo "expected: '$1'"
-      echo "actual:   '$2'"
+      echo "expected: $1"
+      echo "actual:   $2"
     } | flunk
   fi
 }