eye 0.7 → 0.8.celluloid15

data/lib/eye/controller/options.rb

@@ -2,7 +2,7 @@ module Eye::Controller::Options
 
   def set_opt_logger(logger_args)
     # do not apply logger, if in stdout state
-    if !%w{stdout stderr}.include?(Eye::Logger.dev)
+    unless %w[stdout stderr].include?(Eye::Logger.dev)
       Eye::Logger.link_logger(*logger_args)
     end
   end
@@ -11,8 +11,4 @@ module Eye::Controller::Options
     Eye::Logger.log_level = level
   end
 
-  def set_opt_http(opts = {})
-    warn "Warning, set http options not in reel-eye gem" if opts.present?
-  end
-
 end

data/lib/eye/controller/send_command.rb

@@ -35,16 +35,16 @@ private
   def matched_objects(*args, &block)
     objs = find_objects(*args)
     res = objs.map(&:full_name)
-    objs.each{|obj| block[obj] } if block
-    {:result => res}
+    objs.each { |obj| block[obj] } if block
+    { result: res }
 
   rescue Error => ex
     log_ex(ex)
-    {:error => ex.message}
+    { error: ex.message }
 
   rescue Celluloid::DeadActorError => ex
     log_ex(ex)
-    {:error => "'#{ex.message}', try again!"}
+    { error: "'#{ex.message}', try again!" }
   end
 
   def remove_object_from_tree(obj)
@@ -56,12 +56,12 @@ private
     end
 
     if klass == Eye::Group
-      @applications.each{|app| app.groups.delete(obj) }
+      @applications.each { |app| app.groups.delete(obj) }
       @current_config.delete_group(obj.name)
     end
 
     if klass == Eye::Process
-      @applications.each{|app| app.groups.each{|gr| gr.processes.delete(obj) }}
+      @applications.each { |app| app.groups.each { |gr| gr.processes.delete(obj) } }
       @current_config.delete_process(obj.name)
     end
   end
@@ -76,14 +76,14 @@ private
 
     if obj_strs.size == 1 && (obj_strs[0].to_s.strip == 'all' || obj_strs[0].to_s.strip == '*')
       if h[:application]
-        return @applications.select { |app| app.name == h[:application]}
+        return @applications.select { |app| app.name == h[:application] }
       else
         return @applications.dup
       end
     end
 
     res = Eye::Utils::AliveArray.new
-    obj_strs.map{|c| c.to_s.split(',')}.flatten.each do |mask|
+    obj_strs.map { |c| c.to_s.split(',') }.flatten.each do |mask|
       objs = find_objects_by_mask(mask.to_s.strip)
       objs.select! { |obj| obj.app_name == h[:application] } if h[:application]
       res += objs
@@ -110,14 +110,15 @@ private
 
       # remove inherited targets
       res.each do |obj|
-        sub_object = res.any?{|a| a.sub_object?(obj) }
+        sub_object = res.any? { |a| a.sub_object?(obj) }
         final << obj unless sub_object
       end
 
       res = final
 
       # try to remove objects with different applications
-      apps, objs = Eye::Utils::AliveArray.new, Eye::Utils::AliveArray.new
+      apps = Eye::Utils::AliveArray.new
+      objs = Eye::Utils::AliveArray.new
       res.each do |obj|
         if obj.is_a?(Eye::Application)
           apps << obj
@@ -141,11 +142,11 @@ private
     r = left_regexp(mask)
 
     # find app
-    res = @applications.select{|a| a.name =~ r || a.full_name =~ r }
+    res = @applications.select { |a| a.name =~ r || a.full_name =~ r }
 
     # find group
     @applications.each do |a|
-      res += a.groups.select{|gr| gr.name =~ r || gr.full_name =~ r }
+      res += a.groups.select { |gr| gr.name =~ r || gr.full_name =~ r }
     end
 
     # find process
@@ -154,16 +155,12 @@ private
         gr.processes.each do |p|
           res << p if p.name =~ r || p.full_name =~ r
 
-          # child matching
-          if p.children.present?
-            children = p.children.values
-            res += children.select do |ch|
-              name = ch.name rescue ''
-              full_name = ch.full_name rescue ''
-              name =~ r || full_name =~ r
-            end
+          # children matching
+          p.children.each_value do |ch|
+            name = ch.name rescue ''
+            full_name = ch.full_name rescue ''
+            res << ch if name =~ r || full_name =~ r
           end
-
         end
       end
     end
@@ -173,11 +170,12 @@ private
 
   def left_regexp(mask)
     str = Regexp.escape(mask).gsub('\*', '.*?')
-    %r|\A#{str}|
+    %r[\A#{str}]
   end
 
   def exact_regexp(mask)
     str = Regexp.escape(mask).gsub('\*', '.*?')
-    %r|\A#{str}\z|
+    %r[\A#{str}\z]
   end
+
 end

data/lib/eye/controller/status.rb

@@ -2,18 +2,20 @@ module Eye::Controller::Status
 
   def debug_data(*args)
     h = args.extract_options!
-    actors = Celluloid::Actor.all.map{|actor| actor.wrapped_object.class.to_s }.group_by{|a| a}.map{|k,v| [k, v.size]}.sort_by{ |a| a[1] }.reverse
+    actors = Celluloid::Actor.all.map { |actor| actor.wrapped_object.class.to_s }.group_by { |a| a }
+    actors = actors.map { |k, v| [k, v.size] }.sort_by { |a| a[1] }.reverse
 
     res = {
-      :about => Eye::ABOUT,
-      :resources => Eye::SystemResources.resources($$),
-      :ruby => RUBY_DESCRIPTION,
-      :gems => %w|Celluloid Celluloid::IO StateMachine NIO Timers Sigar|.map{|c| gem_version(c) },
-      :logger => Eye::Logger.args.present? ? [Eye::Logger.dev.to_s, *Eye::Logger.args] : Eye::Logger.dev.to_s,
-      :dir => Eye::Local.dir,
-      :pid_path => Eye::Local::pid_path,
-      :sock_path => Eye::Local::socket_path,
-      :actors => actors
+      about: Eye::ABOUT,
+      resources: Eye::SystemResources.resources($$),
+      ruby: RUBY_DESCRIPTION,
+      gems: %w[Celluloid Celluloid::IO StateMachine NIO Timers Sigar].map { |c| gem_version(c) },
+      logger: Eye::Logger.args.present? ? [Eye::Logger.dev.to_s, *Eye::Logger.args] : Eye::Logger.dev.to_s,
+      home: Eye::Local.home,
+      dir: Eye::Local.dir,
+      pid_path: Eye::Local.pid_path,
+      sock_path: Eye::Local.socket_path,
+      actors: actors
     }
 
     res[:config_yaml] = YAML.dump(current_config.to_h) if h[:config].present?
@@ -22,17 +24,18 @@ module Eye::Controller::Status
   end
 
   def info_data(*args)
-    {:subtree => info_objects(*args).map{|a| a.status_data } }
+    h = args.extract_options!
+    { subtree: info_objects(*args).map { |a| a.status_data(h) } }
   end
 
   def short_data(*args)
-    {:subtree => info_objects(*args).select{ |o| o.class == Eye::Application }.map{|a| a.status_data_short } }
+    { subtree: info_objects(*args).select { |o| o.class == Eye::Application }.map(&:status_data_short) }
   end
 
   def history_data(*args)
     res = {}
     history_objects(*args).each do |process|
-      res[process.full_name] = process.schedule_history.reject{|c| c[:state] == :check_crash }
+      res[process.full_name] = process.schedule_history.reject { |c| c[:state] == :check_crash }
     end
     res
   end
@@ -42,7 +45,7 @@ private
   def info_objects(*args)
     res = []
     return @applications if args.empty?
-    matched_objects(*args){|obj| res << obj }
+    matched_objects(*args) { |obj| res << obj }
     res
   end
 

data/lib/eye/dsl.rb

@@ -18,6 +18,7 @@ class Eye::Dsl
   class Error < Exception; end
 
   class << self
+
     attr_accessor :verbose
 
     def debug(msg = '')
@@ -36,7 +37,9 @@ class Eye::Dsl
 
       Eye.parsed_config.transform!
       Eye.parsed_config.validate!
-      Eye.parsed_config
+      parsed_config = Eye.parsed_config
+      Eye.parsed_config = nil # remove object for better GC
+      parsed_config
     end
 
     def parse_apps(*args)
@@ -46,7 +49,9 @@ class Eye::Dsl
     def check_name(name)
       raise Error, "':' is not allowed in name '#{name}'" if name.to_s.include?(':')
     end
+
   end
+
 end
 
 # extend here global module

data/lib/eye/dsl/application_opts.rb

@@ -30,10 +30,11 @@ class Eye::Dsl::ApplicationOpts < Eye::Dsl::Opts
 
   def process(name, &block)
     res = nil
-    group('__default__'){ res = process(name.to_s, &block) }
+    group('__default__') { res = process(name.to_s, &block) }
     res
   end
 
-  alias xgroup nop
-  alias xprocess nop
+  alias_method :xgroup, :nop
+  alias_method :xprocess, :nop
+
 end

data/lib/eye/dsl/chain.rb

@@ -5,8 +5,8 @@ module Eye::Dsl::Chain
 
     acts.each do |act|
       @config[:chain] ||= {}
-      @config[:chain][act] = opts.merge(:action => act)
+      @config[:chain][act] = opts.merge(action: act)
     end
   end
 
-end
+end

data/lib/eye/dsl/child_process_opts.rb

@@ -2,12 +2,12 @@ class Eye::Dsl::ChildProcessOpts < Eye::Dsl::Opts
 
   def allow_options
     [:stop_command, :restart_command, :children_update_period,
-      :stop_signals, :stop_grace, :stop_timeout, :restart_timeout]
+     :stop_signals, :stop_grace, :stop_timeout, :restart_timeout]
   end
 
-  def triggers(*args)
+  def triggers(*_args)
     raise Eye::Dsl::Error, 'triggers not allowed in monitor_children'
   end
-  alias trigger triggers
+  alias_method :trigger, :triggers
 
 end

data/lib/eye/dsl/config_opts.rb

@@ -10,13 +10,13 @@ class Eye::Dsl::ConfigOpts < Eye::Dsl::PureOpts
       @config[:logger] = args
     end
   end
-  alias logger= logger
+  alias_method :logger=, :logger
 
   def syslog(name = 'eye', *args)
     require 'syslog/logger'
     Syslog::Logger.new(name, *args)
   rescue LoadError
-    raise Eye::Dsl::Error, "logger syslog requires Ruby >= 2.0"
+    raise Eye::Dsl::Error, 'logger syslog requires Ruby >= 2.0'
   end
 
   # ==== contact options ==============================
@@ -24,7 +24,7 @@ class Eye::Dsl::ConfigOpts < Eye::Dsl::PureOpts
     create_options_methods([type], Hash)
 
     define_method("set_#{type}") do |value|
-      value = value.merge(:type => type)
+      value = value.merge(type: type)
       super(value)
       Eye::Notify.validate!(value)
     end
@@ -36,14 +36,14 @@ class Eye::Dsl::ConfigOpts < Eye::Dsl::PureOpts
     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)
 
-    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)
+    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)
 
     Eye::Notify.validate!(validate_hash)
 
     @config[:contacts] ||= {}
-    @config[:contacts][contact_name.to_s] = {name: contact_name.to_s, type: contact_type,
-      contact: contact, opts: contact_opts}
+    @config[:contacts][contact_name.to_s] = { name: contact_name.to_s, type: contact_type,
+                                              contact: contact, opts: contact_opts }
   end
 
   def contact_group(contact_group_name, &block)

data/lib/eye/dsl/group_opts.rb

@@ -25,8 +25,8 @@ class Eye::Dsl::GroupOpts < Eye::Dsl::Opts
     opts
   end
 
-  alias xprocess nop
-  alias application parent
-  alias app application
+  alias_method :xprocess, :nop
+  alias_method :application, :parent
+  alias_method :app, :application
 
 end

data/lib/eye/dsl/helpers.rb

@@ -14,7 +14,7 @@ end
 def example_process(proxy, name)
   proxy.process(name) do
     pid_file "/tmp/#{name}.pid"
-    start_command "sleep 100"
+    start_command 'sleep 100'
     daemonize true
   end
 end

data/lib/eye/dsl/main.rb

@@ -1,4 +1,5 @@
 module Eye::Dsl::Main
+
   attr_accessor :parsed_config, :parsed_filename, :parsed_default_app
 
   def application(name, &block)
@@ -19,8 +20,8 @@ module Eye::Dsl::Main
     Eye::Dsl.debug { "<= app: #{name}" }
   end
 
-  alias project application
-  alias app application
+  alias_method :project, :application
+  alias_method :app, :application
 
   def load(glob = '')
     return if glob.blank?
@@ -53,7 +54,7 @@ module Eye::Dsl::Main
     Eye::Dsl.debug { '<= config' }
   end
 
-  alias settings config
+  alias_method :settings, :config
 
   def shared
     require 'ostruct'

data/lib/eye/dsl/opts.rb

@@ -1,28 +1,28 @@
 class Eye::Dsl::Opts < Eye::Dsl::PureOpts
 
-  STR_OPTIONS = [ :pid_file, :working_dir, :stdout, :stderr, :stdall, :stdin, :start_command,
-    :stop_command, :restart_command, :uid, :gid ]
+  STR_OPTIONS = [:pid_file, :working_dir, :stdout, :stderr, :stdall, :stdin, :start_command,
+                 :stop_command, :restart_command, :uid, :gid]
   create_options_methods(STR_OPTIONS, String)
 
-  BOOL_OPTIONS = [ :daemonize, :keep_alive, :auto_start, :stop_on_delete, :clear_pid, :preserve_fds, :use_leaf_child, :clear_env ]
+  BOOL_OPTIONS = [:daemonize, :keep_alive, :auto_start, :stop_on_delete, :clear_pid, :preserve_fds, :use_leaf_child,
+                  :clear_env, :check_identity]
   create_options_methods(BOOL_OPTIONS, [TrueClass, FalseClass])
 
-  INTERVAL_OPTIONS = [ :check_alive_period, :start_timeout, :restart_timeout, :stop_timeout, :start_grace,
-    :restart_grace, :stop_grace, :children_update_period, :restore_in,
-    :auto_update_pidfile_grace, :revert_fuckup_pidfile_grace ]
+  INTERVAL_OPTIONS = [:check_alive_period, :start_timeout, :restart_timeout, :stop_timeout, :start_grace,
+                      :restart_grace, :stop_grace, :children_update_period, :restore_in,
+                      :auto_update_pidfile_grace, :revert_fuckup_pidfile_grace, :check_identity_period, :check_identity_grace]
   create_options_methods(INTERVAL_OPTIONS, [Fixnum, Float])
 
   create_options_methods([:environment], Hash)
   create_options_methods([:umask], Fixnum)
 
-
   def initialize(name = nil, parent = nil)
     super(name, parent)
 
     @config[:application] = parent.name if parent.is_a?(Eye::Dsl::ApplicationOpts) && parent.name != '__default__'
     @config[:group] = parent.name if parent.is_a?(Eye::Dsl::GroupOpts)
 
-    # hack for full name
+    # HACK: for full name
     @full_name = parent.full_name if @name == '__default__' && parent.respond_to?(:full_name)
   end
 
@@ -62,10 +62,10 @@ class Eye::Dsl::Opts < Eye::Dsl::PureOpts
     @config[:triggers].try :delete, nac[:name]
   end
 
-  alias check checks
-  alias nocheck nochecks
-  alias trigger triggers
-  alias notrigger notriggers
+  alias_method :check, :checks
+  alias_method :nocheck, :nochecks
+  alias_method :trigger, :triggers
+  alias_method :notrigger, :notriggers
 
   def command(cmd, arg)
     @config[:user_commands] ||= {}
@@ -95,16 +95,14 @@ class Eye::Dsl::Opts < Eye::Dsl::PureOpts
   end
 
   def set_stop_command(cmd)
-    raise Eye::Dsl::Error, "cannot use both stop_signals and stop_command" if @config[:stop_signals]
+    raise Eye::Dsl::Error, 'cannot use both stop_signals and stop_command' if @config[:stop_signals]
     super
   end
 
   def stop_signals(*args)
-    raise Eye::Dsl::Error, "cannot use both stop_signals and stop_command" if @config[:stop_command]
+    raise Eye::Dsl::Error, 'cannot use both stop_signals and stop_command' if @config[:stop_command]
 
-    if args.count == 0
-      return @config[:stop_signals]
-    end
+    return @config[:stop_signals] if args.count == 0
 
     signals = Array(args).flatten
     validate_signals(signals)
@@ -121,8 +119,8 @@ class Eye::Dsl::Opts < Eye::Dsl::PureOpts
     @config[:environment].merge!(value)
   end
 
-  alias dir working_dir
-  alias env environment
+  alias_method :dir, :working_dir
+  alias_method :env, :environment
 
   def set_stdall(value)
     super
@@ -150,7 +148,7 @@ class Eye::Dsl::Opts < Eye::Dsl::PureOpts
   end
 
   def scoped(&block)
-    h = self.class.new(self.name, self)
+    h = self.class.new(name, self)
     h.instance_eval(&block)
     Eye::Utils.deep_merge!(config, h.config, [:groups, :processes])
   end
@@ -166,7 +164,7 @@ class Eye::Dsl::Opts < Eye::Dsl::PureOpts
       host = Eye::Local.host
 
       if glob.is_a?(Array)
-        on_server = !!glob.any?{|elem| elem == host}
+        on_server = !!glob.any? { |elem| elem == host }
       elsif glob.is_a?(Regexp)
         on_server = !!host.match(glob)
       elsif glob.is_a?(String) || glob.is_a?(Symbol)
@@ -183,15 +181,15 @@ class Eye::Dsl::Opts < Eye::Dsl::PureOpts
 
   def load_env(filename = '~/.env', raise_when_no_file = true)
     fnames = [File.expand_path(filename, @config[:working_dir]),
-      File.expand_path(filename)].uniq
+              File.expand_path(filename)].uniq
     filenames = fnames.select { |f| File.exist?(f) }
 
     if filenames.size < 1
-      unless raise_when_no_file
+      if raise_when_no_file
+        raise Eye::Dsl::Error, "load_env not found in #{fnames}"
+      else
         warn "load_env not found file: '#{filenames.first}'"
         return
-      else
-        raise Eye::Dsl::Error, "load_env not found in #{fnames}"
       end
     end
     raise Eye::Dsl::Error, "load_env conflict filenames: #{filenames}" if filenames.size > 1
@@ -213,13 +211,18 @@ private
 
   def validate_signals(signals = nil)
     return unless signals
-    raise Eye::Dsl::Error, "signals should be Array" unless signals.is_a?(Array)
+    raise Eye::Dsl::Error, 'signals should be Array' unless signals.is_a?(Array)
     s = signals.clone
     while s.present?
       sig = s.shift
       timeout = s.shift
-      raise Eye::Dsl::Error, "signal should be String, Symbol, Fixnum, not #{sig.inspect}" if sig && ![String, Symbol, Fixnum].include?(sig.class)
-      raise Eye::Dsl::Error, "signal sleep should be Numeric, not #{timeout.inspect}" if timeout && ![Fixnum, Float].include?(timeout.class)
+      if sig && ![String, Symbol, Fixnum].include?(sig.class)
+        raise Eye::Dsl::Error, "signal should be String, Symbol, Fixnum, not #{sig.inspect}"
+      end
+
+      if timeout && ![Fixnum, Float].include?(timeout.class)
+        raise Eye::Dsl::Error, "signal sleep should be Numeric, not #{timeout.inspect}"
+      end
     end
   end