snmp-open 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed0ba9db497fbb007a69e702a2ed6321cfde3583
-  data.tar.gz: 9cbd977f12ae09f800fc0b27aa29fbad04bd0cd9
+  metadata.gz: 67cb5790febed285507e8f2872aa8dbb3f025a02
+  data.tar.gz: d1504724d8f8572a03624bca255d10757636d40f
 SHA512:
-  metadata.gz: 74fb9d39823597e02d95f2029e14391d16851e29f0b20006ab595550e56207dc2f20a1bb3404aa118d25cf9e0a8016542c60be327bf43e45683bad890571aa7a
-  data.tar.gz: 6b29974a7a28fa197acb75647674f036f7ef5fad733de2f0ae7a5c780005717e17d8cb87fb4855f398768665ccf987432906d6ed6131f69546798725ac98f6f0
+  metadata.gz: fff2fcd5e4c3a42d921112c4d0f36e96914b037aee168c73b2981796375597e82e7564352030cd0860043c40f24e61a7e44cd8fe3ae7b7f481b7c60e4d973631
+  data.tar.gz: 240aebb9fd9938b76a1d0bc37e56c77d70eb8cd5958a73f952b1766df793c8baabf43a437b0a0207c0c391ea5648018c7948c9ad92572f6b2cabb5555fb67492

data/lib/snmp/open/file_reader.rb

@@ -13,20 +13,37 @@ module SNMP
     # be used to generate a needed file, if the file is unavailable. Controlled
     # by the `warnings` option.
     class FileReader
+      DEFAULT_WARNING_FORMATTER = lambda { |gen, cmd, oid, outfile|
+        "#{gen.cli(cmd, oid)} > #{outfile}"
+      }
+
       def initialize(directory, options = {})
         @directory = directory
         @warnings = options.delete(:warnings)
-        @command_generator =
-          SNMP::Open::CommandReader.new(options.merge(host: '$OPTIONS'))
+        @make_directories = options.delete(:make_directories)
+        if @warnings && !@warnings.respond_to?(:call)
+          @warnings = DEFAULT_WARNING_FORMATTER
+        end
+        options[:host] ||= '$OPTIONS'
+        @command_generator = SNMP::Open::CommandReader.new(options)
       end
 
       def capture(cmd, oid, _options = {})
-        outfile = File.join(cmd.to_s, oid)
-        File.read(File.join(@directory, outfile))
+        mkdir(@directory, cmd.to_s) if @make_directories
+        outfile = File.join(@directory, cmd.to_s, oid)
+        File.read(outfile)
       rescue Errno::ENOENT => err
-        warn "#{@command_generator.cli(cmd, oid)} > #{outfile}" if @warnings
+        if @warnings
+          warning = @warnings.call(@command_generator, cmd, oid, outfile)
+          warn warning
+        end
         raise err
       end
+
+      def mkdir(base, cmd)
+        Dir.mkdir(base) unless File.exist?(base)
+        Dir.mkdir(File.join(base, cmd)) unless File.exist?(File.join(base, cmd))
+      end
     end # class FileReader
   end # class Open
 end # module SNMP

data/lib/snmp/open/version.rb

@@ -1,5 +1,5 @@
 module SNMP
-  module Open
-    VERSION = '0.4.0'.freeze
+  class Open
+    VERSION = '0.5.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: snmp-open
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Ben Miller
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-27 00:00:00.000000000 Z
+date: 2018-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -114,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.5.2.2
 signing_key: 
 specification_version: 4
 summary: Wrapper for command-line SNMP utilities