zabbixapi 2.4.9 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b0c4d39286a5204648a76628cc643fb5155ed4a
-  data.tar.gz: a8076c8cd8f418d0dd40828ac430cd7409285f54
+  metadata.gz: 491a14fb3d69c78a072b5f67a72fa1410835a7c6
+  data.tar.gz: 4f19756c236c435d6f253943182e8d123442e7c1
 SHA512:
-  metadata.gz: 9ceb26cc5e2ddff7674a0f5beefe99bcdf91639eb280d39862daf110d652b05aa40433ec77c8c709d37ffb19153f27529140f54bcad60ce885369bbbd9b761e0
-  data.tar.gz: 1628507b889ce7cb58b72218fb3205f41e219276a0195669f73146408b000c5037d1729ff1687e085dc20efdafa9b7140dc5e1f15586df2ee2e4b72079c50b61
+  metadata.gz: 36562b8555de03cff58f5e7d1b73daa12e5c3d3dfd990ddff49077b6f47470b915ccaa389c8b719f4f8681ed5cf1cf8b319ca892a6d234d183e633d0c71db04c
+  data.tar.gz: bf90b9d74bde43345caf3e66cb36f9bd059e2595e0e4fa454ec1395752b7b59e6d5d70640db1a110702b8faa0ca35e6504c34313e39f60c77f55443f983d4c03

data/.travis.yml

@@ -17,6 +17,10 @@ rvm:
   - 2.0
   - 2.1
   - 2.2
+  - 2.3
+gemfile:
+  - Gemfile
+  - json-1.x.Gemfile
 dist: trusty
 sudo: required
 
@@ -29,3 +33,9 @@ before_script:
   - echo "$(curl -fsSL https://gist.githubusercontent.com/evtuhovich/9544441/raw/d661863063b76cc8e2599bc44d8595b1f86ece38/zabbix)" | sudo tee /etc/zabbix/web/zabbix.conf.php
   - sudo service apache2 restart
 script: "ZABBIX_HOST_URL=http://localhost/zabbix/api_jsonrpc.php bundle exec rspec spec/*"
+
+matrix:
+  exclude:
+    # json 2.x requires ruby 2.x
+    - rvm: 1.9.3
+      gemfile: json-1.x.Gemfile

data/Gemfile

@@ -1,5 +1,3 @@
 source 'https://rubygems.org'
 
-gem "rspec"
-gem "rake"
-gem "json"
+gemspec

data/Gemfile.lock

@@ -1,22 +1,36 @@
+PATH
+  remote: .
+  specs:
+    zabbixapi (3.0.0)
+      json
+
 GEM
   remote: https://rubygems.org/
   specs:
-    diff-lcs (1.1.3)
-    json (1.8.3)
-    rake (0.9.2.2)
-    rspec (2.12.0)
-      rspec-core (~> 2.12.0)
-      rspec-expectations (~> 2.12.0)
-      rspec-mocks (~> 2.12.0)
-    rspec-core (2.12.0)
-    rspec-expectations (2.12.0)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.0)
+    diff-lcs (1.2.5)
+    json (2.0.3)
+    rake (12.0.0)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.4)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  json
   rake
   rspec
+  zabbixapi!
+
+BUNDLED WITH
+   1.14.3

data/README.md

@@ -22,7 +22,7 @@ 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)
+* for zabbix 3.0.x you should use zabbixapi 3.0.y and ruby >= 2
 
 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
@@ -190,7 +190,8 @@ zbx.graphs.create(
   :show_triggers => "0",
   :name => "graph",
   :width => "900",
-  :height => "200"
+  :height => "200",
+  :hostid => zbx.templates.get_id(:host => "template")
 )
 ```
 
@@ -212,7 +213,8 @@ zbx.graphs.create_or_update(
   :show_triggers => "1",
   :name => graph,
   :width => "900",
-  :height => "200"
+  :height => "200",
+  :hostid => zbx.templates.get_id(:host => "template")
 )
 ```
 ### Get ids by host ###
@@ -257,7 +259,7 @@ zbx.triggers.create(
   :comments => "Bla-bla is faulty (disaster)",
   :priority => 5,
   :status     => 0,
-  :templateid => 0,
+  :hostid => zbx.templates.get_id(:host => "template"),
   :type => 0,
   :tags => [
     {

data/json-1.x.Gemfile

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+gem 'json', '~> 1.8'
+gem 'rspec'

data/json-1.x.Gemfile.lock

@@ -0,0 +1,28 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    diff-lcs (1.2.5)
+    json (1.8.5)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.4)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  json (~> 1.8)
+  rspec
+
+BUNDLED WITH
+   1.12.5

data/lib/zabbixapi/basic/basic_logic.rb

@@ -101,9 +101,7 @@ class ZabbixApi
       result = @client.api_request(
         :method => "#{method_name}.get",
         :params => {
-          :filter => {
-            indentify.to_sym => name
-          },
+          :filter => data,
           :output => [key, indentify]
         }
       )
@@ -115,7 +113,7 @@ class ZabbixApi
     def get_or_create(data)
       log "[DEBUG] Call get_or_create with parameters: #{data.inspect}"
 
-      unless (id = get_id(data))
+      unless (id = get_id(indentify.to_sym => data[indentify.to_sym]))
         id = create(data)
       end
       id

data/lib/zabbixapi/classes/applications.rb

@@ -1,50 +1,28 @@
 class ZabbixApi
-  class Applications
+  class Applications < Basic
 
     API_PARAMETERS = %w(applicationids groupids hostids inherited itemids templated templateids selectItems)
 
-    def initialize(client)
-      @client = client
+    def method_name
+      "application"
     end
 
-    def create(data)
-      result = @client.api_request(:method => "application.create", :params => [data])
-      result.empty? ? nil : result['applicationids'][0].to_i
-    end
-
-    def add(data)
-      create(data)
-    end
-
-    def delete(data)
-      result = @client.api_request(:method => "application.delete", :params => [data])
-      result.empty? ? nil : result['applicationids'][0].to_i
+    def indentify
+      "name"
     end
 
     def get_or_create(data)
-      unless (appid = get_id(data))
-        appid = create(data)
-      end
-      appid
-    end
-
-    def destroy(data)
-      delete(data)
-    end
+      log "[DEBUG] Call get_or_create with parameters: #{data.inspect}"
 
-    def get_full_data(data)
-      filter_params = {}
-      request_data = data.dup # Duplicate data, as we modify it. Otherwise methods that use data after calling get_full_data (such as get_id) will fail.
-
-      request_data.each { |key, value| filter_params[key] = request_data.delete(key) unless API_PARAMETERS.include?(key) }
-      @client.api_request(:method => "application.get", :params => request_data.merge({:filter => filter_params, :output => "extend"}))
+      unless (id = get_id(:name => data[:name], :hostid => data[:hostid]))
+        id = create(data)
+      end
+      id
     end
 
-    def get_id(data)
-      result = get_full_data(data)
-      applicationid = nil
-      result.each { |app| applicationid = app['applicationid'].to_i if app['name'] == data[:name] }
-      applicationid
+    def create_or_update(data)
+      applicationid = get_id(:name => data[:name], :hostid => data[:hostid])
+      applicationid ? update(data.merge(:applicationid => applicationid)) : create(data)
     end
 
   end

data/lib/zabbixapi/classes/graphs.rb

@@ -48,6 +48,15 @@ class ZabbixApi
       @client.api_request(:method => "graphitem.get", :params => { :graphids => [data], :output => "extend" } )
     end
 
+    def get_or_create(data)
+      log "[DEBUG] Call get_or_create with parameters: #{data.inspect}"
+
+      unless (id = get_id(:name => data[:name], :templateid => data[:templateid]))
+        id = create(data)
+      end
+      id
+    end
+
     def create_or_update(data)
       graphid = get_id(:name => data[:name], :templateid => data[:templateid])
       graphid ? _update(data.merge(:graphid => graphid)) : create(data)

data/lib/zabbixapi/classes/httptests.rb

@@ -17,8 +17,17 @@ class ZabbixApi
       }
     end
 
+    def get_or_create(data)
+      log "[DEBUG] Call get_or_create with parameters: #{data.inspect}"
+
+      unless (id = get_id(:name => data[:name], :hostid => data[:hostid]))
+        id = create(data)
+      end
+      id
+    end
+
     def create_or_update(data)
-      httptestid = get_id(:name => data[:name])
+      httptestid = get_id(:name => data[:name], :hostid => data[:hostid])
       httptestid ? update(data.merge(:httptestid => httptestid)) : create(data)
     end
   end

data/lib/zabbixapi/classes/items.rb

@@ -45,5 +45,20 @@ class ZabbixApi
         :ipmi_sensor => ''
       }
     end
+
+    def get_or_create(data)
+      log "[DEBUG] Call get_or_create with parameters: #{data.inspect}"
+
+      unless (id = get_id(:name => data[:name], :hostid => data[:hostid]))
+        id = create(data)
+      end
+      id
+    end
+
+    def create_or_update(data)
+      itemid = get_id(:name => data[:name], :hostid => data[:hostid])
+      itemid ? update(data.merge(:itemid => itemid)) : create(data)
+    end
+
   end
 end

data/lib/zabbixapi/classes/triggers.rb

@@ -59,5 +59,19 @@ class ZabbixApi
 
     end
 
+    def get_or_create(data)
+      log "[DEBUG] Call get_or_create with parameters: #{data.inspect}"
+
+      unless (id = get_id(:description => data[:description], :hostid => data[:hostid]))
+        id = create(data)
+      end
+      id
+    end
+
+    def create_or_update(data)
+      triggerid = get_id(:description => data[:description], :hostid => data[:hostid])
+      triggerid ? update(data.merge(:triggerid => triggerid)) : create(data)
+    end
+
   end
 end

data/lib/zabbixapi/classes/usergroups.rb

@@ -13,20 +13,6 @@ class ZabbixApi
       "name"
     end
 
-    # Return usrgrpid
-    #
-    # * *Args*    :
-    #   - +data+ -> Hash with :name => "UserGroup"
-    # * *Returns* :
-    #   - Integer
-    def get_or_create(data)
-      usrgrpid = get_id(data)
-      if usrgrpid.nil?
-        usrgrpid = create(data)
-      end
-      usrgrpid
-    end
-
     # Set permission for usrgrp on some hostgroup
     #
     # * *Args*    :

data/lib/zabbixapi/classes/usermacros.rb

@@ -8,6 +8,46 @@ class ZabbixApi
       "usermacro"
     end
 
+    def get_id(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 = request(data, "usermacro.get", "hostmacroid")
+
+      result.length > 0 && result[0].key?("hostmacroid") ? result[0]["hostmacroid"].to_i : nil
+    end
+
+    def get_id_global(data)
+      log "[DEBUG] Call get_id_global 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 = request(data, "usermacro.get", "globalmacroid")
+
+      result.length > 0 && result[0].key?("globalmacroid") ? result[0]["globalmacroid"].to_i : nil
+    end
+
+    def get_full_data(data)
+      log "[DEBUG] Call get_full_data with parameters: #{data.inspect}"
+
+      request(data, "usermacro.get", "hostmacroid")
+    end
+
+    def get_full_data_global(data)
+      log "[DEBUG] Call get_full_data_global with parameters: #{data.inspect}"
+
+      request(data, "usermacro.get", "globalmacroid")
+    end
+
     def create(data)
       request(data, "usermacro.create", "hostmacroids")
     end
@@ -17,25 +57,65 @@ class ZabbixApi
     end
 
     def delete(data)
-      request(data, "usermacro.delete", "hostmacroids")
+      data_delete = [data]
+      request(data_delete, "usermacro.delete", "hostmacroids")
     end
 
     def delete_global(data)
-      request(data, "usermacro.deleteglobal", "globalmacroids")
+      data_delete = [data]
+      request(data_delete, "usermacro.deleteglobal", "globalmacroids")
     end
 
-    def update
+    def update(data)
       request(data, "usermacro.update", "hostmacroids")
     end
 
-    def update_global
+    def update_global(data)
       request(data, "usermacro.updateglobal", "globalmacroids")
     end
 
+    def get_or_create(data)
+      log "[DEBUG] Call get_or_create with parameters: #{data.inspect}"
+
+      unless (id = get_id(:macro => data[:macro], :hostid => data[:hostid]))
+        id = create(data)
+      end
+      id
+    end
+
+    def get_or_create_global(data)
+      log "[DEBUG] Call get_or_create_global with parameters: #{data.inspect}"
+
+      unless (id = get_id_global(:macro => data[:macro], :hostid => data[:hostid]))
+        id = create_global(data)
+      end
+      id
+    end
+
+    def create_or_update(data)
+      hostmacroid = get_id(:macro => data[:macro], :hostid => data[:hostid])
+      hostmacroid ? update(data.merge(:hostmacroid => hostmacroid)) : create(data)
+    end
+
+    def create_or_update_global(data)
+      hostmacroid = get_id_global(:macro => data[:macro], :hostid => data[:hostid])
+      hostmacroid ? update_global(data.merge(:globalmacroid => globalmacroid)) : create_global(data)
+    end
+
     private
       def request(data, method, result_key)
-        result = @client.api_request(:method => method, :params => data)
-        result.empty? ? nil : result[result_key][0].to_i
+        # Zabbix has different result formats for gets vs updates
+        if method.include?(".get")
+          if result_key.include?("global")
+            result = @client.api_request(:method => method, :params => { :globalmacro => true, :filter => data })
+          else
+            result = @client.api_request(:method => method, :params => { :filter => data })
+          end
+        else
+          result = @client.api_request(:method => method, :params => data)
+
+          result.key?(result_key) && result[result_key].length > 0 ? result[result_key][0].to_i : nil
+        end
       end
 
   end

data/lib/zabbixapi/version.rb

@@ -1,3 +1,3 @@
 class ZabbixApi
-  VERSION = "2.4.9"
+  VERSION = "3.0.0"
 end

data/spec/application.rb

@@ -30,7 +30,7 @@ describe 'application' do
 
     describe 'get_id' do
       it "should return nil" do
-        expect(zbx.applications.get_id(:host => @application)).to be_kind_of(NilClass)
+        expect(zbx.applications.get_id(:name => @application)).to be_kind_of(NilClass)
       end
     end
   end
@@ -65,6 +65,15 @@ describe 'application' do
       end
     end
 
+    describe 'create_or_update' do
+      it "should return id of updated application" do
+        expect(zbx.applications.create_or_update(
+          :name => @application,
+          :hostid => @templateid
+        )).to eq @applicationid
+      end
+    end
+
     describe "delete" do
       it "should return id" do
         expect(zbx.applications.delete(@applicationid)).to eq @applicationid

data/spec/trigger.rb

@@ -85,6 +85,15 @@ describe "trigger" do
       end
     end
 
+    describe 'create_or_update' do
+      it "should return id of updated trigger" do
+        expect(zbx.triggers.create_or_update(
+          :description => @trigger,
+          :hostid => @templateid
+        )).to eq @triggerid
+      end
+    end
+
     describe "delete" do
       it "should return id" do
         expect(zbx.triggers.delete( @triggerid )).to eq @triggerid

data/spec/usergroup.rb

@@ -24,14 +24,15 @@ describe 'usergroup' do
         :usrgrps => [@usergroupid]
       )
 
+      @usergroup2 = gen_name 'usergroup'
+      @usergroupid2 = zbx.usergroups.create(:name => @usergroup2)
       @user2 = gen_name 'user'
-
       @userid2 = zbx.users.create(
         :alias => @user2,
         :name => @user2,
         :surname => @user2,
         :passwd => @user2,
-        :usrgrps => [zbx.usergroups.create(:name => gen_name('usergroup'))]
+        :usrgrps => [@usergroupid2]
       )
     end
 
@@ -53,9 +54,9 @@ describe 'usergroup' do
     describe 'update_users' do
       it "should return id" do
         expect(zbx.usergroups.update_users(
-            :usrgrpids => [@usergroupid],
+            :usrgrpids => [@usergroupid2],
             :userids => [@userid2]
-        )).to eq @usergroupid
+        )).to eq @usergroupid2
       end
     end
 

data/spec/usermacro.rb

@@ -0,0 +1,190 @@
+#encoding: utf-8
+
+require 'spec_helper'
+
+describe 'usermacro' do
+  before :all do
+    @hostgroup = gen_name 'hostgroup'
+    @hostgroupid = zbx.hostgroups.create(:name => @hostgroup)
+    @template = gen_name 'template'
+    @templateid = zbx.templates.create(
+      :host => @template,
+      :groups => [:groupid => @hostgroupid]
+    )
+  end
+
+  context 'when hostmacro not exists' do
+    before do
+      @hostmacro = '{$' + gen_name('HOSTMACRO') + '}'
+    end
+
+    describe 'create' do
+      it "should return integer id" do
+        hostmacroid = zbx.usermacros.create(
+          :macro => @hostmacro,
+          :value => "public",
+          :hostid => @templateid
+        )
+        expect(hostmacroid).to be_kind_of(Integer)
+      end
+    end
+
+    describe 'get_id' do
+      it "should return nil" do
+        expect(zbx.usermacros.get_id(:macro => @hostmacro)).to be_kind_of(NilClass)
+      end
+    end
+  end
+
+  context 'when hostmacro exists' do
+    before :all do
+      @hostmacro = '{$' + gen_name('HOSTMACRO') + '}'
+      @hostmacroid = zbx.usermacros.create(
+        :macro => @hostmacro,
+        :value => "public",
+        :hostid => @templateid
+      )
+    end
+
+    describe 'get_or_create' do
+      it "should return id of hostmacro" do
+        expect(zbx.usermacros.get_or_create(
+          :macro => @hostmacro,
+          :value => "public",
+          :hostid => @templateid
+        )).to eq @hostmacroid
+      end
+    end
+
+    describe 'get_full_data' do
+      it "should contains created hostmacro" do
+        expect(zbx.usermacros.get_full_data(:macro => @hostmacro)[0]).to include("macro" => @hostmacro)
+      end
+    end
+
+    describe 'get_id' do
+      it "should return id of hostmacro" do
+        expect(zbx.usermacros.get_id(:macro => @hostmacro)).to eq @hostmacroid
+      end
+    end
+
+    it "should raise error on no identity given" do
+        expect { zbx.usermacros.get_id({}) }.to raise_error(ZabbixApi::ApiError)
+    end
+
+    describe 'update' do
+      it "should return id" do
+        expect(zbx.usermacros.update(
+          :hostmacroid => zbx.usermacros.get_id(:macro => @hostmacro),
+          :value => "private",
+        )).to eq @hostmacroid
+      end
+    end
+
+    describe 'create_or_update' do
+      it "should update existing usermacro" do
+        expect(zbx.usermacros.create_or_update(
+          :macro => @hostmacro,
+          :value => "public",
+          :hostid => @templateid
+        )).to eq @hostmacroid
+      end
+
+      it "should create usermacro" do
+        new_hostmacro_id = zbx.usermacros.create_or_update(
+          :macro => @hostmacro.gsub(/}/, "____1}"),
+          :value => "public",
+          :hostid => @templateid
+        )
+
+        expect(new_hostmacro_id).to be_kind_of(Integer)
+        expect(new_hostmacro_id).to be > @hostmacroid
+      end
+    end
+
+    describe 'delete' do
+      before :all do
+        @result = zbx.usermacros.delete(@hostmacroid)
+      end
+
+      it "should return deleted id" do
+        expect(@result).to eq @hostmacroid
+      end
+
+      it "should delete item from zabbix" do
+        expect(zbx.usermacros.get_id(:macro => @hostmacro)).to be_nil
+      end
+    end
+  end
+  
+  context 'when globalmacro not exists' do
+    before do
+      @globalmacro = '{$' + gen_name('GLOBALMACRO') + '}'
+    end
+
+    describe 'create_global' do
+      it "should return integer id" do
+        globalmacroid = zbx.usermacros.create_global(
+          :macro => @globalmacro,
+          :value => "public"
+        )
+        expect(globalmacroid).to be_kind_of(Integer)
+      end
+    end
+
+    describe 'get_id_global' do
+      it "should return nil" do
+        expect(zbx.usermacros.get_id_global(:macro => @globalmacro)).to be_kind_of(NilClass)
+      end
+    end
+  end
+
+  context 'when globalmacro exists' do
+    before :all do
+      @globalmacro = '{$' + gen_name('GLOBALMACRO') + '}'
+      @globalmacroid = zbx.usermacros.create_global(
+        :macro => @globalmacro,
+        :value => "public"
+      )
+    end
+
+    describe 'get_full_data_global' do
+      it "should contains created globalmacro" do
+        expect(zbx.usermacros.get_full_data_global(:macro => @globalmacro)[0]).to include("macro" => @globalmacro)
+      end
+    end
+
+    describe 'get_id_global' do
+      it "should return id of globalmacro" do
+        expect(zbx.usermacros.get_id_global(:macro => @globalmacro)).to eq @globalmacroid
+      end
+    end
+
+    it "should raise error on no identity given" do
+        expect { zbx.usermacros.get_id_global({}) }.to raise_error(ZabbixApi::ApiError)
+    end
+
+    describe 'update_global' do
+      it "should return id" do
+        expect(zbx.usermacros.update_global(
+          :globalmacroid => zbx.usermacros.get_id_global(:macro => @globalmacro),
+          :value => "private",
+        )).to eq @globalmacroid
+      end
+    end
+
+    describe 'delete_global' do
+      before :all do
+        @result = zbx.usermacros.delete_global(@globalmacroid)
+      end
+
+      it "should return deleted id" do
+        expect(@result).to eq @globalmacroid
+      end
+
+      it "should delete item from zabbix" do
+        expect(zbx.usermacros.get_id_global(:macro => @globalmacro)).to be_nil
+      end
+    end
+  end
+end

data/zabbixapi.gemspec

@@ -12,7 +12,10 @@ Gem::Specification.new do |s|
   s.description = %q{Allows you to work with zabbix api from ruby.}
   s.licenses    = %w(MIT)
 
-  s.add_dependency('json', '~> 1.6', '>= 1.6.0')
+  s.add_runtime_dependency 'json'
+  s.required_ruby_version = Gem::Requirement.new(">= 2".freeze)
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'rspec'
 
   s.rubyforge_project = "zabbixapi"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zabbixapi
 version: !ruby/object:Gem::Version
-  version: 2.4.9
+  version: 3.0.0
 platform: ruby
 authors:
 - Vasiliev D.V.
@@ -9,28 +9,50 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-14 00:00:00.000000000 Z
+date: 2017-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Allows you to work with zabbix api from ruby.
 email:
 - vadv.mkn@gmail.com
@@ -48,6 +70,8 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- json-1.x.Gemfile
+- json-1.x.Gemfile.lock
 - lib/zabbixapi.rb
 - lib/zabbixapi/basic/basic_alias.rb
 - lib/zabbixapi/basic/basic_func.rb
@@ -94,6 +118,7 @@ files:
 - spec/trigger.rb
 - spec/user.rb
 - spec/usergroup.rb
+- spec/usermacro.rb
 - zabbixapi.gemspec
 homepage: https://github.com/express42/zabbixapi
 licenses:
@@ -107,7 +132,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -115,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: zabbixapi
-rubygems_version: 2.4.3
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Realization for Zabbix API.
@@ -139,3 +164,4 @@ test_files:
 - spec/trigger.rb
 - spec/user.rb
 - spec/usergroup.rb
+- spec/usermacro.rb