zenoss_api 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 268afdc946036a964e71a205ae5dc00c8fbf4082
-  data.tar.gz: 0eff486cdeacf9d2b876ea6c8c973437fad79aac
+  metadata.gz: fe7cb83a35e2b25f8e17900d100565a10cf4ae07
+  data.tar.gz: ba880498c462e7869ccbf543e8ebaecabbf9f2e7
 SHA512:
-  metadata.gz: cb7b5b69304243c9bc2b05ea309049621ff12650f053b4e7cb769ca1312a20b3268d0968fd29f4b08dfabf6dcea34c92ccbe57c4b31d0d6256b19f30f272b9d9
-  data.tar.gz: ef4ada9af5a98ec50a1c2157ca1745a7bdf540ce76c6b4a2eeb02a72676303738daf0e9345f3ab3035827b0fa48da4db8cf2a724af563f2cddba4ae4295842e7
+  metadata.gz: 4a87e98751f54151c4fd3794468efe43ec17a4ea56d314cf15b3aff593d4c6da32d3893f7d33fdcf3b20bbead2fa36170ef380ac9858c1214e9a9ca4b2f1ea2d
+  data.tar.gz: bb0d699f1ef580806fa90e88d632747f44209b16aa2ba1197381a802a972be63b10abbf17efb51be3293d27a2da038e01a9c7443a48c0281371ddc43dd85ba02

data/bin/zenapi

@@ -44,10 +44,16 @@ opts_parser = OptionParser.new do |opts|
     options[:method] = method
   end
   opts.on('-p', '--params key=value', Array, 'zenoss method params: default is none') do |params|
-    if params[0].match /^({.*})$/ 
-      params_hash = JSON.parse(params)
-    else 
-      key_pairs = params.map { |x| x.split('=') } 
+    key_pairs = params.map { |x| x.split('=') } 
+    key_hashes = key_pairs.map { |y| { y[0] => y[1] } } 
+    key_hashes.each { |k| options[:zenoss_params_arg].push k } 
+  end
+  opts.on('-f', '--filters key:value', 'method filter: default is none') do |filter|
+    if filter.match /^({.*})$/
+      filter_hash = JSON.parse(filter)
+      options[:zenoss_params_arg].push filter_hash
+    else
+      key_pairs = filter.split(",").map { |x| x.split(':') } 
       key_hashes = key_pairs.map { |y| { y[0] => y[1] } } 
       key_hashes.each { |k| options[:zenoss_params_arg].push k } 
     end
@@ -113,8 +119,10 @@ opts_parser = OptionParser.new do |opts|
   end
 end
 
+
 opts_parser.parse!
 
+
 if options[:uids_file] 
   uids = []
   options[:uids_file]['devices'].each do |u|

data/lib/zenoss_api/version.rb

@@ -1,3 +1,3 @@
 module ZenossApi
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zenoss_api
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Todd Stoll