zapix 0.1.1 → 0.1.2

data/lib/zapix/proxies/actions.rb

@@ -1,21 +1,21 @@
-require_relative 'basic'
+require_relative 'base'
 
-class Actions < Basic
+class Actions < Base
   def exists?(options)
-    @client.action_exists(options)
+    client.action_exists(options)
   end
 
   def create(options)
-    @client.action_create(options) unless exists?(options)
+    client.action_create(options) unless exists?(options)
   end
 
   def get_id(options)
-    result = @client.action_get({
+    result = client.action_get({
       'filter' => {'name' => options['name']}})
       result.first['actionid']
   end
 
   def delete(*action_ids)
-    @client.action_delete(action_ids)
+    client.action_delete(action_ids)
   end
 end

data/lib/zapix/proxies/applications.rb

@@ -1,18 +1,18 @@
-require_relative 'basic'
+require_relative 'base'
 
-class Applications < Basic
+class Applications < Base
 
   def create(options)
-    @client.application_create(options) unless exists?(options)
+    client.application_create(options) unless exists?(options)
   end
 
   def exists?(options)
-    @client.application_exists(options)
+    client.application_exists(options)
   end
 
   def get_id(options)
     if exists?(options)
-      @client.application_get({
+      client.application_get({
         'filter' => {'name' => options['name'],
         'hostid' => options['hostid']}}).first['applicationid']
     else

data/lib/zapix/proxies/hostgroups.rb

@@ -1,6 +1,6 @@
-require_relative 'basic'
+require_relative 'base'
 
-class HostGroups < Basic
+class HostGroups < Base
 
   def mass_create(*names)
     names.each do |group_name|
@@ -9,25 +9,25 @@ class HostGroups < Basic
   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))
       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)
-    @client.hostgroup_exists({'name' => name})
+    client.hostgroup_exists({'name' => name})
   end
 
   def get_id(name)
     if(exists?(name))
-      result = @client.hostgroup_get({'filter' => {'name' => [name]}})
+      result = client.hostgroup_get({'filter' => {'name' => [name]}})
       result[0]['groupid']
     else
       raise NonExistingHostgroup, "Hostgroup #{name} does not exist !"
@@ -41,18 +41,14 @@ class HostGroups < Basic
   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
-    if(result >= 1)
-      true
-    else
-      false
-    end
+    result = client.hostgroup_get('filter' => {'name' => [hostgroup]}, 'selectHosts' => 'count').first['hosts'].to_i
+    result >= 1 ? true : false
   end
 
   def delete(name)
@@ -63,12 +59,12 @@ class HostGroups < Basic
         # delete all hosts attached to a hostgroup
         host_ids = get_host_ids_of(name)
         host_ids.each do |id|
-          @client.host_delete(['hostid' => id])
+          client.host_delete(['hostid' => id])
         end
         # now it is ok to delete the group
-        @client.hostgroup_delete([get_id(name)])
+        client.hostgroup_delete([get_id(name)])
       else
-        @client.hostgroup_delete([get_id(name)])
+        client.hostgroup_delete([get_id(name)])
       end
     else
       raise NonExistingHostgroup, "Hostgroup #{name} does not exist !"
@@ -78,7 +74,7 @@ class HostGroups < Basic
   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,21 +1,17 @@
-require_relative 'basic'
+require_relative 'base'
 
-class Hostinterfaces < Basic
+class Hostinterfaces < Base
 
   def create(options)
-    @client.hostinterface_create(options) unless exists?(options)
+    client.hostinterface_create(options) unless exists?(options)
   end
 
   def exists?(options)
-    if get(options).empty?
-      false
-    else
-      true
-    end
+    get(options).empty? ? false : true
   end
 
   def get(options)
-    @client.hostinterface_get(
+    client.hostinterface_get(
       {'filter' => {'hostid' => options['hostid'],
       'port' => options['port'],
       'type' => options['type']},

data/lib/zapix/proxies/hosts.rb

@@ -1,16 +1,16 @@
-require_relative 'basic'
-class Hosts < Basic
+require_relative 'base'
+class Hosts < Base
 
   def get_id(name)
     if(exists?(name))
-      @client.host_get({'filter' => {'host' => name}}).first['hostid']
+      client.host_get({'filter' => {'host' => name}}).first['hostid']
     else
       raise NonExistingHost, "Host #{name} does not exist !"
     end
   end
 
   def create(options={})
-    @client.host_create(options) unless exists?(options["host"])
+    client.host_create(options) unless exists?(options["host"])
   end
 
   def create_or_update(options={})
@@ -18,7 +18,7 @@ class Hosts < Basic
     if exists?(options['host'])
       id = get_id(options['host'])
       options.merge!('hostid' => id)
-      @client.host_update(options)
+      client.host_update(options)
     else
       create(options)
     end
@@ -26,24 +26,24 @@ class Hosts < Basic
 
   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})
+    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})
+    client.host_update({'hostid' => options['host_id'], 'templates' => template_ids})
   end
 
   def update_macros(options={})
-    @client.host_update('hostid' => options['host_id'], 'macros' => options['macros'])
+    client.host_update('hostid' => options['host_id'], 'macros' => options['macros'])
   end
 
   def exists?(name)
-    @client.host_exists({'host' => name})
+    client.host_exists({'host' => name})
   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
@@ -53,7 +53,7 @@ class Hosts < Basic
 
   def delete(name)
     if exists?(name)
-      @client.host_delete(['hostid' => get_id(name)])
+      client.host_delete(['hostid' => get_id(name)])
     else
       raise NonExistingHost, "Host #{name} cannot be deleted because it does not exist !"
     end
@@ -62,7 +62,7 @@ class Hosts < Basic
   class NonExistingHost < StandardError; end
   class EmptyHostname < StandardError; end
 
-private
+  private
 
   def extract_host_names(hosts_and_ids)
     hosts_and_ids.map do |current_host|

data/lib/zapix/proxies/scenarios.rb

@@ -1,29 +1,26 @@
-require_relative 'basic'
+require_relative 'base'
 
-class Scenarios < Basic
+class Scenarios < Base
   def create(options)
-    @client.webcheck_create(options) unless exists?(options)
+    client.webcheck_create(options) unless exists?(options)
   end
 
   def get_id(options)
-    @client.webcheck_get({
+    client.webcheck_get({
       'filter' => {'name' => options['name'],
       'hostid' => options['hostid']}})
   end
 
   def delete(options)
-    @client.webcheck_delete(options)
+    client.webcheck_delete(options)
   end
 
   def exists?(options)
-    result = @client.webcheck_get({
+    result = client.webcheck_get({
       'countOutput' => true,
       'filter' => {'name' => options['name'],
       'hostid' => options['hostid']}})
-    if result.to_i >= 1
-      true
-    else
-      false
-    end
+
+    result.to_i >= 1 ? true : false
   end
 end

data/lib/zapix/proxies/templates.rb

@@ -1,22 +1,21 @@
-require_relative 'basic'
-class Templates < Basic
+require_relative 'base'
+class Templates < Base
 
   def exists?(name)
-    @client.template_exists({'name' => name})
+    client.template_exists({'name' => name})
   end
 
   def get_id(name)
     if(exists?(name))
-      @client.template_get({'filter' => {'name' => name}}).first['templateid']
+      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
-
 end

data/lib/zapix/proxies/triggers.rb

@@ -1,20 +1,20 @@
-require_relative 'basic'
-class Triggers < Basic
+require_relative 'base'
+class Triggers < Base
 
   def exists?(options)
-    @client.trigger_exists(options)
+    client.trigger_exists(options)
   end
 
   def create(options)
-    @client.trigger_create(options) unless exists?(options)
+    client.trigger_create(options) unless exists?(options)
   end
 
   def delete(*trigger_ids)
-    @client.trigger_delete(trigger_ids)
+    client.trigger_delete(trigger_ids)
   end
 
   def get_id(options)
-    result = @client.trigger_get({'output' => 'extend',
+    result = client.trigger_get({'output' => 'extend',
       'expandExpression' => true})
     id = extract_id(result, options['expression'])
     unless id.nil?
@@ -26,7 +26,7 @@ class Triggers < Basic
 
   class NonExistingTrigger < StandardError; end
 
-private
+  private
 
   def extract_id(triggers, expression)
     result = nil

data/lib/zapix/proxies/usergroups.rb

@@ -1,18 +1,18 @@
-require_relative 'basic'
+require_relative 'base'
 
-class Usergroups < Basic
+class Usergroups < Base
 
   def create(options)
-    @client.usergroup_create(options) unless exists?(options)
+    client.usergroup_create(options) unless exists?(options)
   end
 
   def exists?(options)
-    @client.usergroup_exists(options)
+    client.usergroup_exists(options)
   end
 
   def get_id(options)
     if(exists?(options))
-      result = @client.usergroup_get({
+      result = client.usergroup_get({
         'filter' => {'name' => options['name']}})
       result.first['usrgrpid']
     else
@@ -21,7 +21,7 @@ class Usergroups < Basic
   end
 
   def delete(*group_ids)
-    @client.usergroup_delete(group_ids)
+    client.usergroup_delete(group_ids)
   end
 
   class NonExistingUsergroup < StandardError; end

data/lib/zapix/proxies/users.rb

@@ -1,29 +1,25 @@
-require_relative 'basic'
+require_relative 'base'
 
-class Users < Basic
+class Users < Base
   def create(options)
-    @client.user_create(options) unless exists?(options)
+    client.user_create(options) unless exists?(options)
   end
 
   def exists?(options)
-    result = @client.user_get({'filter' => {'alias' => options['alias']}})
-    if result.empty?
-      false
-    else
-      true
-    end
+    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']
+      client.user_get({'filter' => {'alias' => options['alias']}}).first['userid']
     else
       raise NonExistingUser, "User #{options['alias']} does not exist !"
     end
   end
 
   def delete(usergroup_ids)
-    @client.user_delete(usergroup_ids)
+    client.user_delete(usergroup_ids)
   end
 
   class NonExistingUser < StandardError; end

data/lib/zapix/version.rb

@@ -1,3 +1,3 @@
 module Zapix
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/zapix.rb

@@ -2,7 +2,7 @@ require 'zapix/version'
 require_relative 'zapix/zabbix_rpc_client'
 
 class ZabbixAPI
-  attr :client
+  attr_reader :client
 
   def self.connect(options = {})
     new(options)
@@ -15,43 +15,43 @@ class ZabbixAPI
   end
 
   def hostgroups
-    @hostgroups ||= HostGroups.new(@client)
+    @hostgroups ||= HostGroups.new(client)
   end
 
   def hosts
-    @hosts ||= Hosts.new(@client)
+    @hosts ||= Hosts.new(client)
   end
 
   def templates
-    @templates ||= Templates.new(@client)
+    @templates ||= Templates.new(client)
   end
 
   def applications
-    @applications ||= Applications.new(@client)
+    @applications ||= Applications.new(client)
   end
 
   def scenarios
-    @scenarios ||= Scenarios.new(@client)
+    @scenarios ||= Scenarios.new(client)
   end
 
   def triggers
-    @triggers ||= Triggers.new(@client)
+    @triggers ||= Triggers.new(client)
   end
 
   def hostinterfaces
-    @hostinterfaces ||= Hostinterfaces.new(@client)
+    @hostinterfaces ||= Hostinterfaces.new(client)
   end
 
   def actions
-    @actions ||= Actions.new(@client)
+    @actions ||= Actions.new(client)
   end
 
   def usergroups
-    @usergroups ||= Usergroups.new(@client)
+    @usergroups ||= Usergroups.new(client)
   end
 
   def users
-    @users ||= Users.new(@client)
+    @users ||= Users.new(client)
   end
 
 end

data/spec/zapix_specs.rb

@@ -21,7 +21,7 @@ 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'
 test_usergroup = 'Operation managers test'
-existing_usergroup = 'Admins'
+existing_usergroup = 'Zabbix administrators'
 non_existing_usergroup = 'Smurfs'
 existing_user = 'Admin'
 non_existing_user = 'Tweegle'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zapix
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-29 00:00:00.000000000 Z
+date: 2013-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -107,7 +107,6 @@ files:
 - lib/zapix.rb
 - lib/zapix/proxies/actions.rb
 - lib/zapix/proxies/applications.rb
-- lib/zapix/proxies/basic.rb
 - lib/zapix/proxies/hostgroups.rb
 - lib/zapix/proxies/hostinterfaces.rb
 - lib/zapix/proxies/hosts.rb
@@ -138,7 +137,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 531610970119711934
+      hash: -3541308116562665514
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -147,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 531610970119711934
+      hash: -3541308116562665514
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24

data/lib/zapix/proxies/basic.rb

@@ -1,5 +0,0 @@
-class Basic
-  def initialize(client)
-    @client = client
-  end
-end