foreman 0.64.0 → 0.65.0

data/data/export/bluepill/master.pill.erb

@@ -7,7 +7,7 @@ Bluepill.application("<%= app %>", :foreground => false, :log_file => "/var/log/
 <% 1.upto(engine.formation[name]) do |num| %>
   <% port = engine.port_for(process, num) %>
   app.process("<%= name %>-<%= num %>") do |process|
-    process.start_command = "<%= process.command %>"
+    process.start_command = %Q{<%= process.command %>}
 
     process.working_dir = "<%= engine.root %>"
     process.daemonize = true

data/data/export/runit/log/run.erb

@@ -3,5 +3,5 @@ set -e
 
 LOG=<%= log %>/<%= name %>-<%= num %>
 
-test -d "$LOG" || mkdir -p m2750 "$LOG" && chown <%= user %> "$LOG"
+test -d "$LOG" || mkdir -p -m 2750 "$LOG" && chown <%= user %> "$LOG"
 exec chpst -u <%= user %> svlogd "$LOG"

data/data/export/runit/run.erb

@@ -1,3 +1,4 @@
 #!/bin/sh
 cd <%= engine.root %>
+exec 2>&1
 exec chpst -u <%= user %> -e <%= File.join(location, "#{process_directory}/env")  %> <%= process.command %>

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

@@ -5,7 +5,7 @@ engine.each_process do |name, process|
     port = engine.port_for(process, num)
     full_name = "#{app}-#{name}-#{num}"
     environment = engine.env.merge("PORT" => port.to_s).map do |key, value|
-      "#{key}=#{shell_quote(value)}"
+      "#{key}=\"#{shell_quote(value)}\""
     end
     app_names << full_name
 %>

data/data/export/systemd/master.target.erb

@@ -1 +1,6 @@
 [Unit]
+StopWhenUnneeded=true
+Wants=<%= process_master_names.join(' ') %>
+
+[Install]
+WantedBy=multi-user.target

data/data/export/systemd/process.service.erb

@@ -13,6 +13,3 @@ StandardOutput=syslog
 StandardError=syslog
 SyslogIdentifier=%n
 KillMode=process
-
-[Install]
-WantedBy=<%= app %>-<%= name %>.target

data/data/export/systemd/process_master.target.erb

@@ -1,5 +1,3 @@
 [Unit]
 StopWhenUnneeded=true
-
-[Install]
-WantedBy=<%= app %>.target
+Wants=<%= process_names.join(' ') %>

data/data/export/upstart/master.conf.erb

@@ -1,12 +1,2 @@
-pre-start script
-
-bash << "EOF"
-  mkdir -p <%= log %>
-  chown -R <%= user %> <%= log %>
-EOF
-
-end script
-
 start on runlevel [2345]
-
-stop on runlevel [016]
+stop on runlevel [!2345]

data/data/export/upstart/process.conf.erb

@@ -2,4 +2,13 @@ start on starting <%= app %>-<%= name %>
 stop on stopping <%= app %>-<%= name %>
 respawn
 
-exec su - <%= user %> -c 'cd <%= engine.root %>; export PORT=<%= port %>;<% engine.env.each_pair do |var,env| %> export <%= var.upcase %>=<%= shell_quote(env) %>; <% end %> <%= process.command %> >> <%= log %>/<%=name%>-<%=num%>.log 2>&1'
+env PORT=<%= port %>
+<% engine.env.each do |name,value| -%>
+env <%= name.upcase %>='<%= value.gsub(/'/, "'\"'\"'") %>'
+<% end -%>
+
+setuid <%= user %>
+
+chdir <%= engine.root %>
+
+exec <%= process.command %>

data/lib/foreman/export/base.rb

@@ -46,10 +46,8 @@ class Foreman::Export::Base
   def export
     error("Must specify a location") unless location
     FileUtils.mkdir_p(location) rescue error("Could not create: #{location}")
-    FileUtils.mkdir_p(log) rescue error("Could not create: #{log}")
-    FileUtils.mkdir_p(run) rescue error("Could not create: #{run}")
-    FileUtils.chown(user, nil, log) rescue error("Could not chown #{log} to #{user}")
-    FileUtils.chown(user, nil, run) rescue error("Could not chown #{run} to #{user}")
+    chown user, log
+    chown user, run
   end
 
   def app
@@ -82,6 +80,12 @@ private ######################################################################
     @@deprecation_warned = true
   end
 
+  def chown user, dir
+    FileUtils.chown user, nil, dir
+  rescue
+    error("Could not chown #{dir} to #{user}") unless File.writable? dir
+  end
+
   def error(message)
     raise Foreman::Export::Exception.new(message)
   end

data/lib/foreman/export/launchd.rb

@@ -8,7 +8,12 @@ class Foreman::Export::Launchd < Foreman::Export::Base
     engine.each_process do |name, process|
       1.upto(engine.formation[name]) do |num|
         port = engine.port_for(process, num)
-        command_args = process.command.split(" ")
+        command_args = process.command.split(/\s+/).map{|arg|
+          case arg
+          when "$PORT" then port
+          else arg
+          end
+        }
         write_template "launchd/launchd.plist.erb", "#{app}-#{name}-#{num}.plist", binding
       end
     end

data/lib/foreman/export/systemd.rb

@@ -10,16 +10,23 @@ class Foreman::Export::Systemd < Foreman::Export::Base
       clean file
     end
 
-    write_template "systemd/master.target.erb", "#{app}.target", binding
+    process_master_names = []
 
     engine.each_process do |name, process|
       next if engine.formation[name] < 1
-      write_template "systemd/process_master.target.erb", "#{app}-#{name}.target", binding
+
+      process_names = []
 
       1.upto(engine.formation[name]) do |num|
         port = engine.port_for(process, num)
         write_template "systemd/process.service.erb", "#{app}-#{name}-#{num}.service", binding
+        process_names << "#{app}-#{name}-#{num}.service"
       end
+
+      write_template "systemd/process_master.target.erb", "#{app}-#{name}.target", binding
+      process_master_names << "#{app}-#{name}.target"
     end
+
+    write_template "systemd/master.target.erb", "#{app}.target", binding
   end
 end

data/lib/foreman/process.rb

@@ -59,7 +59,7 @@ class Foreman::Process
       wrapped_command = "#{runner} -d '#{cwd.shellescape}' -p -- #{expanded_command(env)}"
       POSIX::Spawn.spawn(*spawn_args(env, wrapped_command.shellsplit, {:out => output, :err => output}))
     else
-      wrapped_command = "#{runner} -d '#{cwd.shellescape}' -p -- #{command}"
+      wrapped_command = "exec #{runner} -d '#{cwd.shellescape}' -p -- #{command}"
       Process.spawn env, wrapped_command, :out => output, :err => output
     end
   end

data/lib/foreman/version.rb

@@ -1,5 +1,5 @@
 module Foreman
 
-  VERSION = "0.64.0"
+  VERSION = "0.65.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" "April 2014" "Foreman 0.64.0" "Foreman Manual"
+.TH "FOREMAN" "1" "April 2014" "Foreman 0.65.0" "Foreman Manual"
 .
 .SH "NAME"
 \fBforeman\fR \- manage Procfile\-based applications

data/spec/resources/export/runit/app-alpha-1/log/run

@@ -3,5 +3,5 @@ set -e
 
 LOG=/var/log/app/alpha-1
 
-test -d "$LOG" || mkdir -p m2750 "$LOG" && chown app "$LOG"
+test -d "$LOG" || mkdir -p -m 2750 "$LOG" && chown app "$LOG"
 exec chpst -u app svlogd "$LOG"

data/spec/resources/export/runit/app-alpha-2/log/run

@@ -3,5 +3,5 @@ set -e
 
 LOG=/var/log/app/alpha-2
 
-test -d "$LOG" || mkdir -p m2750 "$LOG" && chown app "$LOG"
+test -d "$LOG" || mkdir -p -m 2750 "$LOG" && chown app "$LOG"
 exec chpst -u app svlogd "$LOG"

data/spec/resources/export/runit/app-bravo-1/log/run

@@ -3,5 +3,5 @@ set -e
 
 LOG=/var/log/app/bravo-1
 
-test -d "$LOG" || mkdir -p m2750 "$LOG" && chown app "$LOG"
+test -d "$LOG" || mkdir -p -m 2750 "$LOG" && chown app "$LOG"
 exec chpst -u app svlogd "$LOG"

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

@@ -8,7 +8,7 @@ stdout_logfile=/var/log/app/alpha-1.log
 stderr_logfile=/var/log/app/alpha-1.error.log
 user=app
 directory=/tmp/app
-environment=PORT=5000
+environment=PORT="5000"
 [program:app-bravo-1]
 command=./bravo
 autostart=true
@@ -18,7 +18,7 @@ stdout_logfile=/var/log/app/bravo-1.log
 stderr_logfile=/var/log/app/bravo-1.error.log
 user=app
 directory=/tmp/app
-environment=PORT=5100
+environment=PORT="5100"
 [program:app-foo_bar-1]
 command=./foo_bar
 autostart=true
@@ -28,7 +28,7 @@ stdout_logfile=/var/log/app/foo_bar-1.log
 stderr_logfile=/var/log/app/foo_bar-1.error.log
 user=app
 directory=/tmp/app
-environment=PORT=5200
+environment=PORT="5200"
 [program:app-foo-bar-1]
 command=./foo-bar
 autostart=true
@@ -38,7 +38,7 @@ stdout_logfile=/var/log/app/foo-bar-1.log
 stderr_logfile=/var/log/app/foo-bar-1.error.log
 user=app
 directory=/tmp/app
-environment=PORT=5300
+environment=PORT="5300"
 
 [group:app]
 programs=app-alpha-1,app-bravo-1,app-foo_bar-1,app-foo-bar-1

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

@@ -8,7 +8,7 @@ stdout_logfile=/var/log/app/alpha-1.log
 stderr_logfile=/var/log/app/alpha-1.error.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.log
 stderr_logfile=/var/log/app/alpha-2.error.log
 user=app
 directory=/tmp/app
-environment=PORT=5001
+environment=PORT="5001"
 
 [group:app]
 programs=app-alpha-1,app-alpha-2

metadata

@@ -1,32 +1,36 @@
 --- !ruby/object:Gem::Specification
 name: foreman
 version: !ruby/object:Gem::Version
-  version: 0.64.0
+  version: 0.65.0
+  prerelease: 
 platform: ruby
 authors:
 - David Dollar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-22 00:00:00.000000000 Z
+date: 2014-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.13.6
+        version: 0.19.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.13.6
+        version: 0.19.1
 - !ruby/object:Gem::Dependency
   name: dotenv
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -47,7 +52,6 @@ extra_rdoc_files: []
 files:
 - bin/foreman
 - bin/foreman-runner
-- bin/taskman
 - data/example/error
 - data/example/log/neverdie.log
 - data/example/Procfile
@@ -150,26 +154,33 @@ files:
 homepage: http://github.com/ddollar/foreman
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -58308520584427646
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -58308520584427646
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Process manager for applications with multiple components
 test_files: []
 has_rdoc: 

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: bbb82e88b1e4cc986e7af63cc6d631fa04a3835f
-  data.tar.gz: 628e407c7dc4c6b1c45feae01f0721226015fc77
-SHA512:
-  metadata.gz: 97b7f37dd66b6d5959c68b02f088e1d13f9ca5e0521020e44134d720ad985498eddb3e6694c1718c84263bbfd50e6ec2a6807ad19ae6c2f615a1c278f1b9f925
-  data.tar.gz: a5233b13f6516fd91fbdac8919d97b5c9538e84147a937bc6c9b071f0eed55a09f8fe3016c66d67d1036528a104b0eff04ed4d82fcba32bd800466911a1df013

data/bin/taskman

@@ -1,8 +0,0 @@
-#!/usr/bin/env ruby
-
-$:.unshift File.expand_path("../../lib", __FILE__)
-
-require "foreman/cli"
-
-Foreman::CLI.engine_class = Foreman::TmuxEngine
-Foreman::CLI.start