Regenerated gemspec for version 0.4.7

README.markdown

@@ -43,6 +43,9 @@ The following options control how the application is run:
     Use this name rather than the application's root directory name as the
     name of the application when exporting.
 
+  * `-l`, `--log`:
+    Specify the directory to place process logs in.
+
   * `-c`, `--concurrency`:
     Specify the number of each process type to run. The value passed in
     should be in the format `process=num,process=num`

export/upstart/master.conf.erb

@@ -1,8 +1,8 @@
 pre-start script
 
 bash << "EOF"
-  mkdir -p /var/log/<%= app %>
+  mkdir -p <%= log_root %>
-  chown -R <%= user %> /var/log/<%= app %>
+  chown -R <%= user %> <%= log_root %>
 EOF
 
 end script

export/upstart/process.conf.erb

@@ -3,4 +3,4 @@ stop on stopping <%= app %>-<%= process.name %>
 respawn
 
 chdir <%= engine.directory %>
-exec su <%= user %> -c "<%= process.command %> >> /var/log/<%=app%>/<%=process.name%>-<%=num%>.log 2>&1"
+exec su <%= user %> -c "<%= process.command %> >> <%= log_root %>/<%=process.name%>-<%=num%>.log 2>&1"

foreman.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{foreman}
-  s.version = "0.4.5"
+  s.version = "0.4.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Dollar"]

lib/foreman.rb

@@ -1,6 +1,6 @@
 module Foreman
 
-  VERSION = "0.4.5"
+  VERSION = "0.4.7"
 
   class AppDoesNotExist < Exception; end
 

lib/foreman/cli.rb

@@ -26,6 +26,7 @@ class Foreman::CLI < Thor
   desc "export FORMAT LOCATION", "Export the application to another process management format"
 
   method_option :app,         :type => :string, :aliases => "-a"
+  method_option :log,         :type => :string, :aliases => "-l"
   method_option :user,        :type => :string, :aliases => "-u"
   method_option :concurrency, :type => :string, :aliases => "-c",
     :banner => '"alpha=5,bar=3"'
@@ -41,6 +42,7 @@ class Foreman::CLI < Thor
     formatter.new(engine).export(location,
       :name        => options[:app],
       :user        => options[:user],
+      :log         => options[:log],
       :concurrency => options[:concurrency]
     )
   rescue Foreman::Export::Exception => ex

lib/foreman/export/inittab.rb

@@ -5,7 +5,7 @@ class Foreman::Export::Inittab < Foreman::Export::Base
   def export(fname=nil, options={})
     app = options[:app] || File.basename(engine.directory)
     user = options[:user] || app
-    log_dir = "/var/log/#{app}"
+    log_root = options[:log] || "/var/log"
 
     concurrency = parse_concurrency(options[:concurrency])
 
@@ -13,15 +13,15 @@ class Foreman::Export::Inittab < Foreman::Export::Base
     inittab << "# ----- foreman #{app} processes -----"
     engine.processes.values.each_with_index do |process, num|
       id = app.slice(0, 2).upcase + sprintf("%02d", num+1)
-      inittab << "#{id}:4:respawn:/bin/su - #{user} -c '#{process.command} >> #{log_dir}/#{process.name}-#{num+1}.log 2>&1'"
+      inittab << "#{id}:4:respawn:/bin/su - #{user} -c '#{process.command} >> #{log_root}/#{process.name}-#{num+1}.log 2>&1'"
     end
     inittab << "# ----- end foreman #{app} processes -----"
 
     inittab = inittab.join("\n") + "\n"
 
     if fname
-      FileUtils.mkdir_p(log_dir)
+      FileUtils.mkdir_p(log_root)
-      FileUtils.chown(user, nil, log_dir)
+      FileUtils.chown(user, nil, log_root)
       write_file(fname, inittab)
     else
       puts inittab

lib/foreman/export/upstart.rb

@@ -10,6 +10,7 @@ class Foreman::Export::Upstart < Foreman::Export::Base
 
     app = options[:app] || File.basename(engine.directory)
     user = options[:user] || app
+    log_root = options[:log] || "/var/log/#{app}"
 
     Dir["#{location}/#{app}*.conf"].each do |file|
       say "cleaning up: #{file}"

man/foreman.1.ronn

@@ -43,6 +43,9 @@ The following options control how the application is run:
     Use this name rather than the application's root directory name as the
     name of the application when exporting.
 
+  * `-l`, `--log`:
+    Specify the directory to place process logs in.
+
   * `-c`, `--concurrency`:
     Specify the number of each process type to run. The value passed in
     should be in the format `process=num,process=num`