upstart-exporter 2.0.1 → 2.1.1

data/.travis.yml

@@ -4,3 +4,4 @@ rvm:
 branches:
   only:
     - master
+script: bundle exec rspec spec

data/lib/upstart-exporter.rb

@@ -89,6 +89,7 @@ module Upstart
         :stop_on => "stopping #{app_name}",
         :respawn => 'respawn',
         :respawn_limit => '',
+        :kill_timeout => options[:kill_timeout],
         :run_user => options[:run_user],
         :run_group => options[:run_group],
         :cmd_name => cmd_name,

data/lib/upstart-exporter/expanded_exporter.rb

@@ -12,29 +12,36 @@ class Upstart::Exporter
       @options = options
       @commands = @config['commands']
       @env = @config['env'] || {}
-      @dir = @config['working_directory'] || ''
     end
 
     def export
-      @commands.each do |command, value|
-        if count = value['count']
+      @commands.each do |command, cmd_options|
+        if count = cmd_options['count']
           count.times do |counter|
-            export_cmd("#{command}_#{counter}", value)
+            export_cmd("#{command}_#{counter}", cmd_options)
           end
         else
-          export_cmd(command, value)
+          export_cmd(command, cmd_options)
         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)
+    def export_cmd(command, cmd_options)
+      cmd_options = {
+        'working_directory' => working_directory(cmd_options),
+        'log' => log(cmd_options),
+        'kill_timeout' => kill_timeout(cmd_options)
+      }.merge(cmd_options)
+
+      script = cmd_options['command']
+      script = add_env_command(script, cmd_options)
+      script = add_dir_command(script, cmd_options)
+      script = add_log_command(script, cmd_options)
+
+      export_cmd_helper(command, script, cmd_options)
+      export_cmd_upstart_conf(command, cmd_options)
     end
 
     def add_env_command(script, command)
@@ -51,7 +58,7 @@ class Upstart::Exporter
     end
 
     def add_dir_command(script, command)
-      dir = command['working_directory'] || @dir
+      dir = command['working_directory']
       if dir.empty?
         script
       else
@@ -59,6 +66,15 @@ class Upstart::Exporter
       end
     end
 
+    def add_log_command(script, command)
+      log = command['log']
+      if log.empty?
+        script
+      else
+        "#{script} >> #{log} 2>&1"
+      end
+    end
+
     def respawn_options(cmd_options)
       if cmd_options.has_key?('respawn')
         cmd_options['respawn']
@@ -87,6 +103,18 @@ class Upstart::Exporter
       "stopping #{app_name}"
     end
 
+    def working_directory(cmd_options)
+      command_option(cmd_options, 'working_directory')
+    end
+
+    def log(cmd_options)
+      command_option(cmd_options, 'log')
+    end
+
+    def kill_timeout(cmd_options)
+      command_option(cmd_options, 'kill_timeout')
+    end
+
     def export_cmd_upstart_conf(cmd_name, cmd_options)
       cmd_upstart_conf_content = Templates.command(
         :app_name => app_name,
@@ -97,11 +125,18 @@ class Upstart::Exporter
         :cmd_name => cmd_name,
         :helper_cmd_conf => helper_cmd_conf(cmd_name),
         :respawn => respawn(cmd_options),
-        :respawn_limit => respawn_limit(cmd_options)
+        :respawn_limit => respawn_limit(cmd_options),
+        :kill_timeout => kill_timeout(cmd_options)
       )
       File.open(upstart_cmd_conf(cmd_name), 'w') do |f|
         f.write(cmd_upstart_conf_content)
       end
     end
+
+    private
+
+    def command_option(cmd_options, key)
+      cmd_options[key.to_s] || @config[key.to_s] || @options[key.to_sym] || ''
+    end
   end
 end

data/lib/upstart-exporter/exporter_helpers.rb

@@ -1,7 +1,7 @@
 class Upstart::Exporter
   module ExporterHelpers
-    def export_cmd_helper(cmd_name, cmd)
-      helper_script_cont = Templates.helper :cmd => cmd
+    def export_cmd_helper(cmd_name, cmd, binds={})
+      helper_script_cont = Templates.helper append_cmd(cmd, binds)
       File.open(helper_cmd_conf(cmd_name), 'w') do |f|
         f.write(helper_script_cont)
       end
@@ -22,5 +22,17 @@ class Upstart::Exporter
     def helper_cmd_conf(cmd_name)
       File.join(@options[:helper_dir], "#{app_cmd(cmd_name)}.sh")
     end
+
+    private
+
+    def append_cmd(cmd, binds)
+      return binds unless cmd
+
+      parts = cmd.split /\s*(&&|\|\|)\s*/
+      parts.last.gsub!(/\A(exec\s*|\s*)/, "exec ")
+      cmd = parts.join(" ")
+
+      binds.merge(:cmd => cmd)
+    end
   end
 end

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

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

data/lib/upstart-exporter/templates.rb

@@ -25,9 +25,9 @@ module Upstart
 
       HELPER_TPL = <<-HEREDOC
 #!/bin/bash
-if [ -f /etc/profile.d/rbenv.sh ]; then
-  source /etc/profile.d/rbenv.sh
-fi
+
+[[ -r /etc/profile.d/rbenv.sh ]] && source /etc/profile.d/rbenv.sh
+
 {{cmd}}
 HEREDOC
 
@@ -52,6 +52,7 @@ start on {{start_on}}
 stop on {{stop_on}}
 {{respawn}}
 {{respawn_limit}}
+kill timeout {{kill_timeout}}
 
 script
   touch /var/log/{{app_name}}/{{cmd_name}}.log
@@ -65,7 +66,7 @@ HEREDOC
       def self.interpolate(str, substitutes)
         str_copy = str.dup
         substitutes.each do |k, v|
-          str_copy.gsub!("{{#{k}}}", v)
+          str_copy.gsub!("{{#{k}}}", v.to_s)
         end
         str_copy
       end

data/lib/upstart-exporter/version.rb

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

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

@@ -56,4 +56,45 @@ describe Upstart::Exporter::ExpandedExporter do
 
     described_class.export(options)
   end
+
+  it 'passes all calculated binds to the helper exporter' do
+    options = {
+      :version => 2,
+      :app_name => 'appname',
+      :working_directory => "/",
+      :log => "public.log",
+      :commands => {
+        'working_directory' => '/var/log',
+        'commands' => {
+          'rm1' => {
+            'command' => 'rm *',
+            'log' => 'private.log'
+          },
+          'rm2' => {
+            'command' => 'rm -rf *',
+            'working_directory' => '/home'
+          },
+          'rm3' => {
+            'command' => 'rm -f vmlinuz',
+          }
+        }
+      }
+    }.merge(@defaults)
+    Upstart::Exporter::Templates.should_receive(:helper) do |options|
+      options.should include('working_directory' => '/var/log') # propagated from 'commands'
+      options.should include('log' => 'private.log')            # redefined by command
+      options.should include(:cmd => "cd '/var/log' && exec rm * >> private.log 2>&1")
+    end
+    Upstart::Exporter::Templates.should_receive(:helper) do |options|
+      options.should include('working_directory' => '/home')    # redefined by command
+      options.should include('log' => 'public.log')             # propagated from the very top level
+      options.should include(:cmd => "cd '/home' && exec rm -rf * >> public.log 2>&1")
+    end
+    Upstart::Exporter::Templates.should_receive(:helper) do |options|
+      options.should include('working_directory' => '/var/log') # propagated from 'commands'
+      options.should include('log' => 'public.log')             # propagated from the very top level
+      options.should include(:cmd => "cd '/var/log' && exec rm -f vmlinuz >> public.log 2>&1")
+    end
+    described_class.export(options)
+  end
 end

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

@@ -21,8 +21,8 @@ end script
 HEREDOC
 
       described_class.app(
-        :run_user => 'SOMEUSER', 
-        :run_group => 'SOMEGROUP', 
+        :run_user => 'SOMEUSER',
+        :run_group => 'SOMEGROUP',
         :app_name => 'SOMEAPP',
         :start_on => '12',
         :stop_on => '13'
@@ -35,13 +35,13 @@ HEREDOC
 
       conf = <<-HEREDOC
 #!/bin/bash
-if [ -f /etc/profile.d/rbenv.sh ]; then
-  source /etc/profile.d/rbenv.sh
-fi
+
+[[ -r /etc/profile.d/rbenv.sh ]] && source /etc/profile.d/rbenv.sh
+
 SOME COMMAND
 HEREDOC
 
-      described_class.helper(:cmd => 'SOME COMMAND').should == conf
+      described_class.helper('cmd' => 'SOME COMMAND').should == conf
     end
   end
 
@@ -54,6 +54,7 @@ start on starting SOMEAPP
 stop on stopping SOMEAPP
 respawn
 respawn limit 5 10
+kill timeout 24
 
 script
   touch /var/log/SOMEAPP/SOMECMD.log
@@ -72,6 +73,7 @@ HEREDOC
                               :respawn_limit => 'respawn limit 5 10',
                               :start_on => 'starting SOMEAPP',
                               :stop_on => 'stopping SOMEAPP',
+                              :kill_timeout => 24,
                               :helper_cmd_conf => 'HELPERPATH').should == conf
     end
   end

data/spec/lib/upstart-exporter_spec.rb

@@ -32,7 +32,7 @@ describe Upstart::Exporter do
     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('/h/p-app-ls_cmd.sh').should == tpl.helper(:cmd => 'exec ls')
       File.read('/u/p-app.conf').should == tpl.app(:run_user => 'u',
                                                    :run_group => 'g',
                                                    :app_name => 'p-app',
@@ -46,6 +46,7 @@ describe Upstart::Exporter do
                                                               :stop_on => 'stopping p-app',
                                                               :respawn => 'respawn',
                                                               :respawn_limit => '',
+                                                              :kill_timeout => 30,
                                                               :helper_cmd_conf => '/h/p-app-ls_cmd.sh')
     end
   end

data/spec/support/procfile.rb

@@ -1,4 +1,4 @@
-def make_procfile(fname, content) 
+def make_procfile(fname, content)
   File.open(fname, 'w') do |f|
     f.write content
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: upstart-exporter
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 9
   prerelease: 
   segments: 
   - 2
-  - 0
   - 1
-  version: 2.0.1
+  - 1
+  version: 2.1.1
 platform: ruby
 authors: 
 - Ilya Averyanov
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-01-21 00:00:00 +04:00
+date: 2014-02-14 00:00:00 +04:00
 default_executable: 
 dependencies: []