upstart-exporter 2.1.1 → 2.1.2

data/lib/upstart-exporter/exporter_helpers.rb

@@ -29,10 +29,23 @@ class Upstart::Exporter
       return binds unless cmd
 
       parts = cmd.split /\s*(&&|\|\|)\s*/
-      parts.last.gsub!(/\A(exec\s*|\s*)/, "exec ")
-      cmd = parts.join(" ")
+      parts.push ensure_prepend_exec(parts.pop)
 
-      binds.merge(:cmd => cmd)
+      binds.merge(:cmd => parts.join(" "))
+    end
+
+    def ensure_prepend_exec(cmd)
+      cmd = guard_leading_env_var(cmd.strip)
+      cmd.gsub(/\A(exec\s*|\s*)/, "exec ")
+    end
+
+    def guard_leading_env_var(cmd)
+      if cmd =~ /\A\S+=\S+/
+        warn "WARNING: Command '#{cmd}' seems to start with assignment of environment var. Prepending with 'env'"
+        "env #{cmd}"
+      else
+        cmd
+      end
     end
   end
 end

data/lib/upstart-exporter/version.rb

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

data/spec/lib/upstart-exporter_spec.rb

@@ -3,7 +3,7 @@ require 'spec/spec_helper'
 describe Upstart::Exporter do
   let(:tpl){ Upstart::Exporter::Templates }
 
-  let(:exporter) do
+  before do
     make_global_config({
       'helper_dir' => '/h',
       'upstart_dir' => '/u',
@@ -13,6 +13,9 @@ describe Upstart::Exporter do
       'start_on_runlevel' => '[7]'
     }.to_yaml)
     make_procfile('Procfile', 'ls_cmd: ls')
+  end
+
+  let(:exporter) do
     exporter = described_class.new({:app_name => 'app', :procfile => 'Procfile'})
   end
 
@@ -49,6 +52,20 @@ describe Upstart::Exporter do
                                                               :kill_timeout => 30,
                                                               :helper_cmd_conf => '/h/p-app-ls_cmd.sh')
     end
+
+    it 'prepends with "env" command starts with env var assignment' do
+      make_procfile('Procfile', 'sidekiq: RAILS_ENV=production sidekiq')
+      exporter.export
+
+      File.read('/h/p-app-sidekiq.sh').should == tpl.helper(:cmd => 'exec env RAILS_ENV=production sidekiq')
+    end
+
+    it 'call to "env" will not appear twice' do
+      make_procfile('Procfile', 'sidekiq: env RAILS_ENV=production sidekiq')
+      exporter.export
+
+      File.read('/h/p-app-sidekiq.sh').should == tpl.helper(:cmd => 'exec env RAILS_ENV=production sidekiq')
+    end
   end
 
   describe '#clear' do

metadata

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