eye 0.2 → 0.2.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: b1592106a2ce3c26da8ad55f6b0036b10e5932fc
+  data.tar.gz: ff73a4ae40c4eeef57e9c50df0e50e8220eb187f
+SHA512:
+  metadata.gz: b81127c859a0e48c6a08b7109582cddcdb12731b93eca191ae3fe65289703075e32c53f3552db24fcca3d693e61ada93ca7bfcae1bed4488724c54918ed6c880
+  data.tar.gz: 22e769a89a91343374045e502404f2fa26002f9a641807d4f772354774a3f88837cf486afb18da4880738548d9b8522f0c865e2b9c8ed2ae6cc9757d3da1ea78

data/README.md

@@ -1,7 +1,7 @@
 Eye
 ===
 
-Process monitoring tool. Alternative for God and Bluepill. With Bluepill like config syntax. Requires MRI Ruby >= 1.9.2. Uses Celluloid and Celluloid::IO.
+Process monitoring tool. An alternative to God and Bluepill. With Bluepill like config syntax. Requires MRI Ruby >= 1.9.2. Uses Celluloid and Celluloid::IO.
 
 
 Recommended installation on the server (system wide):
@@ -153,3 +153,8 @@ Quit monitoring:
 Config explain (for debug):
 
     $ eye explain examples/test.eye
+
+
+### Config api:
+
+  Waiting for pull requests ..., until that you can read `examples` and `spec/dsl` folders.

data/bin/eye

@@ -266,13 +266,10 @@ private
     true
   end
 
-  def wait_server
-    Timeout.timeout(15) do
-      while !server_started?
-        sleep 0.3
-      end
+  def wait_server(timeout = 15)
+    Timeout.timeout(timeout) do
+      sleep 0.3 while !server_started?
     end
-
     true
   rescue Timeout::Error
     false

data/examples/puma.eye

@@ -0,0 +1,34 @@
+RUBY      = '/usr/local/ruby/1.9.3-p392/bin/ruby'
+RAILS_ENV = 'production'
+ROOT      = '/var/www/super_app'
+CURRENT   = File.expand_path(File.join(ROOT, %w{current}))
+LOGS      = File.expand_path(File.join(ROOT, %w{shared log}))
+PIDS      = File.expand_path(File.join(ROOT, %w{shared pids}))
+
+Eye.config do
+  logger "#{LOGS}/eye.log"
+  logger_level Logger::ERROR
+end
+
+Eye.application :super_app do
+  env 'RAILS_ENV' => RAILS_ENV
+  working_dir CURRENT
+  triggers :flapping, :times => 10, :within => 1.minute
+
+  process :puma do
+    daemonize true
+    pid_file "#{PIDS}/puma.pid"
+    stdall "#{LOGS}/#{RAILS_ENV}.log"
+
+    start_command "#{RUBY} bin/puma --port 80 --pidfile #{PIDS}/puma.pid --environment #{RAILS_ENV} config.ru"
+    stop_command "kill -TERM {{PID}}"
+    restart_command "kill -USR2 {{PID}}"
+
+    start_timeout 15.seconds
+    stop_grace 10.seconds
+    restart_grace 10.seconds
+
+    checks :cpu, :every => 30, :below => 80, :times => 3
+    checks :memory, :every => 30, :below => 70.megabytes, :times => [3,5]
+  end
+end

data/eye.gemspec

@@ -5,7 +5,7 @@ Gem::Specification.new do |gem|
   gem.email         = "kostya27@gmail.com"
 
   gem.description   = gem.summary = \
-    %q{Process monitoring tool. Alternative for God and Bluepill. With Bluepill like config syntax. Requires MRI Ruby >= 1.9.2. Uses Celluloid and Celluloid::IO.}
+    %q{Process monitoring tool. An alternative to God and Bluepill. With Bluepill like config syntax. Requires MRI Ruby >= 1.9.2. Uses Celluloid and Celluloid::IO.}
   gem.homepage      = "http://github.com/kostya/eye"
 
   gem.files         = `git ls-files`.split($\)

data/lib/eye.rb

@@ -1,5 +1,5 @@
 module Eye  
-  VERSION   = "0.2"
+  VERSION   = "0.2.1"
   ABOUT     = "Eye v#{VERSION} (c) 2012-2013 @kostya"
 
   autoload :Process,        'eye/process'
@@ -22,5 +22,4 @@ module Eye
   autoload :Control,        'eye/control'
 end
 
-ROOT_BINDING  = binding
-ENV_LANG      = ENV['LANG'] # save original LANG, because ruby somehow rewrite it
+ENV_LANG = ENV['LANG'] # save original LANG, bug of celluloid 0.12

data/lib/eye/application.rb

@@ -24,6 +24,11 @@ class Eye::Application
     @groups << group
   end
 
+  # sort processes in name order
+  def resort_groups
+    @groups = @groups.sort_by{|gr| gr.name == '__default__' ? 'zzzzz' : gr.name }
+  end
+
   def status_data(debug = false)
     h = { name: @name, type: :application, subtree: @groups.map{|gr| gr.status_data(debug) }}
     h.merge!(debug: debug_data) if debug

data/lib/eye/checker.rb

@@ -51,6 +51,7 @@ class Eye::Checker
   end
 
   def check
+    tm1 = Time.now
     @value = get_value
     @values << {:value => @value, :good => good?(value)}
 
@@ -61,7 +62,7 @@ class Eye::Checker
       result = false if bad_count >= min_tries
     end
 
-    info "#{last_human_values} => #{result ? 'OK' : 'Fail'}"
+    info "#{last_human_values} => #{result ? 'OK' : 'Fail'} (#{Time.now - tm1}s)"
     result
   end
 

data/lib/eye/checker/http.rb

@@ -12,7 +12,7 @@ class Eye::Checker::Http < Eye::Checker
   param :open_timeout,  [Fixnum, Float]
   param :read_timeout,  [Fixnum, Float]
 
-  attr_reader :session, :uri
+  attr_reader :uri
 
   def check_name
     'http'
@@ -29,49 +29,49 @@ class Eye::Checker::Http < Eye::Checker
             else
               Net::HTTPSuccess
             end
-    @open_timeout = (open_timeout || timeout || 5).to_i
-    @read_timeout = (read_timeout || timeout || 30).to_i
-
-    @session = Net::HTTP.new(@uri.host, @uri.port)
-    if @uri.scheme == 'https'
-      require 'net/https'
-      @session.use_ssl=true
-      @session.verify_mode = OpenSSL::SSL::VERIFY_NONE
-    end
-    @session.open_timeout = @open_timeout
-    @session.read_timeout = @read_timeout
+    @open_timeout = (open_timeout || 3).to_f
+    @read_timeout = (read_timeout || timeout || 15).to_f
   end
-
+  
   def get_value
     Celluloid::Future.new{ get_value_sync }.value
   end
 
   def get_value_sync
-    res = @session.start do |http|
-      http.get(@uri.path)
-    end
-
+    _session = session
+    res = _session.start{ |http| http.get(@uri.path) }
     {:result => res}
 
-  rescue Timeout::Error
-    debug 'Timeout error'
-    {:exception => :timeout}
+  rescue Timeout::Error => ex
+    debug ex.inspect
+
+    if defined?(Net::OpenTimeout) # for ruby 2.0
+      mes = ex.class.is_a?(Net::OpenTimeout) ? "OpenTimeout<#{@open_timeout}>" : "ReadTimeout<#{@read_timeout}>"
+      {:exception => mes}
+    else
+      error "#{ex.message}"
+      {:exception => "Timeout<#{@open_timeout},#{@read_timeout}>"}
+    end
 
   rescue => ex
-    error "Exception #{ex.message}"
-    {:exception => ex.message}
+    {:exception => "Error<#{ex.message}>"}
   end
 
   def good?(value)
     return false unless value[:result]
-    return false unless value[:result].kind_of?(@kind)
+
+    unless value[:result].kind_of?(@kind)
+      return false 
+    end
 
     if @pattern
-      if @pattern.is_a?(Regexp)
+      matched = if @pattern.is_a?(Regexp)
         @pattern === value[:result].body
       else
         value[:result].body.include?(@pattern.to_s)
       end
+      value[:notice] = "missing '#{@pattern.to_s}'" unless matched
+      matched
     else
       true
     end
@@ -81,13 +81,26 @@ class Eye::Checker::Http < Eye::Checker
     if !value.is_a?(Hash)
       '-'
     elsif value[:exception]
-      if value[:exception] == :timeout
-        'T-out'
-      else
-        'Err'
-      end
+      value[:exception]
     else
-      "#{value[:result].code}=#{value[:result].body.size/ 1024}Kb"
+      body_size = value[:result].body.size / 1024
+      msg = "#{value[:result].code}=#{body_size}Kb"
+      msg += "<#{value[:notice]}>" if value[:notice]
+      msg
+    end
+  end  
+
+private
+
+  def session
+    Net::HTTP.new(@uri.host, @uri.port).tap do |session|
+      if @uri.scheme == 'https'
+        require 'net/https'
+        session.use_ssl=true
+        session.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      end
+      session.open_timeout = @open_timeout
+      session.read_timeout = @read_timeout
     end
   end
 

data/lib/eye/checker/socket.rb

@@ -26,8 +26,8 @@ class Eye::Checker::Socket < Eye::Checker
 
   def initialize(*args)
     super
-    @open_timeout = (open_timeout || 1).to_i
-    @read_timeout = (read_timeout || timeout || 5).to_i
+    @open_timeout = (open_timeout || 1).to_f
+    @read_timeout = (read_timeout || timeout || 5).to_f
 
     if addr =~ %r[\Atcp://(.*?):(.*?)\z]
       @socket_family = :tcp
@@ -44,32 +44,29 @@ class Eye::Checker::Socket < Eye::Checker
   end
 
   def get_value_sync
-    sock = Timeout::timeout(@open_timeout) do
-      if @socket_family == :tcp      
-        TCPSocket.open(@socket_addr, @socket_port)
-      elsif @socket_family == :unix
-        UNIXSocket.open(@socket_path)
-      else
-        raise "Unknown socket addr #{addr}"
-      end
+    sock = begin
+      Timeout::timeout(@open_timeout){ open_socket }
+    rescue Timeout::Error
+      return { :exception => "OpenTimeout<#{@open_timeout}>" }
     end
 
     if send_data
-      Timeout::timeout(@read_timeout) do
-        _write_data(sock, send_data)
-        { :result => _read_data(sock) }
+      begin
+        Timeout::timeout(@read_timeout) do
+          _write_data(sock, send_data)
+          result = _read_data(sock)
+
+          { :result => result }
+        end
+      rescue Timeout::Error
+        return { :exception => "ReadTimeout<#{@read_timeout}>" }
       end
     else
       { :result => :listen }
     end
 
-  rescue Timeout::Error
-    debug 'Timeout error'
-    { :exception => :timeout }
-
   rescue Exception => e
-    warn "Exception #{e.message}"
-    { :exception => e.message }
+    { :exception => "Error<#{e.message}>" }
 
   ensure
     sock.close if sock
@@ -83,18 +80,25 @@ class Eye::Checker::Socket < Eye::Checker
         match = begin
           !!expect_data[value[:result]] 
         rescue Timeout::Error, Exception => ex
-          error "proc match failed with #{ex.message}"
+          mes = "proc match failed with '#{ex.message}'"
+          error(mes)
+          value[:notice] = mes
           return false
         end
         
-        warn "proc #{expect_data} not matched (#{value[:result].truncate(30)}) answer" unless match
+        unless match
+          warn "proc #{expect_data} not matched (#{value[:result].truncate(30)}) answer" 
+          value[:notice] = "missing proc validation"
+        end
+
         return match
       end
 
       return true if expect_data.is_a?(Regexp) && expect_data.match(value[:result])
       return true if value[:result].to_s == expect_data.to_s
 
-      warn "#{expect_data} not matched (#{value[:result].truncate(30)}) answer"      
+      warn "#{expect_data} not matched (#{value[:result].truncate(30)}) answer"
+      value[:notice] = "missing '#{expect_data.to_s}'"
       return false
     end
 
@@ -105,22 +109,30 @@ class Eye::Checker::Socket < Eye::Checker
     if !value.is_a?(Hash)
       '-'
     elsif value[:exception]
-      if value[:exception] == :timeout
-        'T-out'
-      else
-        "Err(#{value[:exception]})"
-      end
+      value[:exception]
     else
       if value[:result] == :listen
         "listen"
       else
-        "#{value[:result].to_s.size}b"
+        res = "#{value[:result].to_s.size}b"
+        res += "<#{value[:notice]}>" if value[:notice]
+        res 
       end
     end
   end
 
 private
 
+  def open_socket
+    if @socket_family == :tcp      
+      TCPSocket.open(@socket_addr, @socket_port)
+    elsif @socket_family == :unix
+      UNIXSocket.open(@socket_path)
+    else
+      raise "Unknown socket addr #{addr}"
+    end
+  end
+
   def _write_data(socket, data)
     case protocol
     when :em_object

data/lib/eye/child_process.rb

@@ -50,6 +50,10 @@ class Eye::ChildProcess
     :up
   end
 
+  def up?
+    state == :up
+  end
+
   def send_command(command, *args)
     schedule command, *args, "#{command} by user"
   end

data/lib/eye/controller.rb

@@ -38,6 +38,8 @@ class Eye::Controller
     Celluloid::logger = Eye.logger
 
     Eye::SystemResources.setup
+    
+    info "starting #{Eye::ABOUT}"
   end
 
 end

data/lib/eye/controller/load.rb

@@ -183,6 +183,8 @@ private
     @added_groups = nil
     @added_processes = nil
 
+    app.resort_groups
+
     app
   end
 

data/lib/eye/dsl.rb

@@ -1,5 +1,7 @@
 require_relative 'dsl/helpers'
 
+Eye::BINDING = binding
+
 class Eye::Dsl
 
   autoload :Main,                 'eye/dsl/main'
@@ -34,7 +36,7 @@ class Eye::Dsl
       content = File.read(filename) if content.blank?
       
       silence_warnings do
-        Kernel.eval(content, ROOT_BINDING, filename.to_s)
+        Kernel.eval(content, Eye::BINDING, filename.to_s)
       end
       
       validate(Eye.parsed_config)

data/lib/eye/dsl/opts.rb

@@ -92,4 +92,13 @@ class Eye::Dsl::Opts < Eye::Dsl::PureOpts
     set_stderr value
   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
+    self.config[:groups].merge!(groups) if groups.present?
+    self.config[:processes].merge!(processes) if processes.present?
+  end
+
 end

data/lib/eye/process.rb

@@ -58,7 +58,7 @@ class Eye::Process
   # add_watchers, remove_watchers:
   include Eye::Process::Watchers
   
-  # check alive, crush methods:
+  # check alive, crash methods:
   include Eye::Process::Monitor
 
   # system methods:

data/lib/eye/process/commands.rb

@@ -25,7 +25,7 @@ module Eye::Process::Commands
       end
 
       self.pid = nil
-      switch :crushed
+      switch :crashed
     end
 
     result
@@ -75,7 +75,7 @@ module Eye::Process::Commands
       execute_restart_command
       sleep self[:restart_timeout].to_f
       result = check_alive_with_refresh_pid_if_needed
-      switch(result ? :restarted : :crushed)
+      switch(result ? :restarted : :crashed)
     else
       stop_process
       start_process
@@ -166,8 +166,7 @@ private
     res = Eye::System.daemonize(self[:start_command], config)
     start_time = Time.now - time_before
 
-    info "daemonizing: `#{self[:start_command]}` with start_grace: #{self[:start_grace].to_f}s, env: #{self[:environment].inspect}, working_dir: #{self[:working_dir]}"
-    
+    info "daemonizing: `#{self[:start_command]}` with start_grace: #{self[:start_grace].to_f}s, env: #{self[:environment].inspect}, working_dir: #{self[:working_dir]} (pid:#{res[:pid]})"
 
     if res[:error]
       error "raised with #{res[:error].inspect}"
@@ -189,7 +188,7 @@ private
     sleep self[:start_grace].to_f
 
     unless process_realy_running?
-      error "process with pid (#{self.pid}) not found, may be crushed (#{check_logs_str})"
+      error "process with pid (#{self.pid}) not found, may be crashed (#{check_logs_str})"
       return {:error => :not_realy_running}
     end
 
@@ -232,11 +231,12 @@ private
     end
 
     unless process_realy_running?
-      error "process in pid_file(#{self[:pid_file]})(#{self.pid}) not found, maybe process do not write there actual pid, or just crushed (#{check_logs_str})"
+      error "process in pid_file(#{self[:pid_file]})(#{self.pid}) not found, maybe process do not write there actual pid, or just crashed (#{check_logs_str})"
       return {:error => :not_realy_running}
     end
 
     res[:pid] = self.pid
+    info "process get pid:#{res[:pid]}"
     res
   end
 

data/lib/eye/process/config.rb

@@ -1,7 +1,7 @@
 module Eye::Process::Config
 
   DEFAULTS = {
-    :keep_alive => true, # restart when crushed
+    :keep_alive => true, # restart when crashed
     :check_alive_period => 5.seconds,
 
     :start_timeout => 15.seconds,

data/lib/eye/process/monitor.rb

@@ -39,16 +39,16 @@ private
       # check that process runned
       unless process_realy_running?
         warn 'check_alive: process not found'
-        notify :warn, 'crushed!'
-        switch :crushed
+        notify :warn, 'crashed!'
+        switch :crashed
       else
         # check that pid_file still here
         ppid = failsafe_load_pid
         
         if ppid != self.pid
-          msg = "check_alive: pid_file(#{self[:pid_file]}) changes by itself (#{self.pid}) => (#{ppid})"
+          msg = "check_alive: pid_file(#{self[:pid_file]}) changes by itself (pid:#{self.pid}) => (pid:#{ppid})"
           if control_pid?
-            msg += ", not correct, pid_file is under eye control, so rewrited back #{self.pid}"
+            msg += ", not correct, pid_file is under eye control, so rewrited back pid:#{self.pid}"
             save_pid_to_file rescue msg += ', (Can`t rewrite pid_file O_o)'
           else
             if ppid == nil
@@ -80,18 +80,18 @@ private
     pid
   end
 
-  def check_crush
+  def check_crash
     if down?
       if self[:keep_alive] && !@flapping
-        warn 'check crushed: process is down'
-        schedule :start, 'crushed'
+        warn 'check crashed: process is down'
+        schedule :start, 'crashed'
       else
-        warn 'check crushed: process is down, and flapping happens (or not keep_alive option)'
+        warn 'check crashed: process is down, and flapping happens (or not keep_alive option)'
         schedule :unmonitor, 'flapping'
       end
     end
   end
 
-  public :check_crush # bug of celluloid 0.12
+  public :check_crash # bug of celluloid 0.12
 
 end

data/lib/eye/process/notify.rb

@@ -1,7 +1,7 @@
 module Eye::Process::Notify
 
   # notify to user:
-  # 1) process crushed by itself, and we restart it [:warn]
+  # 1) process crashed by itself, and we restart it [:warn]
   # 2) checker bounded to restart process [:crit]
   # 3) flapping + switch to unmonitored [:crit]
 

data/lib/eye/process/states.rb

@@ -25,7 +25,7 @@ class Eye::Process
       transition :starting => :up
     end
 
-    event :crushed do
+    event :crashed do
       transition [:starting, :restarting, :up] => :down
     end
 
@@ -53,7 +53,7 @@ class Eye::Process
       transition any => :unmonitored
     end
 
-    after_transition :on => :crushed, :do => :on_crushed
+    after_transition :on => :crashed, :do => :on_crashed
     after_transition any => :unmonitored, :do => :on_unmonitored
     after_transition any-:up => :up, :do => :on_up
     after_transition :up => any-:up, :do => :from_up
@@ -61,8 +61,8 @@ class Eye::Process
     after_transition any => any, :do => :upd_for_triggers
   end
 
-  def on_crushed
-    schedule :check_crush, 'crushed'
+  def on_crashed
+    schedule :check_crash, 'crashed'
   end
 
   def on_unmonitored

data/lib/eye/process/watchers.rb

@@ -59,6 +59,8 @@ private
 
   def watcher_tick(subject)
     unless subject.check
+      return unless up?
+      
       notify :crit, "Bounded #{subject.check_name}: #{subject.last_human_values}"
       schedule :restart, "bounded #{subject.check_name}"
     end

data/lib/eye/utils.rb

@@ -10,5 +10,5 @@ module Eye::Utils
       else value
     end
   end
-    
+
 end

data/spec/checker/http_spec.rb

@@ -18,7 +18,7 @@ describe "Eye::Checker::Http" do
     it "initialize" do
       subject.instance_variable_get(:@kind).should == Net::HTTPSuccess
       subject.instance_variable_get(:@pattern).should == /OK/
-      subject.instance_variable_get(:@open_timeout).should == 2
+      subject.instance_variable_get(:@open_timeout).should == 3
       subject.instance_variable_get(:@read_timeout).should == 2
     end
 
@@ -34,17 +34,22 @@ describe "Eye::Checker::Http" do
     end
 
     it "get_value exception" do
+      a = ""
+      stub(subject).session{ a }
       stub(subject.session).start{ raise Timeout::Error, "timeout" }
-      subject.get_value.should == {:exception => :timeout}
+      mes = RUBY_VERSION < '2.0' ? "Timeout<3.0,2.0>" : "ReadTimeout<2.0>"
 
-      subject.human_value(subject.get_value).should == "T-out"
+      subject.get_value.should == {:exception => mes}
+      subject.human_value(subject.get_value).should == mes
     end
 
     it "get_value raised" do
+      a = ""
+      stub(subject).session{ a }
       stub(subject.session).start{ raise "something" }
-      subject.get_value.should == {:exception => "something"}
+      subject.get_value.should == {:exception => "Error<something>"}
 
-      subject.human_value(subject.get_value).should == "Err"
+      subject.human_value(subject.get_value).should == "Error<something>"
     end
 
   end

data/spec/checker/socket_spec.rb

@@ -30,7 +30,7 @@ describe "Socket Checker" do
 
       it "timeouted" do
         c = chsock(:addr => addr, :send_data => "timeout")
-        c.get_value.should == {:exception => :timeout}
+        c.get_value.should == {:exception => "ReadTimeout<2.0>"}
         c.check.should == false
       end
 
@@ -47,7 +47,7 @@ describe "Socket Checker" do
         @process.stop
         c = chsock(:addr => addr.chop)
         if addr =~ /tcp/
-          c.get_value.should == {:exception => "Connection refused - connect(2)"}
+          c.get_value.should == {:exception => "Error<Connection refused - connect(2)>"}
         else
           c.get_value[:exception].should include("No such file or directory")
         end
@@ -63,7 +63,7 @@ describe "Socket Checker" do
       it "check responding without send_data" do
         c = chsock(:addr => addr.chop, :send_data => nil, :expect_data => nil)
         if addr =~ /tcp/
-          c.get_value.should == {:exception => "Connection refused - connect(2)"}
+          c.get_value.should == {:exception => "Error<Connection refused - connect(2)>"}
         else
           c.get_value[:exception].should include("No such file or directory")
         end

data/spec/controller/controller_spec.rb

@@ -10,10 +10,12 @@ def app_check(app, name, gr_size)
   app.name.should == name
   app.class.should == Eye::Application
   app.groups.size.should == gr_size
+  app.groups.class.should == Eye::Utils::AliveArray
 end
 
 def gr_check(gr, name, p_size, hidden = false)
   gr.class.should == Eye::Group
+  gr.processes.class.should == Eye::Utils::AliveArray
   gr.processes.size.should == p_size
   gr.name.should == name
   gr.hidden.should == hidden

data/spec/dsl/dsl_spec.rb

@@ -69,5 +69,5 @@ describe "Eye::Dsl" do
     cfg['bla'][:groups]['__default__'][:some].should == nil
     cfg['bla'][:groups]['__default__'][:processes][:some].should == nil
   end
-
+  
 end

data/spec/dsl/integration_spec.rb

@@ -308,4 +308,69 @@ describe "Eye::Dsl" do
         :environment=>{"P"=>"1"}}}}}
   end
 
+  
+  describe "scoped" do
+    it "scoped" do
+      conf = <<-E
+        Eye.application("bla") do
+          group :gr do
+            env "A" => '1', "B" => '2'
+    
+            process :a do
+              pid_file "1.pid"
+            end
+
+            scoped do
+              env "A" => '2'
+
+              process :b do
+                pid_file "2.pid"
+              end
+            end
+
+            process :c do
+              pid_file "3.pid"
+            end
+          end
+        end
+      E
+      
+      Eye::Dsl.parse_apps(conf).should == {
+        "bla" => {:name=>"bla", :groups=>{
+          "gr"=>{:name=>"gr", :application=>"bla", :environment=>{"A"=>"1", "B"=>"2"}, 
+            :processes=>{
+              "a"=>{:name=>"a", :application=>"bla", :environment=>{"A"=>"1", "B"=>"2"}, :group=>"gr", :pid_file=>"1.pid"}, 
+              "b"=>{:name=>"b", :application=>"bla", :environment=>{"A"=>"2", "B"=>"2"}, :group=>"gr", :pid_file=>"2.pid"}, 
+              "c"=>{:name=>"c", :application=>"bla", :environment=>{"A"=>"1", "B"=>"2"}, :group=>"gr", :pid_file=>"3.pid"}}}}}}
+    end
+
+    it "scoped" do
+      conf = <<-E
+        Eye.application("bla") do
+          start_timeout 10.seconds
+
+          group(:a){}
+
+          scoped do
+            start_timeout 15.seconds
+            group(:b){
+              scoped do
+
+              end
+            }
+          end
+
+          group(:c){}
+        end
+      E
+      
+      Eye::Dsl.parse_apps(conf).should == {
+        "bla" => {:name=>"bla", :start_timeout=>10, :groups=>{
+          "a"=>{:name=>"a", :start_timeout=>10, :application=>"bla", :processes=>{}}, 
+          "b"=>{:name=>"b", :start_timeout=>15, :application=>"bla", :processes=>{}}, 
+          "c"=>{:name=>"c", :start_timeout=>10, :application=>"bla", :processes=>{}}}}}
+    end
+
+  end
+
 end

data/spec/process/controller_spec.rb

@@ -124,7 +124,7 @@ describe "Process Controller" do
     end
   end
 
-  describe "process cant start, crush each time" do
+  describe "process cant start, crash each time" do
     before :each do
       @process = process(C.p2.merge(:start_command => C.p2[:start_command] + " -r" ))
       @process.send_command :start

data/spec/process/monitoring_spec.rb

@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/../spec_helper'
 describe "Process Monitoring" do
 
   [C.p1, C.p2].each do |cfg|
-    it "process crushed, should restart #{cfg[:name]}" do
+    it "process crashed, should restart #{cfg[:name]}" do
       start_ok_process(cfg)
       old_pid = @pid
 

data/spec/process/restart_spec.rb

@@ -6,7 +6,7 @@ describe "Process Restart" do
       start_ok_process(cfg)
       old_pid = @pid
 
-      dont_allow(@process).check_crush
+      dont_allow(@process).check_crash
       @process.restart
 
       @process.pid.should_not == old_pid
@@ -26,7 +26,7 @@ describe "Process Restart" do
       start_ok_process(cfg.merge(:stop_command => "kill -9 {{PID}}"))
       old_pid = @pid
 
-      dont_allow(@process).check_crush
+      dont_allow(@process).check_crash
       @process.restart
 
       @process.pid.should_not == old_pid
@@ -46,7 +46,7 @@ describe "Process Restart" do
       start_ok_process(cfg.merge(:restart_command => "kill -USR1 {{PID}}"))
       old_pid = @pid
 
-      dont_allow(@process).check_crush
+      dont_allow(@process).check_crash
       @process.restart
 
       sleep 3
@@ -71,7 +71,7 @@ describe "Process Restart" do
       start_ok_process(cfg.merge(:stop_command => "kill -USR1 {{PID}}"))
       old_pid = @pid
 
-      dont_allow(@process).check_crush
+      dont_allow(@process).check_crash
       @process.restart
 
       sleep 3
@@ -93,7 +93,7 @@ describe "Process Restart" do
       # so monitor should see that process died, and up it
       start_ok_process(cfg.merge(:restart_command => "kill -9 {{PID}}"))
 
-      mock(@process).check_crush
+      mock(@process).check_crash
 
       @process.restart
       Eye::System.pid_alive?(@pid).should == false      
@@ -103,7 +103,7 @@ describe "Process Restart" do
     it "Bad restart command, invalid" do
       start_ok_process(cfg.merge(:restart_command => "asdfasdf sdf asd fasdf asdf"))
 
-      dont_allow(@process).check_crush
+      dont_allow(@process).check_crash
 
       @process.restart
       Eye::System.pid_alive?(@pid).should == true
@@ -133,7 +133,7 @@ describe "Process Restart" do
       @process.state = st.to_s
       old_pid = @pid
 
-      dont_allow(@process).check_crush
+      dont_allow(@process).check_crash
       @process.restart
 
       @process.pid.should_not == old_pid

data/spec/process/start_spec.rb

@@ -69,7 +69,7 @@ describe "Process Start" do
       @process.state_name.should == :up
     end
 
-    it "process crushed, with config #{c[:name]}" do
+    it "process crashed, with config #{c[:name]}" do
       @process = process(c.merge(:start_command => c[:start_command] + " -r" ))
       @process.start.should == {:error=>:not_realy_running}
 
@@ -89,7 +89,7 @@ describe "Process Start" do
 
     it "start with invalid command" do
       @process = process(c.merge(:start_command => "asdf asdf1 r f324 f324f 32f44f"))
-      mock(@process).check_crush
+      mock(@process).check_crash
       res = @process.start
       res.should == {:error=>"#<Errno::ENOENT: No such file or directory - asdf>"}
 
@@ -103,7 +103,7 @@ describe "Process Start" do
 
     it "start PROBLEM with stdout permissions" do
       @process = process(c.merge(:stdout => "/var/run/1.log"))
-      mock(@process).check_crush
+      mock(@process).check_crash
       res = @process.start
       res.should == {:error=>"#<Errno::EACCES: Permission denied - open>"}
 
@@ -117,7 +117,7 @@ describe "Process Start" do
 
     it "start PROBLEM binary permissions" do
       @process = process(c.merge(:start_command => "./sample.rb"))
-      mock(@process).check_crush
+      mock(@process).check_crash
       res = @process.start
       res.should == {:error=>"#<Errno::EACCES: Permission denied - ./sample.rb>"}
 

data/spec/process/stop_spec.rb

@@ -40,7 +40,7 @@ describe "Process Stop" do
   it "stop process by default command" do
     start_ok_process
 
-    dont_allow(@process).check_crush
+    dont_allow(@process).check_crash
     @process.stop_process
 
     Eye::System.pid_alive?(@pid).should == false    
@@ -54,7 +54,7 @@ describe "Process Stop" do
     start_ok_process(C.p2.merge(:start_command => C.p2[:start_command] + " -T"))
     Eye::System.pid_alive?(@pid).should == true
 
-    dont_allow(@process).check_crush
+    dont_allow(@process).check_crash
     @process.stop_process
 
     Eye::System.pid_alive?(@pid).should == false    
@@ -67,7 +67,7 @@ describe "Process Stop" do
   it "stop process by specific command" do
     start_ok_process(C.p1.merge(:stop_command => "kill -9 {{PID}}"))
 
-    dont_allow(@process).check_crush
+    dont_allow(@process).check_crash
     @process.stop_process
 
     Eye::System.pid_alive?(@pid).should == false

data/spec/process/triggers/flapping_spec.rb

@@ -64,7 +64,7 @@ describe "Flapping" do
     @process.start!
 
     proxy(@process).schedule(:start, anything)
-    proxy(@process).schedule(:check_crush, anything)
+    proxy(@process).schedule(:check_crash, anything)
     dont_allow(@process).schedule(:unmonitor)
 
 

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: eye
 version: !ruby/object:Gem::Version
-  version: '0.2'
-  prerelease: 
+  version: 0.2.1
 platform: ruby
 authors:
 - Konstantin Makarchev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-09 00:00:00.000000000 Z
+date: 2013-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid-io
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,23 +41,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: state_machine
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -78,196 +69,172 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rr
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ruby-graphviz
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: forking
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fakeweb
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: xmpp4r
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Process monitoring tool. Alternative for God and Bluepill. With Bluepill
+description: Process monitoring tool. An alternative to God and Bluepill. With Bluepill
   like config syntax. Requires MRI Ruby >= 1.9.2. Uses Celluloid and Celluloid::IO.
 email: kostya27@gmail.com
 executables:
@@ -288,6 +255,7 @@ files:
 - examples/processes/forking.rb
 - examples/processes/sample.rb
 - examples/processes/thin.ru
+- examples/puma.eye
 - examples/rbenv.eye
 - examples/sidekiq.eye
 - examples/test.eye
@@ -479,28 +447,27 @@ files:
 homepage: http://github.com/kostya/eye
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.2
 signing_key: 
-specification_version: 3
-summary: Process monitoring tool. Alternative for God and Bluepill. With Bluepill
+specification_version: 4
+summary: Process monitoring tool. An alternative to God and Bluepill. With Bluepill
   like config syntax. Requires MRI Ruby >= 1.9.2. Uses Celluloid and Celluloid::IO.
 test_files:
 - spec/checker/cpu_spec.rb