snmp-open 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ae08ac661e97b5c47899d166a7bdcd6b71e0c55
-  data.tar.gz: b10aae94bb31fc05b38ec3d3ab9ce1d450c3b104
+  metadata.gz: 118c73e3356d85cda27007ac7ada6ccb25e36af3
+  data.tar.gz: a6bbbbddbb1792aa8fef75c308c988c57d74e8a6
 SHA512:
-  metadata.gz: 998d8abcd4e3e7b5967affb6441f590201c7a0c15b24ebe7f56911fa17a103086a2c6392586baa4fb9fe26083985e9de8cbc174eb2524a4303602a11757301be
-  data.tar.gz: ecf925444abd22e218b7235985aa5d98357f9e6e34b759ac760d3bbc5c1e83c89c46c261132663ee479124932c5b8d07e3313c88edd812cccf18aed1a179ce31
+  metadata.gz: c6d5f53dfcc6db0e2278926bf2cd1c86904a7575c9199f3f4a2c6e405d61c245b6d84887c0f8ca8ca7af19c4ab1639b76cc164118f6703f7fd0596749fe1e2bd
+  data.tar.gz: 7986c9fdb242a009c384dd0be8824b73cd59f103b46502d7c142d6f863496c1983e6974f11dca2ffc2d8f3115951b624b092010b2b55196ea5a18e8765fd6858

data/lib/snmp/open/command_reader.rb

@@ -12,6 +12,10 @@ module SNMP
         auth_protocol: '-a',
         community: '-c',
         context: '-n',
+        no_check_increasing: {
+          'snmpbulkwalk' => '-Cc',
+          'snmpwalk' => '-Cc'
+        },
         numeric: '-On', # needed by parser, should always be enabled
         priv_password: '-X', # not recommended, see snmp.conf(5)
         priv_protocol: '-x',
@@ -22,6 +26,12 @@ module SNMP
         host: nil
       }.freeze
 
+      OPTION_VALUES = {
+        no_check_increasing: {
+          true => ''
+        }.freeze
+      }.freeze
+
       # +options+ accepts options dealing with making connections to the host,
       # including all of the options listed in the +OPTIONS+ constant hash.
       # Other options can be given as strings (or any object with a suitable
@@ -33,26 +43,25 @@ module SNMP
       def initialize(options)
         host = options.delete(:host) ||
                (raise ArgumentError, 'Host expected but not given')
-        @host_options = merge_options(options).merge('-On' => nil, host => nil)
+        opts = merge_options(options).merge('-On' => nil, host => nil)
+        @command_options, @host_options = partition_options(opts)
       end
 
       def capture(cmd, oid, options = {})
         out, err = Open3.capture3(cli(cmd, oid, options))
-        raise err unless err.empty?
+        raise CommandError, err.chomp unless err.empty?
         out
       end
 
       # Generate a CLI command string
       def cli(command, id = nil, options = {})
-        command = case command
-                  when Symbol then "snmp#{command}"
-                  else             command.to_s
-                  end
+        command = normalize_command(command)
 
         [
           command,
           *options.map { |k, v| "#{k}#{v}" },
           *@host_options.map { |k, v| "#{k}#{v}" },
+          *@command_options.fetch(command, {}).map { |k, v| "#{k}#{v}" },
           *id
         ].join(' ')
       end
@@ -62,7 +71,8 @@ module SNMP
       def merge_options(options = {})
         options.each_pair.with_object({}) do |(key, value), opts|
           if OPTIONS.key?(key)
-            opts[OPTIONS[key]] = value
+            opts[OPTIONS[key]] =
+              (OPTION_VALUES.fetch(key, {}).fetch(value, value) || next)
           elsif key.is_a?(String)
             opts[key] = value
           else
@@ -70,6 +80,42 @@ module SNMP
           end
         end
       end
+
+      def normalize_command(command)
+        case command
+        when Symbol then "snmp#{command}"
+        else             command.to_s
+        end
+      end
+
+      def partition_options(options)
+        command_keys, host_keys = options
+                                  .keys
+                                  .partition { |k| k.is_a?(Hash) }
+
+        [
+          merge_command_options(options, command_keys),
+          merge_host_options(options, host_keys)
+        ]
+      end
+
+      def merge_command_options(options, keys)
+        keys.each.with_object({}) do |commands, hash|
+          command_value = options[commands]
+          commands.each_pair do |command, option|
+            hash[command] ||= {}
+            hash[command][option] = command_value
+          end
+        end
+      end
+
+      def merge_host_options(options, keys)
+        keys.each.with_object({}) do |key, hash|
+          hash[key] = options[key]
+        end
+      end
     end # class CommandReader
+
+    class CommandError < RuntimeError; end
   end # class Open
 end # module SNMP

data/lib/snmp/open/version.rb

@@ -1,5 +1,5 @@
 module Snmp
   module Open
-    VERSION = '0.1.4'.freeze
+    VERSION = '0.1.5'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: snmp-open
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Ben Miller