From c617ddb3b2ea74616b40227dbcb2490ebfa46f73 Mon Sep 17 00:00:00 2001
From: Aaron Kalin <akalin@martinisoftware.com>
Date: Mon, 10 Sep 2012 18:21:51 -0500
Subject: [PATCH] Cleanup launchd exporter

Also suppresses the deprecation warning for the launchd exporter when
using port instead of engine.port_for
---
 data/export/launchd/launchd.plist.erb           | 8 ++++----
 lib/foreman/export/launchd.rb                   | 1 +
 spec/resources/export/launchd/launchd-a.default | 6 ++----
 spec/resources/export/launchd/launchd-b.default | 6 ++----
 4 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/data/export/launchd/launchd.plist.erb b/data/export/launchd/launchd.plist.erb
index 56fc947..1731c4c 100644
--- a/data/export/launchd/launchd.plist.erb
+++ b/data/export/launchd/launchd.plist.erb
@@ -6,10 +6,10 @@
     <string><%= "#{app}-#{name}-#{num}" %></string>
     <key>EnvironmentVariables</key>
     <dict>
-    <% engine.env.merge("PORT" => port).each_pair do |var,env| %>
-      <key><%= var.upcase %></key>
-      <string><%= env %></string>
-    <% end %>
+    <%- engine.env.merge("PORT" => port).each_pair do |var,env| -%>
+        <key><%= var.upcase %></key>
+        <string><%= env %></string>
+    <%- end -%>
     </dict>
     <key>ProgramArguments</key>
     <array>
diff --git a/lib/foreman/export/launchd.rb b/lib/foreman/export/launchd.rb
index fd73681..4b9571f 100644
--- a/lib/foreman/export/launchd.rb
+++ b/lib/foreman/export/launchd.rb
@@ -7,6 +7,7 @@ class Foreman::Export::Launchd < Foreman::Export::Base
     super
     engine.each_process do |name, process|
       1.upto(engine.formation[name]) do |num|
+        port = engine.port_for(process, num)
         write_template "launchd/launchd.plist.erb", "#{app}-#{name}-#{num}.plist", binding
       end
     end
diff --git a/spec/resources/export/launchd/launchd-a.default b/spec/resources/export/launchd/launchd-a.default
index bcbb8e8..80c731d 100644
--- a/spec/resources/export/launchd/launchd-a.default
+++ b/spec/resources/export/launchd/launchd-a.default
@@ -6,10 +6,8 @@
     <string>app-alpha-1</string>
     <key>EnvironmentVariables</key>
     <dict>
-    
-      <key>PORT</key>
-      <string>5000</string>
-    
+        <key>PORT</key>
+        <string>5000</string>
     </dict>
     <key>ProgramArguments</key>
     <array>
diff --git a/spec/resources/export/launchd/launchd-b.default b/spec/resources/export/launchd/launchd-b.default
index ab7647f..da78927 100644
--- a/spec/resources/export/launchd/launchd-b.default
+++ b/spec/resources/export/launchd/launchd-b.default
@@ -6,10 +6,8 @@
     <string>app-bravo-1</string>
     <key>EnvironmentVariables</key>
     <dict>
-    
-      <key>PORT</key>
-      <string>5000</string>
-    
+        <key>PORT</key>
+        <string>5100</string>
     </dict>
     <key>ProgramArguments</key>
     <array>