pleaserun 0.0.24 → 0.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9996a6b80713eaaee8e724f2db15d03e077d83a0
-  data.tar.gz: 81f91ba1f891d4f5e84a81a7a146bb892abddcbd
+  metadata.gz: 069a73c404991697c3c33c062fadb72a8c3c4478
+  data.tar.gz: fa15c05f36673959b42cc7a4f3201be9644dac54
 SHA512:
-  metadata.gz: 60d7e5dd2cad19f79b5ad2cfd5e61bda17885f4320ca37a6097cf563e2451162f4b00fca3e6bec3291f49883e309fbff2309a2db6077224cb4402ac075467ff4
-  data.tar.gz: ac733fa77a7d954f4d50c7595298125b431d5abeb0c1a52c56524e8af4a7787b5c7ce5fef1a859d3a4ea35f459fb9a717aa5f80e2af6146e20d69cf60796e9de
+  metadata.gz: 7b421de562aa82af6f4e5b611664ded71cab2b3f8ce200d0da6113d9ccdb6b3d72c72edff7b203f9cbea3fd77690d58ea0f88aa32186e49f331d3c4fae334859
+  data.tar.gz: e9e1c9123108d24565d568f0799685602ab7545f630b2b2bbfe64570304fec8836f42936953868a76f5af0723c94deada495513a620ee781badf3cb0ee49175d

data/Gemfile.lock

@@ -1,11 +1,12 @@
 PATH
   remote: .
   specs:
-    pleaserun (0.0.23)
+    pleaserun (0.0.24)
       cabin (> 0)
       clamp
+      dotenv
       insist
-      mustache (= 0.99.8)
+      mustache (= 1.0.3)
       stud
 
 GEM
@@ -17,6 +18,7 @@ GEM
     clamp (1.0.0)
     coderay (1.1.0)
     diff-lcs (1.2.5)
+    dotenv (2.1.1)
     ffi (1.9.6)
     ffi (1.9.6-java)
     ffi-yajl (2.1.0)
@@ -56,7 +58,7 @@ GEM
     mixlib-config (2.1.0)
     mixlib-log (1.6.0)
     mixlib-shellout (2.0.1)
-    mustache (0.99.8)
+    mustache (1.0.3)
     nenv (0.2.0)
     net-ssh (2.9.2)
     notiffany (0.0.6)

data/README.md

@@ -133,6 +133,17 @@ A silly example:
     UID        PID  PPID  C STIME TTY          TIME CMD
     root     50473     1  0 22:36 pts/7    00:00:00 /bin/sleep 60
 
+# Hacking
+
+If you want to work on pleaserun, here's what you need to do:
+
+1. Get a decent version of Ruby.  [rvm](https://rvm.io/) is good for this.
+2. Install bundler: `gem install bundler`
+3. Install dependencies: `bundle install`
+4. Make your changes!
+5. Run tests: `bundle exec rspec`
+6. Make a pull request!
+
 # One last thing!
 
 Please enjoy running things! If you are not enjoying this program, then something is wrong, and we can fix it together :)

data/lib/pleaserun/cli.rb

@@ -44,9 +44,10 @@ class PleaseRun::CLI < Clamp::Command # rubocop:disable ClassLength
 
     # Turn the attribute name into a flag.
     option "--#{facet.name.to_s.gsub("_", "-")}", facet.name.to_s.upcase, facet.description,
-           :attribute_name => facet.name
+           :attribute_name => facet.name,
+           :multivalued => facet.options.fetch(:multivalued, false)
   end
-  
+
   # Load the 'program' attribute from the Base class and use it as the first
   # cli parameter.
   program = base.attributes.find { |f| f.name == :program }
@@ -73,11 +74,11 @@ For example, let's run elasticsearch:
 The above will automatically detect what platform you are running on
 and try to use the most sensible init system. For Ubuntu, this means
 Upstart. For Debian, this means sysv init scripts. For Fedora, this
-means systemd. 
+means systemd.
 
 You can tune the running environment and settings for your runner with various
 flags. By way of example, let's make our elasticsearch service run as the
-'elasticsearch' user! 
+'elasticsearch' user!
 
     % pleaserun --user elasticsearch /opt/elasticsearch/bin/elasticsearch
 
@@ -196,7 +197,7 @@ are made. If it fails, nagios will not start. Yay!
     if log
       logfile = File.new(log, "a")
       @logger.subscribe(logfile)
-      STDERR.puts "Sending all logs to #{log}" if STDERR.tty?
+      #STDERR.puts "Sending all logs to #{log}" if STDERR.tty?
     else
       @logger.subscribe(STDERR)
     end

data/lib/pleaserun/configurable.rb

@@ -94,7 +94,7 @@ module PleaseRun::Configurable
   end # def ClassMixin
 
   # A DSL for describing a facet.
-  # 
+  #
   # For example:
   #
   #     Facet.new(:temperature, "The temperature value") do
@@ -142,13 +142,14 @@ module PleaseRun::Configurable
   class Facet
     attr_reader :name
     attr_reader :description
+    attr_reader :options
     attr_writer :validator, :munger
 
     def initialize(name, description, options = {}, &facet_dsl)
       insist { name }.is_a?(Symbol)
       insist { description }.is_a?(String)
       insist { options }.is_a?(Hash)
-      
+
       @name = name
       @description = description
       @options = options

data/lib/pleaserun/platform/base.rb

@@ -1,3 +1,4 @@
+require "dotenv/parser"
 require "pleaserun/namespace"
 require "pleaserun/configurable"
 require "pleaserun/mustache_methods"
@@ -27,7 +28,7 @@ class PleaseRun::Platform::Base
   attribute :program, "The program to execute. This can be a full path, like " \
     "/usr/bin/cat, or a shorter name like 'cat' if you wish to search $PATH." do
     validate do |program|
-      insist { program.is_a?(String) } 
+      insist { program.is_a?(String) }
     end
   end
 
@@ -57,7 +58,7 @@ class PleaseRun::Platform::Base
       insist { version.is_a?(String) }
     end
   end
-  
+
   attribute :description, "The human-readable description of your program",
             :default => "no description given" do
     validate do |description|
@@ -85,6 +86,27 @@ class PleaseRun::Platform::Base
     end
   end
 
+  attribute :environment_file, "A file containing environment variables to export for your application" do
+    validate do |env|
+      insist { env }.is_a?(File)
+    end
+  end
+
+  attribute :environment_variables, "Env key/value pairs to insert into your sourced_env_file", :multivalued => true do
+    munge do |environment_variables|
+      if environment_variables.is_a?(String)
+        environment_variables = [environment_variables]
+      end
+      if environment_variables.is_a?(Array)
+        environment_variables = Hash[environment_variables.map { |e| e.split('=', 2) }]
+      end
+      environment_variables
+    end
+    validate do |environment_variables|
+      insist { environment_variables }.is_a?(Hash)
+    end
+  end
+
   attribute :nice, "The nice level to add to this program before running" do
     validate do |nice|
       insist { nice }.is_a?(Fixnum)
@@ -130,10 +152,14 @@ class PleaseRun::Platform::Base
     validate { |v| v == "ulimited" || v.to_i > 0 }
   end
 
-  # TODO(sissel): Move this into the sysv platform
-  attribute :sysv_log_path, "The destination for log output. If ending with a trailing / is treated like a directory with path/<name>.log. This setting only currently works with the sysv platform. This flag may go away at any time because I'm not sure we can easily abstract the logging feature across different service managers. Upstart and systemd don't even have this concept.",
-    :default => "/var/log/"
+  attribute :log_directory, "The destination for log output",
+    :default => "/var/log"
 
+  attribute :log_file_stderr, "Name of log file for stderr. Will default to NAME-stderr.log",
+    :default => nil
+
+  attribute :log_file_stdout, "Name of log file for stdout. Will default to NAME-stderr.log",
+    :default => nil
 
   attribute :prestart, "A command to execute before starting and restarting. A failure of this command will cause the start/restart to abort. This is useful for health checks, config tests, or similar operations."
 
@@ -154,7 +180,7 @@ class PleaseRun::Platform::Base
   end # def template_path
 
   def render_template(name)
-    possibilities = [ 
+    possibilities = [
       File.join(template_path, target_version, name),
       File.join(template_path, "default", name),
       File.join(template_path, name)
@@ -191,15 +217,46 @@ class PleaseRun::Platform::Base
     return []
   end # def install_actions
 
-  def sysv_log
-    if sysv_log_directory?
-      File.join(sysv_log_path, name)
-    else
-      sysv_log_path
-    end
+  def log_path
+    File.join(log_directory.chomp("/"), name)
+  end
+
+  def log_path_stderr
+    filename = "#{name}-stderr.log"
+    filename = log_file_stderr unless log_file_stderr.nil?
+    File.join(log_directory.chomp("/"), filename)
+  end
+
+  def log_path_stdout
+    filename = "#{name}-stdout.log"
+    filename = log_file_stdout unless log_file_stdout.nil?
+    File.join(log_directory.chomp("/"), filename)
+  end
+
+  def parsed_environment_variables
+    return {} if environment_file.nil?
+    return {} unless File.exist?(environment_file)
+    Dotenv::Parser.call(File.open(environment_file, "rb:bom|utf-8", &:read))
+  end
+
+  def all_environment_variables
+    parsed_env_vars = {}
+    parsed_env_vars = parsed_environment_variables unless parsed_environment_variables.nil?
+    flag_env_vars = {}
+    flag_env_vars = environment_variables unless environment_variables.nil?
+
+    variables = parsed_env_vars.merge(flag_env_vars)
+    return nil if variables.empty?
+    result = []
+    variables.each {|k, v| result << {'key' => k, 'value' => v} }
+    result
+  end
+
+  def default_file
+    "/etc/default/#{name}"
   end
 
-  def sysv_log_directory?
-    return sysv_log_path.end_with?("/")
+  def sysconfig_file
+    "/etc/sysconfig/#{name}"
   end
 end # class PleaseRun::Base

data/lib/pleaserun/platform/systemd-user.rb

@@ -3,6 +3,14 @@ require "pleaserun/platform/base"
 
 # The platform implementation for systemd user services.
 class PleaseRun::Platform::SystemdUser < PleaseRun::Platform::Base
+  def home
+    @home ||= ENV["HOME"]
+    if @home.nil? || @home.empty?
+      raise PleaseRun::Configurable::ValidationError, "As a normal user (not root), I need to know where your home directory is, but the HOME environment variable seems to be not set."
+    end
+    @home
+  end
+
   def files
     begin
       # TODO(sissel): Make it easy for subclasses to extend validation on attributes.
@@ -11,21 +19,21 @@ class PleaseRun::Platform::SystemdUser < PleaseRun::Platform::Base
       raise PleaseRun::Configurable::ValidationError, "In systemd, the program must be a full path. You gave '#{program}'."
     end
 
-    home = ENV["HOME"]
-    if home.nil? || home.empty?
-      raise PleaseRun::Configurable::ValidationError, "As a normal user (not root), I need to know where your home directory is, but the HOME environment variable seems to be not set."
-    end
-
     if !File.directory?(home)
       raise PleaseRun::Configurable::ValidationError, "HOME (#{home}) is not a directory. Cannot continue."
     end
 
     return Enumerator::Generator.new do |enum|
-      enum.yield(safe_filename("#{home}/.config/systemd/user/{{{ name }}}.service"), render_template("program.service"))
-      enum.yield(safe_filename("#{home}/.config/systemd/user/{{{ name }}}-prestart.sh"), render_template("prestart.sh"), 0755) if prestart
+      enum.yield(safe_filename("{{{home}}}/.config/systemd/user/{{{ name }}}.environment"), environment_data)
+      enum.yield(safe_filename("{{{home}}}/.config/systemd/user/{{{ name }}}.service"), render_template("program.service"))
+      enum.yield(safe_filename("{{{home}}}/.config/systemd/user/{{{ name }}}-prestart.sh"), render_template("prestart.sh"), 0755) if prestart
     end
   end # def files
 
+  def environment_data
+    ENV.collect { |k,v| "#{k}=#{v}" }.join("\n")
+  end
+
   def install_actions
     return ["systemctl --user daemon-reload"]
   end

data/lib/pleaserun/platform/systemd.rb

@@ -21,6 +21,7 @@ class PleaseRun::Platform::Systemd < PleaseRun::Platform::Base
     end
 
     return Enumerator::Generator.new do |enum|
+      enum.yield(safe_filename("/etc/default/{{ name }}"), render_template("default"))
       enum.yield(safe_filename("{{{ unit_path }}}/{{{ name }}}.service"), render_template("program.service"))
 
       # TODO(sissel): This is probably not the best place to put this. Ahh well :)

data/lib/pleaserun/platform/upstart.rb

@@ -7,6 +7,7 @@ class PleaseRun::Platform::Upstart < PleaseRun::Platform::Base
   def files
     return Enumerator::Generator.new do |out|
       out.yield(safe_filename("/etc/init/{{ name }}.conf"), render_template("init.conf"))
+      out.yield(safe_filename("/etc/default/{{ name }}"), render_template("default"))
     end
   end
 end

data/pleaserun.gemspec

@@ -2,7 +2,7 @@ Gem::Specification.new do |spec|
   files = File.read(__FILE__)[/^__END__$.*/m].split("\n")[1..-1]
 
   spec.name = "pleaserun"
-  spec.version = "0.0.24"
+  spec.version = "0.0.25"
   spec.summary = "pleaserun"
   spec.description = "pleaserun"
   spec.license = "Apache 2.0"
@@ -10,8 +10,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency "cabin", ">0" # for logging. apache 2 license
   spec.add_dependency "clamp"
   spec.add_dependency "stud"
-  spec.add_dependency "mustache", "0.99.8"
+  spec.add_dependency "mustache", "1.0.3"
   spec.add_dependency "insist"
+  spec.add_dependency "dotenv"
   #spec.add_dependency "ohai", "~> 6.20" # used for host detection
 
   spec.files = files
@@ -70,12 +71,15 @@ templates/runit/log
 templates/runit/run
 templates/systemd-user/default/prestart.sh
 templates/systemd-user/default/program.service
+templates/systemd/default/default
 templates/systemd/default/prestart.sh
 templates/systemd/default/program.service
 templates/sysv/default/default
 templates/sysv/default/init.sh
+templates/upstart/0.6.5/default
 templates/upstart/0.6.5/init.conf
 templates/upstart/0.6.5/init.d.sh
+templates/upstart/default/default
 templates/upstart/default/init.conf
 templates/upstart/default/init.d.sh
 templates/user/linux/default/installer.sh

data/spec/pleaserun/platform/base_spec.rb

@@ -25,28 +25,105 @@ describe PleaseRun::Platform::Base do
       insist { subject.group } == "root"
     end
 
-    context "#sysv_log" do
+    it "#log_directory should be /var/log" do
+      insist { subject.log_directory } == "/var/log"
+    end
+
+    context "#log_path" do
       let(:name) { "fancy" }
       before { subject.name = name }
 
       context "default" do
         it "should be in /var/log" do
-          expect(subject.sysv_log).to(be == "/var/log/#{name}")
+          expect(subject.log_path).to(be == "/var/log/#{name}")
+        end
+      end
+
+      context "when given a directory without trailing slash" do
+        let(:path) { "/tmp" }
+        before { subject.log_directory = path }
+        it "should be <path>/<name>" do
+          expect(subject.log_path).to(be == File.join(path, name))
         end
       end
 
-      context "when given a directory" do
+      context "when given a directory with trailing slash" do
         let(:path) { "/tmp/" }
-        before { subject.sysv_log_path = path }
+        before { subject.log_directory = path }
         it "should be <path>/<name>" do
-          expect(subject.sysv_log).to(be == File.join(path, subject.name))
+          expect(subject.log_path).to(be == File.join(path, name))
+        end
+      end
+    end
+
+    context "#log_path_stderr" do
+      let(:name) { "fancy" }
+      before { subject.name = name }
+
+      context "default" do
+        it "should be in /var/log" do
+          expect(subject.log_path_stderr).to(be == "/var/log/#{name}-stderr.log")
+        end
+      end
+
+      context "when given a directory without trailing slash" do
+        let(:path) { "/tmp" }
+        before { subject.log_directory = path }
+        it "should be <path>/<name>-stderr.log" do
+          expect(subject.log_path_stderr).to(be == File.join(path, "#{name}-stderr.log"))
+        end
+      end
+
+      context "when given a directory with trailing slash" do
+        let(:path) { "/tmp/" }
+        before { subject.log_directory = path }
+        it "should be <path>/<name>-stderr.log" do
+          expect(subject.log_path_stderr).to(be == File.join(path, "#{name}-stderr.log"))
+        end
+      end
+
+      context "when specified as an argument it should use the name" do
+        let(:path) { "/var/log" }
+        let(:log_file_stderr) { "#{name}-stderr" }
+        before { subject.log_file_stderr = log_file_stderr }
+        it "should be <path>/<name>-stderr" do
+          expect(subject.log_path_stderr).to(be == File.join(path, log_file_stderr))
         end
       end
-      context "when given a path" do
-        let(:path) { "/some/path" }
-        before { subject.sysv_log_path = path }
-        it "should be exactly the path given" do
-          expect(subject.sysv_log).to(be == path)
+    end
+
+    context "#log_path_stdout" do
+      let(:name) { "fancy" }
+      before { subject.name = name }
+
+      context "default" do
+        it "should be in /var/log" do
+          expect(subject.log_path_stdout).to(be == "/var/log/#{name}-stdout.log")
+        end
+      end
+
+      context "when given a directory without trailing slash" do
+        let(:path) { "/tmp" }
+        before { subject.log_directory = path }
+        it "should be <path>/<name>-stdout.log" do
+          expect(subject.log_path_stdout).to(be == File.join(path, "#{name}-stdout.log"))
+        end
+      end
+
+      context "when given a directory with trailing slash" do
+        let(:path) { "/tmp/" }
+        before { subject.log_directory = path }
+        it "should be <path>/<name>-stdout.log" do
+          expect(subject.log_path_stdout).to(be == File.join(path, "#{name}-stdout.log"))
+        end
+      end
+
+      context "when specified as an argument it should use the name" do
+        let(:path) { "/var/log" }
+        let(:log_file_stdout) { "#{name}-stdout" }
+        before { subject.log_file_stdout = log_file_stdout }
+        it "should be <path>/<name>-stdout" do
+          expect(subject.log_path_stdout).to(be == File.join(path, log_file_stdout))
         end
       end
     end

data/spec/pleaserun/platform/sysv_spec.rb

@@ -7,7 +7,8 @@ describe PleaseRun::Platform::SYSV do
   let(:version) { PleaseRun::Detector.detect[1] }
 
   context "deployment", :sysv => true do
-    etc_initd_writable = File.lstat("/etc/init.d").writable? rescue false
+    etc_initd_writable = File.stat("/etc/init.d").writable? rescue false
+    p :WRIT => etc_initd_writable
     if !etc_initd_writable
       it "cannot write to /etc/init.d, so there's no deployment test to do. To run these tests, you'll need to run this as root, and preferrably in a vm or other temporary system"
     else

data/spec/pleaserun/user/base_spec.rb

@@ -67,7 +67,7 @@ describe PleaseRun::User::Base do
     end
   end
 
-  describe "integration" do
+  describe "integration", :if => superuser? do
     let(:platform) { "linux" }
     let(:name) { "example" }
     let(:installer) { Stud::Temporary.pathname }

data/templates/launchd/default/program.plist

@@ -10,8 +10,15 @@
       {{{xml_args}}}
     </array>
     <key>KeepAlive</key> <true/>
-    <key>StandardOutPath</key> <string>/var/log/{{name}}.out</string>
-    <key>StandardErrorPath</key> <string>/var/log/{{name}}.err</string>
+    <key>StandardOutPath</key> <string>{{ log_path_stdout }}</string>
+    <key>StandardErrorPath</key> <string>{{ log_path_stderr }}</string>
+    <key>EnvironmentVariables</key>
+    <dict>
+      {{#all_environment_variables}}
+      <key>{{key}}</key>
+      <string>{{#shell_quote}}{{value}}{{/shell_quote}}</string>
+      {{/all_environment_variables}}
+    </dict>
     <!-- Things to implement eventually.
     <key>UserName</key><string>{{{ user }}}</string>
     <key>GroupName</key><string>{{{ group }}}</string>

data/templates/runit/log

@@ -1,4 +1,4 @@
 #! /bin/sh
 
-exec svlogd -tt /var/log/{{ name }}
+exec svlogd -tt {{ log_path }}
 

data/templates/runit/run

@@ -8,7 +8,8 @@ PROGRAM={{#quoted}}{{{PROGRAM}}}{{/quoted}}
 set -- {{{shell_args}}}
 
 {{#shell_continuation}}
-exec chpst
+exec env {{#all_environment_variables}}{{key}}={{#shell_quote}}{{value}}{{/shell_quote}}{{/all_environment_variables}} \
+  chpst \
   -u {{#quoted}}{{{user}}}:{{{group}}}{{/quoted}}
   {{#chroot}} -/ {{#quoted}}{{{chroot}}}{{/quoted}} {{/chroot}}
   {{#nice}} -n {{#quoted}}{{{nice}}}{{/quoted}} {{/nice}}

data/templates/systemd-user/default/program.service

@@ -5,6 +5,7 @@ Description={{{ description }}}
  
 [Service]
 Type=simple
+EnvironmentFile={{{home}}}/.config/systemd/user/{{{name}}}.environment
 ExecStart={{{program}}} {{{shell_args}}}
 Restart=always
 WorkingDirectory={{{chdir}}}

data/templates/systemd/default/default

@@ -0,0 +1,3 @@
+{{#all_environment_variables}}
+{{key}}={{#shell_quote}}{{value}}{{/shell_quote}}
+{{/all_environment_variables}}

data/templates/systemd/default/program.service

@@ -2,7 +2,7 @@
 {{#description}}
 Description={{{ description }}}
 {{/description}}
- 
+
 [Service]
 Type=simple
 User={{{ user }}}
@@ -10,14 +10,17 @@ Group={{{ group }}}
 # Load env vars from /etc/default/ and /etc/sysconfig/ if they exist.
 # Prefixing the path with '-' makes it try to load, but if the file doesn't
 # exist, it continues onward.
-EnvironmentFile=-/etc/default/{{{name}}}
-EnvironmentFile=-/etc/sysconfig/{{{name}}}
+EnvironmentFile=-{{{default_file}}}
+EnvironmentFile=-{{{sysconfig_file}}}
 ExecStart={{{program}}} {{{shell_args}}}
 {{#prestart}}
 ExecStartPre={{{unit_path}}}/{{{name}}}-prestart.sh
 {{/prestart}}
 Restart=always
 WorkingDirectory={{{chdir}}}
+{{#nice}}Nice={{{nice}}}
+{{/nice}}{{#limit_open_files}}LimitNOFILE={{{limit_open_files}}}
+{{/limit_open_files}}
 
 [Install]
 WantedBy=multi-user.target

data/templates/sysv/default/default

@@ -1,19 +1,3 @@
-user="{{{user}}}"
-group="{{{group}}}"
-chroot="{{{chroot}}}"
-chdir="{{{chdir}}}"
-nice="{{{nice}}}"
-{{#limit_coredump}}limit_coredump="{{{limit_coredump}}}"
-{{/limit_coredump}}{{#limit_cputime}}limit_cputime="{{{limit_cputime}}}"
-{{/limit_cputime}}{{#limit_data}}limit_data="{{{limit_data}}}"
-{{/limit_data}}{{#limit_file_size}}limit_file_size="{{{limit_file_size}}}"
-{{/limit_file_size}}{{#limit_locked_memory}}limit_locked_memory="{{{limit_locked_memory}}}"
-{{/limit_locked_memory}}{{#limit_open_files}}limit_open_files="{{{limit_open_files}}}"
-{{/limit_open_files}}{{#limit_user_processes}}limit_user_processes="{{{limit_user_processes}}}"
-{{/limit_user_processes}}{{#limit_physical_memory}}limit_physical_memory="{{{limit_physical_memory}}}"
-{{/limit_physical_memory}}{{#limit_stack_size}}limit_stack_size="{{{limit_stack_size}}}"{{/limit_stack_size}}
-
-# If this is set to 1, then when `stop` is called, if the process has
-# not exited within a reasonable time, SIGKILL will be sent next.
-# The default behavior is to simply log a message "program stop failed; still running"
-KILL_ON_STOP_TIMEOUT=0
+{{#all_environment_variables}}
+export {{key}}={{#shell_quote}}{{value}}{{/shell_quote}}
+{{/all_environment_variables}}

data/templates/sysv/default/init.sh

@@ -22,9 +22,28 @@ name={{#escaped}}{{#safe_filename}}{{{ name }}}{{/safe_filename}}{{/escaped}}
 program={{#escaped}}{{{ program }}}{{/escaped}}
 args={{{ escaped_args }}}
 pidfile="/var/run/$name.pid"
-
-[ -r /etc/default/$name ] && . /etc/default/$name
-[ -r /etc/sysconfig/$name ] && . /etc/sysconfig/$name
+user="{{{user}}}"
+group="{{{group}}}"
+chroot="{{{chroot}}}"
+chdir="{{{chdir}}}"
+nice="{{{nice}}}"
+{{#limit_coredump}}limit_coredump="{{{limit_coredump}}}"
+{{/limit_coredump}}{{#limit_cputime}}limit_cputime="{{{limit_cputime}}}"
+{{/limit_cputime}}{{#limit_data}}limit_data="{{{limit_data}}}"
+{{/limit_data}}{{#limit_file_size}}limit_file_size="{{{limit_file_size}}}"
+{{/limit_file_size}}{{#limit_locked_memory}}limit_locked_memory="{{{limit_locked_memory}}}"
+{{/limit_locked_memory}}{{#limit_open_files}}limit_open_files="{{{limit_open_files}}}"
+{{/limit_open_files}}{{#limit_user_processes}}limit_user_processes="{{{limit_user_processes}}}"
+{{/limit_user_processes}}{{#limit_physical_memory}}limit_physical_memory="{{{limit_physical_memory}}}"
+{{/limit_physical_memory}}{{#limit_stack_size}}limit_stack_size="{{{limit_stack_size}}}"{{/limit_stack_size}}
+
+# If this is set to 1, then when `stop` is called, if the process has
+# not exited within a reasonable time, SIGKILL will be sent next.
+# The default behavior is to simply log a message "program stop failed; still running"
+KILL_ON_STOP_TIMEOUT=0
+
+[ -r {{{default_file}}} ] && . {{{default_file}}}
+[ -r {{{sysconfig_file}}} ] && . {{{sysconfig_file}}}
 
 [ -z "$nice" ] && nice=0
 
@@ -38,17 +57,15 @@ emit() {
 }
 
 start() {
-  {{! I don't use 'su' here to run as a different user because the process 'su'
+  {{! I do not use 'su' here to run as a different user because the process 'su'
       stays as the parent, causing our pidfile to contain the pid of 'su' not the
       program we intended to run. Luckily, the 'chroot' program on OSX, FreeBSD, and Linux
       all support switching users and it invokes execve immediately after chrooting. }}
 
-  {{#sysv_log_directory?}}
   # Ensure the log directory is setup correctly.
-  [ ! -d "{{{sysv_log_path}}}" ] && mkdir "{{{sysv_log_path}}}"
-  chown "$user":"$group" "{{{sysv_log_path}}}"
-  chmod 755 "{{{sysv_log_path}}}"
-  {{/sysv_log_directory?}}
+  [ ! -d "{{{ log_directory }}}" ] && mkdir "{{{ log_directory }}}"
+  chown "$user":"$group" "{{{ log_directory }}}"
+  chmod 755 "{{{ log_directory }}}"
 
   {{#prestart}}
   if [ "$PRESTART" != "no" ] ; then
@@ -66,7 +83,7 @@ start() {
     {{{ulimit_shell}}}
     cd \"$chdir\"
     exec \"$program\" $args
-  " >> {{{ sysv_log }}}.stdout 2>> {{{ sysv_log }}}.stderr &
+  " >> {{{ log_path_stdout }}} 2>> {{{ log_path_stderr }}} &
 
   # Generate the pidfile from here. If we instead made the forked process
   # generate it there will be a race condition between the pidfile writing

data/templates/upstart/0.6.5/default

@@ -0,0 +1,3 @@
+{{#all_environment_variables}}
+export {{key}}={{#shell_quote}}{{value}}{{/shell_quote}}
+{{/all_environment_variables}}

data/templates/upstart/0.6.5/init.conf

@@ -4,9 +4,11 @@ stop on runlevel [!2345]
 
 respawn
 umask {{{umask}}}
-#nice {{{nice}}}
-#chroot {{{chroot}}}
-#chdir {{{chdir}}}
+{{#nice}}nice {{{nice}}}
+{{/nice}}{{#limit_open_files}}limit nofile {{{limit_open_files}}} {{{limit_open_files}}}
+{{/limit_open_files}}chroot {{{chroot}}}
+chdir {{{chdir}}}
+
 #limit core <softlimit> <hardlimit>
 #limit cpu <softlimit> <hardlimit>
 #limit data <softlimit> <hardlimit>
@@ -35,5 +37,8 @@ pre-start script
 end script
 {{/prestart}}
 
-{{! TODO(sissel): Support logging }}
-exec chroot --userspec {{{user}}}:{{{group}}} {{{chroot}}} {{{program}}} {{{shell_args}}}
+script
+  [ -r "{{{default_file}}}" ] && . "{{{default_file}}}"
+  [ -r "{{{sysconfig_file}}}" ] && . "{{{sysconfig_file}}}"
+  exec chroot --userspec {{{user}}}:{{{group}}} {{{chroot}}} {{{program}}} {{{shell_args}}} >> {{ log_path_stdout }} 2>> {{ log_path_stderr }}
+end script

data/templates/upstart/default/default

@@ -0,0 +1,3 @@
+{{#all_environment_variables}}
+export {{key}}={{#shell_quote}}{{value}}{{/shell_quote}}
+{{/all_environment_variables}}

data/templates/upstart/default/init.conf

@@ -44,7 +44,6 @@ limit stack {{{limit_stack_size}}} {{{limit_stack_size}}}
 {{/limit_stack_size}}
 setuid {{{user}}}
 setgid {{{group}}}
-console log # log stdout/stderr to /var/log/upstart/
 
 {{#prestart}}
 pre-start script
@@ -60,4 +59,8 @@ pre-start script
 end script
 {{/prestart}}
 
-exec {{{program}}} {{{shell_args}}}
+script
+  [ -r {{{default_file}}} ] && . {{{default_file}}}
+  [ -r {{{sysconfig_file}}} ] && . {{{sysconfig_file}}}
+  exec chroot --userspec {{{user}}}:{{{group}}} {{{chroot}}} {{{program}}} {{{shell_args}}} >> {{ log_path_stdout }} 2>> {{ log_path_stderr }}
+end script

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pleaserun
 version: !ruby/object:Gem::Version
-  version: 0.0.24
+  version: 0.0.25
 platform: ruby
 authors:
 - Jordan Sissel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-20 00:00:00.000000000 Z
+date: 2016-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cabin
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.99.8
+        version: 1.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.99.8
+        version: 1.0.3
 - !ruby/object:Gem::Dependency
   name: insist
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: dotenv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: pleaserun
 email:
 - jls@semicomplete.com
@@ -133,12 +147,15 @@ files:
 - templates/runit/run
 - templates/systemd-user/default/prestart.sh
 - templates/systemd-user/default/program.service
+- templates/systemd/default/default
 - templates/systemd/default/prestart.sh
 - templates/systemd/default/program.service
 - templates/sysv/default/default
 - templates/sysv/default/init.sh
+- templates/upstart/0.6.5/default
 - templates/upstart/0.6.5/init.conf
 - templates/upstart/0.6.5/init.d.sh
+- templates/upstart/default/default
 - templates/upstart/default/init.conf
 - templates/upstart/default/init.d.sh
 - templates/user/linux/default/installer.sh
@@ -169,3 +186,4 @@ signing_key:
 specification_version: 4
 summary: pleaserun
 test_files: []
+has_rdoc: