rubix 0.5.3 → 0.5.4

data/VERSION

@@ -1 +1 @@
-0.5.3
+0.5.4

data/lib/rubix/monitors/zabbix_monitor.rb

@@ -33,8 +33,6 @@ module Rubix
   #   FooMonitor.run if $0 == __FILE__
   module ZabbixMonitor
 
-    attr_accessor :template, :host_group, :hosts
-
     def self.included klass
       klass.default_settings.tap do |s|
         s.define :zabbix_api_url, :description => "Zabbix API URL" ,         :required => true, :default => 'http://localhost/api_jsonrpc.php'
@@ -43,10 +41,8 @@ module Rubix
       end
     end
     
-    def initialize settings
-      super(settings)
+    def connect_to_zabbix
       Rubix.connect(settings[:zabbix_api_url], settings[:username], settings[:password])
-      find_hosts
     end
     
     def template_name
@@ -54,15 +50,16 @@ module Rubix
 
     def host_group_name
     end
-
-    def find_hosts
+    
+    def hosts
+      connect_to_zabbix
       case
       when template_name
-        self.template = Rubix::Template.find(:name => template_name)
-        self.hosts    = Rubix::Host.list(self.template.host_ids).find_all(&:monitored)
+        template = Rubix::Template.find(:name => template_name)
+        Rubix::Host.list(template.host_ids).find_all(&:monitored)
       when host_group_name
-        self.host_group = Rubix::HostGroup.find(:name => host_group_name)
-        self.hosts      = Rubix::Host.list(self.host_group.host_ids).find_all(&:monitored)
+        host_group = Rubix::HostGroup.find(:name => host_group_name)
+        Rubix::Host.list(host_group.host_ids).find_all(&:monitored)
       else
         raise Rubix::Error.new("Must define either a 'template_name' or a 'host_group_name' property for a Zabbix monitor.")
       end

data/spec/rubix/monitors/zabbix_monitor_spec.rb

@@ -11,7 +11,7 @@ describe Rubix::ZabbixMonitor do
   end
 
   it "will raise an error when no template name or host group is defined" do
-    lambda { @wrapper.new(@wrapper.default_settings) }.should raise_error(Rubix::Error)
+    lambda { @wrapper.new(@wrapper.default_settings).hosts }.should raise_error(Rubix::Error)
   end
 
   it "can find hosts based on a template" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubix
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-03-08 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &11179480 !ruby/object:Gem::Requirement
+  requirement: &17098960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11179480
+  version_requirements: *17098960
 - !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: &11176580 !ruby/object:Gem::Requirement
+  requirement: &17098520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11176580
+  version_requirements: *17098520
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &11176060 !ruby/object:Gem::Requirement
+  requirement: &17098000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - <=
@@ -43,10 +43,10 @@ dependencies:
         version: 1.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *11176060
+  version_requirements: *17098000
 - !ruby/object:Gem::Dependency
   name: configliere
-  requirement: &11175540 !ruby/object:Gem::Requirement
+  requirement: &17097460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 0.4.8
   type: :runtime
   prerelease: false
-  version_requirements: *11175540
+  version_requirements: *17097460
 - !ruby/object:Gem::Dependency
   name: multipart-post
-  requirement: &11175160 !ruby/object:Gem::Requirement
+  requirement: &17097080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11175160
+  version_requirements: *17097080
 description: Rubix provides abstractions for connecting to Zabbix's API, an ORM for
   wrapping Zabbix resources, a set of scripts for writing data to Zabbix, and a collection
   of Monitor classes for building periodic monitors.