per default wrap every environment value in quotes

spec/foreman/export/supervisord_spec.rb

@@ -73,12 +73,20 @@ describe Foreman::Export::Supervisord, :fakefs do
   end
 
   context "environment export" do
-    it "returns the original environment if it contains no comma" do
-      supervisord.wrap_environment("production").should == "production"
+    it "wraps the original environment with quotes" do
+      supervisord.wrap_environment("slowqueue,fastqueue").should == '"slowqueue,fastqueue"'
     end
 
-    it "wraps the original environment with quotes if it contains a comma" do
-      supervisord.wrap_environment("slowqueue,fastqueue").should == '"slowqueue,fastqueue"'
+    it "correctly translates environment when exporting" do
+      File.open("/tmp/supervisord_env", "w") { |f| f.puts("QUEUE=fastqueue,slowqueue\nVERBOSE=1") }
+
+      engine = Foreman::Engine.new(procfile,:env => "/tmp/supervisord_env")
+      supervisor = Foreman::Export::Supervisord.new("/tmp/init", engine, options)
+      stub(supervisor).say
+
+      supervisor.export
+
+      File.read("/tmp/init/app.conf").should == example_export_file("supervisord/app-env-with-comma.conf")
     end
   end
 

spec/resources/export/supervisord/app-alpha-2.conf

@@ -8,7 +8,7 @@ stdout_logfile=/var/log/app/alpha-1-out.log
 stderr_logfile=/var/log/app/alpha-1-err.log
 user=app
 directory=/tmp/app
-environment=PORT=5000
+environment=PORT="5000"
 [program:app-alpha-2]
 command=./alpha
 autostart=true
@@ -18,7 +18,7 @@ stdout_logfile=/var/log/app/alpha-2-out.log
 stderr_logfile=/var/log/app/alpha-2-err.log
 user=app
 directory=/tmp/app
-environment=PORT=5001
+environment=PORT="5001"
 
 [group:app]
 programs=app-alpha-1,app-alpha-2

spec/resources/export/supervisord/app-env-with-comma.conf

@@ -0,0 +1,24 @@
+
+[program:app-alpha]
+command=./alpha
+autostart=true
+autorestart=true
+stopsignal=QUIT
+stdout_logfile=/var/log/app/alpha-1-out.log
+stderr_logfile=/var/log/app/alpha-1-err.log
+user=app
+directory=/tmp/app
+environment=QUEUE="fastqueue,slowqueue",VERBOSE="1",PORT="5000"
+[program:app-bravo]
+command=./bravo
+autostart=true
+autorestart=true
+stopsignal=QUIT
+stdout_logfile=/var/log/app/bravo-1-out.log
+stderr_logfile=/var/log/app/bravo-1-err.log
+user=app
+directory=/tmp/app
+environment=QUEUE="fastqueue,slowqueue",VERBOSE="1",PORT="5100"
+
+[group:app]
+programs=app-alpha,app-bravo

spec/resources/export/supervisord/app-env.conf

@@ -0,0 +1,21 @@
+
+[program:app-alpha]
+command=./alpha
+autostart=true
+autorestart=true
+stopsignal=QUIT
+stdout_logfile=/var/log/app/alpha-1-out.log
+stderr_logfile=/var/log/app/alpha-1-err.log
+user=app
+directory=/tmp/app
+environment=FOO="bar",PORT="5000"
+[program:app-bravo]
+command=./bravo
+autostart=true
+autorestart=true
+stopsignal=QUIT
+stdout_logfile=/var/log/app/bravo-1-out.log
+stderr_logfile=/var/log/app/bravo-1-err.log
+user=app
+directory=/tmp/app
+environment=FOO="bar",PORT="5100"

spec/resources/export/supervisord/app.conf

@@ -8,7 +8,7 @@ stdout_logfile=/var/log/app/alpha-1-out.log
 stderr_logfile=/var/log/app/alpha-1-err.log
 user=app
 directory=/tmp/app
-environment=PORT=5000
+environment=PORT="5000"
 [program:app-bravo]
 command=./bravo
 autostart=true
@@ -18,7 +18,7 @@ stdout_logfile=/var/log/app/bravo-1-out.log
 stderr_logfile=/var/log/app/bravo-1-err.log
 user=app
 directory=/tmp/app
-environment=PORT=5100
+environment=PORT="5100"
 
 [group:app]
 programs=app-alpha,app-bravo