zapix3 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e83c4140f098e4ef1f92a91bc0a8384f034c33b
-  data.tar.gz: d1c8ed83755afb2526214cc4d6e54126ebd5b696
+  metadata.gz: 3f3f33a9668f650e6509786c63ccf01b8de2a302
+  data.tar.gz: c533c13d7637f018c4797653bd61870557af26d2
 SHA512:
-  metadata.gz: 7fc85708f4ba6231efc574c91996cf2ae8980435d90fe613a234d0b18bdb5a83b436441b8dde22c9de5653fa3eae1ec3bd38082ec1ac02543c46746349363925
-  data.tar.gz: a2477b737f6dbdff67b182cbc2432cb6ac003b5fc618ea490df13d7a5e93e5685da68236678e875e1c679cef8f724abdf52b5bbff938867ce94e824ead8399ae
+  metadata.gz: 0ff6fb058f298868d11c4a48d937fce3c278794fd16dc451cbb7df0884c70b54e11c90a1b6169f15affd386b68df11f0a704097b084b0c24f56b03a9fb271872
+  data.tar.gz: 0842910a995a4e1cb6442ab81d095dc2481539a46af6a1f6d8b4b25b72220738e45a57255d2404a1af4873e3f1965c9d7d4cbd79171c4221da944fae81589c08

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    zapix3 (0.2.2)
+    zapix3 (0.2.3)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -26,19 +26,13 @@ Or install it with gem:
 First create a remote client. Feel free to
 disable the debug mode if you find it annoying.
 
-These environment variables also need to be set:
-
-    ZABBIX_API_URL
-    ZABBIX_API_LOGIN
-    ZABBIX_API_PASSWORD
-
 ```ruby
 require 'zapix'
 zrc = ZabbixAPI.connect(
-  :service_url => 'https://zabbix-server.foo/api_jsonrpc.php',
-  :username => 'guybrush',
-  :password => 'threepwood',
-  :debug => true
+  service_url: ENV['ZABBIX_SERVER_URL'],
+  username: ENV['ZABBIX_USERNAME'],
+  password: ENV['ZABBIX_PASSWORD'],
+  debug: true
 )
 ```
 

data/Rakefile

@@ -1 +1 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'

data/lib/zapix/proxies/actions.rb

@@ -2,8 +2,8 @@ require_relative 'base'
 
 class Actions < Base
   def exists?(options)
-    result = client.action_get({'filter' => {'name' => options['name']}})
-    if (result == nil || result.empty?)
+    result = client.action_get('filter' => { 'name' => options['name'] })
+    if result.nil? || result.empty?
       return false
     else
       return true
@@ -15,9 +15,8 @@ class Actions < Base
   end
 
   def get_id(options)
-    result = client.action_get({
-      'filter' => {'name' => options['name']}})
-    
+    result = client.action_get('filter' => { 'name' => options['name'] })
+
     result.first['actionid']
   end
 

data/lib/zapix/proxies/applications.rb

@@ -1,14 +1,13 @@
 require_relative 'base'
 
 class Applications < Base
-
   def create(options)
     client.application_create(options) unless exists?(options)
   end
 
   def exists?(options)
-    result = client.application_get({'filter' => {'name' => options['name']}})
-    if (result == nil || result.empty?)
+    result = client.application_get('filter' => { 'name' => options['name'] })
+    if result.nil? || result.empty?
       false
     else
       true
@@ -17,14 +16,12 @@ class Applications < Base
 
   def get_id(options)
     if exists?(options)
-      client.application_get({
-        'filter' => {'name' => options['name'],
-        'hostid' => options['hostid']}}).first['applicationid']
+      client.application_get('filter' => { 'name' => options['name'],
+                                           'hostid' => options['hostid'] }).first['applicationid']
     else
       raise NonExistingApplication, "Application #{options['name']} does not exist !"
     end
   end
 
   class NonExistingApplication < StandardError; end
-
 end

data/lib/zapix/proxies/graphs.rb

@@ -7,10 +7,10 @@ class Graphs < Base
 
     graphs.each do |g|
       graphs_with_names_and_ids <<
-      { 
-        'name' => g['name'],
-        'id' => g['graphid']
-      }
+        {
+          'name' => g['name'],
+          'id' => g['graphid']
+        }
     end
 
     graphs_with_names_and_ids

data/lib/zapix/proxies/hostgroups.rb

@@ -1,7 +1,6 @@
 require_relative 'base'
 
 class HostGroups < Base
-
   def mass_create(*names)
     names.each do |group_name|
       create(group_name)
@@ -9,21 +8,21 @@ class HostGroups < Base
   end
 
   def create(name)
-    client.hostgroup_create({'name' => name}) unless exists?(name)
+    client.hostgroup_create('name' => name) unless exists?(name)
   end
 
   def create_or_update(name)
-    if(exists?(name))
+    if exists?(name)
       id = get_id(name)
-      client.hostgroup_update({'groupid' => id,'name' => name})
+      client.hostgroup_update('groupid' => id, 'name' => name)
     else
       create(name)
     end
   end
 
   def exists?(name)
-    result = client.hostgroup_get({'filter' => {'name' => [name]}})
-    if (result == nil || result.empty?)
+    result = client.hostgroup_get('filter' => { 'name' => [name] })
+    if result.nil? || result.empty?
       return false
     else
       return true
@@ -31,8 +30,8 @@ class HostGroups < Base
   end
 
   def get_id(name)
-    if(exists?(name))
-      result = client.hostgroup_get({'filter' => {'name' => [name]}})
+    if exists?(name)
+      result = client.hostgroup_get('filter' => { 'name' => [name] })
       result[0]['groupid']
     else
       raise NonExistingHostgroup, "Hostgroup #{name} does not exist !"
@@ -46,22 +45,22 @@ class HostGroups < Base
   end
 
   def get_host_ids_of(hostgroup)
-    result = client.hostgroup_get('filter' => {'name' => [hostgroup]}, 'selectHosts' => 'refer')
+    result = client.hostgroup_get('filter' => { 'name' => [hostgroup] }, 'selectHosts' => 'refer')
     extract_host_ids(result)
   end
 
   def any_hosts?(hostgroup)
     raise NonExistingHostgroup, "Hostgroup #{hostgroup} does not exist !" unless exists?(hostgroup)
-    result = client.hostgroup_get('filter' => {'name' => [hostgroup]}, 'selectHosts' => 'count').first['hosts'].to_i
-    #result = client.hostgroup_get('countOutput' => 'true', 'filter' => {'name' => [hostgroup]}, 'selectHosts' => 'count').to_i
+    result = client.hostgroup_get('filter' => { 'name' => [hostgroup] }, 'selectHosts' => 'count').first['hosts'].to_i
+    # result = client.hostgroup_get('countOutput' => 'true', 'filter' => {'name' => [hostgroup]}, 'selectHosts' => 'count').to_i
     result >= 1 ? true : false
   end
 
   def delete(name)
-    if(exists?(name))
-      # host cannot exist without a hostgroup, so we need to delete 
+    if exists?(name)
+      # host cannot exist without a hostgroup, so we need to delete
       # the attached hosts also
-      if(any_hosts?(name))
+      if any_hosts?(name)
         # delete all hosts attached to a hostgroup
         host_ids = get_host_ids_of(name)
         host_ids.each do |id|
@@ -80,7 +79,7 @@ class HostGroups < Base
   def get_all
     # the fucking API also returns the ids and that's
     # why we need to extract the names
-    host_groups_with_ids = client.hostgroup_get({'output' => ['name']})
+    host_groups_with_ids = client.hostgroup_get('output' => ['name'])
     extract_host_groups(host_groups_with_ids)
   end
 

data/lib/zapix/proxies/hostinterfaces.rb

@@ -1,7 +1,6 @@
 require_relative 'base'
 
 class Hostinterfaces < Base
-
   def create(options)
     client.hostinterface_create(options) unless exists?(options)
   end
@@ -12,10 +11,10 @@ class Hostinterfaces < Base
 
   def get(options)
     client.hostinterface_get(
-      {'filter' => {'hostid' => options['hostid'],
-      'port' => options['port'],
-      'type' => options['type']},
-      'output' => 'extend'})
+      'filter' => { 'hostid' => options['hostid'],
+                    'port' => options['port'],
+                    'type' => options['type'] },
+      'output' => 'extend'
+    )
   end
-
 end

data/lib/zapix/proxies/hosts.rb

@@ -1,50 +1,49 @@
 require_relative 'base'
 class Hosts < Base
-
   def get_id(name)
-    if(exists?(name))
-      client.host_get({'filter' => {'host' => name}}).first['hostid']
+    if exists?(name)
+      client.host_get('filter' => { 'host' => name }).first['hostid']
     else
       raise NonExistingHost, "Host #{name} does not exist !"
     end
   end
 
   def get_hosts_for_hostgroup(group_id)
-    client.host_get({'groupids' => [group_id]})
+    client.host_get('groupids' => [group_id])
   end
 
-  def create(options={})
-    client.host_create(options) unless exists?(options["host"])
+  def create(options = {})
+    client.host_create(options) unless exists?(options['host'])
   end
 
-  def create_or_update(options={})
+  def create_or_update(options = {})
     raise EmptyHostname, 'Host name cannot be empty !' if options['host'].nil?
     if exists?(options['host'])
       id = get_id(options['host'])
-      options.merge!('hostid' => id)
+      options['hostid'] = id
       client.host_update(options)
     else
       create(options)
     end
   end
 
-  def unlink_and_clear_templates(options={})
-    template_ids = options['template_ids'].map { |id| {'templateid' => id}}
-    client.host_update({'hostid' => options['host_id'], 'templates_clear' => template_ids})
+  def unlink_and_clear_templates(options = {})
+    template_ids = options['template_ids'].map { |id| { 'templateid' => id } }
+    client.host_update('hostid' => options['host_id'], 'templates_clear' => template_ids)
   end
 
-  def update_templates(options={})
-    template_ids = options['template_ids'].map { |id| {'templateid' => id}}
-    client.host_update({'hostid' => options['host_id'], 'templates' => template_ids})
+  def update_templates(options = {})
+    template_ids = options['template_ids'].map { |id| { 'templateid' => id } }
+    client.host_update('hostid' => options['host_id'], 'templates' => template_ids)
   end
 
-  def update_macros(options={})
+  def update_macros(options = {})
     client.host_update('hostid' => options['host_id'], 'macros' => options['macros'])
   end
 
   def exists?(name)
-    result = client.host_get({'filter' => {'host' => name}})
-    if (result == nil || result.empty?)
+    result = client.host_get('filter' => { 'host' => name })
+    if result.nil? || result.empty?
       false
     else
       true
@@ -52,7 +51,7 @@ class Hosts < Base
   end
 
   def get_all
-    host_names_and_ids = client.host_get({'output' => ['name']})
+    host_names_and_ids = client.host_get('output' => ['name'])
 
     # the fucking api ALWAYS returns the ids and that's
     # why we need to extract the names separately

data/lib/zapix/proxies/proxies.rb

@@ -1,13 +1,9 @@
 require_relative 'base'
 
 class Proxies < Base
-
   def get_id(proxy_name)
-    result = client.proxy_get({
-      'filter' => {'host' => proxy_name}
-    })
+    result = client.proxy_get('filter' => { 'host' => proxy_name })
 
     result.first['proxyid']
   end
-
-end
+end

data/lib/zapix/proxies/scenarios.rb

@@ -6,8 +6,7 @@ class Scenarios < Base
   end
 
   def get_id(options)
-    client.httptest_get({
-      'filter' => {'name' => options['name'], 'hostid' => options['hostid']}}).first['httptestid']
+    client.httptest_get('filter' => { 'name' => options['name'], 'hostid' => options['hostid'] }).first['httptestid']
   end
 
   def delete(options)
@@ -15,20 +14,19 @@ class Scenarios < Base
   end
 
   def exists?(options)
-    result = client.httptest_get({
-      'countOutput' => true,
-      'filter' => {'name' => options['name'],
-      'hostid' => options['hostid']}})
+    result = client.httptest_get('countOutput' => true,
+                                 'filter' => { 'name' => options['name'],
+                                               'hostid' => options['hostid'] })
 
     result.to_i >= 1 ? true : false
   end
 
   def get_all
-    scenarios = client.httptest_get({'output' => 'extend'})
+    scenarios = client.httptest_get('output' => 'extend')
     names = extract_names(scenarios)
   end
 
   def extract_names(scenarios)
-    scenarios.map {|scenario| scenario['name']} 
+    scenarios.map { |scenario| scenario['name'] }
   end
 end

data/lib/zapix/proxies/screens.rb

@@ -2,9 +2,7 @@ require_relative 'base'
 
 class Screens < Base
   def get_id(options)
-    result = client.screen_get({
-      'filter' => {'name' => options['name']}
-    })
+    result = client.screen_get('filter' => { 'name' => options['name'] })
 
     result.first['screenid']
   end
@@ -18,8 +16,8 @@ class Screens < Base
   end
 
   def exists?(options)
-    result = client.screen_get({'filter' => {'name' => options['name']}})
-    if (result == nil || result.empty?)
+    result = client.screen_get('filter' => { 'name' => options['name'] })
+    if result.nil? || result.empty?
       false
     else
       true

data/lib/zapix/proxies/templates.rb

@@ -1,9 +1,8 @@
 require_relative 'base'
 class Templates < Base
-
   def exists?(name)
-    result = client.template_get({'filter' => {'name' => name}})
-    if (result == nil || result.empty?)
+    result = client.template_get('filter' => { 'name' => name })
+    if result.nil? || result.empty?
       false
     else
       true
@@ -15,15 +14,15 @@ class Templates < Base
   end
 
   def get_id(name)
-    if(exists?(name))
-      client.template_get({'filter' => {'name' => name}}).first['templateid']
+    if exists?(name)
+      client.template_get('filter' => { 'name' => name }).first['templateid']
     else
       raise NonExistingTemplate, "Template #{name} does not exist !"
     end
   end
 
   def get_templates_for_host(id)
-    client.template_get({'hostids' => [id]}).map { |result_set| result_set['templateid'] }
+    client.template_get('hostids' => [id]).map { |result_set| result_set['templateid'] }
   end
 
   class NonExistingTemplate < StandardError; end

data/lib/zapix/proxies/triggers.rb

@@ -1,22 +1,35 @@
 require_relative 'base'
 class Triggers < Base
-
   def create(options)
-    client.trigger_create(options)
+    client.trigger_create(options) unless exists?(options)
   end
 
   def delete(*trigger_ids)
     client.trigger_delete(trigger_ids)
   end
 
-  def get_id(options)
-    result = client.trigger_get({'output' => 'extend',
-      'expandExpression' => true})
+  # this is very unefficient
+  # but there is no other way to verify that a trigger exists..
+  def exists?(options)
+    result = client.trigger_get('output' => 'extend',
+                                'expandExpression' => true)
+
     id = extract_id(result, options['expression'])
-    unless id.nil?
-      id
+    if id.nil?
+      false
     else
+      true
+    end
+  end
+
+  def get_id(options)
+    result = client.trigger_get('output' => 'extend',
+                                'expandExpression' => true)
+    id = extract_id(result, options['expression'])
+    if id.nil?
       raise NonExistingTrigger, "Trigger with expression #{options['expression']} not found."
+    else
+      id
     end
   end
 
@@ -34,7 +47,4 @@ class Triggers < Base
     end
     result
   end
-
 end
-
-

data/lib/zapix/proxies/usergroups.rb

@@ -1,15 +1,14 @@
 require_relative 'base'
 
 class Usergroups < Base
-
   def create(options)
     client.usergroup_create(options) unless exists?(options)
   end
 
   def exists?(options)
-    #client.usergroup_exists(options)
-    result = client.usergroup_get({'filter' => {'name' => options['name']}})
-    if result.empty? || result == nil
+    # client.usergroup_exists(options)
+    result = client.usergroup_get('filter' => { 'name' => options['name'] })
+    if result.empty? || result.nil?
       false
     else
       true
@@ -17,9 +16,8 @@ class Usergroups < Base
   end
 
   def get_id(options)
-    if(exists?(options))
-      result = client.usergroup_get({
-        'filter' => {'name' => options['name']}})
+    if exists?(options)
+      result = client.usergroup_get('filter' => { 'name' => options['name'] })
       result.first['usrgrpid']
     else
       raise NonExistingUsergroup, "Usergroup #{options['name']} does not exist !"
@@ -31,5 +29,4 @@ class Usergroups < Base
   end
 
   class NonExistingUsergroup < StandardError; end
-
 end

data/lib/zapix/proxies/users.rb

@@ -6,13 +6,13 @@ class Users < Base
   end
 
   def exists?(options)
-    result = client.user_get({'filter' => {'alias' => options['alias']}})
+    result = client.user_get('filter' => { 'alias' => options['alias'] })
     result.empty? ? false : true
   end
 
   def get_id(options)
-    if(exists?(options))
-      client.user_get({'filter' => {'alias' => options['alias']}}).first['userid']
+    if exists?(options)
+      client.user_get('filter' => { 'alias' => options['alias'] }).first['userid']
     else
       raise NonExistingUser, "User #{options['alias']} does not exist !"
     end
@@ -24,5 +24,3 @@ class Users < Base
 
   class NonExistingUser < StandardError; end
 end
-
-

data/lib/zapix/version.rb

@@ -1,3 +1,3 @@
 module Zapix
-  VERSION = "0.2.2"
+  VERSION = '0.2.3'.freeze
 end

data/lib/zapix/zabbix_classes/host.rb

@@ -1,13 +1,12 @@
 class Host
-
   attr_accessor :group_ids, :template_ids, :interfaces, :macros
 
-  def initialize()
-    @group_ids = Array.new
-    @template_ids = Array.new
-    @interfaces = Array.new
-    @macros = Array.new
-    @properties = Hash.new
+  def initialize
+    @group_ids = []
+    @template_ids = []
+    @interfaces = []
+    @macros = []
+    @properties = {}
   end
 
   def add_name(name)
@@ -20,7 +19,7 @@ class Host
 
   def add_group_ids(*ids)
     ids.each do |id|
-      group_ids << {'groupid' => id}
+      group_ids << { 'groupid' => id }
     end
     @properties.merge!('groups' => group_ids)
   end
@@ -36,7 +35,7 @@ class Host
 
   def add_template_ids(*ids)
     ids.each do |id|
-      template_ids << {'templateid' => id}
+      template_ids << { 'templateid' => id }
     end
     @properties.merge!('templates' => template_ids)
   end
@@ -49,7 +48,4 @@ class Host
   def to_hash
     @properties
   end
-
 end
-
-

data/lib/zapix/zabbix_classes/interface.rb

@@ -10,9 +10,9 @@ class Interface
   #  https://www.zabbix.com/documentation/2.0/manual/appendix/api/hostinterface/definitions#host_interface
   # we assume ip and dns shall always be set
 
-  validates_inclusion_of :type, :in => 1..4
-  validates_inclusion_of :main, :in => 0..1
-  validates_inclusion_of :useip, :in => 0..1
+  validates_inclusion_of :type, in: 1..4
+  validates_inclusion_of :main, in: 0..1
+  validates_inclusion_of :useip, in: 0..1
 
   def initialize(attributes)
     @type = attributes['type'] ||= 1
@@ -20,7 +20,7 @@ class Interface
     @useip = attributes['useip'] ||= 1
     @ip = attributes['ip'] = attributes['ip']
     @dns = attributes['dns'] = attributes['dns']
-    @port = attributes['port'] = attributes['port'] ||= 10050
+    @port = attributes['port'] = attributes['port'] ||= 10_050
     @result = {
       'type' => type,
       'main' => main,
@@ -38,5 +38,4 @@ class Interface
   def to_hash
     @result
   end
-
 end

data/lib/zapix/zabbix_rpc_client.rb

@@ -1,9 +1,8 @@
 require 'net/http'
 require 'uri'
 require 'json'
- 
-class ZabbixRPCClient
 
+class ZabbixRPCClient
   attr_reader :uri, :debug
 
   def initialize(options)
@@ -13,7 +12,7 @@ class ZabbixRPCClient
     @debug = options[:debug]
     @auth_token = authenticate
   end
- 
+
   def method_missing(name, *args)
     method_name = map_name(name)
 
@@ -22,17 +21,17 @@ class ZabbixRPCClient
       'params' => args.first,
       'id' => id,
       'jsonrpc' => '2.0',
-      'auth' => @auth_token 
+      'auth' => @auth_token
     }.to_json
 
-    resp = JSON.parse( http_post_request(post_body) )
+    resp = JSON.parse(http_post_request(post_body))
     raise JSONRPCError, resp['error'] if resp['error']
     puts "[DEBUG] Get answer: #{resp}" if debug
-    resp["result"]
+    resp['result']
   end
- 
+
   def http_post_request(post_body)
-    http    = Net::HTTP.new(uri.host, uri.port)
+    http = Net::HTTP.new(uri.host, uri.port)
     http.use_ssl = true
     request = Net::HTTP::Post.new(uri.request_uri)
     request.content_type = 'application/json'
@@ -42,16 +41,16 @@ class ZabbixRPCClient
   end
 
   def authenticate
-    p user_login({'user' => @username, 'password' => @password})
-    user_login({'user' => @username, 'password' => @password})
+    p user_login('user' => @username, 'password' => @password)
+    user_login('user' => @username, 'password' => @password)
   end
 
   def id
-    rand(100000)
+    rand(100_000)
   end
 
   def map_name(name)
-   name.to_s.sub('_', '.')
+    name.to_s.sub('_', '.')
   end
 
   class JSONRPCError < RuntimeError; end

data/lib/zapix.rb

@@ -69,5 +69,4 @@ class ZabbixAPI
   def graphs
     @graphs ||= Graphs.new(client)
   end
-  
 end

data/spec/spec_helper.rb

@@ -6,7 +6,6 @@
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 require 'zapix'
 RSpec.configure do |config|
-
   config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
   config.filter_run :focus

data/spec/zapix_specs.rb

@@ -1,11 +1,11 @@
 require_relative 'spec_helper'
 
 zrc = ZabbixAPI.connect(
-  :service_url => ENV['ZABBIX_API_URL'],
-  :username => ENV['ZABBIX_API_LOGIN'],
-  :password => ENV['ZABBIX_API_PASSWORD'],
-  :debug => true
-  )
+  service_url: ENV['ZABBIX_API_URL'],
+  username: ENV['ZABBIX_API_LOGIN'],
+  password: ENV['ZABBIX_API_PASSWORD'],
+  debug: true
+)
 
 hostgroup = 'hostgroup123'
 another_hostgroup = 'anotherhostgroup'
@@ -17,8 +17,8 @@ application = 'web scenarios'
 host = 'hostname'
 scenario = 'scenario'
 trigger_description = 'Webpage failed on {HOST.NAME}'
-#trigger_expression = "{#{host}:web.test.fail[#{scenario}].max(#3)}#0"
-trigger_expression = "{#{host}:system.cpu.load[percpu,avg1].last()}>5"                
+# trigger_expression = "{#{host}:web.test.fail[#{scenario}].max(#3)}#0"
+trigger_expression = "{#{host}:system.cpu.load[percpu,avg1].last()}>5"
 non_existing_trigger_expression = '{vfs.file.cksum[/etc/passwd].diff(0)}>0'
 existing_action_name = 'Report problems to Zabbix administrators'
 non_existing_action_name = 'No action defined'
@@ -31,7 +31,6 @@ test_user = 'Jim'
 test_action = 'Test Action'
 
 describe ZabbixAPI do
-
   context 'hostgroup' do
     before(:all) do
       zrc.hostgroups.create(hostgroup)
@@ -61,7 +60,7 @@ describe ZabbixAPI do
 
     it 'returns hostgroup id' do
       result = zrc.hostgroups.get_id(hostgroup)
-      (result.to_i).should >= 0
+      result.to_i.should >= 0
     end
 
     it 'throws exception if hostgroup id does not exist' do
@@ -69,7 +68,7 @@ describe ZabbixAPI do
     end
 
     it 'throws exception if someone checks for attached hosts of nonexisting group' do
-     expect { zrc.hostgroups.any_hosts?('nonexisting') }.to raise_error(HostGroups::NonExistingHostgroup)
+      expect { zrc.hostgroups.any_hosts?('nonexisting') }.to raise_error(HostGroups::NonExistingHostgroup)
     end
 
     it 'returns false if a hostgroup has no attached hosts' do
@@ -77,9 +76,8 @@ describe ZabbixAPI do
     end
 
     it 'returns all hostgroups' do
-      (zrc.hostgroups.get_all).should include(hostgroup, another_hostgroup)
+      zrc.hostgroups.get_all.should include(hostgroup, another_hostgroup)
     end
-
   end
   context 'complex hostgroup consisting hosts' do
     before(:each) do
@@ -90,16 +88,15 @@ describe ZabbixAPI do
       example_host.add_interfaces(create_interface.to_hash)
       example_host.add_group_ids(hostgroup_id)
       example_host.add_template_ids(zrc.templates.get_id(template_1), zrc.templates.get_id(template_2))
-      example_host.add_macros({'macro' => '{$TESTMACRO}', 'value' => 'test123'})
+      example_host.add_macros('macro' => '{$TESTMACRO}', 'value' => 'test123')
       zrc.hosts.create_or_update(example_host.to_hash)
     end
 
-     it 'deletes a hostgroup with attached hosts' do
+    it 'deletes a hostgroup with attached hosts' do
       zrc.hosts.exists?(host).should be true
       zrc.hostgroups.delete(hostgroup_with_hosts)
       zrc.hostgroups.exists?(hostgroup_with_hosts).should be false
     end
-   
   end
 
   context 'complex hostgroup' do
@@ -109,7 +106,7 @@ describe ZabbixAPI do
       example_host = Host.new
       example_host.add_name(host)
       example_host.add_interfaces(create_interface.to_hash)
-      example_host.add_macros({'macro' => '{$TESTMACRO}', 'value' => 'test123'})
+      example_host.add_macros('macro' => '{$TESTMACRO}', 'value' => 'test123')
       example_host.add_group_ids(hostgroup_id)
       example_host.add_template_ids(zrc.templates.get_id(template_1), zrc.templates.get_id(template_2))
       zrc.hosts.create_or_update(example_host.to_hash)
@@ -125,7 +122,7 @@ describe ZabbixAPI do
       webcheck_options['hostid'] = zrc.hosts.get_id(host)
       webcheck_options['name'] = scenario
       webcheck_options['applicationid'] = zrc.applications.get_id(application_options)
-      webcheck_options['steps'] = [{'name' => 'Homepage', 'url' => 'm.test.de', 'status_codes' => 200, 'no' => 1}]
+      webcheck_options['steps'] = [{ 'name' => 'Homepage', 'url' => 'm.test.de', 'status_codes' => 200, 'no' => 1 }]
       zrc.scenarios.create(webcheck_options)
 
       # creates a trigger
@@ -141,7 +138,6 @@ describe ZabbixAPI do
     end
 
     describe 'hosts' do
-
       it 'returns true if a hostgroup has attached hosts' do
         zrc.hostgroups.any_hosts?(hostgroup_with_hosts).should be true
       end
@@ -202,13 +198,13 @@ describe ZabbixAPI do
         host_id = zrc.hosts.get_id(host)
         options = {}
         options['host_id'] = host_id
-        options['macros'] = [{'macro' => '{$TESTMACRO}', 'value' => 'this is only a test macro'}]
+        options['macros'] = [{ 'macro' => '{$TESTMACRO}', 'value' => 'this is only a test macro' }]
         zrc.hosts.update_macros(options)
       end
 
       it 'creates a template' do
         template_name = 'Template Tomcat'
-        options = {'host' => template_name}
+        options = { 'host' => template_name }
         options['groups'] = zrc.hostgroups.get_id(templates_hostgroup)
         zrc.templates.create(options)
         zrc.templates.exists?(template_name).should be true
@@ -235,12 +231,12 @@ describe ZabbixAPI do
         options['name'] = application
         options['hostid'] = zrc.hosts.get_id(host)
         result = zrc.applications.get_id(options)
-        (result.to_i).should >= 0
+        result.to_i.should >= 0
       end
 
       it 'throws exception on non existing application' do
         options = {}
-        options['name'] = "nonexisting"
+        options['name'] = 'nonexisting'
         options['hostid'] = zrc.hosts.get_id(host)
         expect { zrc.applications.get_id(options) }.to raise_error(Applications::NonExistingApplication)
       end
@@ -256,7 +252,7 @@ describe ZabbixAPI do
 
       it 'returns all web scenarios' do
         options = {}
-        (zrc.scenarios.get_all).should include(scenario)
+        zrc.scenarios.get_all.should include(scenario)
       end
 
       it 'gets the id of a web scenario' do
@@ -265,12 +261,12 @@ describe ZabbixAPI do
         options['hostid'] = zrc.hosts.get_id(host)
         zrc.scenarios.exists?(options).should be true
         result = zrc.scenarios.get_id(options)
-        (result['result'].to_i).should >= 0
+        result['result'].to_i.should >= 0
       end
 
       it 'returns false if a web scenario does not exist' do
         options = {}
-        options['name'] = "nonexisting"
+        options['name'] = 'nonexisting'
         options['hostid'] = zrc.hosts.get_id(host)
         zrc.scenarios.exists?(options).should be false
       end
@@ -320,7 +316,7 @@ describe ZabbixAPI do
       it 'check if interface exists for host' do
         options = {}
         options['hostid'] = zrc.hosts.get_id(host)
-        options['port'] = 10050
+        options['port'] = 10_050
         options['type'] = 1
         zrc.hostinterfaces.exists?(options).should be true
 
@@ -355,12 +351,12 @@ describe ZabbixAPI do
           'operator'      => 0, # =
           'value' => zrc.hostgroups.get_id('Templates')
         },
-        # not in maintenance
-        {
-          'conditiontype' => 16, # Maintenance
-          'operator'      => 7,  # not in
-          'value'         => 'maintenance'
-        }]
+                                 # not in maintenance
+                                 {
+                                   'conditiontype' => 16, # Maintenance
+                                   'operator'      => 7,  # not in
+                                   'value'         => 'maintenance'
+                                 }]
         options['operations'] = [{
           'operationtype' => 0,
           'esc_period'     => 0,
@@ -397,7 +393,7 @@ describe ZabbixAPI do
         options = {}
         options['name'] = test_action
         result = zrc.actions.get_id(options)
-        (result.to_i).should >= 0
+        result.to_i.should >= 0
       end
     end
 
@@ -431,7 +427,7 @@ describe ZabbixAPI do
         options = {}
         options['name'] = test_usergroup
         result = zrc.usergroups.get_id(options)
-        (result.to_i).should >= 0
+        result.to_i.should >= 0
         options['name'] = non_existing_usergroup
         expect { zrc.usergroups.get_id(options) }.to raise_error(Usergroups::NonExistingUsergroup)
       end
@@ -478,18 +474,18 @@ describe ZabbixAPI do
         options = {}
         options['alias'] = test_user
         result = zrc.users.get_id(options)
-        (result.to_i).should >= 0
+        result.to_i.should >= 0
         options['alias'] = non_existing_user
         expect { zrc.users.get_id(options) }.to raise_error(Users::NonExistingUser)
       end
-
     end
   end
 
   def create_interface
     Interface.new(
       'ip'  => random_local_ip,
-      'dns' => random_domain)
+      'dns' => random_domain
+    )
   end
 
   def create_jmx_interface
@@ -498,7 +494,8 @@ describe ZabbixAPI do
       'dns' => random_domain,
       'type' => 4, # JMX
       'main' => 1, # default jmx interface
-      'port' => 9003)
+      'port' => 9003
+    )
   end
 
   def random_string
@@ -516,5 +513,4 @@ describe ZabbixAPI do
   def random_domain
     "#{random_string}.our-cloud.de"
   end
-
 end

data/zapix.gemspec

@@ -4,24 +4,23 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'zapix/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "zapix3"
+  spec.name          = 'zapix3'
   spec.version       = Zapix::VERSION
-  spec.authors       = ["stoyan"]
-  spec.email         = ["stoyanoff.s@gmail.com"]
-  spec.description   = %q{Communication with the Zabbix API made easy. This version is compatible with zabbix 3.0}
-  spec.summary       = %q{A cool gem}
-  spec.homepage      = "https://github.com/mrsn/zapix3"
-  spec.license       = "MIT"
+  spec.authors       = ['stoyan']
+  spec.email         = ['stoyanoff.s@gmail.com']
+  spec.description   = 'Communication with the Zabbix API made easy. This version is compatible with zabbix 3.0'
+  spec.summary       = 'A cool gem'
+  spec.homepage      = 'https://github.com/mrsn/zapix3'
+  spec.license       = 'MIT'
 
-  spec.files         = `git ls-files`.split($/)
+  spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
-
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "json"
-  spec.add_development_dependency "rspec"
-  spec.add_development_dependency "activerecord"
+  spec.require_paths = ['lib']
 
+  spec.add_development_dependency 'bundler', '~> 1.3'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'json'
+  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'activerecord'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zapix3
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - stoyan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-14 00:00:00.000000000 Z
+date: 2016-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler