From 69253599f3c66be32daeaa8cfd7667604b7befe7 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Tue, 12 Mar 2019 12:09:08 -0400 Subject: [PATCH 1/2] fix: add support for dashes in Procfile names --- main.go | 2 +- test.Procfile | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/main.go b/main.go index ad346d9..a827eff 100644 --- 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 index e9bf882..05ad478 100644 --- 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 From 9b469db2adbb10cd723a86bb4320c4c13148f482 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Tue, 12 Mar 2019 12:12:54 -0400 Subject: [PATCH 2/2] Release 0.6.0 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index a687996..a5fbbe8 100644 --- 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