From 89bdc3ab8e023b74803c0c89a59ebc15d16c902c Mon Sep 17 00:00:00 2001 From: Paul Morton Date: Thu, 18 Oct 2012 09:09:15 -0700 Subject: [PATCH] Strip Windows Line Endings --- lib/foreman/env.rb | 2 +- lib/foreman/procfile.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/foreman/env.rb b/lib/foreman/env.rb index ff579da..1b65514 100644 --- a/lib/foreman/env.rb +++ b/lib/foreman/env.rb @@ -5,7 +5,7 @@ class Foreman::Env attr_reader :entries def initialize(filename) - @entries = File.read(filename).split("\n").inject({}) do |ax, line| + @entries = File.read(filename).gsub("\r\n","\n").split("\n").inject({}) do |ax, line| if line =~ /\A([A-Za-z_0-9]+)=(.*)\z/ key = $1 case val = $2 diff --git a/lib/foreman/procfile.rb b/lib/foreman/procfile.rb index 47238c5..a307643 100644 --- a/lib/foreman/procfile.rb +++ b/lib/foreman/procfile.rb @@ -82,7 +82,7 @@ class Foreman::Procfile private def parse(filename) - File.read(filename).split("\n").map do |line| + File.read(filename).gsub("\r\n","\n").split("\n").map do |line| if line =~ /^([A-Za-z0-9_]+):\s*(.+)$/ [$1, $2] end