kurchatov 0.0.6.pre.3 → 0.0.6.pre.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3567df8dc93294bfc5cb0980d6ba82ebcf22f52
-  data.tar.gz: 9fcd2f6f8c17dbefea266452f832f9d368db34ad
+  metadata.gz: c2c33704a13c283abff889703ea874cdbf649063
+  data.tar.gz: d072ed418b07f26a742aba939ffc78f38f9630cf
 SHA512:
-  metadata.gz: ea845863682c7b511035e7dbabfebae21f5d8d9e9c4a2e11b1081790a2afef3f09231d1787099b192e6e2258c6149bd79148974e95611e78aae7581d3620974f
-  data.tar.gz: 6ad670d192fddfecb12d62fd5ed5a6b90547e438a3158d7f52c288fd2f233387af1fa3756350a2465e896af805df98cb1acd82fbef16f6bd094a22a0ef37197e
+  metadata.gz: 0a94cec105593e4e8422f02aaaef444c0d9cf1adc40fe65b599b3f6a6f52dcbe68242f50026bcbccedbde3915ee8ef1830e1244b56e364e1056c4a97f0f80f37
+  data.tar.gz: 63b221f779d9184ce083e80b457cb30e260ba2003014899b2c50a634c562d4dd8dbaf05df9e7a8bce1acf84c927bf01acb51525568deb113f3109a28111a6f08

data/.travis.yml

@@ -1,3 +1,5 @@
+os: [linux, osx]
+
 language: 
   - 'ruby'
 rvm: 

data/CHANGELOG

@@ -1,3 +1,4 @@
 * Version 0.0.5: Windows support
 * Version 0.0.6.pre.1: Add ignore errors
 * Version 0.0.6.pre.2: :metric => boolean return integer
+* Version 0.0.6.pre.4: Required block for plugin

data/lib/kurchatov/plugin/dsl.rb

@@ -50,6 +50,11 @@ module Kurchatov
         last.run_if = block
       end
 
+      def required(opts ={}, &block)
+        return unless last.respond_to_ohai?(opts)
+        last.required = block
+      end
+
       def last_plugin
         last.plugin
       end
@@ -63,7 +68,7 @@ module Kurchatov
         dsl = Kurchatov::Plugins::DSL.new
         paths.map do |path|
           Log.error("Directory #{path} not exists") and exit Kurchatov::Config[:ERROR_CONFIG] unless
-            File.directory?(path) 
+            File.directory?(path)
           Dir[File.join(path, "*#{PLUGIN_EXT}")].sort
         end.flatten.each do |path|
           begin

data/lib/kurchatov/plugin/riemann.rb

@@ -12,11 +12,12 @@ module Kurchatov
       include Kurchatov::Mixin::Command
       include Kurchatov::Mixin::Http
 
-      attr_accessor :run_if, :collect, :always_start, :ignore_errors, :interval, :plugin
+      attr_accessor :run_if, :collect, :always_start, :required, :ignore_errors, :interval, :plugin
 
       def initialize(name = '')
         super(name)
         @run_if = Proc.new { true }
+        @required = Proc.new { true }
         @plugin = Mashie.new
         @always_start = false
         @ignore_errors = false
@@ -39,12 +40,22 @@ module Kurchatov
         true
       end
 
+      def runnable_by_required?
+        begin
+          self.instance_eval(&required)
+        rescue LoadError
+          return
+        end
+        true
+      end
+
       def runnable_by_config?
         Log.info("Plugin '#{self.name}' disabled by nil collect") and return if collect.nil?
         Log.info("Plugin '#{self.name}' disabled in config") and return if (plugin[:disable] == true)
         Log.info("Plugin '#{self.name}' not started by run_if condition ") and
             return unless self.instance_eval(&run_if)
-        @plugin[:service] = name if @plugin[:service].nil?
+        Log.error("Plugin '#{self.name}' not started by required block") and return unless runnable_by_required?
+        @plugin[:service] ||= name
         true
       end
 

data/lib/kurchatov/version.rb

@@ -1,3 +1,3 @@
 module Kurchatov
-  VERSION = "0.0.6.pre.3"
+  VERSION = "0.0.6.pre.4"
 end

data/tests/data/required.rb

@@ -0,0 +1,9 @@
+always_start true
+
+required do
+  require "error_me"
+end
+
+collect do
+  sleep 1
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kurchatov
 version: !ruby/object:Gem::Version
-  version: 0.0.6.pre.3
+  version: 0.0.6.pre.4
 platform: ruby
 authors:
 - Vasiliev Dmitry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-30 00:00:00.000000000 Z
+date: 2014-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beefcake
@@ -202,6 +202,7 @@ files:
 - lib/ohai/plugins/windows/platform.rb
 - tests/data/config.yml
 - tests/data/event.yml
+- tests/data/required.rb
 - tests/data/sample.rb
 - tests/run.sh
 - tests/server.rb