eye 0.8 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 881c3139243423bac750f9b13715f7a17a05703b
-  data.tar.gz: 1cfb74cc03c6a05a70df392a5a7871868167e9ec
+  metadata.gz: dcb8b4869dbc05dd43d8689f3dac2e2568da2836
+  data.tar.gz: 812fb5390734850ae80aa61515f1b989eaa7dfdb
 SHA512:
-  metadata.gz: e4e6b73614e4dc6dd54afb12324f15eb31850f9bb0acce786b4f677f63e313a806155afa523b9e10760743a24a2066f7ab948d8872cd039bffb62f74113bf227
-  data.tar.gz: 75b41b0387f461bf333064e98b869c25279dd73c5911778f95ffc00374fcf5639a6a5d90af0a2fd1a3ceca7e602673570e8cf77e475e760e26dc2b053b432235
+  metadata.gz: fb16b8809575fe414f6cce0375071badf60e77b5ede06a4f7e941d4f9dd630c9f010bc3a669106e5789a959f66244df9ca505b8b6b9d1a49f8e5a7dc7302603d
+  data.tar.gz: 994e3f4a5444b59ac5d9e33ee7a5d786ef9d1e457b4d161ddc1fa54765b6d7b69a1843fe24a70273019def28fb4b8c0425d7ed516f804fe225d1c6e8029e47a0

data/CHANGES.md

@@ -1,3 +1,9 @@
+0.8.1
+-------
+* allow matching many apps when mask started with '*' (#169)
+* fix potential races in children iterations (#162)
+* remove method truncate (#163)
+
 0.8
 -------
 * info, xinfo, oinfo, history now support -j flag, to output json

data/eye.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |gem|
   gem.required_ruby_version     = '>= 1.9.2'
   gem.required_rubygems_version = '>= 1.3.6'
 
-  gem.add_dependency 'celluloid',     '~> 0.17.2'
+  gem.add_dependency 'celluloid',     '~> 0.17.3'
   gem.add_dependency 'celluloid-io',  '~> 0.17.0'
   gem.add_dependency 'state_machine'
   gem.add_dependency 'thor'

data/lib/eye.rb

@@ -1,5 +1,5 @@
 module Eye
-  VERSION   = '0.8'
+  VERSION   = '0.8.1'
   ABOUT     = "Eye v#{VERSION} (c) 2012-2015 @kostya"
   PROCLINE  = "eye monitoring v#{VERSION}"
 

data/lib/eye/checker/socket.rb

@@ -82,7 +82,7 @@ class Eye::Checker::Socket < Eye::Checker::Defer
       end
 
       unless match
-        warn "proc #{expect_data} not matched (#{value[:result].truncate(30)}) answer"
+        warn "proc #{expect_data} not matched (#{value[:result].to_s[0..30]}) answer"
         value[:notice] = 'missing proc validation'
       end
 
@@ -92,7 +92,7 @@ class Eye::Checker::Socket < Eye::Checker::Defer
     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].to_s[0..30]}) answer"
     value[:notice] = "missing '#{expect_data}'"
 
     false

data/lib/eye/cli.rb

@@ -41,7 +41,7 @@ class Eye::Cli < Thor
     exit(es)
   end
 
-  desc 'xinfo', 'eye-deamon info (-c show current config)'
+  desc 'xinfo', 'eye-daemon info (-c show current config)'
   method_option :config, type: :boolean, aliases: '-c'
   method_option :json, type: :boolean, aliases: '-j'
   def xinfo

data/lib/eye/controller/send_command.rb

@@ -129,7 +129,7 @@ private
 
       return apps if apps.size > 0
 
-      if objs.map(&:app_name).uniq.size > 1
+      if !mask.start_with?('*') && objs.map(&:app_name).uniq.size > 1
         raise Error, "cannot match targets from different applications: #{res.map(&:full_name)}"
       end
     end
@@ -156,10 +156,12 @@ private
           res << p if p.name =~ r || p.full_name =~ r
 
           # children matching
-          p.children.each_value do |ch|
-            name = ch.name rescue ''
-            full_name = ch.full_name rescue ''
-            res << ch if name =~ r || full_name =~ r
+          if (ch = p.children) && (!ch.empty?)
+            ch.values.each do |ch|
+              name = ch.name rescue ''
+              full_name = ch.full_name rescue ''
+              res << ch if name =~ r || full_name =~ r
+            end
           end
         end
       end

data/lib/eye/loader.rb

@@ -1,7 +1,7 @@
 # add gems to $: by `gem` method
 #  this is only way when install eye as system wide
 
-gem 'celluloid',     '~> 0.17.2'
+gem 'celluloid',     '~> 0.17.3'
 gem 'celluloid-io',  '~> 0.17.0'
 gem 'nio4r'
 gem 'timers'

data/lib/eye/process/children.rb

@@ -48,7 +48,7 @@ module Eye::Process::Children
   end
 
   def remove_children
-    children.each_key { |child_pid| clear_child(child_pid) }
+    children.keys.each { |child_pid| clear_child(child_pid) }
   end
 
   def remove_child(child_pid)

data/lib/eye/process/commands.rb

@@ -170,7 +170,7 @@ private
 
   def daemonize_process
     res = daemonize(self[:start_command], config)
-    info "daemonizing: `#{self[:start_command]}` with start_grace: #{self[:start_grace].to_f}s, env: '#{environment_string}'}" \
+    info "daemonizing: `#{self[:start_command]}` with start_grace: #{self[:start_grace].to_f}s, env: '#{environment_string}'" \
       ", <#{res[:pid]}> (in #{self[:working_dir]})"
 
     if res[:error]

data/lib/eye/process/data.rb

@@ -57,7 +57,7 @@ module Eye::Process::Data
 
   def sub_object?(obj)
     return false if self.class == Eye::ChildProcess
-    self.children.each { |_, child| return true if child == obj }
+    self.children.values.each { |child| return true if child == obj }
     false
   end
 

data/lib/eye/trigger/stop_children.rb

@@ -11,7 +11,7 @@ class Eye::Trigger::StopChildren < Eye::Trigger
 
   def check(_trans)
     debug { 'stopping children' }
-    process.children.pmap { |_pid, c| c.stop }
+    process.children.values.pmap &:stop
   end
 
 end

data/lib/eye/utils/mini_active_support.rb

@@ -37,10 +37,6 @@ class String
     word.downcase!
     word
   end
-
-  def truncate(l)
-    self[0..l]
-  end
 end
 
 class Array

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eye
 version: !ruby/object:Gem::Version
-  version: '0.8'
+  version: 0.8.1
 platform: ruby
 authors:
 - Konstantin Makarchev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-22 00:00:00.000000000 Z
+date: 2016-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.2
+        version: 0.17.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.2
+        version: 0.17.3
 - !ruby/object:Gem::Dependency
   name: celluloid-io
   requirement: !ruby/object:Gem::Requirement
@@ -469,7 +469,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: Process monitoring tool. Inspired from Bluepill and God. Requires Ruby(MRI)