kurchatov 0.0.6.pre.3 → 0.0.6.pre.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/.travis.yml +2 -0
- data/CHANGELOG +1 -0
- data/lib/kurchatov/plugin/dsl.rb +6 -1
- data/lib/kurchatov/plugin/riemann.rb +13 -2
- data/lib/kurchatov/version.rb +1 -1
- data/tests/data/required.rb +9 -0
- metadata +3 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: c2c33704a13c283abff889703ea874cdbf649063
|
4
|
+
data.tar.gz: d072ed418b07f26a742aba939ffc78f38f9630cf
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 0a94cec105593e4e8422f02aaaef444c0d9cf1adc40fe65b599b3f6a6f52dcbe68242f50026bcbccedbde3915ee8ef1830e1244b56e364e1056c4a97f0f80f37
|
7
|
+
data.tar.gz: 63b221f779d9184ce083e80b457cb30e260ba2003014899b2c50a634c562d4dd8dbaf05df9e7a8bce1acf84c927bf01acb51525568deb113f3109a28111a6f08
|
data/.travis.yml
CHANGED
data/CHANGELOG
CHANGED
data/lib/kurchatov/plugin/dsl.rb
CHANGED
@@ -50,6 +50,11 @@ module Kurchatov
|
|
50
50
|
last.run_if = block
|
51
51
|
end
|
52
52
|
|
53
|
+
def required(opts ={}, &block)
|
54
|
+
return unless last.respond_to_ohai?(opts)
|
55
|
+
last.required = block
|
56
|
+
end
|
57
|
+
|
53
58
|
def last_plugin
|
54
59
|
last.plugin
|
55
60
|
end
|
@@ -63,7 +68,7 @@ module Kurchatov
|
|
63
68
|
dsl = Kurchatov::Plugins::DSL.new
|
64
69
|
paths.map do |path|
|
65
70
|
Log.error("Directory #{path} not exists") and exit Kurchatov::Config[:ERROR_CONFIG] unless
|
66
|
-
File.directory?(path)
|
71
|
+
File.directory?(path)
|
67
72
|
Dir[File.join(path, "*#{PLUGIN_EXT}")].sort
|
68
73
|
end.flatten.each do |path|
|
69
74
|
begin
|
@@ -12,11 +12,12 @@ module Kurchatov
|
|
12
12
|
include Kurchatov::Mixin::Command
|
13
13
|
include Kurchatov::Mixin::Http
|
14
14
|
|
15
|
-
attr_accessor :run_if, :collect, :always_start, :ignore_errors, :interval, :plugin
|
15
|
+
attr_accessor :run_if, :collect, :always_start, :required, :ignore_errors, :interval, :plugin
|
16
16
|
|
17
17
|
def initialize(name = '')
|
18
18
|
super(name)
|
19
19
|
@run_if = Proc.new { true }
|
20
|
+
@required = Proc.new { true }
|
20
21
|
@plugin = Mashie.new
|
21
22
|
@always_start = false
|
22
23
|
@ignore_errors = false
|
@@ -39,12 +40,22 @@ module Kurchatov
|
|
39
40
|
true
|
40
41
|
end
|
41
42
|
|
43
|
+
def runnable_by_required?
|
44
|
+
begin
|
45
|
+
self.instance_eval(&required)
|
46
|
+
rescue LoadError
|
47
|
+
return
|
48
|
+
end
|
49
|
+
true
|
50
|
+
end
|
51
|
+
|
42
52
|
def runnable_by_config?
|
43
53
|
Log.info("Plugin '#{self.name}' disabled by nil collect") and return if collect.nil?
|
44
54
|
Log.info("Plugin '#{self.name}' disabled in config") and return if (plugin[:disable] == true)
|
45
55
|
Log.info("Plugin '#{self.name}' not started by run_if condition ") and
|
46
56
|
return unless self.instance_eval(&run_if)
|
47
|
-
|
57
|
+
Log.error("Plugin '#{self.name}' not started by required block") and return unless runnable_by_required?
|
58
|
+
@plugin[:service] ||= name
|
48
59
|
true
|
49
60
|
end
|
50
61
|
|
data/lib/kurchatov/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: kurchatov
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.0.6.pre.
|
4
|
+
version: 0.0.6.pre.4
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Vasiliev Dmitry
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2014-
|
11
|
+
date: 2014-02-06 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: beefcake
|
@@ -202,6 +202,7 @@ files:
|
|
202
202
|
- lib/ohai/plugins/windows/platform.rb
|
203
203
|
- tests/data/config.yml
|
204
204
|
- tests/data/event.yml
|
205
|
+
- tests/data/required.rb
|
205
206
|
- tests/data/sample.rb
|
206
207
|
- tests/run.sh
|
207
208
|
- tests/server.rb
|