malevich 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 325d8a8c4611108b8280d60ae54db8be295f4e18
-  data.tar.gz: c260c8bb5f244505a138a1235f5b873d85eee541
+  metadata.gz: 4d7d7c66660faa54456158791fbe274fdf93b3f6
+  data.tar.gz: 9cee49567d7421c75c80030fce5fd0ef923f6d66
 SHA512:
-  metadata.gz: 08feb43a589b177bcbf1070807987cb1050b9032f9420a4f7b3e57f022d6e5d9c48d05340192942a4087f4f364294336c792a15fb8cb4be430d552a684102ce2
-  data.tar.gz: 59c067fbd61348d2a1972fbde4e66c15cc28d8d5e0c9ee957e70d62b8f09365dfb5722dfe1fd176414bf8cdb7db67d30fda02184d8eef0b6ab8fd2fcde1523e7
+  metadata.gz: ac2952fcb7b3e451a2521f5f011d030738a72209375432562db751f5372f851f4f60f280ab22de9a22d78bb7b0ce762046d510641940fec4e8865d0785731069
+  data.tar.gz: 7b614db1bc7009427aa3085d6d73a0f65621efa19b65f48f0fcb4ade116244ab67a485e232dbba738f5d8a5f1b8a30859fc1ac115da5ff432b35a8f19ee737e2

data/bin/malevich

@@ -17,16 +17,15 @@ Usage:
 where [options] are:
   EOS
 
-  opt :config, 'Config file', :default => '/etc/malevich/config.yml'
+  opt :'config', 'Config file', :default => '/etc/malevich/config.yml'
   opt :'log-level', 'Log level', :default => 'DEBUG'
   opt :'riemann-host', 'Riemann server', :short => '-r', :default => '127.0.0.1:5555', :multi => true
   opt :'riemann-tcp', 'Use tcp to connect riemann', :default => true
-  opt :tags, 'Set tags', :short => '-t', :multi => true
-  opt :plugins, 'Directory for plugins', :short => '-d', :default => '/usr/share/malevich/plugins', :multi => true
+  opt :'tags', 'Set tags', :short => '-t', :multi => true
+  opt :'plugins', 'Directory plugins', :short => '-d', :default => '/usr/share/malevich/plugins', :multi => true
   opt :'http-responder', 'Bind http api', :short => '-h', :default => '0.0.0.0:55755'
   opt :'udp-responder', 'Bind udp api', :short => '-u', :default => '127.0.0.1:55955'
   opt :'test', 'Test plugin file', :type => :string
-  opt :'profiling', 'Profiling ruby', :default => false
 end
 
 include Malevich::Mixin

data/lib/malevich.rb

@@ -8,9 +8,9 @@ module Malevich
     attr_reader :config, :cmd, :plugins, :ohai, :monitor, :riemann_events, :dsl
 
     def initialize
-      @config = Hashie::Mash.new # for config from file
-      @cmd = Hashie::Mash.new
-      @plugins = Hashie::Mash.new # for plugin containers (errors, settings)
+      @config = Malevich::Hashie.new # for config from file
+      @cmd = Malevich::Hashie.new
+      @plugins = Malevich::Hashie.new # for plugin containers (errors, settings)
       @logger = Logger.new(STDOUT)
       @monitor = Malevich::Monitor.new
       @riemann_events = ::Queue.new
@@ -33,11 +33,9 @@ module Malevich
     def ohai
       unless @ohai
         Kernel::log :info, 'Load ohai data'
-        real_ohai = Ohai::System.new
-        real_ohai.all_plugins
-        @ohai_timestamp = Time.now
-        @ohai = real_ohai.data.dup
-        real_ohai = nil
+        @ohai = {}
+        @ohai[:os] = 'mac_os_x'
+        @ohai[:platform] = 'mac_os_x'
       end
       @ohai
     end

data/lib/malevich/init.rb

@@ -1,8 +1,6 @@
 require 'json'
 require 'yaml'
 require 'find'
-require 'hashie'
-require 'ohai'
 require 'logger'
 require 'thread'
 require 'socket'
@@ -14,3 +12,4 @@ require 'malevich/plugin'
 require 'malevich/monitor'
 require 'malevich/loader'
 require 'malevich/responders/init'
+require 'malevich/support/init'

data/lib/malevich/monitor.rb

@@ -1,3 +1,6 @@
+require 'ruby-prof'
+RubyProf.measure_mode = RubyProf::MEMORY
+
 module Malevich
   class Monitor
 
@@ -22,6 +25,12 @@ module Malevich
       @tasks << [th, obj]
     end
 
+    def run_gc?
+      @gc_counter ||= 0
+      @gc_counter += 1
+      @gc_counter > 100 ? @gc_counter = 0 : false
+    end
+
     def run!
       loop do
         @tasks.each_with_index do |task, i|
@@ -32,7 +41,7 @@ module Malevich
           self << task[1]
         end
         log :debug, "Check alive #{@tasks.count} threads"
-        ObjectSpace.garbage_collect
+        ObjectSpace.garbage_collect if run_gc?
         sleep CHECK_ALIVE
       end
     end

data/lib/malevich/plugin.rb

@@ -30,7 +30,7 @@ module Malevich
       end
 
       return log_and_false("'#{name}' not started, because have not 'collect'") if collect.nil?
-      return log_and_false("'#{name}' disabled in config") if settings.disable? && settings.disable
+      return log_and_false("'#{name}' disabled in config") if settings.disable
       return log_and_false("'#{name} disabled by run_if statement") unless !!self.instance_eval(&run_if)
       log :unknown, "'#{name}' started"
     end
@@ -57,8 +57,8 @@ module Malevich
 
     def self.make_container(container)
       define_method(container) do |&block|
-        malevich.plugins[container] ||= {}
-        malevich.plugins[container][self.name] ||= Hashie::Mash.new
+        malevich.plugins[container] ||= Malevich::Hashie.new
+        malevich.plugins[container][self.name] ||= Malevich::Hashie.new
         malevich.plugins[container][self.name]
       end
     end

data/lib/malevich/responders/http.rb

@@ -7,7 +7,7 @@ module Malevich
       attr_reader :name
 
       def initialize
-        @host, @port = malevich.cmd['http-responder'].split(':')
+        @host, @port = malevich.cmd[:'http-responder'].split(':')
         @started_at = Time.now.to_i
         @name = 'http api'
       end

data/lib/malevich/responders/riemann.rb

@@ -28,7 +28,7 @@ module Malevich
 
       def make_clients
         @riemanns.clear
-        malevich.cmd['riemann-host'].each do |host|
+        malevich.cmd[:'riemann-host'].each do |host|
           riemann, port = host.split(':')
           port ||= 5555
           client = ::Riemann::Client.new({

data/lib/malevich/responders/udp.rb

@@ -20,7 +20,7 @@ module Malevich
       attr_reader :name
 
       def initialize
-        @host, @port = malevich.cmd['udp-responder'].split(':')
+        @host, @port = malevich.cmd[:'udp-responder'].split(':')
         @name = 'udp api'
       end
 

data/lib/malevich/support/hash.rb

@@ -0,0 +1,26 @@
+# https://raw.github.com/rails/rails/master/activesupport/lib/active_support/core_ext/hash/deep_merge.rb
+module Malevich
+  class Hashie < Hash
+
+    def deep_merge(other_hash, &block)
+      dup.deep_merge!(other_hash, &block)
+    end
+
+    def deep_merge!(other_hash, &block)
+      other_hash.each_pair do |k,v|
+        tv = self[k]
+        if tv.is_a?(Hash) && v.is_a?(Hash)
+          self[k] = tv.deep_merge(v, &block)
+        else
+          self[k] = block && tv ? block.call(k, tv, v) : v
+        end
+      end
+      self
+    end
+
+    def method_missing(method_name, *args, &blk)
+      self.[](method_name.to_sym, &blk)
+    end
+
+  end
+end

data/lib/malevich/support/init.rb

@@ -0,0 +1 @@
+require_relative 'hash'

data/lib/malevich/version.rb

@@ -1,3 +1,3 @@
 module Malevich
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

data/malevich.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email = ['vadv.mkn@gmail.com']
   spec.description = %q{Monitoring tool}
   spec.summary = %q{Monitoring tool}
-  spec.homepage = ''
+  spec.homepage = 'https://github.com/vadv/malevich/'
   spec.license = 'MIT'
 
   spec.files = `git ls-files`.split($/)
@@ -19,12 +19,9 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'riemann-client', '~> 0.2.2'
-  spec.add_dependency 'ohai', '~> 6.20.0'
   spec.add_dependency 'trollop' # ohai
   spec.add_dependency 'mixlib-shellout' # ohai
   spec.add_dependency 'rest-client'
-  spec.add_dependency 'hashie'
-
 
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: malevich
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Vasiliev Dmitry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-13 00:00:00.000000000 Z
+date: 2014-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riemann-client
@@ -24,20 +24,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.2.2
-- !ruby/object:Gem::Dependency
-  name: ohai
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 6.20.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 6.20.0
 - !ruby/object:Gem::Dependency
   name: trollop
   requirement: !ruby/object:Gem::Requirement
@@ -80,20 +66,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: hashie
-  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: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -200,10 +172,11 @@ files:
 - lib/malevich/responders/init.rb
 - lib/malevich/responders/riemann.rb
 - lib/malevich/responders/udp.rb
+- lib/malevich/support/hash.rb
+- lib/malevich/support/init.rb
 - lib/malevich/version.rb
 - malevich.gemspec
-- test/plugin_helpers_spec.rb
-homepage: ''
+homepage: https://github.com/vadv/malevich/
 licenses:
 - MIT
 metadata: {}
@@ -227,6 +200,5 @@ rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Monitoring tool
-test_files:
-- test/plugin_helpers_spec.rb
+test_files: []
 has_rdoc: 

data/test/plugin_helpers_spec.rb

@@ -1,6 +0,0 @@
-require 'rspec'
-require 'malevich'
-
-describe Malevich::Plugin, 'Helpers' do
-
-end