eye 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c291e8ed14e7f8199676afd126f117dbc5a491ed
-  data.tar.gz: be96f87f1d1f70d5666d8a1e63e60516317ec499
+  metadata.gz: f91b36c9b73d802f079d62a345bbf29fcb929768
+  data.tar.gz: 2953436d9e587ff52b0a2ee146c2ac52434e1662
 SHA512:
-  metadata.gz: 33701932d6954c9c274e4f80ac87c1c21a257ab53d351b43c65a0d95eba98227e5ca9d889c2ee6a4857ef38df89d89d83bce90f647732fc85a87f8afde9b4f4d
-  data.tar.gz: 9cfe4c03629ef7f28138caa6cf84e73fbc317c19e5d5712e39728fe58137b93fa9674385e9b78413e4f41926d0da7d608b1a13f37fc1d3eb349d72f6cf6336f9
+  metadata.gz: 1569dabc95b8e86f63eaf7b3d921758638cd2183ea403610400f437f6824fe0d18d0b763c3ce2752ab6d2a63641d2755affd51137d134f6cf3adf2e6caa10869
+  data.tar.gz: 1e9d50a96ae0cc44d2ab218d45933ec4b3a49ec5686875351de2f6b5be10deaaa2e1843431bb88b89eb783c59a0c1f76d1ccda46ad915d11fc4e5da2c27640f1

data/.gitignore

@@ -29,4 +29,5 @@ experiments
 *sublime*
 examples/work*.eye
 script
-[0-9].rb
+[0-9].rb
+*.cache

data/.travis.yml

@@ -1,3 +1,4 @@
 language: ruby
 rvm:
   - "1.9.3"
+script: COVA=1 bundle exec rake

data/CHANGES.md

@@ -0,0 +1,19 @@
+0.3.3.dev
+---------
+
+0.3.2
+---------
+* improve matching targers
+* possibility to add many checkers with the same type per process (ex: checks :http_2, ...)
+* add uid,gid options (only for ruby 2.0)
+
+0.3.1
+-----
+* load multiple configs (folder,...) now not breaks on first error (each config loads separately)
+* load ~/.eyeconfig with first eye load
+* some concurrency fixes
+* custom checker
+
+0.3
+---
+* stable version

data/Gemfile

@@ -2,3 +2,4 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in eye.gemspec
 gemspec
+

data/README.md

@@ -1,5 +1,8 @@
-Eye [![Build Status](https://secure.travis-ci.org/kostya/eye.png?branch=master)](http://travis-ci.org/kostya/eye)
+Eye
 ===
+[![Gem Version](https://badge.fury.io/rb/eye.png)](http://rubygems.org/gems/eye)
+[![Build Status](https://secure.travis-ci.org/kostya/eye.png?branch=master)](http://travis-ci.org/kostya/eye)
+[![Coverage Status](https://coveralls.io/repos/kostya/eye/badge.png?branch=master)](https://coveralls.io/r/kostya/eye?branch=master)
 
 Process monitoring tool. An alternative to God and Bluepill. With Bluepill like config syntax. Requires MRI Ruby >= 1.9.3-p194. Uses Celluloid and Celluloid::IO.
 
@@ -150,6 +153,10 @@ Check config syntax:
 
     $ eye c(heck) examples/test.eye
 
+Config explain (for debug):
+
+    $ eye e(xplain) examples/test.eye
+
 Log tracing:
 
     $ eye trace 
@@ -160,11 +167,6 @@ Quit monitoring:
 
     $ eye q(uit)
 
-Config explain (for debug):
-
-    $ eye explain examples/test.eye
-
-
-### Config api:
+### Config options:
 
-  Waiting for pull requests ..., until that you can read `examples` and `spec/dsl` folders.
+  Waiting for pull requests here..., until that you can read `examples` and `spec/dsl` folders.

data/bin/eye

@@ -10,9 +10,7 @@ class Cli < Thor
 
   desc "info [MASK]", "show process statuses"
   def info(mask = nil)
-    res = cmd(:info, mask)
-    puts res if res && !res.empty?
-    puts
+    print cmd(:info, mask)
   end
 
   desc "status ", "show process statuses"
@@ -25,31 +23,22 @@ class Cli < Thor
   method_option :config, :type => :boolean, :aliases => "-c"
   method_option :show_processes, :type => :boolean, :aliases => "-p"
   def xinfo    
-    res = cmd(:xinfo, options[:config], options[:show_processes])
-    puts res if res && !res.empty?
-    puts
+    print cmd(:xinfo, options[:config], options[:show_processes])
   end
 
   desc "oinfo", "onelined info"
   def oinfo
-    res = cmd(:oinfo)
-    puts res if res && !res.empty?
-    puts
+    print cmd(:oinfo)
   end
 
   desc "load [CONF, ...]", "load config (and start server if needed) (-f for foregraund start)"
   method_option :foregraund, :type => :boolean, :aliases => "-f"
-  method_option :logger, :type => :string, :aliases => "-l"
   def load(*configs)
     configs.map!{ |c| File.expand_path(c) } if !configs.empty?
 
     if options[:foregraund]
       # in foregraund we stop another server, and run just 1 current config version
-      if configs.size != 1
-        say "foregraund expected only one config", :red
-        exit 1
-      end
-
+      error!("foregraund expected only one config") if configs.size != 1
       server_start_foregraund(configs.first)
 
     elsif server_started?
@@ -90,9 +79,7 @@ class Cli < Thor
 
   desc "history TARGET[,...]", "show process states history"
   def history(*targets)
-    res = cmd(:history, *targets)
-    puts res if res && !res.empty?
-    puts
+    print cmd(:history, *targets)
   end
 
   desc "trace [TARGET]", "tracing log for app,group or process"
@@ -146,6 +133,16 @@ class Cli < Thor
 
 private
 
+  def error!(msg)
+    say msg, :red
+    exit 1
+  end
+
+  def print(msg, new_line = true)
+    say msg if msg && !msg.empty?
+    say if new_line
+  end
+
   def client
     @client ||= Eye::Client.new(Eye::Settings.socket_path)
   end
@@ -160,11 +157,9 @@ private
     res = _cmd(cmd, *args)
 
     if res == :not_started
-      say "eye monitoring not found, did you start it?", :red
-      exit 1
+      error! "eye monitoring not found, did you start it?"
     elsif res == :timeouted
-      say "eye does not answer, timeouted...", :red
-      exit 1
+      error! "eye does not answer, timeouted..."
     end
     
     res
@@ -175,18 +170,12 @@ private
   end
   
   def say_load_result(res = {}, opts = {})
-    say(res) unless res.is_a?(Hash)
-
-    if res.has_key?(:error) # TODO: remove that case, outdated
-      show_load_message(res, opts)
-      exit 1 if res[:error]
-    else
-      say_filename = (res.size > 1)
-      say "eye started!", :green if opts[:started]
-      res.each do |filename, _res|
-        say "#{filename}: ", nil, true if say_filename
-        show_load_message(_res, opts)
-      end
+    error!(res) unless res.is_a?(Hash)
+    say_filename = (res.size > 1)
+    say "eye started!", :green if opts[:started]
+    res.each do |filename, _res|
+      say "#{filename}: ", nil, true if say_filename
+      show_load_message(_res, opts)
     end
   end
 
@@ -212,11 +201,11 @@ private
   def send_command(_cmd, *args)
     res = cmd(_cmd, *args)
     if res == :unknown_command
-      say "unknown command :#{_cmd}", :red
+      error! "unknown command :#{_cmd}"
     elsif res == :corrupred_marshal
-      say "something crazy wrong, check eye logs!", :red
+      error! "something crazy wrong, check eye logs!"
     elsif res == []
-      say "command :#{_cmd}, targets not found!", :red
+      error! "command :#{_cmd}, targets not found!"
     else
       say "command :#{_cmd} sended to [#{res * ", "}]"
     end        
@@ -227,7 +216,7 @@ private
     if log_file && File.exists?(log_file)
       Process.exec "tail -n 100 -f #{log_file} | grep '#{tag}'"
     else
-      say "log file not found #{log_file.inspect}", :red
+      error! "log file not found #{log_file.inspect}"
     end
   end
   
@@ -250,8 +239,7 @@ private
 
   def ensure_loader_path
     unless loader_path
-      say "start monitoring needs to run under ruby with installed gem 'eye'", :red
-      exit 1
+      error! "start monitoring needs to run under ruby with installed gem 'eye'"
     end
   end
 
@@ -275,18 +263,15 @@ private
     Eye::Settings.ensure_eye_dir
 
     ensure_stop_previous_server
-    
-    args = []
-    args += ['-l', options[:logger]] if options[:logger]
 
+    args = []
     pid = Process.spawn(ruby_path, loader_path, *args, :out => '/dev/null', :err => '/dev/null', :in => '/dev/null',
                         :chdir => '/', :pgroup => true)
     Process.detach(pid)
     File.open(Eye::Settings.pid_path, 'w'){|f| f.write(pid) }
 
     unless wait_server
-      say "server not runned in 15 seconds, something crazy wrong", :red
-      exit 1
+      error! "server not runned in 15 seconds, something crazy wrong"
     end
 
     configs.unshift(Eye::Settings.eyeconfig) if File.exists?(Eye::Settings.eyeconfig)

data/examples/notify.eye

@@ -11,8 +11,9 @@ Eye.application :some do
 
   process :some_process do
     notify :dev, :info
+    pid_file "1.pid"
 
-    ...
+    #...
   end
 
-end
+end

data/examples/puma.eye

@@ -1,6 +1,6 @@
 RUBY      = '/usr/local/ruby/1.9.3-p392/bin/ruby'
 RAILS_ENV = 'production'
-ROOT      = '/var/www/super_app'
+ROOT      = File.expand_path(File.join(File.dirname(__FILE__), %w[ processes ]))
 CURRENT   = File.expand_path(File.join(ROOT, %w{current}))
 LOGS      = File.expand_path(File.join(ROOT, %w{shared log}))
 PIDS      = File.expand_path(File.join(ROOT, %w{shared pids}))
@@ -12,7 +12,7 @@ end
 
 Eye.application :super_app do
   env 'RAILS_ENV' => RAILS_ENV
-  working_dir CURRENT
+  working_dir ROOT
   triggers :flapping, :times => 10, :within => 1.minute
 
   process :puma do

data/examples/rbenv.eye

@@ -1,6 +1,6 @@
 Eye.application "rbenv_example" do
   env 'RBENV_ROOT' => '/usr/local/rbenv', 'PATH' => "/usr/local/rbenv/shims:/usr/local/rbenv/bin:#{ENV['PATH']}"
-  working_dir "/projects/some_project"
+  working_dir File.expand_path(File.join(File.dirname(__FILE__), %w[ processes ]))
   
   process "some_process" do
     pid_file "some.pid"
@@ -8,4 +8,4 @@ Eye.application "rbenv_example" do
     daemonize true
     stdall "some.log"
   end
-end
+end

data/examples/sidekiq.eye

@@ -16,8 +16,8 @@ def sidekiq_process(proxy, name)
 end
 
 Eye.application :sidekiq_test do
-  working_dir '/some_dir'
+  working_dir File.expand_path(File.join(File.dirname(__FILE__), %w[ processes ]))
   env "RAILS_ENV" => 'production'
  
   sidekiq_process self, :sidekiq
-end
+end

data/examples/thin-farm.eye

@@ -16,6 +16,7 @@ Eye.app 'thin-farm' do
 
   triggers :flapping, :times => 10, :within => 1.minute
   checks :memory, :below => 60.megabytes, :every => 30.seconds, :times => 5
+  start_timeout 30.seconds
 
   group :web do
     chain :action => :restart, :grace => 5.seconds

data/examples/unicorn.eye

@@ -5,7 +5,7 @@ RAILS_ENV = 'production'
 
 Eye.application "rails_unicorn" do
   env "RAILS_ENV" => RAILS_ENV, "PATH" => "#{File.dirname(RUBY)}:#{ENV['PATH']}"
-  working_dir "/projects/rails_unicorn"
+  working_dir File.expand_path(File.join(File.dirname(__FILE__), %w[ processes ]))
   
   process("unicorn") do
     pid_file "tmp/pids/unicorn.pid"

data/eye.gemspec

@@ -27,7 +27,6 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec'
-  gem.add_development_dependency 'simplecov'
   gem.add_development_dependency 'rr'
   gem.add_development_dependency 'ruby-graphviz'
   gem.add_development_dependency 'forking'
@@ -36,4 +35,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'sinatra'
   gem.add_development_dependency 'thin'
   gem.add_development_dependency 'xmpp4r'
+  gem.add_development_dependency 'coveralls'
 end

data/lib/eye.rb

@@ -1,5 +1,5 @@
 module Eye  
-  VERSION   = "0.3.1"
+  VERSION   = "0.3.2"
   ABOUT     = "Eye v#{VERSION} (c) 2012-2013 @kostya"
   PROCLINE  = "eye monitoring v#{VERSION}"
 

data/lib/eye/application.rb

@@ -50,7 +50,7 @@ class Eye::Application
   end
 
   def send_command(command, *args)
-    debug "send_command #{command} #{args}"
+    info "send_command #{command}"
     
     @groups.each do |group|
       group.send_command(command, *args)

data/lib/eye/checker.rb

@@ -13,6 +13,16 @@ class Eye::Checker
 
   attr_accessor :value, :values, :options, :pid, :type, :check_count
 
+  def self.name_and_class(type)
+    type = type.to_sym
+    return {:name => type, :type => type} if TYPES[type]
+
+    if type =~ /\A(.*?)_?[0-9]+\z/
+      ctype = $1.to_sym
+      return {:name => type, :type => ctype} if TYPES[ctype]
+    end   
+  end
+
   def self.get_class(type)
     klass = eval("Eye::Checker::#{TYPES[type]}") rescue nil
     raise "Unknown checker #{type}" unless klass

data/lib/eye/controller/commands.rb

@@ -59,15 +59,10 @@ private
 
   def quit
     info 'exiting...'
-    delete
     sleep 1
     Eye::System.send_signal($$) # soft terminate
     sleep 2
     Eye::System.send_signal($$, 9)
   end
 
-  def delete
-    send_command(:delete)
-  end
-
 end

data/lib/eye/controller/helpers.rb

@@ -6,10 +6,24 @@ module Eye::Controller::Helpers
     $0 = str
   end
 
+  def save_cache
+    File.open(Eye::Settings.cache_path, 'w') { |f| f.write(cache_str) }
+  rescue => ex
+    warn "save cache crashed with #{ex.message}"
+  end
+
+  def cache_str
+    all_processes.map{ |p| "#{p.full_name}=#{p.state}" } * "\n"
+  end
+
   def process_by_name(name)
     all_processes.detect{|c| c.name == name}
   end
 
+  def process_by_full_name(name)
+    all_processes.detect{|c| c.full_name == name }
+  end
+
   def group_by_name(name)
     all_groups.detect{|c| c.name == name}
   end
@@ -58,4 +72,4 @@ module Eye::Controller::Helpers
     res
   end
 
-end
+end

data/lib/eye/controller/load.rb

@@ -22,6 +22,7 @@ module Eye::Controller::Load
     end
 
     set_proc_line
+    save_cache
 
     res
   end
@@ -35,6 +36,8 @@ private
     { :error => false, :config => yield }
 
   rescue Eye::Dsl::Error, Exception, NoMethodError => ex
+    raise if ex.class.to_s.include?('RR') # skip RR exceptions
+
     error "load: config error <#{filename}>: #{ex.message}"
 
     # filter backtrace for user output

data/lib/eye/controller/send_command.rb

@@ -4,7 +4,9 @@ module Eye::Controller::SendCommand
     matched_objects(*obj_strs) do |obj|
       if command.to_sym == :delete
         remove_object_from_tree(obj) 
-        set_proc_line # to sync proc line if was delete application
+
+        set_proc_line
+        save_cache
       end
 
       obj.send_command(command)
@@ -61,32 +63,44 @@ private
     return [] if obj_strs.blank?
     return @applications.dup if obj_strs.size == 1 && (obj_strs[0].strip == 'all' || obj_strs[0].strip == '*')
 
-    res = []
+    res = Eye::Utils::AliveArray.new
     obj_strs.map{|c| c.split(",")}.flatten.each do |mask|
-      res += find_objects_by_mask(mask)
+      res += find_objects_by_mask(mask.to_s.strip)
     end
+    res
+  end
+
+  def find_objects_by_mask(mask)
+    res = find_all_objects_by_mask(mask)
 
     if res.size > 1
-      # remove inherited targets
+      final = Eye::Utils::AliveArray.new
 
-      final = []
+      if mask[-1] != '*'
+        # try to find exactly matched
+        r = right_regexp(mask)
+        res.each do |obj|
+          final << obj if obj.full_name =~ r
+        end
+      end
+
+      return final if final.present?
+
+      # remove inherited targets
       res.each do |obj|
         sub_object = res.any?{|a| a.sub_object?(obj) }
         final << obj unless sub_object
       end
 
       res = final
-    end
+    end    
 
-    res.present? ? Eye::Utils::AliveArray.new(res) : []
+    res
   end
 
-  def find_objects_by_mask(mask)
-    mask.strip!
-
-    res = []
-    str = Regexp.escape(mask).gsub('\*', '.*?')
-    r = %r{\A#{str}}
+  def find_all_objects_by_mask(mask)
+    res = Eye::Utils::AliveArray
+    r = left_regexp(mask)
 
     # find app
     res = @applications.select{|a| a.name =~ r || a.full_name =~ r }
@@ -102,9 +116,16 @@ private
         gr.processes.each do |p|
           res << p if p.name =~ r || p.full_name =~ r
 
+          # child matching
           if p.childs.present?
-            res += p.childs.values.select{|ch| ch.alive? && (ch.name =~ r || ch.full_name =~ r) }
+            childs = p.childs.values
+            res += childs.select do |ch|
+              name = ch.name rescue ''
+              full_name = ch.full_name rescue ''
+              name =~ r || full_name =~ r
+            end
           end
+
         end
       end
     end
@@ -112,4 +133,13 @@ private
     res
   end
 
+  def left_regexp(mask)
+    str = Regexp.escape(mask).gsub('\*', '.*?')
+    %r|\A#{str}|
+  end
+
+  def right_regexp(mask)
+    str = Regexp.escape(mask).gsub('\*', '.*?')
+    %r|#{str}\z|
+  end
 end

data/lib/eye/controller/status.rb

@@ -28,7 +28,7 @@ module Eye::Controller::Status
 
     str = <<-S
 About:  #{Eye::ABOUT}
-Info:   #{resources_str(Eye::SystemResources.resources($$), false)}
+Info:   #{resources_str(Eye::SystemResources.resources($$))}
 Ruby:   #{RUBY_DESCRIPTION}
 Logger: #{Eye::Logger.dev}
 Socket: #{Eye::Settings::socket_path}
@@ -98,16 +98,11 @@ private
     end
   end
 
-  def resources_str(r, mb = true)
+  def resources_str(r)
     return '' if r.blank?
     
     res = "#{r[:start_time]}, #{r[:cpu]}%"
-
-    if r[:memory]
-      mem = mb ? "#{r[:memory] / 1024}Mb" : "#{r[:memory]}Kb"
-      res += ", #{mem}"
-    end
-
+    res += ", #{r[:memory] / 1024}Mb" if r[:memory]
     res += ", <#{r[:pid]}>"
     
     res

data/lib/eye/dsl/application_opts.rb

@@ -6,6 +6,10 @@ class Eye::Dsl::ApplicationOpts < Eye::Dsl::Opts
     [:pid_file, :start_command]
   end
 
+  def not_seed_options
+    [:groups]
+  end
+
   def group(name, &block) 
     Eye::Dsl.debug "=> group #{name}"
     
@@ -28,6 +32,6 @@ class Eye::Dsl::ApplicationOpts < Eye::Dsl::Opts
     group("__default__"){ process(name.to_s, &block) }
   end
 
-  def xgroup(name, &block); end
-  def xprocess(name, &block); end
+  alias xgroup nop
+  alias xprocess nop
 end

data/lib/eye/dsl/group_opts.rb

@@ -6,6 +6,10 @@ class Eye::Dsl::GroupOpts < Eye::Dsl::Opts
     [:pid_file, :start_command]
   end
 
+  def not_seed_options
+    [:processes, :chain]
+  end
+
   def process(name, &block)
     Eye::Dsl.debug "=> process #{name}"
 
@@ -17,11 +21,8 @@ class Eye::Dsl::GroupOpts < Eye::Dsl::Opts
     Eye::Dsl.debug "<= process #{name}"
   end
 
-  def xprocess(name, &block); end
-
-  def application
-    parent
-  end
-  alias :app :application
+  alias xprocess nop
+  alias application parent
+  alias app application
 
 end

data/lib/eye/dsl/main.rb

@@ -11,7 +11,7 @@ module Eye::Dsl::Main
     Eye::Dsl.debug "<= app: #{name}"
   end
 
-  alias :app :application 
+  alias app application
 
   def load(glob = '')
     return if glob.blank?

data/lib/eye/dsl/opts.rb

@@ -1,7 +1,7 @@
 class Eye::Dsl::Opts < Eye::Dsl::PureOpts
 
   STR_OPTIONS = [ :pid_file, :working_dir, :stdout, :stderr, :stdall, :start_command, 
-    :stop_command, :restart_command ]
+    :stop_command, :restart_command, :uid, :gid ]
   create_options_methods(STR_OPTIONS, String)
 
   BOOL_OPTIONS = [ :daemonize, :keep_alive, :control_pid, :auto_start, :stop_on_delete]
@@ -11,17 +11,14 @@ class Eye::Dsl::Opts < Eye::Dsl::PureOpts
     :restart_grace, :stop_grace, :childs_update_period ]
   create_options_methods(INTERVAL_OPTIONS, [Fixnum, Float])
 
-  OTHER_OPTIONS = [ :environment, :stop_signals ]
-  create_options_methods(OTHER_OPTIONS)
+  create_options_methods([:environment], Hash)
+  create_options_methods([:stop_signals], Array)
+  create_options_methods([:umask], Fixnum)
 
 
   def initialize(name = nil, parent = nil)
     super(name, parent)
 
-    # ensure delete subobjects which can appears from parent config
-    @config.delete :groups
-    @config.delete :processes
-
     @config[:application] = parent.name if parent.is_a?(Eye::Dsl::ApplicationOpts)
     @config[:group] = parent.name if parent.is_a?(Eye::Dsl::GroupOpts)
 
@@ -30,14 +27,14 @@ class Eye::Dsl::Opts < Eye::Dsl::PureOpts
   end
 
   def checks(type, opts = {})
-    type = type.to_sym
-    raise Eye::Dsl::Error, "unknown checker type #{type}" unless Eye::Checker::TYPES[type]
+    nac = Eye::Checker.name_and_class(type.to_sym)
+    raise Eye::Dsl::Error, "unknown checker type #{type}" unless nac
 
-    opts.merge!(:type => type)
+    opts.merge!(:type => nac[:type])
     Eye::Checker.validate!(opts)
     
     @config[:checks] ||= {}
-    @config[:checks][type] = opts
+    @config[:checks][nac[:name]] = opts
   end
 
   def triggers(type, opts = {})
@@ -53,9 +50,9 @@ class Eye::Dsl::Opts < Eye::Dsl::PureOpts
 
   # clear checks from parent
   def nochecks(type)
-    type = type.to_sym
-    raise Eye::Dsl::Error, "unknown checker type #{type}" unless Eye::Checker::TYPES[type]
-    @config[:checks].try :delete, type
+    nac = Eye::Checker.name_and_class(type.to_sym)
+    raise Eye::Dsl::Error, "unknown checker type #{type}" unless nac
+    @config[:checks].try :delete, nac[:name]
   end
 
   # clear triggers from parent
@@ -85,7 +82,7 @@ class Eye::Dsl::Opts < Eye::Dsl::PureOpts
     @config[:environment].merge!(value)
   end
 
-  alias :env :environment
+  alias env environment
 
   def set_stdall(value)
     super
@@ -94,6 +91,16 @@ class Eye::Dsl::Opts < Eye::Dsl::PureOpts
     set_stderr value
   end
 
+  def set_uid(value)
+    raise Eye::Dsl::Error, ":uid not supported by ruby (needed 2.0)" unless Eye::Settings.supported_setsid?
+    super
+  end
+
+  def set_gid(value)
+    raise Eye::Dsl::Error, ":gid not supported by ruby (needed 2.0)" unless Eye::Settings.supported_setsid?
+    super
+  end
+
   def scoped(&block)
     h = self.class.new(self.name, self)
     h.instance_eval(&block)

data/lib/eye/dsl/process_opts.rb

@@ -7,15 +7,12 @@ class Eye::Dsl::ProcessOpts < Eye::Dsl::Opts
     @config[:monitor_children].merge!(opts.config)
   end
 
-  def xmonitor_children(&block); end
+  alias xmonitor_children nop
 
   def application
     parent.try(:parent)
   end
-  alias :app :application
-
-  def group
-    parent
-  end
+  alias app application
+  alias group parent
 
 end

data/lib/eye/dsl/pure_opts.rb

@@ -49,7 +49,12 @@ class Eye::Dsl::PureOpts
 
     if parent
       @parent = parent
-      @config = merge_parent_config ? Eye::Utils::deep_clone(parent.config) : {}
+      if merge_parent_config
+        @config = Eye::Utils::deep_clone(parent.config)
+        parent.not_seed_options.each { |opt| @config.delete(opt) }
+      else
+        @config = {}
+      end
       @full_name = "#{parent.full_name}:#{@full_name}"
     else
       @config = {}
@@ -66,6 +71,10 @@ class Eye::Dsl::PureOpts
     []
   end
 
+  def not_seed_options
+    []
+  end
+
   def with_condition(cond = true, &block)
     self.instance_eval(&block) if cond && block
   end
@@ -90,6 +99,8 @@ class Eye::Dsl::PureOpts
     end
   end
 
+  def nop(*args, &block); end
+
 private
 
   def self.with_parsed_file(file_name)

data/lib/eye/group.rb

@@ -109,7 +109,7 @@ class Eye::Group
 
   def break_chain
     info "break chain"
-    scheduler.clear_pending_list
+    scheduler_clear_pending_list
     @chain_breaker = true    
   end
 

data/lib/eye/logger.rb

@@ -42,11 +42,11 @@ class Eye::Logger
     attr_reader :dev, :log_level
 
     def link_logger(dev)
-      @dev = dev ? dev.to_s.downcase : nil
+      @dev = dev ? dev.to_s : nil
       @dev_fd = @dev
 
-      @dev_fd = STDOUT if @dev == 'stdout'
-      @dev_fd = STDERR if @dev == 'stderr'
+      @dev_fd = STDOUT if @dev.to_s.downcase == 'stdout'
+      @dev_fd = STDERR if @dev.to_s.downcase == 'stderr'
       
       @inner_logger = InnerLogger.new(@dev_fd)
       @inner_logger.level = self.log_level || Logger::INFO
@@ -77,4 +77,4 @@ private
     end
   end
 
-end
+end

data/lib/eye/process/scheduler.rb

@@ -53,6 +53,10 @@ module Eye::Process::Scheduler
   def scheduler_actions_list
     scheduler.list.map{|c| c[:args].first rescue nil }.compact
   end
+
+  def scheduler_clear_pending_list
+    scheduler.clear_pending_list
+  end
   
   def self.included(base)
     base.finalizer :remove_scheduler

data/lib/eye/process/validate.rb

@@ -1,4 +1,5 @@
 require 'shellwords'
+require 'etc'
 
 module Eye::Process::Validate
 
@@ -18,6 +19,13 @@ module Eye::Process::Validate
 
     Shellwords.shellwords(config[:stop_command]) if config[:stop_command]
     Shellwords.shellwords(config[:restart_command]) if config[:restart_command]
+
+    Etc.getpwnam(config[:uid]) if config[:uid]
+    Etc.getpwnam(config[:gid]) if config[:gid]
+
+    if config[:working_dir]
+      raise Error, "working_dir '#{config[:working_dir]}' is invalid" unless File.directory?(config[:working_dir])
+    end
   end
 
-end
+end

data/lib/eye/process/watchers.rb

@@ -46,14 +46,14 @@ private
   end  
   
   def start_checkers
-    self[:checks].each{|type, cfg| start_checker(cfg) }
+    self[:checks].each{|name, cfg| start_checker(name, cfg) }
   end
 
-  def start_checker(cfg)
+  def start_checker(name, cfg)
     subject = Eye::Checker.create(pid, cfg, logger.prefix)
 
     # ex: {:type => :memory, :every => 5.seconds, :below => 100.megabytes, :times => [3,5]}
-    add_watcher("check_#{cfg[:type]}".to_sym, subject.every, subject, &method(:watcher_tick).to_proc)
+    add_watcher("check_#{name}".to_sym, subject.every, subject, &method(:watcher_tick).to_proc)
   end
 
   def watcher_tick(subject)

data/lib/eye/settings.rb

@@ -4,7 +4,7 @@ module Eye::Settings
   module_function
   
   def dir
-    if Process::UID.eid == 0 # root
+    if root?
       '/var/run/eye'
     else
       File.expand_path(File.join(home, '.eye'))
@@ -12,13 +12,17 @@ module Eye::Settings
   end
 
   def eyeconfig
-    if Process::UID.eid == 0 # root
+    if root?
       '/etc/eye.conf'
     else
       File.expand_path(File.join(home, '.eyeconfig'))
     end
   end
 
+  def root?
+    Process::UID.eid == 0
+  end
+
   def home
     ENV['EYE_HOME'] || ENV['HOME']
   end
@@ -32,15 +36,23 @@ module Eye::Settings
   end
 
   def socket_path
-    path('sock')
+    path(ENV['EYE_SOCK'] || "sock#{ENV['EYE_V']}")
   end
   
   def pid_path
-    path('pid')
+    path(ENV['EYE_PID'] || "pid#{ENV['EYE_V']}")
   end
   
+  def cache_path
+    path("processes#{ENV['EYE_V']}.cache")
+  end
+
   def client_timeout
     5
   end
 
-end
+  def supported_setsid?
+    RUBY_VERSION >= '2.0'
+  end
+
+end

data/lib/eye/system.rb

@@ -1,5 +1,6 @@
 require 'shellwords'
 require 'pathname'
+require 'etc'
 
 module Eye::System
   class << self
@@ -134,6 +135,14 @@ module Eye::System
       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]
+
+      if Eye::Settings.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
 

data/lib/eye/utils/alive_array.rb

@@ -2,7 +2,8 @@ class Eye::Utils::AliveArray
   extend Forwardable
   include Enumerable
 
-  def_delegators :@arr, :[], :<<, :clear, :delete, :size, :empty?, :push, :flatten
+  def_delegators :@arr, :[], :<<, :clear, :delete, :size, :empty?, :push, 
+                        :flatten, :present?, :uniq!
 
   def initialize(arr = [])
     @arr = arr
@@ -28,4 +29,25 @@ class Eye::Utils::AliveArray
     self.class.new super
   end
 
+  def +(other)
+    if other.is_a?(Eye::Utils::AliveArray)
+      @arr += other.pure
+    elsif other.is_a?(Array)
+      @arr += other
+    else
+      raise "Unexpected + #{other}"
+    end
+    self
+  end
+
+  def ==(other)
+    if other.is_a?(Eye::Utils::AliveArray)
+      @arr == other.pure
+    elsif other.is_a?(Array)
+      @arr == other
+    else
+      raise "Unexpected == #{other}"
+    end
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eye
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Konstantin Makarchev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-15 00:00:00.000000000 Z
+date: 2013-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -123,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rr
+  name: ruby-graphviz
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -137,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ruby-graphviz
+  name: forking
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -151,7 +151,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: forking
+  name: fakeweb
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -165,35 +165,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: fakeweb
+  name: eventmachine
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.3
 - !ruby/object:Gem::Dependency
-  name: eventmachine
+  name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: sinatra
+  name: thin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -207,7 +207,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: thin
+  name: xmpp4r
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -221,7 +221,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: xmpp4r
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -246,6 +246,7 @@ files:
 - .gitignore
 - .rspec
 - .travis.yml
+- CHANGES.md
 - Gemfile
 - LICENSE
 - README.md