zabbixapi 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: e53d0e095f85693462a04e39c5c31d0cef3d6695
-  data.tar.gz: dcb73a599e97d0245b0bb510d867c2b99d1b157c
+SHA1:
+  metadata.gz: 36996cc80617db9b2b099259078827cb00a79f92
+  data.tar.gz: eb15e6b0025ba2696e926f05c5d74dc8e3d1f9a9
 SHA512:
-  metadata.gz: 98fe68e87a8de3dbc7070ec412856c3d3f3f4d82f0e658cb75e62e1310d19fab9165327cfe907d8b4916f7c59d55fd0127ca1e0c58cc2692ade4ef2d9577c05b
-  data.tar.gz: 110ea1b4871e68d7c47ae2017c7fbe6cdb3abb426af78bc0fc9779af7dce99473d05771698f4fd2e9f0663b669b43017409b4d2049cb35ebe4e9b1d195fbfba1
+  metadata.gz: 921aebf75006230af71140ad7680e1c06293c8cfaf6de71bc50a33ad4b18dabab62ce79b276bab3658abd6fb95aef98c0eb2e63196c972d7e50ab79b70701605
+  data.tar.gz: d5fbf12cc9995d0b77227871a490b99ed7c001b9aa3bffad4093735b2f739deb6c690bd31a5a685c0180e100dfd283d9740ad122e9fb421db5e5706f88468dfc

data/README.md

@@ -1,21 +1,23 @@
-#Ruby Zabbix Api Module
+# Ruby Zabbix Api Module
 
 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 works with all version of zabbix
+##### 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)
+* 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 [master or branch zabbix2.2](https://github.com/express42/zabbixapi/tree/master)
+
+Because Zabbix 2.2 is a main branch of Zabbix, so master of zabbixapi supports this version of zabbix.
 
 ## Version policy
 
 Zabbixapi has next version policy:
 * for zabbix 1.8.9 and below you should use zabbixapi 0.6.x
 * for zabbix 2.0.x you should use zabbixapi 2.0.y
-* for zabbix 2.2.x you should use zabbixapi 2.2.y (coming soon)
+* for zabbix 2.2.x you should use zabbixapi 2.2.y
 
 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
@@ -71,16 +73,21 @@ zbx.applications.create(
 ### Create Item
 ```ruby
 zbx.items.create(
+  :name => "item",
   :description => "item",
   :key_ => "proc.num[aaa]",
+  :type => 6,
+  :value_type => 6,
   :hostid => zbx.templates.get_id(:host => "template"),
   :applications => [zbx.applications.get_id(:name => "application")]
 )
 # or use (lib merge json):
 zbx.items.create_or_update(
+  :name => "item",
   :description => "item",
   :key_ => "proc.num[aaa]",
   :type => 6,
+  :value_type => 4,
   :hostid => zbx.templates.get_id(:host => "template"),
   :applications => [zbx.applications.get_id(:name => "application")]
 )
@@ -243,7 +250,7 @@ zbx.users.create(
 
 ### Update user
 ```ruby
-zbx.users.update(:userid => zbx.users.get_id(:name => "user"), :name => "user2")
+zbx.users.update(:userid => zbx.users.get_id(:alias => "user"), :name => "user2")
 ```
 
 ### Delete graph
@@ -279,7 +286,7 @@ zbx.screens.delete(
 zbx.usergroups.get_or_create(:name => "Some user group")
 zbx.usergroups.add_user(
   :usrgrpids => [zbx.usergroups.get_id(:name => "Some user group")],
-  :userids => [zbx.users.get_id(:name => "Some user")]
+  :userids => [zbx.users.get_id(:alias => "user")]
 )
 # set write and read permissions for UserGroup on all hostgroups
 zbx.usergroups.set_perm(
@@ -298,7 +305,7 @@ zbx.mediatypes.create_or_update(
   :smtp_email => "zabbix@test.com"
 )
 zbx.users.add_medias(
-  :userids => [zbx.users.get_id(:name => "user")],
+  :userids => [zbx.users.get_id(:alias => "user")],
   :media => [
     {
       :mediatypeid => zbx.mediatypes.get_id(:description => "mediatype"),

data/lib/zabbixapi/classes/usergroups.rb

@@ -66,5 +66,22 @@ class ZabbixApi
       result ? result['usrgrpids'][0].to_i : nil
     end
 
+    # Update usergroup, modify users
+    # 
+    # * *Args*    :
+    #   - +data+ -> Hash with :usrgrpids => id, :userids => []
+    # * *Returns* :
+    #   - Integer
+    def update_users(data)
+      result = @client.api_request(
+        :method => "usergroup.massUpdate", 
+        :params => {
+          :usrgrpids => data[:usrgrpids],
+          :userids => data[:userids]
+        }
+      )
+      result ? result['usrgrpids'][0].to_i : nil
+    end
+
   end
 end

data/lib/zabbixapi/classes/users.rb

@@ -14,7 +14,7 @@ class ZabbixApi
     end
 
     def indentify
-      "name"
+      "alias"
     end
 
     def add_medias(data)

data/lib/zabbixapi/client.rb

@@ -56,13 +56,13 @@ class ZabbixApi
       unless @proxy_uri.nil?
         http = Net::HTTP.Proxy(@proxy_host, @proxy_port, @proxy_user, @proxy_pass).new(uri.host, uri.port)
 
-        if uri.port == 443
+        if uri.scheme == 'https'
           http.use_ssl = true
           http.verify_mode = OpenSSL::SSL::VERIFY_NONE
         end
       else
         http = Net::HTTP.new(uri.host, uri.port)
-        if uri.port == 443
+        if uri.scheme == 'https'
           http.use_ssl = true
           http.verify_mode = OpenSSL::SSL::VERIFY_NONE
         end

data/lib/zabbixapi/version.rb

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

data/spec/user.rb

@@ -21,7 +21,7 @@ describe 'user' do
       it "should return integer id" do
         user = gen_name 'user'
         userid = zbx.users.create(
-          :alias => "Test #{user}",
+          :alias => user,
           :name => user,
           :surname => user,
           :passwd => user,
@@ -33,7 +33,7 @@ describe 'user' do
 
     describe 'get_id' do
       it "should return nil" do
-        zbx.users.get_id(:name => "name_____").should be_nil
+        zbx.users.get_id(:alias => "name_____").should be_nil
       end
     end
   end
@@ -63,7 +63,7 @@ describe 'user' do
 
     describe 'get_full_data' do
       it "should return string name" do
-        zbx.users.get_full_data(:name => @user)[0]['name'].should be_kind_of(String)
+        zbx.users.get_full_data(:alias => @user)[0]['name'].should be_kind_of(String)
       end
     end
 

data/spec/usergroup.rb

@@ -50,6 +50,15 @@ describe 'usergroup' do
       end
     end
 
+    describe 'update_users' do
+      it "should return id" do
+        zbx.usergroups.update_users(
+            :usrgrpids => [@usergroupid],
+            :userids => [@userid2]
+        ).should eq @usergroupid
+      end
+    end
+
     describe 'set_perms' do
       it "should return id" do
         zbx.usergroups.set_perms(

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zabbixapi
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Vasiliev D.V.
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-19 00:00:00.000000000 Z
+date: 2014-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -18,7 +18,7 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.6.0
   type: :runtime
@@ -28,7 +28,7 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.6.0
 description: Allows you to work with zabbix api from ruby.
@@ -95,17 +95,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: zabbixapi
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Realization for Zabbix API.
@@ -125,4 +125,3 @@ test_files:
 - spec/trigger.rb
 - spec/user.rb
 - spec/usergroup.rb
-has_rdoc: