eye 0.4.2 → 0.5

data/lib/eye/dsl.rb

@@ -20,7 +20,7 @@ class Eye::Dsl
   class << self
     attr_accessor :verbose
 
-    def debug(msg = "")
+    def debug(msg = '')
       puts msg if verbose
     end
 

data/lib/eye/dsl/application_opts.rb

@@ -3,7 +3,7 @@ class Eye::Dsl::ApplicationOpts < Eye::Dsl::Opts
   include Eye::Dsl::Chain
 
   def disallow_options
-    [:pid_file, :start_command]
+    [:pid_file, :start_command, :daemonize]
   end
 
   def not_seed_options
@@ -15,6 +15,7 @@ class Eye::Dsl::ApplicationOpts < Eye::Dsl::Opts
 
     opts = Eye::Dsl::GroupOpts.new(name, self)
     opts.instance_eval(&block)
+
     if cfg = opts.config
       @config[:groups] ||= {}
 
@@ -26,10 +27,13 @@ class Eye::Dsl::ApplicationOpts < Eye::Dsl::Opts
     end
 
     Eye::Dsl.debug "<= group #{name}"
+    opts
   end
 
   def process(name, &block)
-    group("__default__"){ process(name.to_s, &block) }
+    res = nil
+    group('__default__'){ res = process(name.to_s, &block) }
+    res
   end
 
   alias xgroup nop

data/lib/eye/dsl/child_process_opts.rb

@@ -6,7 +6,8 @@ class Eye::Dsl::ChildProcessOpts < Eye::Dsl::Opts
   end
 
   def triggers(*args)
-    raise Eye::Dsl::Error, "triggers does not allowed in monitor_children"
+    raise Eye::Dsl::Error, 'triggers does not allowed in monitor_children'
   end
+  alias trigger triggers
 
-end
+end

data/lib/eye/dsl/config_opts.rb

@@ -23,7 +23,7 @@ class Eye::Dsl::ConfigOpts < Eye::Dsl::PureOpts
 
   def contact(contact_name, contact_type, contact, contact_opts = {})
     raise Eye::Dsl::Error, "unknown contact_type #{contact_type}" unless Eye::Notify::TYPES[contact_type]
-    raise Eye::Dsl::Error, "contact should be a String" unless contact.is_a?(String)
+    raise Eye::Dsl::Error, 'contact should be a String' unless contact.is_a?(String)
 
     notify_hash = @config[contact_type] || (@parent && @parent.config[contact_type]) || Eye::parsed_config.settings[contact_type] || {}
     validate_hash = notify_hash.merge(contact_opts).merge(:type => contact_type)
@@ -46,4 +46,4 @@ class Eye::Dsl::ConfigOpts < Eye::Dsl::PureOpts
     end
   end
 
-end
+end

data/lib/eye/dsl/group_opts.rb

@@ -3,7 +3,7 @@ class Eye::Dsl::GroupOpts < Eye::Dsl::Opts
   include Eye::Dsl::Chain
 
   def disallow_options
-    [:pid_file, :start_command]
+    [:pid_file, :start_command, :daemonize]
   end
 
   def not_seed_options
@@ -19,6 +19,7 @@ class Eye::Dsl::GroupOpts < Eye::Dsl::Opts
     @config[:processes][name.to_s] = opts.config if opts.config
 
     Eye::Dsl.debug "<= process #{name}"
+    opts
   end
 
   alias xprocess nop

data/lib/eye/dsl/main.rb

@@ -29,13 +29,15 @@ module Eye::Dsl::Main
   end
 
   def config(&block)
-    Eye::Dsl.debug "=> config"
+    Eye::Dsl.debug '=> config'
 
     opts = Eye::Dsl::ConfigOpts.new
     opts.instance_eval(&block)
     @parsed_config.settings.merge!(opts.config)
 
-    Eye::Dsl.debug "<= config"
+    Eye::Dsl.debug '<= config'
   end
 
+  alias settings config
+
 end

data/lib/eye/dsl/opts.rb

@@ -98,26 +98,33 @@ class Eye::Dsl::Opts < Eye::Dsl::PureOpts
   end
 
   def set_uid(value)
-    raise Eye::Dsl::Error, ":uid not supported by ruby (needed 2.0)" unless Eye::Settings.supported_setsid?
+    raise Eye::Dsl::Error, ':uid not supported (use ruby >= 2.0)' unless Eye::Local.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?
+    raise Eye::Dsl::Error, ':gid not supported (use ruby >= 2.0)' unless Eye::Local.supported_setsid?
     super
   end
 
   def scoped(&block)
     h = self.class.new(self.name, self)
     h.instance_eval(&block)
+
     groups = h.config.delete :groups
-    processes = h.config.delete :processes
 
     if groups.present?
       config[:groups] ||= {}
-      config[:groups].merge!(groups)
+      groups.each do |name, cfg|
+        processes = cfg.delete(:processes) || {}
+        config[:groups][name] ||= {}
+        config[:groups][name].merge!(cfg)
+        config[:groups][name][:processes] ||= {}
+        config[:groups][name][:processes].merge!(processes)
+      end
     end
 
+    processes = h.config.delete :processes
     if processes.present?
       config[:processes] ||= {}
       config[:processes].merge!(processes)

data/lib/eye/dsl/validation.rb

@@ -1,66 +1,72 @@
 module Eye::Dsl::Validation
+  def self.included(base)
+    base.extend(ClassMethods)
+  end
+
   class Error < Exception; end
 
-  def inherited(subclass)
-    subclass.validates = self.validates.clone
-    subclass.should_bes = self.should_bes.clone
-    subclass.defaults = self.defaults.clone
-    subclass.variants = self.variants.clone
-  end
+  module ClassMethods
+    def inherited(subclass)
+      subclass.validates = self.validates.clone
+      subclass.should_bes = self.should_bes.clone
+      subclass.defaults = self.defaults.clone
+      subclass.variants = self.variants.clone
+    end
 
-  attr_accessor :validates, :should_bes, :defaults, :variants
+    attr_accessor :validates, :should_bes, :defaults, :variants
 
-  def validates; @validates ||= {}; end
-  def should_bes; @should_bes ||= []; end
-  def defaults; @defaults ||= {}; end
-  def variants; @variants ||= {}; end
+    def validates; @validates ||= {}; end
+    def should_bes; @should_bes ||= []; end
+    def defaults; @defaults ||= {}; end
+    def variants; @variants ||= {}; end
 
-  def param(param, types = [], should_be = false, default = nil, _variants = nil)
-    param = param.to_sym
+    def param(param, types = [], should_be = false, default = nil, _variants = nil)
+      param = param.to_sym
 
-    validates[param] = types
-    should_bes << param if should_be
-    defaults[param] = default
-    variants[param] = _variants
+      validates[param] = types
+      should_bes << param if should_be
+      defaults[param] = default
+      variants[param] = _variants
 
-    return if param == :do
+      return if param == :do
 
-    define_method "#{param}" do
-      @options[param] || default
+      define_method "#{param}" do
+        @options[param] || default
+      end
     end
-  end
 
-  def validate(options = {})
-    options.each do |param, value|
-      param = param.to_sym
-      types = validates[param]
-      unless types
-        if param != :type
-          raise Error, "#{self.name} unknown param :#{param} value #{value.inspect}"
+    def validate(options = {})
+      options.each do |param, value|
+        param = param.to_sym
+        types = validates[param]
+        unless types
+          if param != :type
+            raise Error, "#{self.name} unknown param :#{param} value #{value.inspect}"
+          end
         end
-      end
 
-      if self.variants[param]
-        if value && !value.is_a?(Proc)
-          if value.is_a?(Array)
-            if (value - self.variants[param]).present?
+        if self.variants[param]
+          if value && !value.is_a?(Proc)
+            if value.is_a?(Array)
+              if (value - self.variants[param]).present?
+                raise Error, "#{value.inspect} should within #{self.variants[param].inspect}"
+              end
+            elsif !self.variants[param].include?(value)
               raise Error, "#{value.inspect} should within #{self.variants[param].inspect}"
             end
-          elsif !self.variants[param].include?(value)
-            raise Error, "#{value.inspect} should within #{self.variants[param].inspect}"
           end
         end
-      end
 
-      next if types.blank?
+        next if types.blank?
 
-      types = Array(types)
-      good = types.any?{|type| value.is_a?(type) }
-      raise Error, "#{self.name} bad param :#{param} value #{value.inspect}, type #{types.inspect}" unless good
-    end
+        types = Array(types)
+        good = types.any?{|type| value.is_a?(type) }
+        raise Error, "#{self.name} bad param :#{param} value #{value.inspect}, type #{types.inspect}" unless good
+      end
 
-    should_bes.each do |param|
-      raise Error, "#{self.name} for param :#{param} value should be" unless options[param.to_sym] || defaults[param.to_sym]
+      should_bes.each do |param|
+        raise Error, "#{self.name} for param :#{param} value should be" unless options[param.to_sym] || defaults[param.to_sym]
+      end
     end
   end
 

data/lib/eye/group.rb

@@ -114,7 +114,7 @@ class Eye::Group
   end
 
   def break_chain
-    info "break chain"
+    info 'break chain'
     scheduler_clear_pending_list
     @chain_breaker = true
   end

data/lib/eye/loader.rb

@@ -1,14 +1,10 @@
-# mini bundler, for embedded server gem installation
+# add gems to $: by `gem` method
+#  this is only way when install eye as system wide
 
-gem 'celluloid',     '~> 0.14.0'
-gem 'celluloid-io',  '~> 0.14.0'
+gem 'celluloid',     '~> 0.15.0'
+gem 'celluloid-io',  '~> 0.15.0'
 gem 'nio4r'
 gem 'timers'
 
 gem 'state_machine'
-
-if RUBY_VERSION == '1.9.2'
-  gem 'activesupport', '>= 3', '< 4.0'
-else
-  gem 'activesupport', '>= 3'
-end
+gem 'sigar',         '~> 0.7.2'

data/lib/eye/{settings.rb → local.rb}

@@ -1,6 +1,6 @@
 require 'fileutils'
 
-module Eye::Settings
+module Eye::Local
   module_function
 
   def dir

data/lib/eye/logger.rb

@@ -56,6 +56,7 @@ class Eye::Logger
     attr_reader :dev, :log_level
 
     def link_logger(dev)
+      old_dev = @dev
       @dev = dev ? dev.to_s : nil
       @dev_fd = @dev
 
@@ -64,6 +65,10 @@ class Eye::Logger
 
       @inner_logger = InnerLogger.new(@dev_fd)
       @inner_logger.level = self.log_level || Logger::INFO
+
+    rescue Errno::ENOENT, Errno::EACCES
+      @dev = old_dev
+      raise
     end
 
     def log_level=(level)

data/lib/eye/notify.rb

@@ -1,15 +1,18 @@
 class Eye::Notify
   include Celluloid
-  extend Eye::Dsl::Validation
+  include Eye::Dsl::Validation
 
   autoload :Mail,     'eye/notify/mail'
   autoload :Jabber,   'eye/notify/jabber'
 
-  TYPES = {:mail => "Mail", :jabber => "Jabber"}
+  TYPES = {:mail => 'Mail', :jabber => 'Jabber'}
 
   def self.get_class(type)
     klass = eval("Eye::Notify::#{TYPES[type]}") rescue nil
     raise "Unknown notify #{type}" unless klass
+    if deps = klass.depends_on
+      Array(deps).each { |d| require d }
+    end
     klass
   end
 
@@ -71,7 +74,7 @@ class Eye::Notify
   end
 
   def execute
-    raise "realize me"
+    raise 'realize me'
   end
 
   param :contact, [String]
@@ -81,17 +84,20 @@ class Eye::Notify
   end
 
   def message_body
-    "#{message_subject} at #{msg_at.to_s(:short)}"
+    "#{message_subject} at #{msg_at.strftime(Eye::Cli::Render::DF)}"
   end
 
   def self.register(base)
-    name = base.to_s.gsub("Eye::Notify::", '')
+    name = base.to_s.gsub('Eye::Notify::', '')
     type = name.underscore.to_sym
     Eye::Notify::TYPES[type] = name
     Eye::Notify.const_set(name, base)
     Eye::Dsl::ConfigOpts.add_notify(type)
   end
 
+  def self.depends_on
+  end
+
   class Custom < Eye::Notify
     def self.inherited(base)
       super
@@ -107,4 +113,4 @@ private
     end
   end
 
-end
+end

data/lib/eye/notify/jabber.rb

@@ -1,3 +1,5 @@
+require 'xmpp4r'
+
 class Eye::Notify::Jabber < Eye::Notify
 
   # Eye.config do
@@ -11,8 +13,6 @@ class Eye::Notify::Jabber < Eye::Notify
   param :password, String
 
   def execute
-    require 'xmpp4r'
-
     debug "send jabber #{[host, port, user, password]} - #{[contact, message_body]}"
 
     mes = ::Jabber::Message.new(contact, message_body)

data/lib/eye/process/child.rb

@@ -6,8 +6,9 @@ module Eye::Process::Child
 
   def add_or_update_childs
     return unless self[:monitor_children]
-
     return unless self.up?
+    return if @updating_childs
+    @updating_childs = true
 
     unless self.pid
       warn 'Cant add childs, because no pid'
@@ -41,6 +42,7 @@ module Eye::Process::Child
     h = {:new => new_childs.size, :removed => removed_childs.size, :exists => exist_childs.size }
     debug "childs info: #{ h.inspect }"
 
+    @updating_childs = false
     h
   end
 

data/lib/eye/process/commands.rb

@@ -88,7 +88,7 @@ private
 
   def kill_process
     unless self.pid
-      error "try to kill process without pid"
+      error 'try to kill process without pid'
       return
     end
 
@@ -145,7 +145,7 @@ private
 
   def execute_restart_command
     unless self.pid
-      error "try to execute restart_command without pid"
+      error 'try to execute restart_command without pid'
       return
     end
 

data/lib/eye/process/controller.rb

@@ -43,7 +43,7 @@ module Eye::Process::Controller
         info "process from pid_file(#{self.pid}) found and already running, so :up"
         switch :already_running
       else
-        warn "process not found, so :unmonitor"
+        warn 'process not found, so :unmonitor'
         schedule :unmonitor, Eye::Reason.new(:'not found')
       end
     end

data/lib/eye/process/trigger.rb

@@ -14,7 +14,7 @@ module Eye::Process::Trigger
 
   def check_triggers(transition)
     return if unmonitored?
-    self.triggers.each { |trigger| trigger.notify(transition) }
+    self.triggers.each { |trigger| trigger.notify(transition, state_reason) }
   end
 
   def retry_start_after_flapping