eye 0.4.2 → 0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4cc2e7aadccf1d14e140a5973af361dbb08095e9
-  data.tar.gz: 2a893e150885625c221d598f9a0dcddf4040e076
+  metadata.gz: 52f2c58046c9d6301970df8a240c6c961ff0733a
+  data.tar.gz: 822332e4acc57056a53e81bb608eb77d02c12efd
 SHA512:
-  metadata.gz: 8e97e29338ad7de4c16f4c36b599f911625431b0680e96a523e04b8ba8046730270b80af718b55d323c2524952477a876f3e097be67ee3ecf3d1cf1ec4b3c18f
-  data.tar.gz: f284102b968e833691aab4cccac606f6bb2815dbcc9514203ac687f607c2603e8f12b0e18cb3daddbf09569e217d1e9c6ae4ad86232a63e5c32a10958eb5b1dc
+  metadata.gz: d65c899e338aeae72c9a7d637a60e6bd6e5dfc971c3ffaccb44d48fb8f362b41831a20ae16df93bdb9f0717c9499bad0a5a84829fcb24a46d97af81ddc89eb2d
+  data.tar.gz: f14fdcdb398ef75eb47f145ff231bd80f4f7f28597c89ffba4d5983c9dc6bf5ae2edbf8e0ffa90fb84c0a8949b7e158bdb961a166891f124bc2cb32bb9c6561a

data/.gitignore

@@ -32,3 +32,5 @@ script
 [0-9].rb
 *.cache
 *.tmp
+/vendor/
+

data/.travis.yml

@@ -4,3 +4,7 @@ rvm:
   - "1.9.3"
   - "2.0"
 script: bundle exec rake N=15
+#before_script:
+#  - bundle exec rake remove_coverage
+#after_script:
+#  - bundle exec rake coveralls:push

data/CHANGES.md

@@ -1,3 +1,14 @@
+0.5
+-------
+* little fixes in dsl
+* remove activesupport dependency
+* rename `state` trigger to `transition`
+* add runtime, cputime, file_touched checks
+* real cpu check
+* use sigar gem instead of `ps ax`
+* refactor cli (requires `eye q && eye l` after update gem from 0.4.x)
+* update celluloid to 0.15
+
 0.4.2
 -----
 * add checker options :initial_grace, :skip_initial_fails

data/README.md

@@ -100,8 +100,8 @@ Eye.application "test" do
     start_command "bundle exec thin start -R thin.ru -p 33233 -d -l thin.log -P thin.pid"
     stop_signals [:QUIT, 2.seconds, :TERM, 1.seconds, :KILL]
 
-    check :http, :url => "http://127.0.0.1:33233/hello", :pattern => /World/, :every => 5.seconds,
-                 :times => [2, 3], :timeout => 1.second
+    check :http, :url => "http://127.0.0.1:33233/hello", :pattern => /World/,
+                 :every => 5.seconds, :times => [2, 3], :timeout => 1.second
   end
 
 end
@@ -116,7 +116,7 @@ load folder with configs:
     $ eye l examples/
     $ eye l examples/*.rb
 
-foregraund load:
+foreground load:
 
     $ eye l CONF -f
 

data/Rakefile

@@ -3,6 +3,9 @@
 require "bundler/gem_tasks"
 require 'rspec/core/rake_task'
 require 'parallel_tests/tasks'
+require 'coveralls/rake/task'
+
+Coveralls::RakeTask.new
 
 task :default => :pspecs
 
@@ -14,6 +17,11 @@ RSpec::Core::RakeTask.new(:spec) do |t|
   t.verbose = false
 end
 
+task :remove_coverage do
+  require 'fileutils'
+  FileUtils.rm_rf(File.expand_path(File.join(File.dirname(__FILE__), %w{ coverage })))
+end
+
 task :env do
   require 'bundler/setup'
   require 'eye'

data/bin/eye

@@ -1,321 +1,5 @@
 #!/usr/bin/env ruby
 $:.unshift File.expand_path(File.join(File.dirname(__FILE__), %w[.. lib]))
-require 'rubygems' if RUBY_VERSION < '1.9'
 require 'eye'
 
-gem 'thor'
-require 'thor'
-
-class Eye::Cli < Thor
-
-  desc "info [MASK]", "show process statuses"
-  def info(mask = nil)
-    print cmd(:info, *Array(mask))
-  end
-
-  desc "status ", "show process statuses"
-  def status
-    say ":status is deprecated, use :info instead", :yellow
-    info
-  end
-
-  desc "xinfo", "extended eye info, debug data"
-  method_option :config, :type => :boolean, :aliases => "-c"
-  method_option :processes, :type => :boolean, :aliases => "-p"
-  def xinfo
-    print cmd(:xinfo, :config => options[:config], :processes => options[:processes])
-  end
-
-  desc "oinfo", "onelined info"
-  def oinfo
-    print cmd(:oinfo)
-  end
-
-  desc "load [CONF, ...]", "load config (and start server if needed) (-f for foregraund start)"
-  method_option :foregraund, :type => :boolean, :aliases => "-f"
-  def load(*configs)
-    configs.map!{ |c| File.expand_path(c) } if !configs.empty?
-
-    if options[:foregraund]
-      # in foregraund we stop another server, and run just 1 current config version
-      error!("foregraund expected only one config") if configs.size != 1
-      server_start_foregraund(configs.first)
-
-    elsif server_started?
-      say_load_result cmd(:load, *configs)
-
-    else
-      server_start(configs)
-
-    end
-  end
-
-  desc "quit", "stop eye monitoring"
-  def quit
-    res = _cmd(:quit)
-
-    # if eye server got crazy, stop by force
-    ensure_stop_previous_server if res != :corrupred_data
-
-    # remove pid_file
-    File.delete(Eye::Settings.pid_path) if File.exists?(Eye::Settings.pid_path)
-
-    say "quit...", :yellow
-  end
-
-  [:start, :stop, :restart, :unmonitor, :monitor, :delete, :match].each do |_cmd|
-    desc "#{_cmd} MASK[,...]", "#{_cmd} app,group or process"
-    define_method(_cmd) do |*targets|
-      send_command(_cmd, *targets)
-    end
-  end
-
-  desc "signal SIG, MASK[,...]", "send signal to matched app,group or process (ex: `eye sig USR2 some_app`)"
-  def signal(sig, *targets)
-    send_command(:signal, sig, *targets)
-  end
-
-  desc "break TARGET[,...]", "break group chain executing"
-  def break(*targets)
-    send_command(:break_chain, *targets)
-  end
-
-  desc "history TARGET[,...]", "show process states history"
-  def history(*targets)
-    print cmd(:history, *targets)
-  end
-
-  desc "trace [TARGET]", "tracing log for app,group or process"
-  def trace(target = "")
-    log_trace(target)
-  end
-
-  desc "version", "show current version"
-  def version
-    say Eye::ABOUT
-  end
-
-  desc "check CONF", "check syntax of the config file"
-  method_option :host, :type => :string, :aliases => "-h"
-  method_option :verbose, :type => :boolean, :aliases => "-v"
-  def check(conf)
-    conf = File.expand_path(conf) if conf && !conf.empty?
-
-    Eye::System.host = options[:host] if options[:host]
-    Eye::Dsl.verbose = options[:verbose]
-
-    if RUBY_VERSION < '1.9'
-      say_load_result cmd(:check, conf), :syntax => true
-    else
-      say_load_result Eye::Controller.new.check(conf), :syntax => true
-    end
-  end
-
-  desc "explain CONF", "explain config tree (for debug)"
-  method_option :host, :type => :string, :aliases => "-h"
-  method_option :verbose, :type => :boolean, :aliases => "-v"
-  def explain(conf)
-    conf = File.expand_path(conf) if conf && !conf.empty?
-
-    Eye::System.host = options[:host] if options[:host]
-    Eye::Dsl.verbose = options[:verbose]
-
-    if RUBY_VERSION < '1.9'
-      say_load_result cmd(:explain, conf), :print_config => true, :syntax => true
-    else
-      say_load_result Eye::Controller.new.explain(conf), :print_config => true, :syntax => true
-    end
-  end
-
-  desc "watch [MASK]", "interactive process info"
-  def watch(*args)
-    pid = Process.spawn("watch -n 1 --color #{$0} i #{args * ' '}")
-    Process.waitpid(pid)
-  rescue Interrupt
-  end
-
-private
-
-  def error!(msg)
-    say msg, :red
-    exit 1
-  end
-
-  def print(msg, new_line = true)
-    say msg if msg && !msg.empty?
-    say if new_line
-  end
-
-  def client
-    @client ||= Eye::Client.new(Eye::Settings.socket_path)
-  end
-
-  def _cmd(cmd, *args)
-    client.command(cmd, *args)
-  rescue Errno::ECONNREFUSED, Errno::ENOENT
-    :not_started
-  end
-
-  def cmd(cmd, *args)
-    res = _cmd(cmd, *args)
-
-    if res == :not_started
-      error! "socket(#{Eye::Settings.socket_path}) not found, did you `eye load`?"
-    elsif res == :timeouted
-      error! "eye does not answer, timeouted..."
-    end
-
-    res
-  end
-
-  def server_started?
-    _cmd(:ping) == :pong
-  end
-
-  def say_load_result(res = {}, opts = {})
-    error!(res) unless res.is_a?(Hash)
-    say_filename = (res.size > 1)
-    say "eye started!", :green if opts[:started]
-    error = false
-    res.each do |filename, _res|
-      say "#{filename}: ", nil, true if say_filename
-      show_load_message(_res, opts)
-      error = true if _res[:error]
-    end
-
-    exit(1) if error
-  end
-
-  def show_load_message(res, opts = {})
-    if res[:error]
-      say res[:message], :red
-      res[:backtrace].to_a.each{|line| say line, :red }
-    else
-      if opts[:syntax]
-        say "config ok!", :green if !res[:empty]
-      else
-        say "config loaded!", :green if !res[:empty]
-      end
-
-      if opts[:print_config]
-        require 'pp'
-        PP.pp res[:config], STDOUT, 150
-      end
-    end
-  end
-
-  def send_command(_cmd, *args)
-    res = cmd(_cmd, *args)
-    if res == :unknown_command
-      error! "unknown command :#{_cmd}"
-    elsif res == :corrupred_data
-      error! "something crazy wrong, check eye logs!"
-    elsif res.is_a?(Hash)
-      if res[:error]
-        error! "Error: #{res[:error]}"
-      elsif res = res[:result]
-        if res == []
-          error! "command :#{_cmd}, targets not found!"
-        else
-          say "command :#{_cmd} sended to [#{res * ", "}]"
-        end
-      end
-    else
-      error! "unknown result #{res.inspect}"
-    end
-  end
-
-  def log_trace(tag = '')
-    log_file = cmd(:logger_dev)
-    if log_file && File.exists?(log_file)
-      Process.exec "tail -n 100 -f #{log_file} | grep '#{tag}'"
-    else
-      error! "log file not found #{log_file.inspect}"
-    end
-  end
-
-  def loader_path
-    if RUBY_VERSION < '1.9'
-      begin
-        return Gem.bin_path('eye', 'loader_eye')
-      rescue Gem::GemNotFoundException, Gem::Exception
-      end
-    end
-
-    filename = File.expand_path(File.join(File.dirname(__FILE__), %w[loader_eye]))
-    File.exists?(filename) ? filename : nil
-  end
-
-  def ruby_path
-    require 'rbconfig'
-    RbConfig::CONFIG['bindir'] + "/ruby"
-  end
-
-  def ensure_loader_path
-    unless loader_path
-      error! "start monitoring needs to run under ruby with installed gem 'eye'"
-    end
-  end
-
-  def server_start_foregraund(conf = nil)
-    ensure_loader_path
-    Eye::Settings.ensure_eye_dir
-
-    if server_started?
-      _cmd(:quit) && sleep(1) # stop previous server
-    end
-
-    args = []
-    args += ['-c', conf] if conf
-    args += ['-l', 'stdout']
-
-    Process.exec(ruby_path, loader_path, *args)
-  end
-
-  def server_start(configs)
-    ensure_loader_path
-    Eye::Settings.ensure_eye_dir
-
-    ensure_stop_previous_server
-
-    args = []
-    pid = Process.spawn(ruby_path, loader_path, *args, :out => '/dev/null', :err => '/dev/null', :in => '/dev/null',
-                        :chdir => '/', :pgroup => true)
-    Process.detach(pid)
-    File.open(Eye::Settings.pid_path, 'w'){|f| f.write(pid) }
-
-    unless wait_server
-      error! "server not runned in 15 seconds, something crazy wrong"
-    end
-
-    configs.unshift(Eye::Settings.eyeconfig) if File.exists?(Eye::Settings.eyeconfig)
-
-    if !configs.empty?
-      say_load_result cmd(:load, *configs), :started => true
-    else
-      say "started!", :green
-    end
-  end
-
-  def ensure_stop_previous_server
-    Eye::Settings.ensure_eye_dir
-    pid = File.read(Eye::Settings.pid_path).to_i rescue nil
-    if pid
-      Process.kill(9, pid) rescue nil
-    end
-    File.delete(Eye::Settings.pid_path) rescue nil
-    true
-  end
-
-  def wait_server(timeout = 15)
-    Timeout.timeout(timeout) do
-      sleep 0.3 while !server_started?
-    end
-    true
-  rescue Timeout::Error
-    false
-  end
-
-end
-
 Eye::Cli.start

data/bin/loader_eye

@@ -30,9 +30,9 @@ OptionParser.new do |opts|
 
 end.parse!
 
-Eye::Settings.ensure_eye_dir
+Eye::Local.ensure_eye_dir
 
-socket_path = options[:socket_path] || Eye::Settings.socket_path
+socket_path = options[:socket_path] || Eye::Local.socket_path
 server = Eye::Server.new(socket_path)
 
 Eye::Logger.log_level = options[:debug] ? Logger::DEBUG : Logger::INFO
@@ -45,7 +45,7 @@ Eye::Control # preload
 
 if config
   res = server.command('load', config)
-  exit if res[:error]
+  exit if res.values.any? { |r| r[:error] }
 end
 
 Eye::Control.set_proc_line

data/examples/test.eye

@@ -78,8 +78,8 @@ Eye.application "test" do
     start_command "bundle exec thin start -R thin.ru -p 33233 -d -l thin.log -P thin.pid"
     stop_signals [:QUIT, 2.seconds, :TERM, 1.seconds, :KILL]
 
-    check :http, :url => "http://127.0.0.1:33233/hello", :pattern => /World/, :every => 5.seconds,
-                 :times => [2, 3], :timeout => 1.second
+    check :http, :url => "http://127.0.0.1:33233/hello", :pattern => /World/,
+                 :every => 5.seconds, :times => [2, 3], :timeout => 1.second
   end
 
 end

data/eye.gemspec

@@ -2,7 +2,7 @@ require File.expand_path('../lib/eye', __FILE__)
 
 Gem::Specification.new do |gem|
   gem.authors       = "Konstantin Makarchev"
-  gem.email         = "kostya27@gmail.com"
+  gem.email         = "eye-rb@googlegroups.com"
 
   gem.description   = gem.summary = \
     %q{Process monitoring tool. Inspired from Bluepill and God. Requires Ruby(MRI) >= 1.9.3-p194. Uses Celluloid and Celluloid::IO.}
@@ -19,16 +19,11 @@ Gem::Specification.new do |gem|
   gem.required_ruby_version     = '>= 1.9.2' # because of celluloid
   gem.required_rubygems_version = '>= 1.3.6'
 
-  gem.add_dependency 'celluloid',     '~> 0.14.0'
-  gem.add_dependency 'celluloid-io',  '~> 0.14.0'
+  gem.add_dependency 'celluloid',     '~> 0.15.0'
+  gem.add_dependency 'celluloid-io',  '~> 0.15.0'
   gem.add_dependency 'state_machine'
   gem.add_dependency 'thor'
-
-  if RUBY_VERSION == '1.9.2'
-    gem.add_dependency 'activesupport', '>= 3', '< 4.0'
-  else
-    gem.add_dependency 'activesupport', '>= 3'
-  end
+  gem.add_dependency 'sigar',         '~> 0.7.2'
 
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec', '< 2.14'