zabbixapi 2.4.7 → 2.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e527079a1480ac3175e6cb8db6b1754b2b59bec
-  data.tar.gz: a032b442b07c115dc0b5275dc1c26be1a387cfe8
+  metadata.gz: 9993377c6f344fef920fc248798eec2d010ba7ec
+  data.tar.gz: 96bb61c40517a55efd1f0ca1c2dde18c7d24677b
 SHA512:
-  metadata.gz: e6367ff0bed467de9596ed84d92c6e507b417c5b90203278c24a8f0963bbe2b16177ed8ff46010437712cbe81ca09ad029b9cb740a363304a6490ef1c763ee5b
-  data.tar.gz: d9a3b31befd619ab851aad5392bd2d2c514bf9437b313c6f4917d6ee5e15642e16a570ae089e20b68f58bf5868f7030a57ed29c9ecd7a4b2ac09c80b8bd74caf
+  metadata.gz: 482de14774541ede7972c80dd4b082539412f5b7bfa08ccf9b2fedcc066b415319e6226665c691f4688417b2b1647256af08751c7d70ec8c59c50932ae558f46
+  data.tar.gz: 246494db24bc2cc0527459d6874f2054e58259910f9f21db23375b82ea064c3aeef882993a9e68ae4e901fa725fa3d5e2aab7c2ad4b0aa380fbd7a254958850f

data/.travis.yml

@@ -6,22 +6,25 @@ rvm:
   - 1.9.3
   - 2.0
   - 2.1
+  - 2.2
+dist: trusty
+sudo: required
+
 before_script:
-  - sudo apt-get purge postgresql-9.1 postgresql-9.2 postgresql-9.3 postgresql-9.4 postgresql-9.5
-  - wget -qO - https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add -
-  - echo "deb http://apt.postgresql.org/pub/repos/apt/ trusty-pgdg main" | sudo tee /etc/apt/sources.list.d/postgresql.list
+  - sudo apt-get purge postgresql-9.1 postgresql-9.2 postgresql-9.3 postgresql-9.4 -y
+    #  - wget -qO - https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add -
+    #  - echo "deb http://apt.postgresql.org/pub/repos/apt/ trusty-pgdg main" | sudo tee /etc/apt/sources.list.d/postgresql.list
   - wget -qO - http://repo.zabbix.com/zabbix-official-repo.key | sudo apt-key add -
   - echo "deb http://repo.zabbix.com/zabbix/3.0/ubuntu/ trusty main" | sudo tee /etc/apt/sources.list.d/zabbix.list
   - sudo apt-get update
   - sudo dpkg-reconfigure locales
-  - sudo apt-get install curl
-  - sudo apt-get install apache2
-  - sudo apt-get install libiodbc2
-  - sudo apt-get install postgresql-9.5
-  - sudo apt-get install zabbix-frontend-php
+  - sudo apt-get install curl -y
+  - sudo apt-get install apache2 -y
+  - sudo apt-get install libiodbc2 -y
+  - sudo apt-get install zabbix-frontend-php -y
   - sudo useradd -r zabbix
-  - sudo apt-get install zabbix-server-pgsql
-  - sudo apt-get install php5-pgsql
+  - sudo apt-get install zabbix-server-pgsql -y
+  - sudo apt-get install php5-pgsql -y
   - sudo sed -i "s,;date.timezone =,date.timezone = 'US/Eastern'," /etc/php5/apache2/php.ini
   - 'echo -e "local all postgres trust\nlocal   all   all trust\nhost all all 127.0.0.1/32 trust\nhost all all ::1/128 trust" | sudo tee /etc/postgresql/9.5/main/pg_hba.conf'
   - sudo /etc/init.d/postgresql restart

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.4.7
+
+[PR #45](https://github.com/express42/zabbixapi/pull/45) Add support for zabbix 3.0.x (Thanx @wandenberg)
+
 ## 2.4.6
 
 [PR #39](https://github.com/express42/zabbixapi/issues/39) Add support for maintenance API

data/README.md

@@ -9,9 +9,10 @@ Simple and lightweight ruby module for work with zabbix api
 * 1.8.9 (api version 1.3) /zabbixapi 0.6.x [branch zabbix1.8](https://github.com/express42/zabbixapi/tree/zabbix1.8)
 * 2.0.x (api version 1.4 -> 2.0.10) /zabbixapi 2.0.x [branch zabbix2.0](https://github.com/express42/zabbixapi/tree/zabbix2.0)
 * 2.2.x (api version 2.2.x) /zabbixapi 2.2.x [branch zabbix2.2](https://github.com/express42/zabbixapi/tree/zabbix2.2)
-* 2.4.x (api version 2.2.x) /zabbixapi 2.4.x [master or branch zabbix2.4](https://github.com/express42/zabbixapi/)
+* 2.4.x (api version 2.2.x) /zabbixapi 2.4.x [master](https://github.com/express42/zabbixapi/)
+* 3.0.x (api version 3.0.x) /zabbixapi 2.4.x [master](https://github.com/express42/zabbixapi/)
 
-Because Zabbix 2.4 is a main branch of Zabbix, so master of zabbixapi supports this version of zabbix.
+Because Zabbix 3.0 is a main branch of Zabbix, so master of zabbixapi supports this version of zabbix.
 
 ## Version policy
 
@@ -20,15 +21,16 @@ Zabbixapi has next version policy:
 * for zabbix 2.0.x you should use zabbixapi 2.0.y
 * for zabbix 2.2.x you should use zabbixapi 2.2.y
 * for zabbix 2.4.x you should use zabbixapi 2.4.y
+* for zabbix 3.0.x you should use zabbixapi 2.4.y (>= 2.4.7)
 
 The PATCH (third digit) version of zabbixapi should not correspond to PATCH version of zabbix, for example
 zabbixapi-2.0.x should works with all version of zabbix 2.0.y
 
-We support only two last versions of zabbix (2.2 and 2.4), so you should consider zabbixapi 0.6.x and 2.0.x depricated.
+We support only two last versions of zabbix (2.4 and 3.0), so you should consider zabbixapi 0.6.x, 2.0.x and 2.2.x depricated.
 
 ## Installation
 ```
-gem install zabbixapi -v 2.4.2
+gem install zabbixapi -v 2.4.7
 ```
 
 ## Getting Started
@@ -455,4 +457,4 @@ zbx.query(
 ## Zabbix documentation
 
 * [Zabbix Project Homepage](http://zabbix.com/)
-* [Zabbix Api docs](https://www.zabbix.com/documentation/2.4/manual/api/reference)
+* [Zabbix Api docs](https://www.zabbix.com/documentation/3.0/manual/api/reference)

data/lib/zabbixapi.rb

@@ -24,6 +24,7 @@ require "zabbixapi/classes/usergroups"
 require "zabbixapi/classes/usermacros"
 require "zabbixapi/classes/users"
 require "zabbixapi/classes/configurations"
+require "zabbixapi/classes/actions"
 
 class ZabbixApi
 
@@ -109,4 +110,8 @@ class ZabbixApi
     @configurations ||= Configurations.new(@client)
   end
 
+  def actions
+    @actions ||= Actions.new(@client)
+  end
+
 end

data/lib/zabbixapi/basic/basic_logic.rb

@@ -2,7 +2,7 @@ class ZabbixApi
   class Basic
 
     def create(data)
-      log "[DEBUG] Call create with parametrs: #{data.inspect}"
+      log "[DEBUG] Call create with parameters: #{data.inspect}"
 
       data_with_default = default_options.empty? ? data : merge_params(default_options, data)
       data_create = [data_with_default]
@@ -11,7 +11,7 @@ class ZabbixApi
     end
 
     def delete(data)
-      log "[DEBUG] Call delete with parametrs: #{data.inspect}"
+      log "[DEBUG] Call delete with parameters: #{data.inspect}"
 
       data_delete = [data]
       result = @client.api_request(:method => "#{method_name}.delete", :params => data_delete)
@@ -19,14 +19,14 @@ class ZabbixApi
     end
 
     def create_or_update(data)
-      log "[DEBUG] Call create_or_update with parametrs: #{data.inspect}"
+      log "[DEBUG] Call create_or_update with parameters: #{data.inspect}"
 
       id = get_id(indentify.to_sym => data[indentify.to_sym])
       id ? update(data.merge(key.to_sym => id.to_s)) : create(data)
     end
 
     def update(data, force=false)
-      log "[DEBUG] Call update with parametrs: #{data.inspect}"
+      log "[DEBUG] Call update with parameters: #{data.inspect}"
 
       dump = {}
       item_id = data[key.to_sym].to_i
@@ -46,7 +46,7 @@ class ZabbixApi
     end
 
     def get_full_data(data)
-      log "[DEBUG] Call get_full_data with parametrs: #{data.inspect}"
+      log "[DEBUG] Call get_full_data with parameters: #{data.inspect}"
 
       @client.api_request(
         :method => "#{method_name}.get",
@@ -59,8 +59,17 @@ class ZabbixApi
       )
     end
 
+    def get_raw(data)
+      log "[DEBUG] Call get_raw with parameters: #{data.inspect}"
+
+      @client.api_request(
+        :method => "#{method_name}.get",
+        :params => data
+      )
+    end
+
     def dump_by_id(data)
-      log "[DEBUG] Call dump_by_id with parametrs: #{data.inspect}"
+      log "[DEBUG] Call dump_by_id with parameters: #{data.inspect}"
 
       @client.api_request(
         :method => "#{method_name}.get",
@@ -82,16 +91,29 @@ class ZabbixApi
     end
 
     def get_id(data)
-      log "[DEBUG] Call get_id with parametrs: #{data.inspect}"
-
-      result = symbolize_keys( get_full_data(data) )
+      log "[DEBUG] Call get_id with parameters: #{data.inspect}"
+
+      # symbolize keys if the user used string keys instead of symbols
+      data = symbolize_keys(data) if data.key?(indentify)
+      # raise an error if indentify name was not supplied 
+      name = data[indentify.to_sym]
+      raise ApiError.new("#{indentify} not supplied in call to get_id") if name == nil
+      result = @client.api_request(
+        :method => "#{method_name}.get",
+        :params => {
+          :filter => {
+            indentify.to_sym => name
+          },
+          :output => [key, indentify]
+        }
+      )
       id = nil
-      result.each { |item| id = item[key.to_sym].to_i if item[indentify.to_sym] == data[indentify.to_sym] }
+      result.each { |item| id = item[key].to_i if item[indentify] == data[indentify.to_sym] }
       id
     end
 
     def get_or_create(data)
-      log "[DEBUG] Call get_or_create with parametrs: #{data.inspect}"
+      log "[DEBUG] Call get_or_create with parameters: #{data.inspect}"
 
       unless (id = get_id(data))
         id = create(data)

data/lib/zabbixapi/classes/actions.rb

@@ -0,0 +1,13 @@
+class ZabbixApi
+  class Actions < Basic
+
+    def method_name
+      "action"
+    end
+
+    def indentify
+      "name"
+    end
+
+  end
+end

data/lib/zabbixapi/client.rb

@@ -27,7 +27,7 @@ class ZabbixApi
 
     def initialize(options = {})
       @options = options
-      unless ENV['http_proxy'].nil?
+      if ENV['http_proxy'] != nil && options[:no_proxy] != true
         @proxy_uri = URI.parse(ENV['http_proxy'])
         @proxy_host = @proxy_uri.host
         @proxy_port = @proxy_uri.port

data/lib/zabbixapi/version.rb

@@ -1,3 +1,3 @@
 class ZabbixApi
-  VERSION = "2.4.7"
+  VERSION = "2.4.8"
 end

data/spec/action.rb

@@ -0,0 +1,79 @@
+#encoding: utf-8
+
+require 'spec_helper'
+
+describe 'action' do
+  before do
+    @actionname = gen_name 'action'
+    @usergroupid = zbx.usergroups.create(:name => gen_name('usergroup'))
+    @actiondata = {
+        :name => @actionname,
+        :eventsource => '0',                    # event source is a triggerid
+        :status => '0',                         # action is enabled
+        :esc_period => '120',                   # how long each step should take
+        :def_shortdata => "Email header",
+        :def_longdata => "Email content",
+        :filter => {
+            :evaltype => '1',                   # perform 'and' between the conditions
+            :conditions => [
+                {
+                    :conditiontype => '3',      # trigger name
+                    :operator => '2',           # like
+                    :value => 'pattern'         # the pattern
+                },
+                {
+                    :conditiontype => '5',      # trigger value
+                    :operator => '0',           # equal
+                    :value => '1'               # 'on'
+                },
+                {
+                    :conditiontype => '4',      # trigger severity
+                    :operator => '5',           # >=
+                    :value => '3'               # average
+                }
+            ]
+        },
+        :operations => [
+            {
+                :operationtype => '0',              # send message
+                :opmessage_grp => [                 # who the message will be sent to
+                    {
+                        :usrgrpid => @usergroupid
+                    }
+                ],
+                :opmessage => {
+                    :default_msg => '0',            # use default message
+                    :mediatypeid =>  '1'            # email id
+                }
+            }
+        ]
+    }
+  end
+
+  context 'when not exists' do
+    describe 'create' do
+      it "should return integer id" do
+        actionid = zbx.actions.create(@actiondata)
+        expect(actionid).to be_kind_of(Integer)
+      end
+    end
+  end
+
+  context 'when exists' do
+    before do
+      @actionid = zbx.actions.create(@actiondata)
+    end
+
+    describe 'create_or_update' do
+      it "should return id" do
+        expect(zbx.actions.create_or_update(@actiondata)).to eq @actionid
+      end
+    end
+
+    describe 'delete' do
+      it "should return id" do
+        expect(zbx.actions.delete(@actionid)).to eq @actionid
+      end
+    end    
+  end
+end

data/spec/application.rb

@@ -24,7 +24,7 @@ describe 'application' do
           :name => @application,
           :hostid => @templateid
         )
-        applicationid.should be_kind_of(Integer)
+        expect(applicationid).to be_kind_of(Integer)
       end
     end
 
@@ -67,7 +67,7 @@ describe 'application' do
 
     describe "delete" do
       it "should return id" do
-        zbx.applications.delete(@applicationid).should eq @applicationid
+        expect(zbx.applications.delete(@applicationid)).to eq @applicationid
       end
     end
   end

data/spec/graph.rb

@@ -66,13 +66,13 @@ describe 'graph' do
 
     describe 'get_or_create' do
       it "should return id of existing graph" do
-        zbx.graphs.get_or_create(
+        expect(zbx.graphs.get_or_create(
           :gitems => [gitems],
           :show_triggers => "0",
           :name => @graph,
           :width => "900",
           :height => "200"
-        ).should eq @graphid
+        )).to eq @graphid
       end
     end
 
@@ -92,37 +92,37 @@ describe 'graph' do
 
     describe 'get_id' do
       it "should return id" do
-        zbx.graphs.get_id( :name => @graph ).should eq @graphid
+        expect(zbx.graphs.get_id( :name => @graph )).to eq @graphid
       end
     end
 
     describe 'get_ids_by_host' do
       it "should contains id of graph" do
         graph_array = zbx.graphs.get_ids_by_host( :host => @host )
-        graph_array.should be_kind_of(Array)
-        graph_array.should include(@graphid.to_s)
+        expect(graph_array).to be_kind_of(Array)
+        expect(graph_array).to include(@graphid.to_s)
       end
     end
 
     describe 'update' do
       it "should return id" do
-        zbx.graphs.update(
+        expect(zbx.graphs.update(
           :graphid => @graphid,
           :gitems => [gitems],
           :ymax_type => 1
-        ).should eq @graphid
+        )).to eq @graphid
       end
     end
 
     describe 'create_or_update' do
       it "should return existing id" do
-        zbx.graphs.create_or_update(
+        expect(zbx.graphs.create_or_update(
           :gitems => [gitems],
           :show_triggers => "1",
           :name => @graph,
           :width => "900",
           :height => "200"
-        ).should eq @graphid
+        )).to eq @graphid
       end
     end
 

data/spec/host.rb

@@ -29,7 +29,7 @@ describe 'host' do
           ],
           :groups => [:groupid => @hostgroupid]
         )
-        hostid.should be_kind_of(Integer)
+        expect(hostid).to be_kind_of(Integer)
       end
 
       it "should create host in multiple groups" do
@@ -54,6 +54,7 @@ describe 'host' do
     describe 'get_id' do
       it "should return nil" do
         expect(zbx.hosts.get_id(:host => @host)).to be_kind_of(NilClass)
+        expect(zbx.hosts.get_id('host' => @host)).to be_kind_of(NilClass)
       end
     end
   end
@@ -95,12 +96,13 @@ describe 'host' do
     describe 'get_id' do
       it "should return id of host" do
         expect(zbx.hosts.get_id(:host => @host)).to eq @hostid
+        expect(zbx.hosts.get_id('host' => @host)).to eq @hostid
       end
     end
 
     describe 'create_or_update' do
       it "should return id of updated host" do
-        zbx.hosts.create_or_update(
+        expect(zbx.hosts.create_or_update(
           :host => @host,
           :interfaces => [
             {
@@ -113,25 +115,25 @@ describe 'host' do
             }
           ],
           :groups => [:groupid => @hostgroupid]
-        ).should eq @hostid
+        )).to eq @hostid
       end
     end
 
     describe 'update' do
       it "should return id" do
-        zbx.hosts.update(
+        expect(zbx.hosts.update(
           :hostid => @hostid,
           :status => 0
-        ).should eq @hostid
+        )).to eq @hostid
       end
 
       it "should update groups" do
         @hostgroupid2 = zbx.hostgroups.create(:name => gen_name('hostgroup'))
 
-        zbx.hosts.update(
+        expect(zbx.hosts.update(
             :hostid  =>  @hostid,
             :groups => [ :groupid => @hostgroupid2]
-        ).should eq @hostid
+        )).to eq @hostid
 
         expect(zbx.hosts.dump_by_id(:hostid => @hostid).first['groups'].first["groupid"]).to eq @hostgroupid2.to_s
 
@@ -167,9 +169,8 @@ describe 'host' do
 
     describe 'delete' do
       it "HOST: Delete" do
-        zbx.hosts.delete( @hostid ).should eq @hostid
+        expect(zbx.hosts.delete( @hostid )).to eq @hostid
       end
     end
   end
 end
-

data/spec/hostgroup.rb

@@ -20,35 +20,35 @@ describe 'hostgroup' do
 
     describe 'get_id' do
       it "should return id" do
-        zbx.hostgroups.get_id(:name => @hostgroup).should eq @hostgroupid
+        expect(zbx.hostgroups.get_id(:name => @hostgroup)).to eq @hostgroupid
       end
 
       it "should return nil for not existing group" do
-        zbx.hostgroups.get_id(:name => "#{@hostgroup}______").should be_kind_of(NilClass)
+        expect(zbx.hostgroups.get_id(:name => "#{@hostgroup}______")).to be_kind_of(NilClass)
       end
     end
 
     describe 'get_or_create' do
       it "should return id of existing hostgroup" do
-        zbx.hostgroups.get_or_create(:name => @hostgroup).should eq @hostgroupid
+        expect(zbx.hostgroups.get_or_create(:name => @hostgroup)).to eq @hostgroupid
       end
     end
 
     describe 'create_or_update' do
       it "should return id of hostgroup" do
-        zbx.hostgroups.create_or_update(:name => @hostgroup).should eq @hostgroupid
+        expect(zbx.hostgroups.create_or_update(:name => @hostgroup)).to eq @hostgroupid
       end
     end
 
     describe 'all' do
       it "should contains created hostgroup" do
-        zbx.hostgroups.all.should include(@hostgroup => @hostgroupid.to_s)
+        expect(zbx.hostgroups.all).to include(@hostgroup => @hostgroupid.to_s)
       end
     end
 
     describe "delete" do
       it "shold return id" do
-        zbx.hostgroups.delete(@hostgroupid).should eq @hostgroupid
+        expect(zbx.hostgroups.delete(@hostgroupid)).to eq @hostgroupid
       end
     end
   end

data/spec/item.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'application' do
+describe 'item' do
   before :all do
     @hostgroup = gen_name 'hostgroup'
     @hostgroupid = zbx.hostgroups.create(:name => @hostgroup)
@@ -32,13 +32,13 @@ describe 'application' do
           :hostid => @templateid,
           :applications => [@applicationid]
         )
-        itemid.should be_kind_of(Integer)
+        expect(itemid).to be_kind_of(Integer)
       end
     end
 
     describe 'get_id' do
       it "should return nil" do
-        expect(zbx.items.get_id(:host => @item)).to be_kind_of(NilClass)
+        expect(zbx.items.get_id(:name => @item)).to be_kind_of(NilClass)
       end
     end
   end
@@ -79,24 +79,28 @@ describe 'application' do
       end
     end
 
+    it "should raise error on no identity given" do
+        expect { zbx.items.get_id({}) }.to raise_error(ZabbixApi::ApiError)
+    end
+
     describe 'update' do
       it "should return id" do
-        zbx.items.update(
+        expect(zbx.items.update(
           :itemid => zbx.items.get_id(:name => @item),
           :status => 1
-        ).should eq @itemid
+        )).to eq @itemid
       end
     end
 
     describe 'create_or_update' do
       it "should update existing item" do
-        zbx.items.create_or_update(
+        expect(zbx.items.create_or_update(
           :name => @item,
           :key_ => "proc.num[#{gen_name 'proc'}]",
           :status => 0,
           :hostid => @templateid,
           :applications => [@applicationid]
-        ).should eq @itemid
+        )).to eq @itemid
       end
 
       it "should create item" do
@@ -123,10 +127,8 @@ describe 'application' do
       end
 
       it "should delete item from zabbix" do
-        expect(zbx.items.get_id(:id => @itemid)).to be_nil
+        expect(zbx.items.get_id(:name => @item)).to be_nil
       end
     end
   end
 end
-
-

data/spec/maintenance.rb

@@ -41,35 +41,35 @@ describe 'maintenance' do
 
     describe 'get_id' do
       it "should return id" do
-        zbx.maintenance.get_id(:name => @maintenance).should eq @maintenanceid
+        expect(zbx.maintenance.get_id(:name => @maintenance)).to eq @maintenanceid
       end
 
       it "should return nil for not existing group" do
-        zbx.maintenance.get_id(:name => "#{@maintenance}______").should be_kind_of(NilClass)
+        expect(zbx.maintenance.get_id(:name => "#{@maintenance}______")).to be_kind_of(NilClass)
       end
     end
 
     describe 'get_or_create' do
       it "should return id of existing maintenance" do
-        zbx.maintenance.get_or_create(:name => @maintenance).should eq @maintenanceid
+        expect(zbx.maintenance.get_or_create(:name => @maintenance)).to eq @maintenanceid
       end
     end
 
     describe 'create_or_update' do
       it "should return id of maintenance" do
-        zbx.maintenance.create_or_update(:name => @maintenance).should eq @maintenanceid
+        expect(zbx.maintenance.create_or_update(:name => @maintenance)).to eq @maintenanceid
       end
     end
 
     describe 'all' do
       it "should contains created maintenance" do
-        zbx.maintenance.all.should include(@maintenance => @maintenanceid.to_s)
+        expect(zbx.maintenance.all).to include(@maintenance => @maintenanceid.to_s)
       end
     end
 
     describe "delete" do
       it "shold return id" do
-        zbx.maintenance.delete(@maintenanceid).should eq @maintenanceid
+        expect(zbx.maintenance.delete(@maintenanceid)).to eq @maintenanceid
       end
     end
 	

data/spec/mediatype.rb

@@ -17,7 +17,7 @@ describe 'mediatype' do
         :smtp_email => "zabbix@test.com",
         :smtp_helo => "test.com"
       )
-      mediatypeid.should be_kind_of(Integer)
+      expect(mediatypeid).to be_kind_of(Integer)
     end
     end
   end
@@ -35,11 +35,11 @@ describe 'mediatype' do
 
     describe 'create_or_update' do
       it "should return id" do
-        zbx.mediatypes.create_or_update(
+        expect(zbx.mediatypes.create_or_update(
           :description => @mediatype,
           :smtp_email => "zabbix2@test.com",
           :smtp_helo => "test.com"
-        ).should eq @mediatypeid
+        )).to eq @mediatypeid
       end
 
       it "should return id" do

data/spec/query.rb

@@ -4,7 +4,7 @@ require 'spec_helper'
 
 describe "query" do
   it "should works" do
-    zbx.query(
+    expect(zbx.query(
       method: 'host.get',
       params: {
         filter: {
@@ -12,7 +12,7 @@ describe "query" do
         },
         selectInterfaces: 'refer'
       }
-    ).should be_kind_of(Array)
+    )).to be_kind_of(Array)
   end
 end
 

data/spec/screen.rb

@@ -55,7 +55,7 @@ describe 'screen' do
           :screen_name => @screen_name,
           :graphids => [@graphid]
         )
-        screenid.should be_kind_of(Integer)
+        expect(screenid).to be_kind_of(Integer)
       end
     end
   end
@@ -75,13 +75,13 @@ describe 'screen' do
           :screen_name => @screen_name,
           :graphids => [@graphid]
         )
-        screenid.should eq @screenid
+        expect(screenid).to eq @screenid
       end
     end
 
     describe 'delete' do
       it "should return id" do
-        zbx.screens.delete(@screenid).should eq @screenid
+        expect(zbx.screens.delete(@screenid)).to eq @screenid
       end
     end
   end

data/spec/server.rb

@@ -5,13 +5,11 @@ require 'spec_helper'
 describe 'server' do
   describe 'version' do
     it "should be string" do
-      zbx.server.version.should be_kind_of(String)
+      expect(zbx.server.version).to be_kind_of(String)
     end
 
     it "should be 2.4.x or 3.0.x or 3.2.x" do
-      zbx.server.version.should match(/(2\.4|3\.[02])\.\d+/)
+      expect(zbx.server.version).to match(/(2\.4|3\.[02])\.\d+/)
     end
   end
 end
-
-

data/spec/spec_helper.rb

@@ -4,8 +4,8 @@ require 'zabbixapi'
 def zbx
   # settings
   @api_url = ENV['ZABBIX_HOST_URL'] || 'http://10.211.55.6/api_jsonrpc.php'
-  @api_login = 'Admin'
-  @api_password = 'zabbix'
+  @api_login = ENV['ZABBIX_USERNAME'] || 'Admin'
+  @api_password = ENV['ZABBIX_PASSWORD'] || 'zabbix'
 
   @zbx ||= ZabbixApi.connect(
     :url => @api_url,

data/spec/template.rb

@@ -19,7 +19,7 @@ describe "template" do
           :host => @template,
           :groups => [:groupid => @hostgroupid]
         )
-        templateid.should be_kind_of(Integer)
+        expect(templateid).to be_kind_of(Integer)
       end
     end
 
@@ -62,7 +62,7 @@ describe "template" do
 
     describe "all" do
       it "should contains template" do
-        zbx.templates.all.should include(@template => @templateid.to_s)
+        expect(zbx.templates.all).to include(@template => @templateid.to_s)
       end
     end
 
@@ -73,7 +73,7 @@ describe "template" do
           :host => template,
           :groups => [:groupid => @hostgroupid]
         )
-        zbx.templates.delete(templateid).should eq templateid
+        expect(zbx.templates.delete(templateid)).to eq templateid
       end
     end
 
@@ -99,10 +99,10 @@ describe "template" do
       context "not linked with host" do
         describe "mass_update" do
           it "should return true" do
-            zbx.templates.mass_update(
+            expect(zbx.templates.mass_update(
               :hosts_id => [@hostid],
               :templates_id => [@templateid]
-            ).should be_true
+            )).to be true
           end
         end
       end
@@ -120,26 +120,26 @@ describe "template" do
             tmpl_array = zbx.templates.get_ids_by_host(
               :hostids => [@hostid]
             )
-            tmpl_array.should be_kind_of(Array)
-            tmpl_array.should include @templateid.to_s
+            expect(tmpl_array).to be_kind_of(Array)
+            expect(tmpl_array).to include @templateid.to_s
           end
         end
 
         describe "mass_add" do
           it "should return true" do
-            zbx.templates.mass_add(
+            expect(zbx.templates.mass_add(
               :hosts_id => [@hostid],
               :templates_id => [@templateid]
-            ).should be_kind_of(TrueClass)
+            )).to be_kind_of(TrueClass)
           end
         end
 
         describe "mass_remove" do
           it "should return true" do
-            zbx.templates.mass_remove(
+            expect(zbx.templates.mass_remove(
               :hosts_id => [@hostid],
               :templates_id => [@templateid]
-            ).should be_true
+            )).to be true
           end
         end
       end

data/spec/trigger.rb

@@ -41,7 +41,7 @@ describe "trigger" do
           :status     => 0,
           :type => 0
         )
-        triggerid.should be_kind_of(Integer)
+        expect(triggerid).to be_kind_of(Integer)
       end
     end
   end
@@ -61,13 +61,13 @@ describe "trigger" do
 
     describe "get_id" do
       it "should return id" do
-        zbx.triggers.get_id(:description => @trigger).should eq @triggerid
+        expect(zbx.triggers.get_id(:description => @trigger)).to eq @triggerid
       end
     end
 
     describe "delete" do
       it "should return id" do
-        zbx.triggers.delete( @triggerid ).should eq @triggerid
+        expect(zbx.triggers.delete( @triggerid )).to eq @triggerid
       end
     end
   end

data/spec/user.rb

@@ -38,13 +38,13 @@ describe 'user' do
           :passwd => user,
           :usrgrps => [@usergroupid]
         )
-        userid.should be_kind_of(Integer)
+        expect(userid).to be_kind_of(Integer)
       end
     end
 
     describe 'get_id' do
       it "should return nil" do
-        zbx.users.get_id(:alias => "name_____").should be_nil
+        expect(zbx.users.get_id(:alias => "name_____")).to be_nil
       end
     end
   end
@@ -63,33 +63,33 @@ describe 'user' do
 
     describe 'create_or_update' do
       it "should return id" do
-        zbx.users.create_or_update(
+        expect(zbx.users.create_or_update(
           :alias => @user,
           :name => @user,
           :surname => @user,
           :passwd => @user
-        ).should eq @userid
+        )).to eq @userid
       end
     end
 
     describe 'get_full_data' do
       it "should return string name" do
-        zbx.users.get_full_data(:alias => @user)[0]['name'].should be_kind_of(String)
+        expect(zbx.users.get_full_data(:alias => @user)[0]['name']).to be_kind_of(String)
       end
     end
 
     describe 'update' do
       it "should return id" do
-        zbx.users.update(:userid => @userid, :name => gen_name('user')).should eq @userid
+        expect(zbx.users.update(:userid => @userid, :name => gen_name('user'))).to eq @userid
       end
     end
 
     describe 'add_medias' do
       it "should return integer media id" do
-        zbx.users.add_medias(
+        expect(zbx.users.add_medias(
           :userids => [@userid],
           :media => [media]
-        ).should be_kind_of(Integer)
+        )).to be_kind_of(Integer)
       end
     end
 
@@ -102,14 +102,14 @@ describe 'user' do
             :media => [media]
           )
 
-          returned_userid.should eq @userid
+          expect(returned_userid).to eq @userid
         end
       end
     end
 
     describe 'delete' do
       it "should return id" do
-        zbx.users.delete(@userid).should eq @userid
+        expect(zbx.users.delete(@userid)).to eq @userid
       end
     end
   end

data/spec/usergroup.rb

@@ -7,7 +7,7 @@ describe 'usergroup' do
   context 'when not exists' do
     it "should be integer id" do
       usergroupid = zbx.usergroups.create(:name => gen_name('usergroup'))
-      usergroupid.should be_kind_of(Integer)
+      expect(usergroupid).to be_kind_of(Integer)
     end
   end
 
@@ -37,41 +37,41 @@ describe 'usergroup' do
 
     describe 'get_or_create' do
       it "should return id" do
-        zbx.usergroups.get_or_create(:name => @usergroup).should eq @usergroupid
+        expect(zbx.usergroups.get_or_create(:name => @usergroup)).to eq @usergroupid
       end
     end
 
     describe 'add_user' do
       it "should return id" do
-        zbx.usergroups.add_user(
+        expect(zbx.usergroups.add_user(
             :usrgrpids => [@usergroupid],
             :userids => [@userid2]
-        ).should eq @usergroupid
+        )).to eq @usergroupid
       end
     end
 
     describe 'update_users' do
       it "should return id" do
-        zbx.usergroups.update_users(
+        expect(zbx.usergroups.update_users(
             :usrgrpids => [@usergroupid],
             :userids => [@userid2]
-        ).should eq @usergroupid
+        )).to eq @usergroupid
       end
     end
 
     describe 'set_perms' do
       it "should return id" do
-        zbx.usergroups.set_perms(
+        expect(zbx.usergroups.set_perms(
           :usrgrpid => @usergroupid,
           :hostgroupids => zbx.hostgroups.all.values,
           :permission => 3
-        ).should eq @usergroupid
+        )).to eq @usergroupid
       end
     end
 
     describe 'delete' do
       it "should raise error when has users with only one group" do
-        expect { zbx.usergroups.delete(@usergroupid) }.to raise_error
+        expect { zbx.usergroups.delete(@usergroupid) }.to raise_error(ZabbixApi::ApiError)
       end
 
       it "should return id of deleted group" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zabbixapi
 version: !ruby/object:Gem::Version
-  version: 2.4.7
+  version: 2.4.8
 platform: ruby
 authors:
 - Vasiliev D.V.
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-05 00:00:00.000000000 Z
+date: 2016-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -53,6 +53,7 @@ files:
 - lib/zabbixapi/basic/basic_func.rb
 - lib/zabbixapi/basic/basic_init.rb
 - lib/zabbixapi/basic/basic_logic.rb
+- lib/zabbixapi/classes/actions.rb
 - lib/zabbixapi/classes/applications.rb
 - lib/zabbixapi/classes/configurations.rb
 - lib/zabbixapi/classes/errors.rb
@@ -73,6 +74,7 @@ files:
 - lib/zabbixapi/classes/users.rb
 - lib/zabbixapi/client.rb
 - lib/zabbixapi/version.rb
+- spec/action.rb
 - spec/application.rb
 - spec/basic_func.rb
 - spec/configuration.rb
@@ -116,6 +118,7 @@ signing_key:
 specification_version: 4
 summary: Realization for Zabbix API.
 test_files:
+- spec/action.rb
 - spec/application.rb
 - spec/basic_func.rb
 - spec/configuration.rb