zabbixapi 0.5.9 → 0.6.0

data/lib/zabbixapi/1.8/classes/hosts.rb

@@ -35,7 +35,7 @@ class ZabbixApi
 
     def unlink_templates(data)
       result = @client.api_request(
-        :method => "host.massRemove", 
+        :method => "host.massRemove",
         :params => {
           :hostids => data[:hosts_id],
           :templates => data[:templates_id]

data/lib/zabbixapi/1.8/classes/triggers.rb

@@ -1,6 +1,6 @@
 class ZabbixApi
   class Triggers < Basic
-    
+
     def array_flag
       true
     end
@@ -29,9 +29,9 @@ class ZabbixApi
       )
     end
 
-    def safe_update(data)     
+    def safe_update(data)
       log "[DEBUG] Call update with parametrs: #{data.inspect}"
-      
+
       dump = {}
       item_id = data[key.to_sym].to_i
       dump_by_id(key.to_sym => data[key.to_sym]).each do |item|
@@ -39,17 +39,17 @@ class ZabbixApi
       end
 
       expression = dump[:items][0][:key_]+"."+dump[:functions][0][:function]+"("+dump[:functions][0][:parameter]+")"
-      dump[:expression] = dump[:expression].gsub(/{(\d*)}/,"{#{expression}}") #TODO ugly regexp
+      dump[:expression] = dump[:expression].gsub(/\{(\d*)\}/,"{#{expression}}") #TODO ugly regexp
       dump.delete(:functions)
       dump.delete(:items)
 
       old_expression = data[:expression]
-      data[:expression] = data[:expression].gsub(/{.*\:/,"{") #TODO ugly regexp
+      data[:expression] = data[:expression].gsub(/\{.*\:/,"{") #TODO ugly regexp
       data.delete(:templateid)
-      
+
       log "[DEBUG] expression: #{dump[:expression]}\n data: #{data[:expression]}"
 
-      if hash_equals?(dump, data) 
+      if hash_equals?(dump, data)
         log "[DEBUG] Equal keys #{dump} and #{data}, skip update"
         item_id
       else

data/lib/zabbixapi/client.rb

@@ -1,4 +1,5 @@
 require 'json'
+require 'net/https'
 require 'net/http'
 
 class ZabbixApi
@@ -16,7 +17,7 @@ class ZabbixApi
 
     def auth
       api_request(
-        :method => 'user.authenticate', 
+        :method => 'user.authenticate',
         :params => {
           :user      => @options[:user],
           :password  => @options[:password],

data/lib/zabbixapi/version.rb

@@ -1,3 +1,3 @@
 class ZabbixApi
-  VERSION = "0.5.9"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zabbixapi
 version: !ruby/object:Gem::Version
-  version: 0.5.9
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-26 00:00:00.000000000 Z
+date: 2013-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -104,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: zabbixapi
-rubygems_version: 1.8.25
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Realization for Zabbix API.