zabbixapi 2.0.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 !binary "U0hBMQ==":
-  metadata.gz: acfb3f390844a6875bacfda608080b148a3872a2
-  data.tar.gz: 5c6a2e839a324b6de537b9e93d68db825a4e818f
+  metadata.gz: e53d0e095f85693462a04e39c5c31d0cef3d6695
+  data.tar.gz: dcb73a599e97d0245b0bb510d867c2b99d1b157c
 SHA512:
-  metadata.gz: d47ef057a22a1268ea94f67c98381bff223037e8ff8f84fc48323c42bd96a5f5248bfd1396497a3ece93920acf25718f1d159fdda1e343b57d20d797a1781f76
-  data.tar.gz: 2af73a1a183dee4576ed0a213993579d454646b77db072deb77c69b06389c10661c9360b4ab3cd266d42abc510d2f67e2778a07600b59246a2e61747f01528f5
+  metadata.gz: 98fe68e87a8de3dbc7070ec412856c3d3f3f4d82f0e658cb75e62e1310d19fab9165327cfe907d8b4916f7c59d55fd0127ca1e0c58cc2692ade4ef2d9577c05b
+  data.tar.gz: 110ea1b4871e68d7c47ae2017c7fbe6cdb3abb426af78bc0fc9779af7dce99473d05771698f4fd2e9f0663b669b43017409b4d2049cb35ebe4e9b1d195fbfba1

data/.travis.yml

@@ -5,8 +5,8 @@ rvm:
   - 2.0.0
   - 2.1.1
 before_script:
-  - wget -qO - http://obs.express42.com/project_root:/zabbix2.0/precise/Release.key | sudo apt-key add -
-  - echo "deb http://obs.express42.com/project_root:/zabbix2.0/precise/ ./" | sudo tee /etc/apt/sources.list.d/zabbix.list
+  - wget -qO - http://obs.express42.com/project_root:/zabbix2.2/precise/Release.key | sudo apt-key add -
+  - echo "deb http://obs.express42.com/project_root:/zabbix2.2/precise/ ./" | sudo tee /etc/apt/sources.list.d/zabbix.list
   - sudo apt-get update
   - sudo apt-get install libiodbc2
   - sudo apt-get install zabbix-server-pgsql zabbix-frontend-php

data/README.md

@@ -4,10 +4,11 @@ Simple and lightweight ruby module for work with zabbix api
 
 [![Build Status](https://travis-ci.org/express42/zabbixapi.png)](https://travis-ci.org/express42/zabbixapi)
 
-#####Now worked with zabbix
-* 1.8.2 (api version 1.2) /zabbixapi 0.6.x
-* 1.8.9 (api version 1.3) /zabbixapi 0.6.x
-* 2.0.x (api version 1.4 -> 2.0.10) /zabbixapi 2.0.x
+#####Now works with all version of zabbix
+* 1.8.2 (api version 1.2) /zabbixapi 0.6.x [branch zabbix1.8](https://github.com/express42/zabbixapi/tree/zabbix1.8)
+* 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 master](https://github.com/express42/zabbixapi/tree/master)
+* 2.2.x (api version 2.2.x) /zabbixapi 2.2.x [current branch zabbix2.2](https://github.com/express42/zabbixapi/tree/zabbix2.2)
 
 ## Version policy
 
@@ -23,7 +24,7 @@ We support only two last versions of zabbix (2.0 and 2.2), so you should conside
 
 ## Installation
 ```
-gem install zabbixapi
+gem install zabbixapi -v 2.2.0
 ```
 
 ## Getting Started
@@ -310,7 +311,7 @@ zbx.users.add_medias(
 )
 ```
 
-### Create proxy (2.0 and later)
+### Create proxy
 #### Active proxy
 ```ruby
 zbx.proxies.create(
@@ -366,4 +367,4 @@ zbx.query(
 ## Zabbix documentation
 
 * [Zabbix Project Homepage](http://zabbix.com/)
-* [Zabbix Api docs](https://www.zabbix.com/documentation/2.0/manual/appendix/api/api)
+* [Zabbix Api docs](https://www.zabbix.com/documentation/2.2/manual/api/reference)

data/lib/zabbixapi.rb

@@ -41,7 +41,7 @@ class ZabbixApi
 
   def initialize(options = {})
     @client = Client.new(options)
-    unless @client.api_version == "1.4" || @client.api_version =~ /2\.0\.\d+/
+    unless @client.api_version =~ /2\.2\.\d+/
       raise "Zabbix API version: #{@client.api_version} is not support by this version of zabbixapi"
     end
   end

data/lib/zabbixapi/classes/items.rb

@@ -13,7 +13,7 @@ class ZabbixApi
       "name"
     end
 
-    def default_options 
+    def default_options
       {
         :name => nil,
         :key_ => nil,
@@ -49,14 +49,5 @@ class ZabbixApi
         :ipmi_sensor => ''
       }
     end
-
-    def delete(data)
-      log "[DEBUG] Call delete with parametrs: #{data.inspect}"
-
-      data_delete = array_flag ? [data] : [key.to_sym => data]
-      result = @client.api_request(:method => "#{method_name}.delete", :params => data_delete)
-      result['itemids'].keys[0].to_i
-    end
-
   end
 end

data/lib/zabbixapi/classes/screens.rb

@@ -44,15 +44,9 @@ class ZabbixApi
       colspan = data[:colspan] || 0
       height = data[:height] || 320 # default 320
       width = data[:width] || 200 # default 200
-      vsize = data[:vsize] || (graphids.size/hsize).to_i
+      vsize = data[:vsize] || [1, (graphids.size/hsize).to_i].max
       screenid = get_id(:name => screen_name)
 
-      if ((graphids.size/hsize) / 2) == 0
-        vsize = data[:vsize] || (graphids.size/hsize).to_i
-      else
-        vsize = data[:vsize] || ((graphids.size/hsize)+1).to_i
-      end
-
       unless screenid
         # Create screen
         graphids.each_with_index do |graphid, index|

data/lib/zabbixapi/version.rb

@@ -1,3 +1,3 @@
 class ZabbixApi
-  VERSION = "2.0.0"
+  VERSION = "2.2.0"
 end

data/spec/server.rb

@@ -8,8 +8,8 @@ describe 'server' do
       zbx.server.version.should be_kind_of(String)
     end
 
-    it "should be 2.0.x" do
-      zbx.server.version.should match(/2\.0\.\d+/)
+    it "should be 2.2.x" do
+      zbx.server.version.should match(/2\.2\.\d+/)
     end
   end
 end

data/spec/spec_helper.rb

@@ -3,7 +3,7 @@ require 'zabbixapi'
 
 def zbx
   # settings
-  @api_url = ENV['ZABBIX_HOST_URL'] || 'http://localhost:7070/api_jsonrpc.php'
+  @api_url = ENV['ZABBIX_HOST_URL'] || 'http://10.211.55.6/api_jsonrpc.php'
   @api_login = 'Admin'
   @api_password = 'zabbix'
 

data/spec/usergroup.rb

@@ -61,8 +61,14 @@ describe 'usergroup' do
     end
 
     describe 'delete' do
-      it "should return id" do
-        zbx.usergroups.delete(@usergroupid).should eq @usergroupid
+      it "should raise error when has users with only one group" do
+        expect { zbx.usergroups.delete(@usergroupid) }.to raise_error
+      end
+
+      it "should return id of deleted group" do
+        usergroupid = zbx.usergroups.create(:name => gen_name('usergroup'))
+
+        expect(zbx.usergroups.delete(usergroupid)).to eq usergroupid
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zabbixapi
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Vasiliev D.V.
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-18 00:00:00.000000000 Z
+date: 2014-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json