eye 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b27fc1f2b1ca918d1dec48f63af0f59446f6a166
-  data.tar.gz: b823fadfaea2111a8c57ec07e4b2ae84ad7899a2
+  metadata.gz: 7f123c5b720394e6881f617954469fac8a054e5b
+  data.tar.gz: d717bad68e6f059afd86ea9b05975b59c5f8e36d
 SHA512:
-  metadata.gz: 6fd472f37e8123f426b45409e2067c1bf901cf265aa37a3480229eda6dcbc8fcdca4c51656580cc756c305da9f565f18a35dda277a48f188da36bb69a02effa0
-  data.tar.gz: ce0459d1f8d2d0d236a9ca2586ed44e2e173b6c82bfc6c426c473e9d0c20dce20bf28935af89efc23f2e33a48be9953a61fd0a2e0b5b536ef62e8fbd32a38997
+  metadata.gz: b56a789a1a18fd4acdda18ea67943bf1c4861e9fe46e8dce7c4b815ca17a1c2367a013e91fa3006669af4c61d470b3b8425792d1c4154a63090023799cf34416
+  data.tar.gz: fa7ef643b765bfc27bb4c2bab36d73f9277c82d1ca22df3dd857b9597e98f00e5896811f77fdc26b24785e504153bfd17a77b883bec693662e904ac50a836347

data/.travis.yml

@@ -0,0 +1,3 @@
+language: ruby
+rvm:
+  - "1.9.3"

data/README.md

@@ -1,8 +1,13 @@
 Eye
 ===
 
+[![Build Status](https://secure.travis-ci.org/kostya/eye.png?branch=master)](http://travis-ci.org/kostya/eye)
+
 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.
 
+Little demo, shows general commands and how chain works:
+
+[![Eye](https://raw.github.com/kostya/stuff/master/eye/eye.png)](https://raw.github.com/kostya/stuff/master/eye/eye.gif)
 
 Recommended installation on the server (system wide):
 

data/bin/eye

@@ -83,6 +83,13 @@ class Cli < Thor
     send_command(:break_chain, *targets)
   end
 
+  desc "history TARGET[,...]", "show process states history"
+  def history(*targets)
+    res = cmd(:history, *targets)
+    puts res if res && !res.empty?
+    puts
+  end
+
   desc "trace [TARGET]", "tracing log for app,group or process"
   def trace(target = "")
     log_trace(target)

data/lib/eye.rb

@@ -1,5 +1,5 @@
 module Eye  
-  VERSION   = "0.2.3"
+  VERSION   = "0.2.4"
   ABOUT     = "Eye v#{VERSION} (c) 2012-2013 @kostya"
 
   autoload :Process,        'eye/process'

data/lib/eye/application.rb

@@ -67,4 +67,8 @@ class Eye::Application
     res
   end
 
+  def processes
+    Eye::Utils::AliveArray.new(@groups.map{|gr| gr.processes.to_a }.flatten)
+  end
+
 end

data/lib/eye/checker.rb

@@ -78,7 +78,7 @@ class Eye::Checker
   end
 
   def check_name
-    self.class.to_s
+    @check_name ||= @type.to_s
   end
 
   def max_tries
@@ -114,4 +114,9 @@ class Eye::Checker
   param :times, [Fixnum, Array]
   param :fire, Symbol, nil, nil, [:stop, :restart, :unmonitor, :nothing]
 
+  class Defer < Eye::Checker
+    def get_value
+      Celluloid::Future.new{ get_value_deferred }.value
+    end
+  end
 end

data/lib/eye/checker/cpu.rb

@@ -5,7 +5,7 @@ class Eye::Checker::Cpu < Eye::Checker
   param :below, [Fixnum, Float], true
 
   def check_name
-    "cpu(#{human_value(below)})"
+    @check_name ||= "cpu(#{human_value(below)})"
   end
 
   def get_value

data/lib/eye/checker/file_ctime.rb

@@ -6,10 +6,6 @@ class Eye::Checker::FileCTime < Eye::Checker
 
   param :file, [String], true
 
-  def check_name
-    'ctime'
-  end
-
   def get_value
     File.ctime(file) rescue nil
   end

data/lib/eye/checker/file_size.rb

@@ -9,10 +9,6 @@ class Eye::Checker::FileSize < Eye::Checker
   param :below, [Fixnum, Float]
   param :above, [Fixnum, Float]
 
-  def check_name
-    'fsize'
-  end
-
   def get_value
     File.size(file) rescue nil
   end

data/lib/eye/checker/http.rb

@@ -1,6 +1,6 @@
 require 'net/http'
 
-class Eye::Checker::Http < Eye::Checker
+class Eye::Checker::Http < Eye::Checker::Defer
 
   # checks :http, :every => 5.seconds, :times => 1,
   #  :url => "http://127.0.0.1:3000/", :kind => :success, :pattern => /OK/, :timeout => 3.seconds
@@ -14,10 +14,6 @@ class Eye::Checker::Http < Eye::Checker
 
   attr_reader :uri
 
-  def check_name
-    'http'
-  end
-
   def initialize(*args)
     super
 
@@ -33,11 +29,7 @@ class Eye::Checker::Http < Eye::Checker
     @read_timeout = (read_timeout || timeout || 15).to_f
   end
   
-  def get_value
-    Celluloid::Future.new{ get_value_sync }.value
-  end
-
-  def get_value_sync
+  def get_value_deferred
     res = session.start{ |http| http.get(@uri.request_uri) }
     {:result => res}
 

data/lib/eye/checker/memory.rb

@@ -5,7 +5,7 @@ class Eye::Checker::Memory < Eye::Checker
   param :below, [Fixnum, Float], true
   
   def check_name
-    "memory(#{human_value(below)})"
+    @check_name ||= "memory(#{human_value(below)})"
   end
 
   def get_value

data/lib/eye/checker/socket.rb

@@ -1,4 +1,4 @@
-class Eye::Checker::Socket < Eye::Checker
+class Eye::Checker::Socket < Eye::Checker::Defer
 
   # checks :socket, :every => 5.seconds, :times => 1,
   #  :addr => "unix:/var/run/daemon.sock", :timeout => 3.seconds,
@@ -20,10 +20,6 @@ class Eye::Checker::Socket < Eye::Checker
   param :expect_data,   [String, Regexp, Proc]
   param :protocol,      [Symbol], nil, nil, [:default, :em_object]
 
-  def check_name
-    'socket'
-  end
-
   def initialize(*args)
     super
     @open_timeout = (open_timeout || 1).to_f
@@ -39,11 +35,7 @@ class Eye::Checker::Socket < Eye::Checker
     end
   end
 
-  def get_value
-    Celluloid::Future.new{ get_value_sync }.value
-  end
-
-  def get_value_sync
+  def get_value_deferred
     sock = begin
       Timeout::timeout(@open_timeout){ open_socket }
     rescue Timeout::Error

data/lib/eye/controller.rb

@@ -19,6 +19,7 @@ class Eye::Controller
   autoload :Commands,       'eye/controller/commands'
   autoload :Status,         'eye/controller/status'
   autoload :SendCommand,    'eye/controller/send_command'
+  autoload :ShowHistory,    'eye/controller/show_history'
 
   include Eye::Logger::Helpers
   include Eye::Controller::Load
@@ -26,6 +27,7 @@ class Eye::Controller
   include Eye::Controller::Commands
   include Eye::Controller::Status
   include Eye::Controller::SendCommand
+  include Eye::Controller::ShowHistory
 
   attr_reader :applications, :current_config
 

data/lib/eye/controller/commands.rb

@@ -20,12 +20,12 @@ module Eye::Controller::Commands
         exclusive{ load(*args) }
       when :info
         info_string(*args)
-      when :object_info
-        info_data(*args)
       when :xinfo
         info_string_debug(*args)
       when :oinfo
         info_string_short
+      when :history
+        history_string(*args)
       when :quit
         quit
       when :check
@@ -38,6 +38,13 @@ module Eye::Controller::Commands
         :pong
       when :logger_dev
         Eye::Logger.dev
+
+      # object commands, for api
+      when :raw_info
+        info_data(*args)
+      when :raw_history
+        history_data(*args)
+
       else
         :unknown_command
     end   

data/lib/eye/controller/load.rb

@@ -27,9 +27,8 @@ private
   BT_REGX = %r[/lib/eye/|lib/celluloid|internal:prelude|logger.rb:|active_support/core_ext|shellwords.rb].freeze
 
   def catch_load_error(filename, &block)
-    res = block.call
+    {:error => false, :config => yield }
 
-    {:error => false, :config => res}
   rescue Eye::Dsl::Error, Exception, NoMethodError => ex
     error "load: config error <#{filename}>: #{ex.message}"
 
@@ -81,12 +80,11 @@ private
   end
 
   def _load(filename)
+    info "load: #{filename} in #{Eye::VERSION}"
     new_cfg = parse_set_of_configs(filename)
     
     load_config(new_cfg, @loaded_config[:applications].keys)
     @loaded_config = nil
-
-    GC.start
   end
 
   def load_config(new_config, changed_apps = [])

data/lib/eye/controller/show_history.rb

@@ -0,0 +1,62 @@
+module Eye::Controller::ShowHistory
+
+  def history_string(*obj_strs)
+    data = history_data(*obj_strs)
+
+    res = []
+    data.each do |name, data|
+      res << detail_process_info(name, data)
+    end
+
+    res * "\n"
+  end
+
+  def history_data(*obj_strs)
+    res = {}
+    get_processes_for_history(*obj_strs).each do |process|
+      res[process.full_name] = process.schedule_history.reject{|c| c[:state] == :check_crash }
+    end
+    res
+  end
+
+private
+
+  def get_processes_for_history(*obj_strs)
+    res = []
+    matched_objects(*obj_strs) do |obj| 
+      if (obj.is_a?(Eye::Process) || obj.is_a?(Eye::ChildProcess))
+        res << obj 
+      else
+        res += obj.processes.to_a
+      end
+    end
+    Eye::Utils::AliveArray.new(res)
+  end
+
+  def detail_process_info(name, history)
+    return if history.empty?
+
+    res = "\033[1m#{name}\033[0m:\n"
+    history = history.reverse
+
+    history.chunk{|h| [h[:state], h[:reason]] }.each do |_, hist|
+      if hist.size >= 3
+        res << detail_process_info_string(hist[0])
+        res << detail_process_info_string(:state => "... #{hist.size - 2} times", :reason => '...', :at => hist[-1][:at])
+        res << detail_process_info_string(hist[-1])
+      else
+        hist.each do |h|
+          res << detail_process_info_string(h)
+        end
+      end
+    end
+
+    res
+  end
+
+  def detail_process_info_string(h)
+    state = h[:state].to_s.ljust(14)
+    "#{Time.at(h[:at]).to_s(:db)} - #{state} (#{h[:reason]})\n"
+  end
+
+end

data/lib/eye/controller/status.rb

@@ -97,8 +97,6 @@ private
     end
   end
 
-  REV_REGX = /r:([a-z0-9]{5,})/i
-
   def resources_str(r, mb = true)
     return '' if r.blank?
     
@@ -109,11 +107,6 @@ private
       res += ", #{mem}"
     end
 
-    # show process revision, as parse from procline part: 'r:12345678'
-    if r[:cmd] && r[:cmd].to_s =~ REV_REGX
-      res += ", #{$1.to_s[0..5]}"
-    end
-
     res += ", <#{r[:pid]}>"
     
     res

data/lib/eye/dsl/child_process_opts.rb

@@ -1,7 +1,8 @@
 class Eye::Dsl::ChildProcessOpts < Eye::Dsl::Opts
 
   def allow_options
-    [:stop_command, :restart_command, :childs_update_period]
+    [:stop_command, :restart_command, :childs_update_period,
+      :stop_signals, :stop_grace, :stop_timeout, :restart_timeout]
   end
 
 end

data/lib/eye/process/controller.rb

@@ -28,6 +28,10 @@ module Eye::Process::Controller
   end
 
   def restart
+    unless pid # unmonitored case
+      try_update_pid_from_file
+    end
+
     restart_process
   end
 

data/lib/eye/process/data.rb

@@ -24,8 +24,8 @@ module Eye::Process::Data
           resources: Eye::SystemResources.resources(pid) }
 
     if @states_history
-      h.merge!( state_changed_at: @states_history.last[:at],
-                state_reason: @states_history.last[:reason] )
+      h.merge!( state_changed_at: @states_history.last_state_changed_at,
+                state_reason: @states_history.last_reason )
     end
 
     h.merge!(debug: debug_data) if debug

data/lib/eye/process/monitor.rb

@@ -40,7 +40,7 @@ private
       unless process_realy_running?
         warn "check_alive: process(#{self.pid}) not found!"
         notify :warn, 'crashed!'
-        switch :crashed
+        switch :crashed, 'crashed'
       else
         # check that pid_file still here
         ppid = failsafe_load_pid

data/lib/eye/process/scheduler.rb

@@ -37,6 +37,8 @@ module Eye::Process::Scheduler
     send(command, *h[:args], &block)
     @current_scheduled_command = nil
     info "<= #{command}"
+
+    schedule_history.push(command, reason, @last_scheduled_at.to_i)
   end
 
   def scheduler_actions_list
@@ -50,6 +52,10 @@ module Eye::Process::Scheduler
   attr_accessor :current_scheduled_command
   attr_accessor :last_scheduled_command, :last_scheduled_reason, :last_scheduled_at
 
+  def schedule_history
+    @schedule_history ||= Eye::Process::StatesHistory.new(50)
+  end
+
 private
 
   def remove_scheduler

data/lib/eye/process/states_history.rb

@@ -1,7 +1,7 @@
 class Eye::Process::StatesHistory < Eye::Utils::Tail
 
   def push(state, reason = nil, tm = Time.now)
-    super(state: state, at: tm, reason: reason)
+    super(state: state, at: tm.to_i, reason: reason)
   end
 
   def states
@@ -11,7 +11,7 @@ class Eye::Process::StatesHistory < Eye::Utils::Tail
   def states_for_period(period, from_time = nil)
     tm = Time.now - period
     tm = [tm, from_time].max if from_time
-
+    tm = tm.to_f
     self.select{|s| s[:at] >= tm }.map{|c| c[:state] }
   end
 
@@ -19,8 +19,12 @@ class Eye::Process::StatesHistory < Eye::Utils::Tail
     last[:state]
   end
 
+  def last_reason
+    last[:reason]
+  end
+
   def last_state_changed_at
-    last[:at]
+    Time.at(last[:at])
   end
 
   def seq?(*seq)

data/lib/eye/system.rb

@@ -95,29 +95,17 @@ module Eye::System
     end
 
     # get table
-    # {pid => {:rss =>, :cpu =>, :ppid => , :cmd => , :start_time}}
+    # {pid => {:rss =>, :cpu =>, :ppid => , :start_time => }}
     # slow
     def ps_aux
-      cmd = if RUBY_PLATFORM.include?('darwin')
-        'ps axo pid,ppid,pcpu,rss,start,command'
-      else
-        'ps axo pid,ppid,pcpu,rss,start_time,command'
-      end
-
-      str = Process.send('`', cmd).force_encoding('binary')
-      lines = str.split("\n")
-      lines.shift # remove first line
-      lines.inject(Hash.new) do |mem, line|
-        chunk = line.strip.split(/\s+/).map(&:strip)
-        mem[chunk[0].to_i] = {
-          :rss => chunk[3].to_i, 
-          :cpu => chunk[2].to_i, 
-          :ppid => chunk[1].to_i, 
-          :start_time => chunk[4],
-          :cmd => chunk[5..-1].join(' ')
-        }
-        mem
+      str = Process.send('`', PS_AUX_CMD).force_encoding('binary')
+      h = {}
+      str.each_line do |line|
+        chunk = line.strip.split(/\s+/)
+        h[chunk[0].to_i] = { :ppid => chunk[1].to_i, :cpu => chunk[2].to_i, 
+          :rss => chunk[3].to_i, :start_time => chunk[4] }
       end
+      h
     end
 
     # normalize file
@@ -136,6 +124,12 @@ module Eye::System
 
   private
 
+    PS_AUX_CMD = if RUBY_PLATFORM.include?('darwin')
+      'ps axo pid,ppid,pcpu,rss,start'
+    else
+      'ps axo pid,ppid,pcpu,rss,start_time'
+    end
+
     def spawn_options(config = {})
       o = {}
       o = {chdir: config[:working_dir]} if config[:working_dir]

data/lib/eye/system_resources.rb

@@ -24,10 +24,6 @@ class Eye::SystemResources
       childs
     end
 
-    def cmd(pid)
-      ps_aux[pid].try :[], :cmd
-    end
-
     def start_time(pid)
       ps_aux[pid].try :[], :start_time
     end
@@ -38,7 +34,6 @@ class Eye::SystemResources
       { :memory => memory(pid), 
         :cpu => cpu(pid), 
         :start_time => start_time(pid),
-        :cmd => cmd(pid),
         :pid => pid
       }
     end
@@ -49,6 +44,11 @@ class Eye::SystemResources
     end
     
   private
+
+    def reset!
+      setup.terminate
+      @actor = nil
+    end
   
     def ps_aux
       setup
@@ -67,7 +67,10 @@ class Eye::SystemResources
     end
 
     def get
-      set! if @at + UPDATE_INTERVAL < Time.now
+      if @at + UPDATE_INTERVAL < Time.now
+        @at = Time.now # for minimize races
+        set!
+      end
       @ps_aux
     end
 

data/lib/eye/utils/alive_array.rb

@@ -2,7 +2,7 @@ class Eye::Utils::AliveArray
   extend Forwardable
   include Enumerable
 
-  def_delegators :@arr, :[], :<<, :clear, :delete, :size, :empty?
+  def_delegators :@arr, :[], :<<, :clear, :delete, :size, :empty?, :push, :flatten
 
   def initialize(arr = [])
     @arr = arr

data/spec/controller/controller_spec.rb

@@ -38,6 +38,8 @@ describe "Eye::Controller" do
 
     app1 = apps.first
     app_check(app1, 'app1', 3)
+    app1.processes.map(&:name).sort.should == ["g4", "g5", "p1", "p2", "q3"]
+
     app2 = apps.last
     app_check(app2, 'app2', 1)
 
@@ -104,6 +106,20 @@ S
     subject.info_string_short.split("\n").size.should == 2
   end
 
+  it "history_string" do
+    subject.load(fixture("dsl/load.eye"))
+    str = subject.history_string('*')
+    str.should be_a(String)
+    str.size.should > 100
+  end
+
+  it "history_data" do
+    subject.load(fixture("dsl/load.eye"))
+    h = subject.history_data('app1')
+    h.size.should == 5
+    h.keys.sort.should == ["app1:g4", "app1:g5", "app1:gr1:p1", "app1:gr1:p2", "app1:gr2:q3"]
+  end
+
   it "should delete all apps" do
     subject.load(fixture("dsl/load.eye")).should include(error: false)
     subject.send_command(:delete, 'all')

data/spec/controller/intergration_spec.rb

@@ -124,7 +124,7 @@ describe "Intergration" do
       r2 = @p2.states_history.detect{|c| c[:state] == :restarting}[:at]
 
       # >8 because, grace start, and grace stop added
-      (r2 - r1).should > 8
+      (r2 - r1).should >= 8
     end
 
     it "restart group with chain async" do

data/spec/process/restart_spec.rb

@@ -127,6 +127,19 @@ describe "Process Restart" do
     end
   end
 
+  it "restart eye-daemonized lock-process from unmonitored status, and process realy running (WAS a problem)" do
+    start_ok_process(C.p4)
+    @pid = @process.pid
+    @process.unmonitor
+    Eye::System.pid_alive?(@pid).should == true
+
+    @process.restart
+    @process.state_name.should == :up
+
+    Eye::System.pid_alive?(@pid).should == false
+    @process.load_pid_from_file.should_not == @pid
+  end
+
   [:down, :unmonitored, :up].each do |st|
     it "ok restart from #{st}" do
       start_ok_process(C.p1)
@@ -170,5 +183,4 @@ describe "Process Restart" do
     @process.unmonitored?.should == true
   end
 
-
 end

data/spec/process/scheduler_spec.rb

@@ -154,6 +154,16 @@ describe "Scheduler" do
       @process.last_scheduled_reason.should == 'reason'
       @process.test3.should == [1, :bla, 3]
     end
+
+    it "save history" do
+      @process.schedule :scheduler_test3, 1, :bla, 3, "reason"
+      sleep 0.1
+      h = @process.schedule_history
+      h.size.should == 1
+      h = h[0]
+      h[:state].should == :scheduler_test3
+      h[:reason].should == "reason"
+    end
   end
 
   describe "schedule_in" do
@@ -161,7 +171,7 @@ describe "Scheduler" do
       @process.schedule_in(1.second, :scheduler_test3, 1, 2, 3)
       sleep 0.5
       @process.test3.should == nil
-      sleep 0.6
+      sleep 0.7
       @process.test3.should == [1,2,3]
     end
   end

data/spec/spec_helper.rb

@@ -24,7 +24,6 @@ require 'rspec/mocks'
 require 'fakeweb'
 
 require File.join(File.dirname(__FILE__), %w{support spec_support})
-require File.join(File.dirname(__FILE__), %w{support scheduler_hack})
 
 $logger_path = File.join(File.dirname(__FILE__), %w{spec.log})
 

data/spec/support/rr_celluloid.rb

@@ -1,36 +1,15 @@
 require 'rr'
 require 'rspec/core/mocking/with_rr'
 
-module RR
-
-  module Celluloid
-    def mock(subject=DoubleDefinitions::DoubleDefinitionCreate::NO_SUBJECT, method_name=nil, &definition_eval_block)
-      s = subject.respond_to?(:wrapped_object) ? subject.wrapped_object : subject
-      super(s, method_name, &definition_eval_block)
-    end
-
-    def stub(subject=DoubleDefinitions::DoubleDefinitionCreate::NO_SUBJECT, method_name=nil, &definition_eval_block)
-      s = subject.respond_to?(:wrapped_object) ? subject.wrapped_object : subject
-      super(s, method_name, &definition_eval_block)
-    end
-    
-    def dont_allow(subject=DoubleDefinitions::DoubleDefinitionCreate::NO_SUBJECT, method_name=nil, &definition_eval_block)
-      s = subject.respond_to?(:wrapped_object) ? subject.wrapped_object : subject
-      super(s, method_name, &definition_eval_block)
-    end
-    
-    def proxy(subject=DoubleDefinitions::DoubleDefinitionCreate::NO_SUBJECT, method_name=nil, &definition_eval_block)
-      s = subject.respond_to?(:wrapped_object) ? subject.wrapped_object : subject
-      super(s, method_name, &definition_eval_block)
-    end
-    
-    def strong(subject=DoubleDefinitions::DoubleDefinitionCreate::NO_SUBJECT, method_name=nil, &definition_eval_block)
-      s = subject.respond_to?(:wrapped_object) ? subject.wrapped_object : subject
-      super(s, method_name, &definition_eval_block)
-    end
-
+module RR::CelluloidExt
+  %w{mock stub dont_allow proxy strong}.each do |_method|
+    module_eval <<-Q
+      def #{_method}(*args)
+        args[0] = args[0].wrapped_object if args[0].respond_to?(:wrapped_object)
+        super
+      end
+    Q
   end
-  
 end
 
-RSpec::Core::MockFrameworkAdapter.send(:include, RR::Celluloid)
+RSpec::Core::MockFrameworkAdapter.send(:include, RR::CelluloidExt)

data/spec/system_resources_spec.rb

@@ -11,12 +11,12 @@ describe "Eye::SystemResources" do
   it "should get cpu" do
     x = Eye::SystemResources.cpu($$)
     x.should >= 0
-    x.should < 100
+    x.should <= 150
   end
 
   it "should get start time" do
     x = Eye::SystemResources.start_time($$)
-    x.length.should >= 5
+    x.length.should >= 4
   end
 
   it "should get childs" do
@@ -27,31 +27,29 @@ describe "Eye::SystemResources" do
     x.all?{|c| c > 0 }.should == true
   end
 
-  it "should get cmd" do
-    Eye::Control.set_proc_line
-    x = Eye::SystemResources.cmd($$)
-    x.should match(/eye/)    
-  end
-
   it "should cache and update when interval" do
-    silence_warnings{ Eye::SystemResources::PsAxActor::UPDATE_INTERVAL = 2 }
+    Eye::SystemResources.send :reset!
+    stub(Eye::System).ps_aux{ {$$ => {:rss => 123}} }
 
-    x1 = Eye::SystemResources.cmd($$)
-    x2 = Eye::SystemResources.cmd($$)
+    silence_warnings{ Eye::SystemResources::PsAxActor::UPDATE_INTERVAL = 1 }
+
+    x1 = Eye::SystemResources.memory($$)
+    x2 = Eye::SystemResources.memory($$)
     x1.should == x2
 
-    sleep 1
-    x3 = Eye::SystemResources.cmd($$)
+    sleep 0.5
+    x3 = Eye::SystemResources.memory($$)
     x1.should == x3
 
-    # change the cmd
-    $0 = "ruby rspec ..."
+    stub(Eye::System).ps_aux{ {$$ => {:rss => 124}} }
 
-    sleep 1.5
-    x4 = Eye::SystemResources.cmd($$)
+    sleep 0.7
+    x4 = Eye::SystemResources.memory($$)
     x1.should == x4 # first value is old
 
-    x5 = Eye::SystemResources.cmd($$)
+    sleep 0.1
+
+    x5 = Eye::SystemResources.memory($$)
     x1.should_not == x5 # seconds is new
   end
 

data/spec/system_spec.rb

@@ -12,7 +12,7 @@ describe "Eye::System" do
   it "check_pid_alive" do
     Eye::System.check_pid_alive($$).should == {:result => true}
     Eye::System.check_pid_alive(123456)[:error].class.should == Errno::ESRCH
-    Eye::System.check_pid_alive(-122)[:error].class.should == Errno::ESRCH
+    Eye::System.check_pid_alive(-122)[:error].should be
     Eye::System.check_pid_alive(nil).should == {:result => false}
   end
 
@@ -25,7 +25,7 @@ describe "Eye::System" do
     x[:ppid].should > 1 # parent pid
     x[:cpu].should >= 0 # proc
     x[:rss].should > 1000 # memory
-    x[:start_time].length.should >= 5
+    x[:start_time].length.should >= 4
   end
 
   it "prepare env" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eye
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Konstantin Makarchev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-14 00:00:00.000000000 Z
+date: 2013-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
@@ -245,6 +245,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.md
@@ -281,6 +282,7 @@ files:
 - lib/eye/controller/helpers.rb
 - lib/eye/controller/load.rb
 - lib/eye/controller/send_command.rb
+- lib/eye/controller/show_history.rb
 - lib/eye/controller/status.rb
 - lib/eye/dsl.rb
 - lib/eye/dsl/application_opts.rb
@@ -440,7 +442,6 @@ files:
 - spec/process/update_config_spec.rb
 - spec/spec_helper.rb
 - spec/support/rr_celluloid.rb
-- spec/support/scheduler_hack.rb
 - spec/support/spec_support.rb
 - spec/system_resources_spec.rb
 - spec/system_spec.rb
@@ -583,7 +584,6 @@ test_files:
 - spec/process/update_config_spec.rb
 - spec/spec_helper.rb
 - spec/support/rr_celluloid.rb
-- spec/support/scheduler_hack.rb
 - spec/support/spec_support.rb
 - spec/system_resources_spec.rb
 - spec/system_spec.rb

data/spec/support/scheduler_hack.rb

@@ -1,16 +0,0 @@
-module Eye::Process::SchedulerHack
-
-  def scheduled_action(command, *args, &block)
-    super
-
-    schedule_history << command
-  end
-
-  def schedule_history
-    @schedule_history ||= Eye::Process::StatesHistory.new(100)
-  end
-
-end
-
-Eye::Process.send :include, Eye::Process::SchedulerHack
-Eye::Group.send :include, Eye::Process::SchedulerHack