nsca 0.1.0 → 0.1.1

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/nsca/check.rb

@@ -14,7 +14,7 @@ module NSCA
 				def measure &block
 					timeout ||= 0
 					exception = Class.new Timeout::Error
-					pd = perfdatas[perfdata_label]
+					pd = perfdatas[perfdata_label.to_sym]
 					timeout = pd.max
 					m = realtime do
 						begin
@@ -35,6 +35,7 @@ module NSCA
 			def min()  self.class.min  end
 			def max()  self.class.max  end
 			def to_s() "#{label}=#{value}#{unit},#{warn},#{crit},#{min},#{max}" end
+			def to_sym() self.class.label.to_sym end
 
 			def return_code
 				if @value.nil? then 3
@@ -71,17 +72,29 @@ module NSCA
 			def init return_code = nil, status = nil, perfdatas = nil, timestamp = nil
 				@return_code = return_code  if return_code
 				@status = status  if status
-				perfdatas.each &method( :[])  if perfdatas
+				case perfdatas
+				when Hash
+					perfdatas.each &method( :[])
+				when Array
+					push *perfdatas
+				end
 				@timestamp = timestamp  if timestamp
 				self
 			end
 
 			def [] perfdata_label
-				pd = @perfdatas[perfdata_label]
+				pd = @perfdatas[perfdata_label.to_sym]
 				pd && pd.value
 			end
 
+			def push *perfdatas
+				perfdatas.each {|perfdata| @perfdatas[perfdata.label] = perfdata }
+				@perfdatas
+			end
+
 			def []= perfdata_label, value
+				return push value  if value.is_a? PerformanceData::Base
+				perfdata_label = perfdata_label.to_sym
 				cl = self.class.perfdatas[perfdata_label]
 				cl ||= PerformanceData::Base.new perfdata_label
 				@perfdatas[perfdata_label] = cl.new value
@@ -89,11 +102,13 @@ module NSCA
 
 			def text
 				r = "#{status || ReturnCode.find(return_code)}"
-				r += " | #{perfdatas.map( &:to_s).join ' '}"  unless perfdatas.empty?
+				r += " | #{perfdatas.each_value.map( &:to_s).join ' '}"  unless perfdatas.empty?
 				r
 			end
 
-			def measure( perfdata_label, &block) @perfdatas[perfdata_label].measure &block end
+			def measure perfdata_label, &block
+				@perfdatas[perfdata_label.to_sym].measure &block
+			end
 			def send() NSCA::send self end
 
 			def ok status = nil, perfdatas = nil
@@ -141,7 +156,7 @@ module NSCA
 				attr_reader :service, :hostname, :perfdatas
 				def init service, hostname = nil, perfdatas = nil
 					@service, @hostname, @perfdatas = service, hostname || `hostname -f`, {}
-					perfdatas.each {|pd| @perfdatas[pd.label] = pd }
+					perfdatas.each {|pd| @perfdatas[pd.label.to_sym] = pd }
 					self
 				end
 

data/nsca.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "nsca"
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Denis Knauf"]
-  s.date = "2013-04-08"
+  s.date = "2013-04-09"
   s.description = "Create your alerts easily and send it to Nagios"
   s.email = "Denis.Knauf@gmail.com"
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nsca
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-08 00:00:00.000000000 Z
+date: 2013-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: enum
@@ -162,7 +162,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -806147665
+      hash: 410259443
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: