eye 0.1.11 → 0.2

data/spec/dsl/process_spec.rb

@@ -327,4 +327,54 @@ describe "Eye::Dsl" do
 
   end
 
+  describe "process validations" do
+    it "validate daemonize command" do
+      conf = <<-E
+        Eye.application("bla") do
+          process("1") do
+            pid_file "1.pid"
+            daemonize true
+            start_command "sh -c 'echo some; ruby 1.rb'"
+          end        
+        end
+      E
+      expect{Eye::Dsl.parse_apps(conf)}.to raise_error(Eye::Process::Validate::Error)
+
+      conf = <<-E
+        Eye.application("bla") do
+          process("1") do
+            pid_file "1.pid"
+            daemonize true
+            start_command "echo some && ruby 1.rb"
+          end        
+        end
+      E
+      expect{Eye::Dsl.parse_apps(conf)}.to raise_error(Eye::Process::Validate::Error)
+
+      conf = <<-E
+        Eye.application("bla") do
+          process("1") do
+            pid_file "1.pid"
+            daemonize true
+            start_command "ruby 1.rb"
+          end        
+        end
+      E
+      expect{Eye::Dsl.parse_apps(conf)}.not_to raise_error(Eye::Process::Validate::Error)
+    end
+
+    it "not validate non-daemonize command" do
+      conf = <<-E
+        Eye.application("bla") do
+          process("1") do
+            pid_file "1.pid"
+            start_command "sh -c 'echo some && ruby 1.rb'"
+          end        
+        end
+      E
+      expect{Eye::Dsl.parse_apps(conf)}.not_to raise_error(Eye::Process::Validate::Error)
+    end
+
+  end
+
 end

data/spec/mock_spec.rb

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 require File.dirname(__FILE__) + '/spec_helper'
 
 class Aaa

data/spec/notify/jabber_spec.rb

@@ -0,0 +1,25 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe "Eye::Notify::Jabber" do
+  before :each do
+    @message = {:message=>"something", :name=>"blocking process", 
+        :full_name=>"main:default:blocking process", :pid=>123, 
+        :host=>'host1', :level=>:crit, :at => Time.now}
+    @h = {:host=>"mx.some.host.ru", :type=>:mail, :port=>25, :contact=>"vasya@mail.ru", :password => "123"}
+  end
+
+  it "should send jabber" do
+    require 'xmpp4r'
+    
+    @m = Eye::Notify::Jabber.new(@h, @message)
+
+    ob = ""
+    mock(Jabber::Client).new(anything){ ob }
+    mock(ob).connect('mx.some.host.ru', 25)
+    mock(ob).auth('123')
+    mock(ob).send(is_a(Jabber::Message))
+    mock(ob).close
+
+    @m.execute
+  end
+end

data/spec/notify/mail_spec.rb

@@ -0,0 +1,26 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe "Eye::Notify::Mail" do
+  before :each do
+    @message = {:message=>"something", :name=>"blocking process", 
+        :full_name=>"main:default:blocking process", :pid=>123, 
+        :host=>'host1', :level=>:crit, :at => Time.now}
+    @h = {:host=>"mx.some.host.ru", :type=>:mail, :port=>25, :domain=>"some.host", :contact=>"vasya@mail.ru"}
+  end
+
+  it "should send mail" do
+    @m = Eye::Notify::Mail.new(@h, @message)
+
+    ob = ""
+    mock(Net::SMTP).start('mx.some.host.ru', 25, 'some.host', nil, nil, nil){ ob }
+
+    @m.execute
+
+    @m.message_subject.should == "[host1] [main:default:blocking process] something"
+    @m.contact.should == "vasya@mail.ru"
+
+    m = @m.message.split("\n")
+    m.should include("To: <vasya@mail.ru>")
+    m.should include("Subject: [host1] [main:default:blocking process] something")
+  end
+end

data/spec/notify_spec.rb

@@ -0,0 +1,90 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+class Not1 < Eye::Notify
+  param :port, Fixnum
+
+  def execute
+  end
+end
+
+describe "Eye::Notify" do
+  before :each do
+    @message = {:message=>"something", :name=>"blocking process", 
+        :full_name=>"main:default:blocking process", :pid=>123, 
+        :host=>'host1', :level=>:crit, :at => Time.now}
+
+  end
+
+  context "create notify class" do
+    before :each do
+      @config = {
+        :mail=>{:host=>"mx.some.host.ru", :type => :mail, :port => 25, :domain => "some.host"}, 
+        :contacts=>{
+          "vasya"=>{:name=>"vasya", :type=>:mail, :contact=>"vasya@mail.ru", :opts=>{}}, 
+          "petya"=>{:name=>"petya", :type=>:mail, :contact=>"petya@mail.ru", :opts=>{:port=>1111}}, 
+          'idiots'=>[{:name=>"idiot1", :type=>:mail, :contact=>"idiot1@mail.ru", :opts=>{}}, {:name=>"idiot2", :type=>:mail, :contact=>"idiot2@mail.ru", :opts=>{:port=>1111}}], 
+          "idiot1"=>{:name=>"idiot1", :type=>:mail, :contact=>"idiot1@mail.ru", :opts=>{}}, 
+          "idiot2"=>{:name=>"idiot2", :type=>:mail, :contact=>"idiot2@mail.ru", :opts=>{:port=>1111}},
+          "idiot3"=>{:name=>"idiot3", :type=>:jabber, :contact=>"idiot3@mail.ru", :opts=>{:host => "jabber.some.host", :port=>1111, :user => "some_user"}}}}
+
+      stub(Eye::Control).current_config{ {:config => @config} }
+    end
+
+    it "should create right class" do
+      h = {:host=>"mx.some.host.ru", :type=>:mail, :port=>25, :domain=>"some.host", :contact=>"vasya@mail.ru"}
+      mock(Eye::Notify::Mail).new(h, @message)
+      Eye::Notify.notify('vasya', @message)
+    end
+
+    it "should create right class with additional options" do
+      h = {:host=>"mx.some.host.ru", :type=>:mail, :port=>1111, :domain=>"some.host", :contact=>"petya@mail.ru"}
+      mock(Eye::Notify::Mail).new(h, @message)
+      Eye::Notify.notify('petya', @message)
+    end
+
+    it "should create right class with group of contacts" do
+      h1 = {:host=>"mx.some.host.ru", :type=>:mail, :port=>25, :domain=>"some.host", :contact=>"idiot1@mail.ru"}
+      h2 = {:host=>"mx.some.host.ru", :type=>:mail, :port=>1111, :domain=>"some.host", :contact=>"idiot2@mail.ru"}
+      mock(Eye::Notify::Mail).new(h1, @message)
+      mock(Eye::Notify::Mail).new(h2, @message)
+      Eye::Notify.notify('idiots', @message)
+    end
+
+    it "without contact should do nothing" do
+      dont_allow(Eye::Notify::Mail).new
+      Eye::Notify.notify('noperson', @message)
+    end
+
+    it "should also notify to jabber" do
+      h = {:host=>"jabber.some.host", :port=>1111, :user=>"some_user", :contact=>"idiot3@mail.ru"}
+      mock(Eye::Notify::Jabber).new(h, @message)
+      Eye::Notify.notify('idiot3', @message)
+    end
+  end
+
+  context "initialize" do
+    before :each do
+      @h = {:host=>"mx.some.host.ru", :type=>:mail, :port=>25, :domain=>"some.host", :contact=>"vasya@mail.ru"}
+    end
+
+    it "create and intall async task" do
+      n = Eye::Notify::Not1.new(@h, @message)
+
+      $wo = nil
+      mock(n).execute do
+        $wo = n.wrapped_object
+      end
+
+      n.async_notify
+      sleep 0.5
+      n.alive?.should == false
+
+      $wo.contact.should == 'vasya@mail.ru'
+      $wo.port.should == 25
+
+      $wo.message_subject.should == '[host1] [main:default:blocking process] something'
+      $wo.message_body.should start_with('[host1] [main:default:blocking process] something at')
+    end
+  end
+
+end

data/spec/process/config_spec.rb

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 require File.dirname(__FILE__) + '/../spec_helper'
 
 describe "Eye::Process::Config" do

data/spec/process/notify_spec.rb

@@ -0,0 +1,27 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe "Eye::Process::Notify" do
+  before :each do
+    stub(Eye::System).host{ 'host1' }
+    @process = process(C.p1.merge(:notify => {'vasya' => :warn, 
+      'petya' => :crit, 'somebody' => :crit}))
+  end
+
+  it "should send to notifies warn message" do
+    m = {:message=>"something", :name=>"blocking process", :full_name=>"main:default:blocking process", :pid=>nil, :host=>"host1", :level=>:warn}
+    mock(Eye::Notify).notify('vasya', hash_including(m))
+    @process.notify(:warn, 'something')
+  end
+
+  it "should send to notifies crit message" do
+    m = {:message=>"something", :name=>"blocking process", 
+      :full_name=>"main:default:blocking process", :pid=>nil, 
+      :host=>'host1', :level=>:crit}
+
+    mock(Eye::Notify).notify('vasya', hash_including(m))
+    mock(Eye::Notify).notify('petya', hash_including(m))
+    mock(Eye::Notify).notify('somebody', hash_including(m))
+    @process.notify(:crit, 'something')
+  end
+
+end

data/spec/process/states_history_spec.rb

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 require File.dirname(__FILE__) + '/../spec_helper'
 
 describe "Eye::Process::StatesHistory" do

data/spec/process/stop_spec.rb

@@ -112,6 +112,12 @@ describe "Process Stop" do
 
     @process.stop_process!
     sleep 1.5
+
+    # not blocking actor
+    should_spend(0) do
+      @process.name.should == 'blocking process'
+    end
+
     Eye::System.pid_alive?(@pid).should == true
     sleep 1.5
     Eye::System.pid_alive?(@pid).should == true

data/spec/process/system_spec.rb

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 require File.dirname(__FILE__) + '/../spec_helper'
 
 describe "Eye::Process::System" do
@@ -69,32 +68,46 @@ describe "Eye::Process::System" do
     (Time.now - @process.pid_file_ctime).should < 0.1.second
   end
 
-  it "with_timeout" do
-    res = @process.with_timeout(0.5) do
-      sleep 0.3
-      11
+  [C.p1, C.p2].each do |cfg|
+    it "blocking execute should not block process actor mailbox #{cfg[:name]}" do
+      @process = Eye::Process.new(cfg.merge(:start_command => "sleep 5", :start_timeout => 10.seconds))
+      should_spend(1) do
+        @process.start!    
+        sleep 1
+
+        # here mailbox should anwser without blocks
+        @process.name.should == cfg[:name]
+      end
     end
+  end
 
-    res.should == 11
+  context "#wait_for_condition" do
+    subject{ Eye::Process.new(C.p1) }
 
-    res = @process.with_timeout(0.5) do
-      sleep 0.7
-      11
+    it "success" do
+      should_spend(0) do
+        subject.wait_for_condition(1){ 15 }.should == 15
+      end      
+    end
+
+    it "success with sleep" do
+      should_spend(0.3) do
+        subject.wait_for_condition(1){ sleep 0.3; :a }.should == :a
+      end      
     end
-    res.should == :timeout
-  end
-  
-  [C.p1, C.p2].each do |cfg|
-    it "blocking execute should not block process actor mailbox #{cfg[:name]}" do
-      @process = Eye::Process.new(cfg.merge(:start_command => "sleep 5", :start_timeout => 10.seconds))
-      tm1 = Time.now
-      @process.start!    
-      sleep 1
 
-      # here mailbox should anwser without blocks
-      @process.name.should == cfg[:name]
-      (Time.now - tm1).should < 2 # seconds
+    it "fail by timeout" do
+      should_spend(1) do
+        subject.wait_for_condition(1){ sleep 4; true }.should == false
+      end      
+    end
+
+    it "fail with bad result" do
+      should_spend(1) do
+        subject.wait_for_condition(1){ nil }.should == false
+      end      
     end
   end
 
+
 end

data/spec/process/update_config_spec.rb

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 require File.dirname(__FILE__) + '/../spec_helper'
 
 describe "#update_config" do

data/spec/spec_helper.rb

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 require 'rubygems'
 require "bundler/setup"
 require 'celluloid'
@@ -38,6 +37,8 @@ $logger = Eye::Logger.new("spec")
 Celluloid.logger = $logger
 STDERR.reopen($logger_path)
 
+$logger.info "specs started in process #{$$}"
+
 RSpec.configure do |config|
   config.mock_with :rr
 
@@ -117,4 +118,10 @@ def join(*args)
   end
 
   result
-end
+end
+
+def should_spend(timeout = 0, delta = 0.05, &block)
+  tm1 = Time.now
+  yield
+  (Time.now - tm1).should be_within(delta).of(timeout)
+end

data/spec/support/spec_support.rb

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 module C
   extend self
 

data/spec/system_resources_spec.rb

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 require File.dirname(__FILE__) + '/spec_helper'
 
 describe "Eye::SystemResources" do

data/spec/system_spec.rb

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 require File.dirname(__FILE__) + '/spec_helper'
 
 describe "Eye::System" do
@@ -79,11 +78,9 @@ describe "Eye::System" do
 
   describe "execute" do
     it "sleep and exit" do
-      tm = Time.now
-      Eye::System.execute("sleep 1")
-      tm2 = Time.now
-
-      (tm2 - tm).should > 1.second
+      should_spend(1, 0.2) do
+        Eye::System.execute("sleep 1")
+      end
     end
   end
 

data/spec/utils/alive_array_spec.rb

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 require File.dirname(__FILE__) + '/../spec_helper'
 
 class AliveArrayActor

data/spec/utils/celluloid_chain_spec.rb

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 require File.dirname(__FILE__) + '/../spec_helper'
 
 class TestActor

data/spec/utils/tail_spec.rb

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 require File.dirname(__FILE__) + '/../spec_helper'
 
 describe "Eye::Utils::Tail" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eye
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: '0.2'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-22 00:00:00.000000000 Z
+date: 2013-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
@@ -219,8 +219,56 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Process monitoring tool. With Bluepill like config syntax. Requires MRI
-  Ruby >= 1.9.2. Uses Celluloid and Celluloid::IO.
+- !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
+  like config syntax. Requires MRI Ruby >= 1.9.2. Uses Celluloid and Celluloid::IO.
 email: kostya27@gmail.com
 executables:
 - eye
@@ -239,7 +287,9 @@ files:
 - examples/processes/em.rb
 - examples/processes/forking.rb
 - examples/processes/sample.rb
+- examples/processes/thin.ru
 - examples/rbenv.eye
+- examples/sidekiq.eye
 - examples/test.eye
 - examples/unicorn.eye
 - eye.gemspec
@@ -280,6 +330,9 @@ files:
 - lib/eye/io/unix_socket.rb
 - lib/eye/loader.rb
 - lib/eye/logger.rb
+- lib/eye/notify.rb
+- lib/eye/notify/jabber.rb
+- lib/eye/notify/mail.rb
 - lib/eye/process.rb
 - lib/eye/process/child.rb
 - lib/eye/process/commands.rb
@@ -293,6 +346,7 @@ files:
 - lib/eye/process/states_history.rb
 - lib/eye/process/system.rb
 - lib/eye/process/trigger.rb
+- lib/eye/process/validate.rb
 - lib/eye/process/watchers.rb
 - lib/eye/server.rb
 - lib/eye/settings.rb
@@ -329,6 +383,7 @@ files:
 - spec/dsl/getter_spec.rb
 - spec/dsl/integration_spec.rb
 - spec/dsl/load_spec.rb
+- spec/dsl/notify_spec.rb
 - spec/dsl/process_spec.rb
 - spec/dsl/sub_procs_spec.rb
 - spec/dsl/with_server_spec.rb
@@ -389,6 +444,9 @@ files:
 - spec/fixtures/dsl/subfolder4/b.rb
 - spec/fixtures/dsl/subfolder4/c.rb
 - spec/mock_spec.rb
+- spec/notify/jabber_spec.rb
+- spec/notify/mail_spec.rb
+- spec/notify_spec.rb
 - spec/process/checks/child_checks_spec.rb
 - spec/process/checks/cpu_spec.rb
 - spec/process/checks/ctime_spec.rb
@@ -400,6 +458,7 @@ files:
 - spec/process/config_spec.rb
 - spec/process/controller_spec.rb
 - spec/process/monitoring_spec.rb
+- spec/process/notify_spec.rb
 - spec/process/restart_spec.rb
 - spec/process/scheduler_spec.rb
 - spec/process/start_spec.rb
@@ -438,11 +497,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
-summary: Process monitoring tool. With Bluepill like config syntax. Requires MRI Ruby
-  >= 1.9.2. Uses Celluloid and Celluloid::IO.
+summary: Process monitoring tool. Alternative for 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
 - spec/checker/file_ctime_spec.rb
@@ -468,6 +527,7 @@ test_files:
 - spec/dsl/getter_spec.rb
 - spec/dsl/integration_spec.rb
 - spec/dsl/load_spec.rb
+- spec/dsl/notify_spec.rb
 - spec/dsl/process_spec.rb
 - spec/dsl/sub_procs_spec.rb
 - spec/dsl/with_server_spec.rb
@@ -528,6 +588,9 @@ test_files:
 - spec/fixtures/dsl/subfolder4/b.rb
 - spec/fixtures/dsl/subfolder4/c.rb
 - spec/mock_spec.rb
+- spec/notify/jabber_spec.rb
+- spec/notify/mail_spec.rb
+- spec/notify_spec.rb
 - spec/process/checks/child_checks_spec.rb
 - spec/process/checks/cpu_spec.rb
 - spec/process/checks/ctime_spec.rb
@@ -539,6 +602,7 @@ test_files:
 - spec/process/config_spec.rb
 - spec/process/controller_spec.rb
 - spec/process/monitoring_spec.rb
+- spec/process/notify_spec.rb
 - spec/process/restart_spec.rb
 - spec/process/scheduler_spec.rb
 - spec/process/start_spec.rb