foreman 0.76.0 → 0.77.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a46526a39ab41e0411a81f1f09fd8f8a567490b0
-  data.tar.gz: 210e82d37b359fb128588a374815d7dcfac22140
+  metadata.gz: 8ace00c61e2302bb26cb004552b600bf0c791f3b
+  data.tar.gz: d9d96a049154dcac4402f72a4251bcd5ac21daf5
 SHA512:
-  metadata.gz: 9bfb35d1a2f01365708c4bc9dc8be5f7959bb42863e376206808651e20ed33d201d4dc3f96bff98c0face9db589b05a21d7ce49310b8b218db614efe98d978eb
-  data.tar.gz: 7f2d6cca39949dae2ef8d8b58fb4ae20a2b4e81d695cf7cf980e459ae1404cb56707532a6fc0fb98f61c5cd68d93934b592c2ca3d70aafd5b41a644926458a00
+  metadata.gz: 1d6f953545ff47dc24a7dd19739fd4cf5b5a898830180bed8f953b9d5fa2e953339163a86040ce1a7589b9dd9b66f5e065bfbc6a2555462fccca6645073d59a2
+  data.tar.gz: 2ffde5cf550f9ae2f2c14e7b6f5ed06bdccbbad46b65b8bb7d6d37e41c7328e193391a0df5156fcb6575164ad708ffeec87cba89684a1c60951925f6e8adddce

data/data/export/supervisord/app.conf.erb

@@ -8,7 +8,7 @@ engine.each_process do |name, process|
       "#{key}=\"#{shell_quote(value)}\""
     end
     app_names << full_name
-%>
+-%>
 [program:<%= full_name %>]
 command=<%= process.command %>
 autostart=true
@@ -18,10 +18,11 @@ stdout_logfile=<%= log %>/<%= name %>-<%= num %>.log
 stderr_logfile=<%= log %>/<%= name %>-<%= num %>.error.log
 user=<%= user %>
 directory=<%= engine.root %>
-environment=<%= environment.join(',') %><%
+environment=<%= environment.join(',') %>
+
+<%
   end
 end
-%>
-
+-%>
 [group:<%= app %>]
 programs=<%= app_names.join(',') %>

data/lib/foreman/export/upstart.rb

@@ -6,19 +6,23 @@ class Foreman::Export::Upstart < Foreman::Export::Base
   def export
     super
 
-    (Dir["#{location}/#{app}-*.conf"] << "#{location}/#{app}.conf").each do |file|
-      clean file
-    end
+    master_file = "#{app}.conf"
 
-    write_template master_template, "#{app}.conf", binding
+    clean File.join(location, master_file)
+    write_template master_template, master_file, binding
 
     engine.each_process do |name, process|
+      process_master_file = "#{app}-#{name}.conf"
+      clean File.join(location, process_master_file)
+
       next if engine.formation[name] < 1
-      write_template process_master_template, "#{app}-#{name}.conf", binding
+      write_template process_master_template, process_master_file, binding
 
       1.upto(engine.formation[name]) do |num|
         port = engine.port_for(process, num)
-        write_template process_template, "#{app}-#{name}-#{num}.conf", binding
+        process_file = "#{app}-#{name}-#{num}.conf"
+        clean File.join(location, process_file)
+        write_template process_template, process_file, binding
       end
     end
   end

data/lib/foreman/version.rb

@@ -1,5 +1,5 @@
 module Foreman
 
-  VERSION = "0.76.0"
+  VERSION = "0.77.0"
 
 end

data/man/foreman.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "FOREMAN" "1" "August 2014" "Foreman 0.76.0" "Foreman Manual"
+.TH "FOREMAN" "1" "January 2015" "Foreman 0.77.0" "Foreman Manual"
 .
 .SH "NAME"
 \fBforeman\fR \- manage Procfile\-based applications

data/spec/foreman/export/upstart_spec.rb

@@ -50,6 +50,20 @@ describe Foreman::Export::Upstart, :fakefs do
     upstart.export
   end
 
+  it 'does not delete exported files for app which share name prefix' do
+    FileUtils.mkdir_p "/tmp/init"
+
+    ["app-worker", "app-worker-worker", "app-worker-worker-1"].each do |name|
+      path = "/tmp/init/#{name}.conf"
+      FileUtils.touch(path)
+      dont_allow(FileUtils).rm(path)
+    end
+
+    upstart.export
+    expect(File.exist?('/tmp/init/app.conf')).to be true
+    expect(File.exist?('/tmp/init/app-worker.conf')).to be true
+  end
+
   it "quotes and escapes environment variables" do
     engine.env['KEY'] = 'd"\|d'
     upstart.export

data/spec/resources/export/supervisord/app-alpha-1.conf

@@ -1,4 +1,3 @@
-
 [program:app-alpha-1]
 command=./alpha
 autostart=true
@@ -9,6 +8,7 @@ stderr_logfile=/var/log/app/alpha-1.error.log
 user=app
 directory=/tmp/app
 environment=PORT="5000"
+
 [program:app-bravo-1]
 command=./bravo
 autostart=true
@@ -19,6 +19,7 @@ stderr_logfile=/var/log/app/bravo-1.error.log
 user=app
 directory=/tmp/app
 environment=PORT="5100"
+
 [program:app-foo_bar-1]
 command=./foo_bar
 autostart=true
@@ -29,6 +30,7 @@ stderr_logfile=/var/log/app/foo_bar-1.error.log
 user=app
 directory=/tmp/app
 environment=PORT="5200"
+
 [program:app-foo-bar-1]
 command=./foo-bar
 autostart=true

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

@@ -1,4 +1,3 @@
-
 [program:app-alpha-1]
 command=./alpha
 autostart=true
@@ -9,6 +8,7 @@ stderr_logfile=/var/log/app/alpha-1.error.log
 user=app
 directory=/tmp/app
 environment=PORT="5000"
+
 [program:app-alpha-2]
 command=./alpha
 autostart=true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman
 version: !ruby/object:Gem::Version
-  version: 0.76.0
+  version: 0.77.0
 platform: ruby
 authors:
 - David Dollar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-26 00:00:00.000000000 Z
+date: 2015-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor