eye 0.7 → 0.8.celluloid15

data/lib/eye/dsl/process_opts.rb

@@ -7,21 +7,21 @@ class Eye::Dsl::ProcessOpts < Eye::Dsl::Opts
     Eye::Utils.deep_merge!(@config[:monitor_children], opts.config)
   end
 
-  alias xmonitor_children nop
+  alias_method :xmonitor_children, :nop
 
   def application
     parent.try(:parent)
   end
-  alias app application
-  alias group parent
+  alias_method :app, :application
+  alias_method :group, :parent
 
   def depend_on(names, opts = {})
     names = Array(names).map(&:to_s)
-    trigger("wait_dependency_#{unique_num}", {:names => names}.merge(opts))
+    trigger("wait_dependency_#{unique_num}", { names: names }.merge(opts))
     nm = @config[:name]
     names.each do |name|
       parent.process(name) do
-        trigger("check_dependency_#{unique_num}", :names => [ nm ] )
+        trigger("check_dependency_#{unique_num}", names: [nm])
       end
     end
 
@@ -31,8 +31,14 @@ class Eye::Dsl::ProcessOpts < Eye::Dsl::Opts
 private
 
   def unique_num
-    $unique_num ||= 0
-    $unique_num += 1
+    self.class.unique_num ||= 0
+    self.class.unique_num += 1
+  end
+
+  class << self
+
+    attr_accessor :unique_num
+
   end
 
 end

data/lib/eye/dsl/pure_opts.rb

@@ -11,7 +11,7 @@ class Eye::Dsl::PureOpts
           end
 
           if types
-            good_type = Array(types).any?{|type| arg.is_a?(type) } || arg.nil?
+            good_type = Array(types).any? { |type| arg.is_a?(type) } || arg.nil?
             raise Eye::Dsl::Error, "bad :#{opt} value #{arg.inspect}, type should be #{types.inspect}" unless good_type
           end
 
@@ -19,7 +19,7 @@ class Eye::Dsl::PureOpts
         end
 
         define_method("get_#{opt}") do
-          @config[ opt.to_sym ]
+          @config[opt.to_sym]
         end
 
         define_method(opt) do |*args|
@@ -37,7 +37,7 @@ class Eye::Dsl::PureOpts
       end
     end
 
-    self.send :include, m
+    send :include, m
   end
 
   attr_reader :name, :full_name
@@ -50,7 +50,7 @@ class Eye::Dsl::PureOpts
     if parent
       @parent = parent
       if merge_parent_config
-        @config = Eye::Utils::deep_clone(parent.config)
+        @config = Eye::Utils.deep_clone(parent.config)
         parent.not_seed_options.each { |opt| @config.delete(opt) }
       else
         @config = {}
@@ -76,7 +76,7 @@ class Eye::Dsl::PureOpts
   end
 
   def with_condition(cond = true, &block)
-    self.instance_eval(&block) if cond && block
+    instance_eval(&block) if cond && block
   end
 
   def use(proc, *args)
@@ -84,18 +84,18 @@ class Eye::Dsl::PureOpts
       self.class.with_parsed_file(proc) do |path|
         if File.exist?(path)
           Eye::Dsl.debug { "=> load #{path}" }
-          self.instance_eval(File.read(path))
+          instance_eval(File.read(path))
           Eye::Dsl.debug { "<= load #{path}" }
         end
       end
     else
       ie = if args.present?
-        lambda{|i| proc[i, *args] }
+        ->(i) { proc[i, *args] }
       else
         proc
       end
 
-      self.instance_eval(&ie)
+      instance_eval(&ie)
     end
   end
 
@@ -104,8 +104,12 @@ class Eye::Dsl::PureOpts
   def self.with_parsed_file(file_name)
     saved_parsed_filename = Eye.parsed_filename
 
+    real_filename = if Eye.parsed_filename && File.symlink?(Eye.parsed_filename)
+      File.readlink(Eye.parsed_filename)
+    else
+      Eye.parsed_filename
+    end
 
-    real_filename = Eye.parsed_filename && File.symlink?(Eye.parsed_filename) ? File.readlink(Eye.parsed_filename) : Eye.parsed_filename
     dirname = File.dirname(real_filename) rescue nil
     path = File.expand_path(file_name, dirname)
 

data/lib/eye/dsl/validation.rb

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

data/lib/eye/group.rb

@@ -1,6 +1,7 @@
 require 'celluloid'
 
 class Eye::Group
+
   include Celluloid
 
   autoload :Chain, 'eye/group/chain'
@@ -44,12 +45,12 @@ class Eye::Group
     @processes = @processes.sort_by(&:name)
   end
 
-  def status_data(debug = false)
-    plist = @processes.map{|p| p.status_data(debug) }
+  def status_data(opts = {})
+    plist = @processes.map { |p| p.status_data(opts) }
 
     h = { name: name, type: :group, subtree: plist }
 
-    h[:debug] = debug_data if debug
+    h[:debug] = debug_data if opts[:debug]
 
     # show current chain
     if current_scheduled_command
@@ -68,16 +69,17 @@ class Eye::Group
   end
 
   def status_data_short
-    h = Hash.new
+    h = {}
     @processes.each do |p|
-      h[p.state] ||= 0
-      h[p.state] += 1
+      state = p.state
+      h[state] ||= 0
+      h[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)
@@ -144,10 +146,23 @@ 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 = self.last_scheduled_reason
+      process.last_scheduled_reason = 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.16.0'
-gem 'celluloid-io',  '~> 0.16.0'
+gem 'celluloid',     '~> 0.15.0'
+gem 'celluloid-io',  '~> 0.15.0'
 gem 'nio4r'
 gem 'timers'
 
 gem 'state_machine'
-gem 'sigar',         '~> 0.7.2'
+gem 'sigar', '~> 0.7.3'

data/lib/eye/local.rb

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

data/lib/eye/logger.rb

@@ -1,23 +1,27 @@
 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.new do |s, d, p, m|
+      self.formatter = proc 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.to_s}>"
+      [Class, Module].include?(self.class) ? to_s : "<#{self.class}>"
     end
 
     def logger_sub_tag
@@ -38,6 +42,7 @@ class Eye::Logger
       error "#{ex.message} #{ex.backtrace}"
       # notify here?
     end
+
   end
 
   Logger::Severity.constants.each do |level|
@@ -57,6 +62,7 @@ class Eye::Logger
   end
 
   class << self
+
     attr_reader :dev, :log_level, :args
 
     def link_logger(dev, *args)
@@ -74,7 +80,7 @@ class Eye::Logger
         @inner_logger = dev
       end
 
-      @inner_logger.level = self.log_level || Logger::INFO
+      @inner_logger.level = log_level || Logger::INFO
 
     rescue Exception
       @inner_logger = nil
@@ -88,12 +94,13 @@ class Eye::Logger
 
     def log_level=(level)
       @log_level = level
-      @inner_logger.level = self.log_level if @inner_logger
+      @inner_logger.level = log_level if @inner_logger
     end
 
     def inner_logger
       @inner_logger ||= InnerLogger.new(nil)
     end
+
   end
 
 private