zabbixapi 0.4.9 → 0.5.0a

data/README.md

@@ -219,14 +219,14 @@ zbx.screens.get_or_create_for_host(
 
 ### Create UserGroup, add user and add rights ###
 ```ruby
-zbx.usergroups.add(:name => "Some user group")
+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")]
 )
 # get read permissions for UserGroup on all hostgroup
 zbx.usergroups.set_perm_read(
-   :usrgrpids => zbx.usergroups.get_or_create(:name => "Some user group"),
+   :usrgrpid => zbx.usergroups.get_or_create(:name => "Some user group"),
    :hostgroupids => zbx.hostgroups.all.values
 )
 ```

data/lib/zabbixapi/usergroups.rb

@@ -87,18 +87,19 @@ class ZabbixApi
       usrgrpid
     end
 
-    # Set read permisssion for usrgrp on some hostgroup
+    # Set permission for usrgrp on some hostgroup
     # 
     # * *Args*    :
-    #   - +data+ -> Hash with :usrgrpids => id, :hostgroupids => []
+    #   - +data+ -> Hash with :usrgrpids => id, :hostgroupids => [], :permission => 2,3 (read and read write)
     # * *Returns* :
     #   - Integer
-    def set_perm_read(data)
+    def set_perm(data)
+      permission = data[:permission] || 2 
       result = @client.api_request(
         :method => "usergroup.massAdd", 
         :params => {
           :usrgrpids => [data[:usrgrpids]],
-          :rights => data[:hostgroupids].map { |t| {:permission => 2, :id => t} }
+          :rights => data[:hostgroupids].map { |t| {:permission => permission, :id => t} }
         }
       )
       result ? result['usrgrpids'][0].to_i : nil

data/lib/zabbixapi/version.rb

@@ -1,3 +1,3 @@
 class ZabbixApi
-  VERSION = "0.4.9"
+  VERSION = "0.5.0a"
 end

data/spec/localhost.rb

@@ -373,10 +373,11 @@ describe ZabbixApi, "test_api" do
     ).should be_kind_of(Integer)
   end
 
-  it "USERGROUPS: Set UserGroup read perm" do
-    puts zbx.usergroups.set_perm_read(
-      :usrgrpids => zbx.usergroups.get_or_create(:name => usergroup).to_s,
-      :hostgroupids => zbx.hostgroups.all.values
+  it "USERGROUPS: Set UserGroup read & write perm" do
+    puts zbx.usergroups.set_perm(
+      :usrgrpid => zbx.usergroups.get_or_create(:name => usergroup).to_s,
+      :hostgroupids => zbx.hostgroups.all.values,
+      :permission => 3
     )
   end
 

data/spec/run.rb

@@ -370,10 +370,11 @@ describe ZabbixApi, "test_api" do
     ).should be_kind_of(Integer)
   end
 
-  it "USERGROUPS: Set UserGroup read perm" do
-    puts zbx.usergroups.set_perm_read(
-      :usrgrpids => zbx.usergroups.get_or_create(:name => usergroup).to_s,
-      :hostgroupids => zbx.hostgroups.all.values
+  it "USERGROUPS: Set UserGroup read & write perm" do
+    puts zbx.usergroups.set_perm(
+      :usrgrpid => zbx.usergroups.get_or_create(:name => usergroup).to_s,
+      :hostgroupids => zbx.hostgroups.all.values,
+      :permission => 3
     )
   end
 

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: zabbixapi
 version: !ruby/object:Gem::Version
-  version: 0.4.9
-  prerelease: 
+  version: 0.5.0a
+  prerelease: 5
 platform: ruby
 authors:
 - Vasiliev D.V.
@@ -58,13 +58,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 772966212321473365
+      hash: -2374189325789372111
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: zabbixapi
 rubygems_version: 1.8.24