upstart-exporter 1.0.1 → 2.0.1

data/.ruby-version

@@ -0,0 +1 @@
+1.8.7-p352

data/.travis.yml

@@ -0,0 +1,6 @@
+language: ruby
+rvm:
+  - 1.8.7
+branches:
+  only:
+    - master

data/Gemfile

@@ -1,11 +1,9 @@
 source "http://rubygems.org"
-
-# Specify your gem's dependencies in upstart-exporter.gemspec
 gemspec
-  
+
 gem 'rake'
 gem 'yard'
-gem 'redcarpet'
+gem 'safe_yaml'
 
 gem 'rspec'
 gem 'fakefs', :require => 'fakefs/safe'

data/README.md

@@ -1,7 +1,7 @@
 Gem for exporting user-scripts as Upstart scripts
 ====================
 
-[![Build Status](https://secure.travis-ci.org/savonarola/upstart-exporter.png)](http://travis-ci.org/savonarola/upstart-exporter)
+[![Build Status](https://secure.travis-ci.org/funbox/upstart-exporter.png)](http://travis-ci.org/funbox/upstart-exporter)
 
 Purpose
 -------
@@ -24,21 +24,21 @@ Configuration
 The export process is configured through the only config, /etc/upstart-exporter.yaml, which is a simple YAML file of the following format:
 
     ---
-    run_user: www # The user under which all installed through upstart-exporter background jobs are run 
+    run_user: www # The user under which all installed through upstart-exporter background jobs are run
     run_group: www # The group of run_user
     helper_dir: /var/helper_dir # Auxilary directory for scripts incapsulating background jobs
     upstart_dir: /var/upstart_dir # Directory where upstart scripts should be placed
     prefix: 'myupstartjobs-' # Prefix added to app's log folders and upstart scripts
 
 The config is not installed by default. If this config is absent, the default values are the following:
-    
+
     helper_dir: /var/local/upstart_helpers/
     upstart_dir: /etc/init/
     run_user: service
     prefix: 'fb-'
 
-To give a certain user (i.e. deployuser) ability to use this script, one can place the following lines into sudoers file:
-    
+To give a certain user (i.e. deployuser) ability to use this script, you can place the following lines into sudoers file:
+
     # Commands required for manipulating jobs
     Cmnd_Alias UPSTART = /sbin/start, /sbin/stop, /sbin/restart
     Cmnd_Alias UPEXPORT = /usr/local/bin/upstart-export
@@ -50,27 +50,92 @@ To give a certain user (i.e. deployuser) ability to use this script, one can pla
 
     ...
 
-    # Allow deploy user to manipulate jobs 
+    # Allow deploy user to manipulate jobs
     deployuser        ALL=(deployuser) NOPASSWD: ALL, (root) NOPASSWD: UPSTART, UPEXPORT
-    
+
 
 Usage
 -----
 
-After upstart-exporter is installed and configured, one may export background jobs from an arbitrary Procfile-like file of the following format:
+Gem is able to process two versions of Procfile's, format of the Procfile is
+defined in the _version_ key. If the key is not present or is not equal to _2_
+gem will try to parse it as Procfile v.1.
+
+Procfile v.1
+------------
+
+After upstart-exporter is installed and configured, you may export background jobs from an arbitrary Procfile-like file of the following format:
 
     cmdlabel1: cmd1
     cmdlabel2: cmd2
-    
+
 i.e. a file ./myprocfile containing:
 
     my_tail_cmd: /usr/bin/tail -F /var/log/messages
     my_another_tail_cmd: /usr/bin/tail -F /var/log/messages
 
-For security purposes, command labels are allowed to contain only letters, digits and underscores.
+For security purposes, command labels are allowed to contain only letters, digits, and underscores.
+
+Procfile v.2
+------------
+
+Another format of Procfile scripts is YAML config. A configuration script may
+look like this:
+
+    version: 2
+    start_on_runlevel: "[2345]"
+    stop_on_runlevel: "[06]"
+    env:
+      RAILS_ENV: production
+      TEST: true
+    working_directory: /srv/projects/mpro/current
+    commands:
+      my_tail_cmd:
+        command: /usr/bin/tail -F /var/log/messages
+        respawn:
+          count: 5
+          interval: 10
+        env:
+          RAILS_ENV: staging # if needs to be redefined or extended
+        working_directory: '/var/...' # if needs to be redefined
+      my_another_tail_cmd:
+        command: /usr/bin/tail -F /var/log/messages
+        respawn: false # by default respawn option is enabled
+      my_one_another_tail_cmd:
+        command: /usr/bin/tail -F /var/log/messages
+      my_multi_tail_cmd:
+        command: /usr/bin/tail -F /var/log/messages
+        count: 2
+
+*start_on_runlevel* and *stop_on_runlevel* are two global options that can't be
+redefined. For more information on these options look into [upstart scripts documentation.]( http://upstart.ubuntu.com/cookbook/#start-on)
+
+*working_directory* will generate the next line:
+
+    cd 'your/working/directory' && your_command
+
+*env* params can be redefined and extended in per-command options. Note, that
+you can't remove globally defined *env* variable.
+For given earlier Procfile example the generated command will look like:
+
+    env RAILS_ENV=staging TEST=true your_command
+
+*respawn* option controls restarting of scripts in case of their failure.
+By default this option is enabled. For
+more info look into [documentation](http://upstart.ubuntu.com/cookbook/#respawn)).
+
+*respawn_limit* option controls how often job can fail. If the job restarts more
+often than *count* times in *interval*, it won't be restarted anymore. For more
+info look into [documentation](http://upstart.ubuntu.com/cookbook/#respawn-limit).
+
+Options *working_directory*, *env*, *respawn* and *respawn_limit* can be
+defined both as global and as per-command options.
+
+Exporting
+---------
+
+To export Procfile you should run
 
-To export this file one should run
-    
     sudo upstart-export -p ./myprocfile -n myapp
 
 where _myapp_ is the application name. This name only affects the names of generated files. For security purposes, app name is also allowed to contain only letters, digits and underscores. Assuming that default options are used, the following files and folders will be generated:
@@ -94,16 +159,17 @@ Prefix 'fb-' (which can be customised through config) is added to avoid collisio
 
     sudo stop fb-myapp-my_tail_cmd
 
-It's stdout/stderr will be redirected to /var/log/fb-myapp/my\_tail\_cmd.log.   
+It's stdout/stderr will be redirected to /var/log/fb-myapp/my\_tail\_cmd.log.
+
+To start/stop all application commands at once, you can run:
 
-To start/stop all application commands at once, one can run:
-    
     sudo start fb-myapp
     ...
     sudo stop fb-myapp
 
-To remove upstart scripts and helpers for a particular application one can run
+To remove upstart scripts and helpers for a particular application you can run
 
     sudo upstart-export -c -n myapp
 
 The logs are not cleared in this case. Also, all old application scripts are cleared before each export.
+

data/lib/upstart-exporter/errors.rb

@@ -3,7 +3,7 @@ end
 
 module Upstart::Exporter::Errors
   def error(msg)
-    raise Upstart::Exporter::Error, msg 
+    raise Upstart::Exporter::Error, msg
   end
 end
 

data/lib/upstart-exporter/expanded_exporter.rb

@@ -0,0 +1,107 @@
+class Upstart::Exporter
+  class ExpandedExporter
+    include ExporterHelpers
+    include Errors
+
+    def self.export(options)
+      new(options).export
+    end
+
+    def initialize(options)
+      @config = options[:commands]
+      @options = options
+      @commands = @config['commands']
+      @env = @config['env'] || {}
+      @dir = @config['working_directory'] || ''
+    end
+
+    def export
+      @commands.each do |command, value|
+        if count = value['count']
+          count.times do |counter|
+            export_cmd("#{command}_#{counter}", value)
+          end
+        else
+          export_cmd(command, value)
+        end
+      end
+    end
+
+  private
+
+    def export_cmd(command, value)
+      script = value['command']
+      script = add_env_command(script, value)
+      script = add_dir_command(script, value)
+      export_cmd_helper(command, script)
+      export_cmd_upstart_conf(command, value)
+    end
+
+    def add_env_command(script, command)
+      vars = ''
+      env = @env.merge((command['env'] || {}))
+      env.each do |var, val|
+        vars += "#{var}=#{val} "
+      end
+      if vars.empty?
+        script
+      else
+        "env #{vars} #{script}"
+      end
+    end
+
+    def add_dir_command(script, command)
+      dir = command['working_directory'] || @dir
+      if dir.empty?
+        script
+      else
+        "cd '#{dir}' && #{script}"
+      end
+    end
+
+    def respawn_options(cmd_options)
+      if cmd_options.has_key?('respawn')
+        cmd_options['respawn']
+      elsif @config.has_key?('respawn')
+        @config['respawn']
+      else
+        {}
+      end
+    end
+
+    def respawn(cmd_options)
+      respawn_options(cmd_options) ? 'respawn' : ''
+    end
+
+    def respawn_limit(cmd_options)
+      limits = respawn_options(cmd_options)
+      return '' unless limits && limits['count'] && limits['interval']
+      "respawn limit #{limits['count'].to_i} #{limits['interval'].to_i}"
+    end
+
+    def start_on
+      "starting #{app_name}"
+    end
+
+    def stop_on
+      "stopping #{app_name}"
+    end
+
+    def export_cmd_upstart_conf(cmd_name, cmd_options)
+      cmd_upstart_conf_content = Templates.command(
+        :app_name => app_name,
+        :start_on => start_on,
+        :stop_on => stop_on,
+        :run_user => @options[:run_user],
+        :run_group => @options[:run_group],
+        :cmd_name => cmd_name,
+        :helper_cmd_conf => helper_cmd_conf(cmd_name),
+        :respawn => respawn(cmd_options),
+        :respawn_limit => respawn_limit(cmd_options)
+      )
+      File.open(upstart_cmd_conf(cmd_name), 'w') do |f|
+        f.write(cmd_upstart_conf_content)
+      end
+    end
+  end
+end

data/lib/upstart-exporter/exporter_helpers.rb

@@ -0,0 +1,26 @@
+class Upstart::Exporter
+  module ExporterHelpers
+    def export_cmd_helper(cmd_name, cmd)
+      helper_script_cont = Templates.helper :cmd => cmd
+      File.open(helper_cmd_conf(cmd_name), 'w') do |f|
+        f.write(helper_script_cont)
+      end
+    end
+
+    def app_name
+      @options[:prefix] + @options[:app_name]
+    end
+
+    def app_cmd(cmd_name)
+      "#{app_name}-#{cmd_name}"
+    end
+
+    def upstart_cmd_conf(cmd_name)
+      File.join(@options[:upstart_dir], "#{app_cmd(cmd_name)}.conf")
+    end
+
+    def helper_cmd_conf(cmd_name)
+      File.join(@options[:helper_dir], "#{app_cmd(cmd_name)}.sh")
+    end
+  end
+end

data/lib/upstart-exporter/options/command_line.rb

@@ -27,14 +27,20 @@ module Upstart::Exporter::Options
         elsif line =~ /^\s*$/
           # do nothing, empty
         else
-          error "procfile lines should have the following format: 'some_label: command'"
+          break if commands['version'] && commands['version'].strip == '2'
+          error "procfile version 1 lines should have the following format: 'some_label: command'"
         end
       end
+      if commands['version'] && commands['version'].strip == '2'
+        commands = YAML.load(content)
+        error('procfile should include "commands" key') unless commands['commands']
+        error('command names should include only letters and/or underscores') if commands['commands'].keys.find { |k| k !~ /\A[A-z\d_]*?\z/ }
+      end
       commands
     end
 
     def process_appname(app_name)
-      error "Application name should contain only letters (and underscore) and be nonempty, so #{app_name.inspect} is not suitable" unless app_name =~ /^\w+$/ 
+      error "Application name should contain only letters (and underscore) and be nonempty, so #{app_name.inspect} is not suitable" unless app_name =~ /^\w+$/
       app_name
     end
 

data/lib/upstart-exporter/options/global.rb

@@ -7,7 +7,9 @@ module Upstart::Exporter::Options
       'upstart_dir' => '/etc/init/',
       'run_user' => 'service',
       'run_group' => 'service',
-      'prefix' => 'fb-'
+      'prefix' => 'fb-',
+      'start_on_runlevel' => '[3]',
+      'stop_on_runlevel' => '[3]'
     }
 
     CONF = '/etc/upstart-exporter.yaml'

data/lib/upstart-exporter/templates.rb

@@ -1,16 +1,23 @@
 module Upstart
   class Exporter
     class Templates
+      extend Errors
 
       def self.helper(binds)
         interpolate(HELPER_TPL, binds)
       end
 
       def self.app(binds)
+        if error_val = binds.find { |v| v =~ /\A[A-z0-9_\- ]*?\z/ }
+          error("value #{error_val} is insecure and can't be accepted")
+        end
         interpolate(APP_TPL, binds)
       end
 
       def self.command(binds)
+        if error_val = binds.find { |v| v =~ /\A[A-z0-9_\- ]*?\z/ }
+          error("value #{error_val} is insecure and can't be accepted")
+        end
         interpolate(COMMAND_TPL, binds)
       end
 
@@ -25,6 +32,9 @@ fi
 HEREDOC
 
       APP_TPL = <<-HEREDOC
+start on {{start_on}}
+stop on {{stop_on}}
+
 pre-start script
 
 bash << "EOF"
@@ -38,9 +48,10 @@ end script
 HEREDOC
 
       COMMAND_TPL = <<-HEREDOC
-start on starting {{app_name}}
-stop on stopping {{app_name}}
-respawn
+start on {{start_on}}
+stop on {{stop_on}}
+{{respawn}}
+{{respawn_limit}}
 
 script
   touch /var/log/{{app_name}}/{{cmd_name}}.log
@@ -62,4 +73,3 @@ HEREDOC
     end
   end
 end
-    

data/lib/upstart-exporter/version.rb

@@ -1,5 +1,5 @@
 module Upstart
   class Exporter
-    VERSION = "1.0.1"
+    VERSION = "2.0.1"
   end
 end

data/lib/upstart-exporter.rb

@@ -1,15 +1,19 @@
-require "upstart-exporter/version"
-require "upstart-exporter/templates"
-require "upstart-exporter/errors"
-require "upstart-exporter/options/global"
-require "upstart-exporter/options/command_line"
+require 'yaml'
+require 'upstart-exporter/version'
+require 'upstart-exporter/errors'
+require 'upstart-exporter/templates'
+require 'upstart-exporter/exporter_helpers'
+require 'upstart-exporter/expanded_exporter'
+require 'upstart-exporter/options/global'
+require 'upstart-exporter/options/command_line'
 
 module Upstart
   class Exporter
     include Errors
+    include ExporterHelpers
 
     attr_reader :options
-  
+
     def initialize(command_line_args)
       global_options = Options::Global.new
       command_line_options = Options::CommandLine.new(command_line_args)
@@ -20,8 +24,12 @@ module Upstart
     def export
       clear
       export_app
-      options[:commands].each do |cmd_name, cmd|
-        export_command(cmd_name, cmd)
+      if options[:commands]['version'] && options[:commands]['version'] == 2
+        ExpandedExporter.export(options)
+      else
+        options[:commands].each do |cmd_name, cmd|
+          export_command(cmd_name, cmd)
+        end
       end
     end
 
@@ -37,17 +45,29 @@ module Upstart
 
     protected
 
+    def start_on_runlevel
+      lvl = options[:commands]['start_on_runlevel'] || options[:start_on_runlevel]
+      "runlevel #{lvl}"
+    end
+
+    def stop_on_runlevel
+      lvl = options[:commands]['stop_on_runlevel'] || options[:stop_on_runlevel]
+      "runlevel #{lvl}"
+    end
+
     def ensure_dirs
       ensure_dir(options[:helper_dir])
       ensure_dir(options[:upstart_dir])
     end
 
-    def app_name
-      options[:prefix] + options[:app_name]
-    end
-
     def export_app
-      app_conf = Templates.app :app_name => app_name, :run_user => options[:run_user], :run_group => options[:run_group]
+      app_conf = Templates.app(
+        :app_name => app_name,
+        :run_user => options[:run_user],
+        :run_group => options[:run_group],
+        :start_on => start_on_runlevel,
+        :stop_on => stop_on_runlevel
+      )
       File.open(upstart_conf, 'w') do |f|
         f.write(app_conf)
       end
@@ -62,27 +82,18 @@ module Upstart
       File.join(options[:upstart_dir], "#{app_name}.conf")
     end
 
-    def app_cmd(cmd_name)
-      "#{app_name}-#{cmd_name}"
-    end
-    
-    def upstart_cmd_conf(cmd_name)
-      File.join(options[:upstart_dir], "#{app_cmd(cmd_name)}.conf")
-    end
-    
-    def helper_cmd_conf(cmd_name)
-      File.join(options[:helper_dir], "#{app_cmd(cmd_name)}.sh")
-    end
-
-    def export_cmd_helper(cmd_name, cmd)
-      helper_script_cont = Templates.helper :cmd => cmd
-      File.open(helper_cmd_conf(cmd_name), 'w') do |f|
-        f.write(helper_script_cont)
-      end
-    end
-
     def export_cmd_upstart_conf(cmd_name)
-      cmd_upstart_conf_content = Templates.command :app_name => app_name, :run_user => options[:run_user], :run_group => options[:run_group], :cmd_name => cmd_name, :helper_cmd_conf => helper_cmd_conf(cmd_name)
+      cmd_upstart_conf_content = Templates.command(
+        :app_name => app_name,
+        :start_on => "starting #{app_name}",
+        :stop_on => "stopping #{app_name}",
+        :respawn => 'respawn',
+        :respawn_limit => '',
+        :run_user => options[:run_user],
+        :run_group => options[:run_group],
+        :cmd_name => cmd_name,
+        :helper_cmd_conf => helper_cmd_conf(cmd_name)
+      )
       File.open(upstart_cmd_conf(cmd_name), 'w') do |f|
         f.write(cmd_upstart_conf_content)
       end

data/spec/lib/upstart-exporter/errors_spec.rb

@@ -18,7 +18,6 @@ describe Upstart::Exporter::Errors do
       end
 
       lambda{ Foo.new.error("arrgh") }.should raise_exception(Upstart::Exporter::Error)
-      
     end
   end
 end

data/spec/lib/upstart-exporter/expanded_exporter_spec.rb

@@ -0,0 +1,59 @@
+require 'spec/spec_helper'
+
+describe Upstart::Exporter::ExpandedExporter do
+  before do
+    @defaults = {}
+    Upstart::Exporter::Options::Global::DEFAULTS.each do |key, value|
+      @defaults[key.to_sym] = value
+    end
+
+    File.stub(:open)
+  end
+
+  it 'calls template render exact amount of times' do
+    Upstart::Exporter::Templates.should_receive(:command).exactly(5).times
+    options = {
+      :commands => {
+        'commands' => {
+          'ls' => {
+            'command' => 'ls',
+            'count' => 3
+          },
+          'ls2' => {
+            'command' => 'ls',
+            'count' => 2
+          }
+        }
+      },
+      :app_name => 'appname'
+    }.merge(@defaults)
+
+    described_class.export(options)
+  end
+
+  it 'merges env params in the right order' do
+    Upstart::Exporter::Templates.should_receive(:helper) do |options|
+      options[:cmd].should include('B=b')
+      options[:cmd].should include('T=t')
+    end
+    options = {
+      :commands => {
+        'env' => {
+          'T' => 't',
+          'B' => 'a'
+        },
+        'commands' => {
+          'ls' => {
+            'command' => 'ls',
+            'env' => {
+              'B' => 'b'
+            }
+          }
+        }
+      },
+      :app_name => 'appname'
+    }.merge(@defaults)
+
+    described_class.export(options)
+  end
+end

data/spec/lib/upstart-exporter/options/command_line_spec.rb

@@ -6,25 +6,32 @@ describe Upstart::Exporter::Options::CommandLine do
         make_procfile('Procfile', 'ls_cmd: ls')
         described_class.new(:app_name => 'someappname', :procfile => 'Procfile').should respond_to('[]')
     end
-    
+
     it "should parse procfile" do
         make_procfile('Procfile', 'ls_cmd: ls')
         options = described_class.new(:app_name => 'someappname', :procfile => 'Procfile')
         options[:commands].should == {'ls_cmd' => ' ls'}
     end
-    
+
+    it 'should parse procfile v2' do
+        make_procfile('Procfile', "version: 2\ncommands:\n  ls:\n    command: ls -al")
+        options = described_class.new(:app_name => 'someappname', :procfile => 'Procfile')
+        options[:commands].should have_key('commands')
+        options[:commands]['commands'].should have_key('ls')
+    end
+
     it "should skip empty and commented lines in a procfile" do
         make_procfile('Procfile', "ls_cmd1: ls1\n\nls_cmd2: ls2\n # fooo baaar")
         options = described_class.new(:app_name => 'someappname', :procfile => 'Procfile')
         options[:commands].should == {'ls_cmd1' => ' ls1', 'ls_cmd2' => ' ls2'}
     end
-    
+
     it "should store app_name" do
         make_procfile('Procfile', "ls_cmd1: ls1\n\nls_cmd2: ls2\n # fooo baaar")
         options = described_class.new(:app_name => 'someappname', :procfile => 'Procfile')
         options[:app_name].should == 'someappname'
     end
-    
+
     it "should not process procfile if :clear arg is present" do
         make_procfile('Procfile', "bad procfile")
         options = described_class.new(:app_name => 'someappname', :procfile => 'Procfile', :clear => true)
@@ -41,7 +48,7 @@ describe Upstart::Exporter::Options::CommandLine do
       lambda{ described_class.new(:procfile => 'Procfile') }.should raise_exception
     end
   end
-  
+
   context "when bad Procfile is passed" do
     it "should raise exception" do
       make_procfile('Procfile', 'ls cmd: ls')
@@ -51,7 +58,10 @@ describe Upstart::Exporter::Options::CommandLine do
       lambda{ described_class.new(:app_name => 'someappname', :procfile => 'Procfile') }.should raise_exception
 
       lambda{ described_class.new(:app_name => 'someappname', :procfile => '::') }.should raise_exception
-      
+
+      make_procfile('Procfile', "version: 2\ncommands:\n  ls cmd:\n    command: ls")
+      lambda{ described_class.new(:app_name => 'someappname', :procfile => 'Procfile') }.should raise_exception
+
       lambda{ described_class.new(:app_name => 'someappname') }.should raise_exception
     end
   end

data/spec/lib/upstart-exporter/options/global_spec.rb

@@ -3,7 +3,7 @@ require 'spec/spec_helper'
 describe Upstart::Exporter::Options::Global do
   let(:defaults){ Upstart::Exporter::Options::Global::DEFAULTS }
   let(:conf){ Upstart::Exporter::Options::Global::CONF }
-  
+
 
   it "should give access to options like a hash" do
     capture(:stderr) do
@@ -40,7 +40,7 @@ describe Upstart::Exporter::Options::Global do
         described_class.new[:run_user].should == 'wwwww'
       end
     end
-    
+
     it "should preserve default values for options not specified in the config" do
       capture(:stderr) do
         make_global_config({'run_user' => 'wwwww'}.to_yaml)

data/spec/lib/upstart-exporter/templates_spec.rb

@@ -3,8 +3,11 @@ require 'spec/spec_helper'
 describe Upstart::Exporter::Templates do
   describe ".app" do
     it "should generate a valid app config" do
-      
+
       conf = <<-HEREDOC
+start on 12
+stop on 13
+
 pre-start script
 
 bash << "EOF"
@@ -17,13 +20,19 @@ EOF
 end script
 HEREDOC
 
-      described_class.app(:run_user => 'SOMEUSER', :run_group => 'SOMEGROUP', :app_name => 'SOMEAPP').should == conf
+      described_class.app(
+        :run_user => 'SOMEUSER', 
+        :run_group => 'SOMEGROUP', 
+        :app_name => 'SOMEAPP',
+        :start_on => '12',
+        :stop_on => '13'
+      ).should == conf
     end
   end
 
   describe ".helper" do
     it "should generate a valid helper script" do
-      
+
       conf = <<-HEREDOC
 #!/bin/bash
 if [ -f /etc/profile.d/rbenv.sh ]; then
@@ -39,11 +48,12 @@ HEREDOC
 
   describe ".helper" do
     it "should generate a valid upstart script for a single command" do
-      
+
       conf = <<-HEREDOC
 start on starting SOMEAPP
 stop on stopping SOMEAPP
 respawn
+respawn limit 5 10
 
 script
   touch /var/log/SOMEAPP/SOMECMD.log
@@ -54,7 +64,15 @@ script
 end script
 HEREDOC
 
-      described_class.command(:run_user => 'SOMEUSER', :run_group => 'SOMEGROUP', :app_name => 'SOMEAPP', :cmd_name => 'SOMECMD', :helper_cmd_conf => 'HELPERPATH').should == conf
+      described_class.command(:run_user => 'SOMEUSER',
+                              :run_group => 'SOMEGROUP',
+                              :app_name => 'SOMEAPP',
+                              :cmd_name => 'SOMECMD',
+                              :respawn => 'respawn',
+                              :respawn_limit => 'respawn limit 5 10',
+                              :start_on => 'starting SOMEAPP',
+                              :stop_on => 'stopping SOMEAPP',
+                              :helper_cmd_conf => 'HELPERPATH').should == conf
     end
   end
 

data/spec/lib/upstart-exporter_spec.rb

@@ -9,7 +9,8 @@ describe Upstart::Exporter do
       'upstart_dir' => '/u',
       'run_user' => 'u',
       'run_group' => 'g',
-      'prefix' => 'p-'
+      'prefix' => 'p-',
+      'start_on_runlevel' => '[7]'
     }.to_yaml)
     make_procfile('Procfile', 'ls_cmd: ls')
     exporter = described_class.new({:app_name => 'app', :procfile => 'Procfile'})
@@ -27,13 +28,25 @@ describe Upstart::Exporter do
         FileTest.file?(f).should be_true
       end
     end
-    
+
     it 'created scripts, folders and sh helpers should have valid content' do
       exporter.export
 
       File.read('/h/p-app-ls_cmd.sh').should == tpl.helper(:cmd => ' ls')
-      File.read('/u/p-app.conf').should == tpl.app(:run_user => 'u', :run_group => 'g', :app_name => 'p-app')
-      File.read('/u/p-app-ls_cmd.conf').should == tpl.command(:run_user => 'u', :run_group => 'g',  :app_name => 'p-app', :cmd_name => 'ls_cmd', :helper_cmd_conf => '/h/p-app-ls_cmd.sh')
+      File.read('/u/p-app.conf').should == tpl.app(:run_user => 'u',
+                                                   :run_group => 'g',
+                                                   :app_name => 'p-app',
+                                                   :start_on => 'runlevel [7]',
+                                                   :stop_on => 'runlevel [3]')
+      File.read('/u/p-app-ls_cmd.conf').should == tpl.command(:run_user => 'u',
+                                                              :run_group => 'g',
+                                                              :app_name => 'p-app',
+                                                              :cmd_name => 'ls_cmd',
+                                                              :start_on => 'starting p-app',
+                                                              :stop_on => 'stopping p-app',
+                                                              :respawn => 'respawn',
+                                                              :respawn_limit => '',
+                                                              :helper_cmd_conf => '/h/p-app-ls_cmd.sh')
     end
   end
 
@@ -44,10 +57,10 @@ describe Upstart::Exporter do
       Dir['/h/*'].should be_empty
       Dir['/u/*'].should be_empty
     end
-    
+
     it 'should keep files of other apps' do
       exporter.export
-      
+
       make_procfile('Procfile1', 'ls_cmd: ls')
       other_exporter = described_class.new({:app_name => 'other_app', :procfile => 'Procfile1'})
       other_exporter.export

data/upstart-exporter.gemspec

@@ -5,15 +5,14 @@ require "upstart-exporter/version"
 Gem::Specification.new do |s|
   s.name        = "upstart-exporter"
   s.version     = Upstart::Exporter::VERSION
-  s.authors     = ["Ilya Averyanov"]
-  s.email       = ["ilya@averyanov.org"]
+  s.authors     = ["Ilya Averyanov", "Egor Blinov"]
+  s.email       = ["ilya@averyanov.org", "monshq@gmail.com"]
   s.homepage    = ""
-  s.summary     = %q{Gem for converting Procfile-like files to upstart scripts}
-  s.description = %q{Gem for converting Procfile-like files to upstart scripts}
+  s.summary     = %q{Gem for converting extended Procfile-like files to upstart scripts}
+  s.description = %q{Gem for converting extended Procfile-like files to upstart scripts}
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-
 end

metadata

@@ -1,26 +1,29 @@
 --- !ruby/object:Gem::Specification 
 name: upstart-exporter
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 13
   prerelease: 
   segments: 
-  - 1
+  - 2
   - 0
   - 1
-  version: 1.0.1
+  version: 2.0.1
 platform: ruby
 authors: 
 - Ilya Averyanov
+- Egor Blinov
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2012-02-22 00:00:00 Z
+date: 2014-01-21 00:00:00 +04:00
+default_executable: 
 dependencies: []
 
-description: Gem for converting Procfile-like files to upstart scripts
+description: Gem for converting extended Procfile-like files to upstart scripts
 email: 
 - ilya@averyanov.org
+- monshq@gmail.com
 executables: 
 - upstart-export
 extensions: []
@@ -31,6 +34,8 @@ files:
 - .gitignore
 - .rbenv-version
 - .rspec
+- .ruby-version
+- .travis.yml
 - .yardoc/checksums
 - .yardoc/objects/root.dat
 - .yardoc/proxy_types
@@ -63,11 +68,14 @@ files:
 - doc/top-level-namespace.html
 - lib/upstart-exporter.rb
 - lib/upstart-exporter/errors.rb
+- lib/upstart-exporter/expanded_exporter.rb
+- lib/upstart-exporter/exporter_helpers.rb
 - lib/upstart-exporter/options/command_line.rb
 - lib/upstart-exporter/options/global.rb
 - lib/upstart-exporter/templates.rb
 - lib/upstart-exporter/version.rb
 - spec/lib/upstart-exporter/errors_spec.rb
+- spec/lib/upstart-exporter/expanded_exporter_spec.rb
 - spec/lib/upstart-exporter/options/command_line_spec.rb
 - spec/lib/upstart-exporter/options/global_spec.rb
 - spec/lib/upstart-exporter/templates_spec.rb
@@ -77,6 +85,7 @@ files:
 - spec/support/procfile.rb
 - spec/support/streams.rb
 - upstart-exporter.gemspec
+has_rdoc: true
 homepage: ""
 licenses: []
 
@@ -106,12 +115,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: Gem for converting Procfile-like files to upstart scripts
+summary: Gem for converting extended Procfile-like files to upstart scripts
 test_files: 
 - spec/lib/upstart-exporter/errors_spec.rb
+- spec/lib/upstart-exporter/expanded_exporter_spec.rb
 - spec/lib/upstart-exporter/options/command_line_spec.rb
 - spec/lib/upstart-exporter/options/global_spec.rb
 - spec/lib/upstart-exporter/templates_spec.rb
@@ -120,4 +130,3 @@ test_files:
 - spec/support/global_config.rb
 - spec/support/procfile.rb
 - spec/support/streams.rb
-has_rdoc: