eye 0.8.celluloid15 → 0.8.pre

data/lib/eye/controller/status.rb

@@ -2,20 +2,19 @@ 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 }
-    actors = actors.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}.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,
-      home: Eye::Local.home,
-      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,
+      :dir => Eye::Local.dir,
+      :pid_path => Eye::Local::pid_path,
+      :sock_path => Eye::Local::socket_path,
+      :actors => actors,
+      :celluloid_backported => $CELLULOID_BACKPORTED
     }
 
     res[:config_yaml] = YAML.dump(current_config.to_h) if h[:config].present?
@@ -24,18 +23,17 @@ module Eye::Controller::Status
   end
 
   def info_data(*args)
-    h = args.extract_options!
-    { subtree: info_objects(*args).map { |a| a.status_data(h) } }
+    {:subtree => info_objects(*args).map{|a| a.status_data } }
   end
 
   def short_data(*args)
-    { subtree: info_objects(*args).select { |o| o.class == Eye::Application }.map(&:status_data_short) }
+    {:subtree => info_objects(*args).select{ |o| o.class == Eye::Application }.map{|a| a.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
@@ -45,7 +43,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,7 +18,6 @@ class Eye::Dsl
   class Error < Exception; end
 
   class << self
-
     attr_accessor :verbose
 
     def debug(msg = '')
@@ -37,9 +36,7 @@ class Eye::Dsl
 
       Eye.parsed_config.transform!
       Eye.parsed_config.validate!
-      parsed_config = Eye.parsed_config
-      Eye.parsed_config = nil # remove object for better GC
-      parsed_config
+      Eye.parsed_config
     end
 
     def parse_apps(*args)
@@ -49,9 +46,7 @@ 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,11 +30,10 @@ 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_method :xgroup, :nop
-  alias_method :xprocess, :nop
-
+  alias xgroup nop
+  alias 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_method :trigger, :triggers
+  alias 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_method :logger=, :logger
+  alias 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_method :xprocess, :nop
-  alias_method :application, :parent
-  alias_method :app, :application
+  alias xprocess nop
+  alias application parent
+  alias 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,5 +1,4 @@
 module Eye::Dsl::Main
-
   attr_accessor :parsed_config, :parsed_filename, :parsed_default_app
 
   def application(name, &block)
@@ -20,8 +19,8 @@ module Eye::Dsl::Main
     Eye::Dsl.debug { "<= app: #{name}" }
   end
 
-  alias_method :project, :application
-  alias_method :app, :application
+  alias project application
+  alias app application
 
   def load(glob = '')
     return if glob.blank?
@@ -54,7 +53,7 @@ module Eye::Dsl::Main
     Eye::Dsl.debug { '<= config' }
   end
 
-  alias_method :settings, :config
+  alias 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, :check_identity]
+  BOOL_OPTIONS = [ :daemonize, :keep_alive, :auto_start, :stop_on_delete, :clear_pid, :preserve_fds, :use_leaf_child, :clear_env ]
   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, :check_identity_period, :check_identity_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 ]
   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_method :check, :checks
-  alias_method :nocheck, :nochecks
-  alias_method :trigger, :triggers
-  alias_method :notrigger, :notriggers
+  alias check checks
+  alias nocheck nochecks
+  alias trigger triggers
+  alias notrigger notriggers
 
   def command(cmd, arg)
     @config[:user_commands] ||= {}
@@ -95,14 +95,16 @@ 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]
 
-    return @config[:stop_signals] if args.count == 0
+    if args.count == 0
+      return @config[:stop_signals]
+    end
 
     signals = Array(args).flatten
     validate_signals(signals)
@@ -119,8 +121,8 @@ class Eye::Dsl::Opts < Eye::Dsl::PureOpts
     @config[:environment].merge!(value)
   end
 
-  alias_method :dir, :working_dir
-  alias_method :env, :environment
+  alias dir working_dir
+  alias env environment
 
   def set_stdall(value)
     super
@@ -148,7 +150,7 @@ class Eye::Dsl::Opts < Eye::Dsl::PureOpts
   end
 
   def scoped(&block)
-    h = self.class.new(name, self)
+    h = self.class.new(self.name, self)
     h.instance_eval(&block)
     Eye::Utils.deep_merge!(config, h.config, [:groups, :processes])
   end
@@ -164,7 +166,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)
@@ -181,15 +183,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
-      if raise_when_no_file
-        raise Eye::Dsl::Error, "load_env not found in #{fnames}"
-      else
+      unless raise_when_no_file
         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
@@ -211,18 +213,13 @@ 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
-      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
+      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)
     end
   end
 

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_method :xmonitor_children, :nop
+  alias xmonitor_children nop
 
   def application
     parent.try(:parent)
   end
-  alias_method :app, :application
-  alias_method :group, :parent
+  alias app application
+  alias 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,14 +31,8 @@ class Eye::Dsl::ProcessOpts < Eye::Dsl::Opts
 private
 
   def unique_num
-    self.class.unique_num ||= 0
-    self.class.unique_num += 1
-  end
-
-  class << self
-
-    attr_accessor :unique_num
-
+    $unique_num ||= 0
+    $unique_num += 1
   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
 
-    send :include, m
+    self.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)
-    instance_eval(&block) if cond && block
+    self.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}" }
-          instance_eval(File.read(path))
+          self.instance_eval(File.read(path))
           Eye::Dsl.debug { "<= load #{path}" }
         end
       end
     else
       ie = if args.present?
-        ->(i) { proc[i, *args] }
+        lambda{|i| proc[i, *args] }
       else
         proc
       end
 
-      instance_eval(&ie)
+      self.instance_eval(&ie)
     end
   end
 
@@ -104,12 +104,8 @@ 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)