eye 0.8.celluloid15 → 0.8.pre

data/lib/eye/dsl/validation.rb

@@ -1,5 +1,4 @@
 module Eye::Dsl::Validation
-
   def self.included(base)
     base.extend(ClassMethods)
   end
@@ -7,37 +6,25 @@ module Eye::Dsl::Validation
   class Error < Exception; end
 
   module ClassMethods
-
     def inherited(subclass)
-      subclass.validates = validates.clone
-      subclass.should_bes = should_bes.clone
-      subclass.defaults = defaults.clone
-      subclass.variants = variants.clone
+      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
 
-    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
 
-      validates[param] = types
-      should_bes << param if should_be
+      self.validates[param] = types
+      self.should_bes << param if should_be
       param_default(param, default)
       self.variants[param] = variants
 
@@ -68,38 +55,38 @@ module Eye::Dsl::Validation
     end
 
     def validate(options = {})
-      options.each { |param, value| validate_param(param, value) }
-
-      should_bes.each do |param|
-        raise Error, "#{name} for param :#{param} value should be" unless options[param.to_sym] || defaults[param.to_sym]
-      end
-    end
-
-    def validate_param(param, value)
-      param = param.to_sym
-      types = validates[param]
-      if !types && param != :type
-        raise Error, "#{name} unknown param :#{param} value #{value.inspect}"
-      end
+      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
 
-      if variants[param] && value && !value.is_a?(Proc)
-        if value.is_a?(Array)
-          value = value.reject { |v| v.is_a?(Proc) }
-          if (value - variants[param]).present?
-            raise Error, "#{value.inspect} should be within #{variants[param].inspect}"
+        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 be within #{self.variants[param].inspect}"
+              end
+            elsif !self.variants[param].include?(value)
+              raise Error, "#{value.inspect} should be within #{self.variants[param].inspect}"
+            end
           end
-        elsif !variants[param].include?(value)
-          raise Error, "#{value.inspect} should be within #{variants[param].inspect}"
         end
-      end
 
-      if types.present?
+        next if types.blank?
+
         types = Array(types)
-        good = types.any? { |type| value.is_a?(type) }
-        raise Error, "#{name} bad param :#{param} value #{value.inspect}, type #{types.inspect}" unless good
+        good = types.any?{|type| value.is_a?(type) }
+        raise Error, "#{self.name} bad param :#{param} value #{value.inspect}, type #{types.inspect}" unless good
       end
-    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]
+      end
+    end
   end
 
 end

data/lib/eye/group.rb

@@ -1,7 +1,6 @@
 require 'celluloid'
 
 class Eye::Group
-
   include Celluloid
 
   autoload :Chain, 'eye/group/chain'
@@ -45,12 +44,12 @@ class Eye::Group
     @processes = @processes.sort_by(&:name)
   end
 
-  def status_data(opts = {})
-    plist = @processes.map { |p| p.status_data(opts) }
+  def status_data(debug = false)
+    plist = @processes.map{|p| p.status_data(debug) }
 
     h = { name: name, type: :group, subtree: plist }
 
-    h[:debug] = debug_data if opts[:debug]
+    h[:debug] = debug_data if debug
 
     # show current chain
     if current_scheduled_command
@@ -69,17 +68,16 @@ class Eye::Group
   end
 
   def status_data_short
-    h = {}
+    h = Hash.new
     @processes.each do |p|
-      state = p.state
-      h[state] ||= 0
-      h[state] += 1
+      h[p.state] ||= 0
+      h[p.state] += 1
     end
     { name: (@name == '__default__' ? 'default' : @name), type: :group, states: h }
   end
 
   def debug_data
-    { queue: scheduler_actions_list, chain: chain_status }
+    {:queue => scheduler_actions_list, :chain => chain_status}
   end
 
   def send_command(command, *args)
@@ -146,23 +144,10 @@ class Eye::Group
     @processes.include?(obj)
   end
 
-  # to sort groups
-  def <=>(other)
-    if hidden
-      1
-    else
-      if other.hidden
-        -1
-      else
-        name <=> other.name
-      end
-    end
-  end
-
 private
 
   def async_schedule(command, *args)
-    info "send to all processes #{command} #{args.present? ? args * ',' : nil}"
+    info "send to all processes #{command} #{args.present? ? args*',' : nil}"
 
     @processes.each do |process|
       process.send_command(command, *args) unless process.skip_group_action?(command)

data/lib/eye/group/chain.rb

@@ -11,7 +11,7 @@ private
 
     started_at = Time.now
 
-    @processes.each do |process|
+    @processes.each do | process |
       if process.skip_group_action?(command)
         @chain_processes_current = @chain_processes_current.to_i + 1
         next
@@ -44,7 +44,7 @@ private
       # sync command, with waiting
       # this is very hackety, because call method of the process without its scheduler
       # need to provide some scheduler future
-      process.last_scheduled_reason = last_scheduled_reason
+      process.last_scheduled_reason = self.last_scheduled_reason
       process.send(command, *args)
     else
       # async command
@@ -54,7 +54,7 @@ private
 
   def chain_status
     if @config[:chain]
-      [:start, :restart].map { |c| @config[:chain][c].try(:[], :grace) }
+      [:start, :restart].map{|c| @config[:chain][c].try(:[], :grace) }
     end
   end
 
@@ -67,7 +67,7 @@ private
   DEFAULT_CHAIN = 0.2
 
   def chain_options(command)
-    command = :start if command == :monitor # HACK: for monitor command, work as start
+    command = :start if command == :monitor # hack for monitor command, work as start
 
     if @config[:chain] && @config[:chain][command]
       type = @config[:chain][command].try :[], :type
@@ -76,10 +76,10 @@ private
       grace = @config[:chain][command].try :[], :grace
       grace = grace ? (grace.to_f rescue DEFAULT_CHAIN) : DEFAULT_CHAIN
 
-      { type: type, grace: grace }
+      {:type => type, :grace => grace}
     else
       # default chain case
-      { type: :async, grace: DEFAULT_CHAIN }
+      {:type => :async, :grace => DEFAULT_CHAIN}
     end
   end
 

data/lib/eye/loader.rb

@@ -1,10 +1,10 @@
 # add gems to $: by `gem` method
 #  this is only way when install eye as system wide
 
-gem 'celluloid',     '~> 0.15.0'
-gem 'celluloid-io',  '~> 0.15.0'
+gem 'celluloid',     '~> 0.17.0'
+gem 'celluloid-io',  '~> 0.17.0'
 gem 'nio4r'
 gem 'timers'
 
 gem 'state_machine'
-gem 'sigar', '~> 0.7.3'
+gem 'sigar',         '~> 0.7.2'

data/lib/eye/local.rb

@@ -1,9 +1,7 @@
 require 'fileutils'
 
 module Eye::Local
-
   class << self
-
     def dir
       @dir ||= begin
         if root?
@@ -30,7 +28,7 @@ module Eye::Local
 
     def home
       h = ENV['EYE_HOME'] || ENV['HOME']
-      raise 'HOME undefined, should be HOME or EYE_HOME environment' unless h
+      raise "HOME undefined, should be HOME or EYE_HOME environment" unless h
       h
     end
 
@@ -39,7 +37,7 @@ module Eye::Local
     end
 
     def ensure_eye_dir
-      FileUtils.mkdir_p(dir) unless ENV['EYE_SOCK'] && ENV['EYE_PID']
+      FileUtils.mkdir_p(dir)
     end
 
     def socket_path
@@ -74,7 +72,7 @@ module Eye::Local
     end
 
     def eyefile
-      @eyefile ||= find_eyefile(ENV['EYE_HOME'] || '.')
+      @eyefile ||= find_eyefile('.')
     end
 
     def find_eyefile(start_from_dir)
@@ -87,13 +85,10 @@ module Eye::Local
       until !File.directory?(current) || current == previous
         filename = File.join(current, 'Eyefile')
         return filename if File.file?(filename)
-        previous = current
-        current = File.expand_path('..', current)
+        current, previous = File.expand_path('..', current), current
       end
     end
 
     attr_accessor :local_runner
-
   end
-
 end

data/lib/eye/logger.rb

@@ -1,27 +1,23 @@
 require 'logger'
 
 class Eye::Logger
-
   attr_accessor :prefix, :subprefix
 
   class InnerLogger < Logger
-
     FORMAT = '%d.%m.%Y %H:%M:%S'
 
     def initialize(*args)
       super
 
-      self.formatter = proc do |s, d, _p, m|
+      self.formatter = Proc.new do |s, d, p, m|
         "#{d.strftime(FORMAT)} #{s.ljust(5)} -- #{m}\n"
       end
     end
-
   end
 
   module ObjectExt
-
     def logger_tag
-      [Class, Module].include?(self.class) ? to_s : "<#{self.class}>"
+      [Class, Module].include?(self.class) ? to_s : "<#{self.class.to_s}>"
     end
 
     def logger_sub_tag
@@ -42,7 +38,6 @@ class Eye::Logger
       error "#{ex.message} #{ex.backtrace}"
       # notify here?
     end
-
   end
 
   Logger::Severity.constants.each do |level|
@@ -62,7 +57,6 @@ class Eye::Logger
   end
 
   class << self
-
     attr_reader :dev, :log_level, :args
 
     def link_logger(dev, *args)
@@ -80,7 +74,7 @@ class Eye::Logger
         @inner_logger = dev
       end
 
-      @inner_logger.level = log_level || Logger::INFO
+      @inner_logger.level = self.log_level || Logger::INFO
 
     rescue Exception
       @inner_logger = nil
@@ -94,13 +88,12 @@ class Eye::Logger
 
     def log_level=(level)
       @log_level = level
-      @inner_logger.level = log_level if @inner_logger
+      @inner_logger.level = self.log_level if @inner_logger
     end
 
     def inner_logger
       @inner_logger ||= InnerLogger.new(nil)
     end
-
   end
 
 private

data/lib/eye/notify.rb

@@ -1,7 +1,6 @@
 require 'celluloid'
 
 class Eye::Notify
-
   include Celluloid
   include Eye::Dsl::Validation
 
@@ -9,7 +8,7 @@ class Eye::Notify
   autoload :Jabber,   'eye/notify/jabber'
   autoload :Slack,    'eye/notify/slack'
 
-  TYPES = { mail: 'Mail', jabber: 'Jabber', slack: 'Slack' }
+  TYPES = {:mail => 'Mail', :jabber => 'Jabber', :slack => 'Slack'}
 
   def self.get_class(type)
     klass = eval("Eye::Notify::#{TYPES[type]}") rescue nil
@@ -36,19 +35,19 @@ class Eye::Notify
 
     create_proc = lambda do |nh|
       type = nh[:type]
-      config = (settings[type] || {}).merge(nh[:opts] || {}).merge(contact: nh[:contact])
+      config = (settings[type] || {}).merge(nh[:opts] || {}).merge(:contact => nh[:contact])
       klass = get_class(type)
       notify = klass.new(config, message_h)
       notify.async_notify if notify
     end
 
     if needed_hash.is_a?(Array)
-      needed_hash.each { |nh| create_proc[nh] }
+      needed_hash.each{|nh| create_proc[nh] }
     else
       create_proc[needed_hash]
     end
 
-  rescue Object => ex
+  rescue Exception, Timeout::Error => ex
     log_ex(ex)
   end
 
@@ -67,7 +66,7 @@ class Eye::Notify
 
   def async_notify
     async.notify
-    after(TIMEOUT) { terminate }
+    after(TIMEOUT){ terminate }
   end
 
   def notify
@@ -103,18 +102,15 @@ class Eye::Notify
   end
 
   class Custom < Eye::Notify
-
     def self.inherited(base)
       super
       register(base)
     end
-
   end
 
-  %w[at host message name full_name pid level].each do |name|
+  %w{at host message name full_name pid level}.each do |name|
     define_method("msg_#{name}") do
       @message_h[name.to_sym]
     end
   end
-
 end

data/lib/eye/notify/jabber.rb

@@ -27,4 +27,4 @@ class Eye::Notify::Jabber < Eye::Notify
     client.close
   end
 
-end
+end

data/lib/eye/notify/mail.rb

@@ -41,8 +41,8 @@ class Eye::Notify::Mail < Eye::Notify
     h << "To: <#{contact}>"
     h << "Subject: #{message_subject}"
     h << "Date: #{msg_at.httpdate}"
-    h << "Message-Id: <#{rand(1_000_000_000).to_s(36)}.#{$$}.#{contact}>"
+    h << "Message-Id: <#{rand(1000000000).to_s(36)}.#{$$}.#{contact}>"
     "#{h * "\n"}\n#{message_body}"
   end
 
-end
+end