eye-patch 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37ab5e0e01c82e59761cee6a57d99453236b354f
-  data.tar.gz: a0672dcd843064cd0d8b73e13bd0634b6291754c
+  metadata.gz: f0a0561f6759a1882a53a023411f8b4c3e1694e6
+  data.tar.gz: 2609ee2f323b7d70da60dcc26d746f73b6fac0d8
 SHA512:
-  metadata.gz: b65c101d35198019e88302828258d5093d5a43865aa56e59de9631e927637c189346438ad956b0075dc9ac65827b38b67f51d11602689708f570127ea9f93f58
-  data.tar.gz: 2c2549d8e6e312daa2c89afa37fdd469d7e8b4e4c999dd10c25d21d0cf222d2299b6e03cdc059cb2202ed86d37bb5460b544646bcc330ac891c29a8c55fb8986
+  metadata.gz: c108b4b7c2b473162f96aed3d3cc1755c7ae9731b9d03d9c1f068bc2634efdb704f109d015545ebcd6db38364da579431372f3d0aff7e5c5100dae02e8616279
+  data.tar.gz: c722ab3ff4543cac6ef865a15c783242634cd006788a914377987dcdd36dbe4cdecee19fbb034fba08e6fb1fb652b32d1f12cf1b92711fd446600deeefb1deae

data/lib/eye/patch/overrides.rb

@@ -7,6 +7,27 @@ Eye::Cli.class_eval do
   end
 end
 
+Eye::System.class_eval do
+  private
+
+  def spawn_options(config = {})
+    o = {pgroup: true, chdir: config[:working_dir] || '/'}
+    o.update(out: [config[:stdout], 'a']) if config[:stdout]
+    o.update(err: [config[:stderr], 'a']) if config[:stderr]
+    o.update(in: config[:stdin]) if config[:stdin]
+    o.update(close_others: !config[:preserve_fds])
+
+    if Eye::Local.root?
+      o.update(uid: Etc.getpwnam(config[:uid]).uid) if config[:uid]
+      o.update(gid: Etc.getpwnam(config[:gid]).gid) if config[:gid]
+    end
+
+    o.update(umask: config[:umask]) if config[:umask]
+
+    o
+  end
+end
+
 Eye::Controller.class_eval do
   private
 

data/lib/eye/patch/process_set.rb

@@ -28,9 +28,10 @@ module Eye::Patch
     end
 
     def parse_single_process(name, config)
-      self[name] = @group.merge(config).merge(
-        name: name,
-        group: @group[:name] )
+      self[name] = @group
+        .merge(stdout: config[:stdall], stderr: config[:stdall])
+        .merge(config)
+        .merge(name: name, group: @group[:name])
     end
 
     def indexed_config(config, index)

data/lib/eye/patch/version.rb

@@ -1,5 +1,5 @@
 module Eye
   module Patch
-    VERSION = "0.0.7"
+    VERSION = "0.0.8"
   end
 end

data/test/fixtures/test.yml

@@ -33,6 +33,7 @@ processes:
       start_timeout: 25 seconds
       start_command: bundle exec my-process
       pid_file: tmp/pids/my-process.pid
+      stdall: log/my-process.log
   - name: first-grouped-process
     group: my-group
     config:

data/test/lib/eye/patch_test.rb

@@ -79,5 +79,13 @@ describe Eye::Patch do
       process = @application[:groups]["__default__"][:processes].values.first
       assert_equal @application[:triggers], process[:triggers]
     end
+
+    it "sets :stderr and :stdout options for each process from passed :stdall" do
+      process = @original["processes"].reject { |process| process["group"] }.first
+      parsed_process = @application[:groups]["__default__"][:processes].values.first
+
+      assert_equal process["config"]["stdall"], parsed_process[:stdout]
+      assert_equal process["config"]["stdall"], parsed_process[:stderr]
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eye-patch
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Andrew Horner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-06 00:00:00.000000000 Z
+date: 2014-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eye