Merge pull request #15 from josegonzalez/master

Release 0.6.0
dokku · Mar 12, 2019 · e9aefd2 · e9aefd2
2 parents 093f9fd + 9b469db
commit e9aefd2
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -5,7 +5,7 @@ MAINTAINER_NAME = Jose Diaz-Gonzalez
 REPOSITORY = go-procfile-util
 HARDWARE = $(shell uname -m)
 SYSTEM_NAME  = $(shell uname -s | tr '[:upper:]' '[:lower:]')
-BASE_VERSION ?= 0.5.0
+BASE_VERSION ?= 0.6.0
 IMAGE_NAME ?= $(MAINTAINER)/$(REPOSITORY)
 PACKAGECLOUD_REPOSITORY ?= dokku/dokku-betafish
 

diff --git a/main.go b/main.go
@@ -72,7 +72,7 @@ func getProcfile(path string) (string, error) {
 
 func parseProcfile(path string, delimiter string) ([]procfileEntry, error) {
 	var entries []procfileEntry
-	reCmd, _ := regexp.Compile(`^([A-Za-z0-9_]+)` + delimiter + `\s*(.+)$`)
+	reCmd, _ := regexp.Compile(`^([A-Za-z0-9_-]+)` + delimiter + `\s*(.+)$`)
 	reComment, _ := regexp.Compile(`^(.*)\s#.+$`)
 
 	text, err := getProcfile(path)

diff --git a/test.Procfile b/test.Procfile
@@ -5,9 +5,13 @@
 # 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
-worker: node worker.js
+wor-ker: node worker.js
+-wor-ker2: node worker.js
+-wor-ker_2: node worker.js
 custom: echo -n
-
+2custom: echo -n
+-3custom-: echo -n
+release: touch /app/release.test
 
 # Old version with separate processes (use this if you have issues with the threaded version)
 # web: bundle exec rails server