eye 0.6.3 → 0.6.4

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    Yzg5NjVhMzljODliZWQ5OTZiOWM4NzYyMTc2YTgzYWVlOWY5MTRhYw==
-  data.tar.gz: !binary |-
-    MzQzY2FjY2Y3ZDllYTdjZjE0OGZhY2FhZDdkYTA2ZmE0Y2FjNzIyMg==
+SHA1:
+  metadata.gz: 1efc0c3530c9b3015f9a7b6a536e12d9c8221189
+  data.tar.gz: 012ddf11788989c1d13cb1bd766d95c9a3da3fd2
 SHA512:
-  metadata.gz: !binary |-
-    ZDMzMzRhZWY3YTk1ZjA5NWVhZjljZjlhOTcwODVjNjYwM2Q1NDY3ZThjN2Vj
-    ZDA2NWI4MDg3YmExNmRmZDMwNWQ0ZDY5MmNjYzAzMTViMmE3MjlkOTBmOTAw
-    NWJhMjUwZjE3YzI0MTA1MDM3YTZiN2RiZDA3OGJlOTY4MjIyYTM=
-  data.tar.gz: !binary |-
-    NDdhNTkxM2NlMzE4NzI3ZjlmNzUxODFiYzBkZDA3OTM2Mzc2ZGRiNTU2OGQ1
-    ZGE1YzE2OTU3NDNkZDFiODQ3YjE3YTc4OWM5YzU4M2NiMmVhNmYwMWExZTQ0
-    ZjFjMGU5YjBiNzRjZjZiMjM4ODYwNGEwNGYyMjAzNjI2Y2RlOTI=
+  metadata.gz: 9b57ada510bfd95fb8402c08efc2a983b27102916e869e3e16da52faed26aa53154eec0bf685c9005dea68386b451b412b92c6190fd536449aeeaf59738aeae5
+  data.tar.gz: ff9c785da7173b427c7cb071d7cedc399d5698b38a8eed8810eeff9521ade37cf400359d16a3605248f4f8b6f91f9c15791ef042965045ec4732ed597303d1b7

data/.gitignore

@@ -36,3 +36,4 @@ script
 *.tmp
 /vendor/
 *.gz
+.eye

data/.travis.yml

@@ -3,4 +3,5 @@ rvm:
   - "1.9.3"
   - "2.0.0"
   - "2.1"
+  - "2.2"
 script: bundle exec rake N=15

data/CHANGES.md

@@ -1,3 +1,18 @@
+0.7.pre
+-------
+* Update Celluloid to 0.16.0
+
+0.6.4
+-----
+* leye: rename env variable EYEFILE to EYE_FILE
+* leye: add options --eyefile and --eyehome #102
+* leye: now store pid and sock into "DIR(eyefile)/.eye" (requires to leye quit && leye load)
+* add dsl load_env method
+* add trigger executing helpers :execute_sync, :execute_async
+* add [triggers example](https://github.com/kostya/eye/blob/master/examples/triggers.eye)
+* fix user command expand {PID} #104
+* add EYE_CLIENT_TIMEOUT variable to set client timeout #99
+
 0.6.3
 -----
 * Add custom logger #81

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012-2014 'Konstantin Makarchev'
+Copyright (c) 2012-2015 'Konstantin Makarchev'
 
 MIT License
 

data/README.md

@@ -205,10 +205,11 @@ Process states and events:
 [![Eye](https://raw.github.com/kostya/stuff/master/eye/mprocess.png)](https://raw.github.com/kostya/stuff/master/eye/process.png)
 
 
-[EyeHttp Gem](https://github.com/kostya/eye-http)
-
 [Eye related projects](https://github.com/kostya/eye/wiki/Related-projects)
 
 [Articles](https://github.com/kostya/eye/wiki/Articles)
 
+[Using Env variables](https://github.com/kostya/eye/wiki/Using-ENV-variables-in-config)
+
+
 Thanks `Bluepill` for the nice config ideas.

data/bin/leye

@@ -6,11 +6,26 @@ require 'eye'
 #  which looking for Eyefile
 #  like foreman
 
+while true
+  if ARGV[0] == '--eyefile'
+    ARGV.shift
+    ENV['EYE_FILE'] = File.expand_path(ARGV.shift.to_s)
+  elsif ARGV[0] == '--eyehome'
+    ARGV.shift
+    ENV['EYE_HOME'] = File.expand_path(ARGV.shift.to_s)
+  else
+    break
+  end
+end
+
 unless Eye::Local.eyefile
-  puts "Not found Eyefile"
+  puts "\033[31mNot found Eyefile (in #{File.expand_path('.')})\033[0m"
   exit 1
 end
 
-Eye::Local.dir = File.dirname(Eye::Local.eyefile)
+unless ENV.key?('EYE_HOME')
+  Eye::Local.dir = File.join(File.dirname(Eye::Local.eyefile), '.eye')
+end
+
 Eye::Local.local_runner = true
 Eye::Cli.start

data/examples/triggers.eye

@@ -0,0 +1,55 @@
+# Triggers example:
+#
+# to execute commands inside trigger need to use 2 methods:
+# process.execute_async(cmd, opts), and
+# process.execute_sync(cmd, opts)
+
+Eye.config do
+  logger "/tmp/eye.log"
+end
+
+Eye.app :triggers do
+
+  # Execute shell command before process start
+  process :a do
+    pid_file "/tmp/a.pid"
+    start_command "sleep 100"
+    daemonize true
+
+    # send message async which sendxmpp, before process start
+    trigger :transition, to: :starting, do: -> {
+      process.execute_async "sendxmpp -s 'hhahahaa' someone@jabber.org"
+    }
+  end
+
+  # Touch some file before process start, remove file after process die
+  process :b do
+    pid_file "/tmp/b.pid"
+    start_command "sleep 100"
+    daemonize true
+
+    # before process starting, touch some file
+    trigger :transition1, to: :starting, do: -> {
+      process.execute_sync "touch /tmp/bla.file"
+    }
+
+    # after process, crashed, or stopped, remove that file
+    trigger :transition2, to: :down, do: -> {
+      process.execute_sync "rm /tmp/bla.file"
+    }
+  end
+
+  # With restart :c process, send restart to process :a
+  process :c do
+    pid_file "/tmp/c.pid"
+    start_command "sleep 100"
+    daemonize true
+
+    app_name = app.name
+    trigger :transition, :event => :restarting, :do => ->{
+      info "send restarting to :a"
+      Eye::Control.command('restart', "#{app_name}:a")
+    }
+  end
+
+end

data/lib/eye.rb

@@ -1,6 +1,6 @@
 module Eye
-  VERSION   = "0.6.3"
-  ABOUT     = "Eye v#{VERSION} (c) 2012-2014 @kostya"
+  VERSION   = "0.6.4"
+  ABOUT     = "Eye v#{VERSION} (c) 2012-2015 @kostya"
   PROCLINE  = "eye monitoring v#{VERSION}"
 
   autoload :Process,        'eye/process'

data/lib/eye/checker.rb

@@ -78,7 +78,7 @@ class Eye::Checker
   end
 
   def logger_tag
-    @process.logger.prefix
+    @process.logger.prefix if @process
   end
 
   def logger_sub_tag

data/lib/eye/checker/file_ctime.rb

@@ -5,6 +5,11 @@ class Eye::Checker::FileCTime < Eye::Checker
 
   param :file, [String], true
 
+  def initialize(*args)
+    super
+    self.file = process.expand_path(file) if process && file
+  end
+
   def get_value
     File.ctime(file) rescue nil
   end

data/lib/eye/checker/file_size.rb

@@ -6,6 +6,11 @@ class Eye::Checker::FileSize < Eye::Checker::Measure
 
   param :file, [String], true
 
+  def initialize(*args)
+    super
+    self.file = process.expand_path(file) if process && file
+  end
+
   def check_name
     @check_name ||= "fsize(#{measure_str})"
   end

data/lib/eye/checker/file_touched.rb

@@ -3,6 +3,11 @@ class Eye::Checker::FileTouched < Eye::Checker
   param :file, [String], true
   param :delete, [TrueClass, FalseClass]
 
+  def initialize(*args)
+    super
+    self.file = process.expand_path(file) if process && file
+  end
+
   def get_value
     File.exists?(file)
   end

data/lib/eye/checker/http.rb

@@ -36,7 +36,7 @@ class Eye::Checker::Http < Eye::Checker::Defer
     debug { ex.inspect }
 
     if defined?(Net::OpenTimeout) # for ruby 2.0
-      mes = ex.class.is_a?(Net::OpenTimeout) ? "OpenTimeout<#{@open_timeout}>" : "ReadTimeout<#{@read_timeout}>"
+      mes = ex.is_a?(Net::OpenTimeout) ? "OpenTimeout<#{@open_timeout}>" : "ReadTimeout<#{@read_timeout}>"
       {:exception => mes}
     else
       {:exception => "Timeout<#{@open_timeout},#{@read_timeout}>"}

data/lib/eye/cli.rb

@@ -73,6 +73,7 @@ class Eye::Cli < Thor
       server_start_foreground(configs.first)
 
     elsif server_started?
+      configs << Eye::Local.eyefile if Eye::Local.local_runner
       say_load_result cmd(:load, *configs)
 
     else
@@ -90,7 +91,7 @@ class Eye::Cli < Thor
       cmd(:stop_all, options[:timeout].to_i)
     end
 
-    Eye::Local.client_timeout = 5
+    Eye::Local.client_timeout = Eye::Local.default_client_timeout
     res = _cmd(:quit)
 
     # if eye server got crazy, stop by force

data/lib/eye/controller/helpers.rb

@@ -2,6 +2,7 @@ module Eye::Controller::Helpers
 
   def set_proc_line
     str = Eye::PROCLINE
+    str = 'l' + str if Eye::Local.local_runner
     str += " [#{@applications.map(&:name) * ', '}]" if @applications.present?
     str += " (v #{ENV['EYE_V']})" if ENV['EYE_V']
     str += " (in #{Eye::Local.dir})"

data/lib/eye/controller/status.rb

@@ -10,6 +10,7 @@ module Eye::Controller::Status
       :ruby => RUBY_DESCRIPTION,
       :gems => %w|Celluloid Celluloid::IO StateMachine NIO Timers Sigar|.map{|c| gem_version(c) },
       :logger => Eye::Logger.args.present? ? [Eye::Logger.dev.to_s, *Eye::Logger.args] : Eye::Logger.dev.to_s,
+      :dir => Eye::Local.dir,
       :pid_path => Eye::Local::pid_path,
       :sock_path => Eye::Local::socket_path,
       :actors => actors

data/lib/eye/dsl/opts.rb

@@ -94,7 +94,14 @@ class Eye::Dsl::Opts < Eye::Dsl::PureOpts
     @config[:notify].delete(contact.to_s)
   end
 
+  def set_stop_command(cmd)
+    raise Eye::Dsl::Error, "cannot use both stop_signals and stop_command" if @config[:stop_signals]
+    super
+  end
+
   def stop_signals(*args)
+    raise Eye::Dsl::Error, "cannot use both stop_signals and stop_command" if @config[:stop_command]
+
     if args.count == 0
       return @config[:stop_signals]
     end
@@ -174,6 +181,32 @@ class Eye::Dsl::Opts < Eye::Dsl::PureOpts
     on_server
   end
 
+  def load_env(filename = '~/.env', raise_when_no_file = true)
+    fnames = [File.expand_path(filename, @config[:working_dir]),
+      File.expand_path(filename)].uniq
+    filenames = fnames.select { |f| File.exists?(f) }
+
+    if filenames.size < 1
+      unless raise_when_no_file
+        warn "load_env not found file: '#{filenames.first}'"
+        return
+      else
+        raise Eye::Dsl::Error, "load_env not found in #{fnames}"
+      end
+    end
+    raise Eye::Dsl::Error, "load_env conflict filenames: #{filenames}" if filenames.size > 1
+
+    content = File.read(filenames.first)
+    info "load_env from '#{filenames.first}'"
+
+    env_vars = content.split("\n")
+    env_vars.each do |e|
+      next unless e.include?('=')
+      k, *v = e.split('=')
+      env k => v.join('=')
+    end
+  end
+
 private
 
   def validate_signals(signals = nil)

data/lib/eye/dsl/validation.rb

@@ -34,6 +34,10 @@ module Eye::Dsl::Validation
         value = @options[param]
         value.nil? ? default : value
       end
+
+      define_method "#{param}=" do |value|
+        @options[param] = value
+      end
     end
 
     def param_default(param, default)

data/lib/eye/local.rb

@@ -54,8 +54,12 @@ module Eye::Local
       path("processes#{ENV['EYE_V']}.cache")
     end
 
+    def default_client_timeout
+      (ENV['EYE_CLIENT_TIMEOUT'] || 5).to_i
+    end
+
     def client_timeout
-      @client_timeout ||= 5
+      @client_timeout ||= default_client_timeout
     end
 
     def client_timeout=(cl)
@@ -82,8 +86,8 @@ module Eye::Local
     end
 
     def find_eyefile(start_from_dir)
-      fromenv = ENV['EYEFILE']
-      return fromenv if fromenv && !fromenv.empty? && File.exist?(fromenv)
+      fromenv = ENV['EYE_FILE']
+      return fromenv if fromenv && !fromenv.empty? && File.file?(fromenv)
 
       previous = nil
       current  = File.expand_path(start_from_dir)

data/lib/eye/process/children.rb

@@ -31,7 +31,8 @@ module Eye::Process::Children
 
     if new_children.present?
       new_children.each do |child_pid|
-        self.children[child_pid] = Eye::ChildProcess.new(child_pid, self[:monitor_children], logger.prefix, self.pid)
+        cfg = self[:monitor_children].try :update, :notify => self[:notify]
+        self.children[child_pid] = Eye::ChildProcess.new(child_pid, cfg, logger.prefix, self.pid)
       end
     end
 
@@ -47,12 +48,14 @@ module Eye::Process::Children
   end
 
   def remove_children
-    if children.present?
-      children.keys.each{|child_pid| remove_child(child_pid) }
-    end
+    children.each_key { |child_pid| clear_child(child_pid) }
   end
 
   def remove_child(child_pid)
+    clear_child(child_pid)
+  end
+
+  def clear_child(child_pid)
     child = self.children.delete(child_pid)
     child.destroy if child && child.alive?
   end

data/lib/eye/process/commands.rb

@@ -282,6 +282,7 @@ private
 
     # cmd is string, or array of signals
     if cmd.is_a?(String)
+      cmd = prepare_command(cmd)
       res = execute(cmd, config.merge(:timeout => 120))
       error "cmd #{cmd} error #{res.inspect}" if res[:error]
     elsif cmd.is_a?(Array)

data/lib/eye/process/system.rb

@@ -76,6 +76,18 @@ module Eye::Process::System
     defer{ Eye::System::execute cmd, cfg }
   end
 
+  def execute_sync(cmd, opts = {:timeout => 1.second})
+    res = execute cmd, self.config.merge(opts)
+    info "execute_sync `#{cmd}` with res: #{res}"
+    res
+  end
+
+  def execute_async(cmd, opts = {})
+    res = Eye::System.daemonize(cmd, self.config.merge(opts))
+    info "execute_async `#{cmd}` with res: #{res}"
+    res
+  end
+
   def failsafe_load_pid
     pid = load_pid_from_file
 
@@ -96,4 +108,8 @@ module Eye::Process::System
     false
   end
 
+  def expand_path(path)
+    File.expand_path(path, self[:working_dir])
+  end
+
 end

metadata

@@ -1,251 +1,251 @@
 --- !ruby/object:Gem::Specification
 name: eye
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - Konstantin Makarchev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-06 00:00:00.000000000 Z
+date: 2015-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.15.0
 - !ruby/object:Gem::Dependency
   name: celluloid-io
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.15.0
 - !ruby/object:Gem::Dependency
   name: state_machine
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sigar
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '2.14'
 - !ruby/object:Gem::Dependency
   name: rr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ruby-graphviz
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: forking
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fakeweb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.3
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: xmpp4r
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.1
 description: Process monitoring tool. Inspired from Bluepill and God. Requires Ruby(MRI)
@@ -258,9 +258,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - CHANGES.md
 - Gemfile
 - LICENSE
@@ -286,6 +286,7 @@ files:
 - examples/stress_test.eye
 - examples/test.eye
 - examples/thin-farm.eye
+- examples/triggers.eye
 - examples/unicorn.eye
 - eye.gemspec
 - lib/eye.rb
@@ -382,12 +383,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []