snmp-open 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b13230f5561531372236208bfe42c5a0d44ef032d8075316fd02bf78ec7e78b3
-  data.tar.gz: 2fc93d9967c5fc37918b7f371147e14f9942d356699a02e4ce46b06763bfceb0
+  metadata.gz: 0c647ac12c0055f8f71908c27d5460e3b220d2c265751987d7a08ac1b1179efa
+  data.tar.gz: 74dfcf665582e2d23f093a6e67b83e9def03c1b8939d9772b7a645e884f95dbe
 SHA512:
-  metadata.gz: b3678f4b2e04b9f5a3a45edd3273d8ecfecb8a7a2bc4d92568b9644c6192e8e5fbeb8b902f0bf53d5c42b184f1402359a6daf8ea9f9923c1331b22b914fc0a54
-  data.tar.gz: 19a0f2e47cb585f3a1aaab331c3a97bbec05d3e57ce8ec76e17f5c1dc48f96a5b68cbb0b9d8b7b648490cbfbeed0dd1f2810381574286bd5135bddc9eac2d5bc
+  metadata.gz: d8bd115d0a86d384dc860191bbb045e4903ab739ef1581041b6e030134345a60a3481a4f75554ddaf527587db8e72d0b544949590638606fabe0ea2ada23a77d
+  data.tar.gz: d505743d70310b076a783e1cdad8ab95a1a5776c6e8f5caf467c827791216896d76db3baf5fc9c4ca25519de6bf6336a7c6e27c3bff308e8eb65235c68ecf597

data/.github/workflows/ruby.yml

@@ -12,7 +12,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest]
-        ruby: [2.4, 2.5, 2.6, 2.7, jruby, truffleruby]
+        ruby: [2.4, 2.5, 2.6, 2.7, jruby]
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v2

data/lib/snmp/open/parser.rb

@@ -63,17 +63,24 @@ module SNMP
       private
 
       def align(columns)
-        indexes = columns.first.map { |value| index_using_first_oid(value) }
+        indexes = indexes_from_columns(columns)
+        bases = bases_from_columns(columns)
         hash = columns.flat_map { |row| row.map { |v| [v.oid, v] } }.to_h
 
         indexes.map do |index|
-          @oids.map do |base|
+          bases.map do |base, _|
             oid = [base, *index].join('.')
             hash.fetch(oid) { Value.new(oid, 'absent', nil) }
           end
         end
       end
 
+      def bases_from_columns(columns)
+        @oids
+          .zip(columns.map { |c| c&.first&.oid })
+          .map { |base, oid| base && oid && split_oid(base, oid) }
+      end
+
       def clean_input_text(text)
         text
           .gsub(/\r\n|\n\r|\r/, "\n")
@@ -82,16 +89,8 @@ module SNMP
           .gsub(Static::ANY_MESSAGE, Static::QUOTED_MESSAGES)
       end
 
-      def index_using_first_oid(value)
-        base = @oids.first
-
-        if base == value.oid
-          nil
-        elsif value.oid.start_with?(base)
-          value.oid.gsub(/\A#{base}\.?/, '')
-        else
-          raise "Received ID doesn't start with the given ID"
-        end
+      def indexes_from_columns(columns)
+        columns.first.map { |value| split_oid(@oids.first, value.oid)[1] }
       end
 
       def parse_tokens(tokens)
@@ -124,6 +123,21 @@ module SNMP
         ValueParser.find(type, token).parse(tokens)
       end
 
+      # split a complete OID into a base and index, given an expected base
+      # raises if the base isn't present
+      def split_oid(base, oid)
+        if base == oid
+          [base, nil]
+        elsif oid.start_with?(base)
+          [base, oid.sub(/\A#{base}\.?/, '')]
+        elsif base.include?('::') && !oid.include?('::')
+          alternate_base = base.sub(/\A[^:]+::/, '')
+          split_oid(alternate_base, oid)
+        else
+          raise "Received ID doesn't start with the given ID"
+        end
+      end
+
       def table(columns)
         if columns.size == 1 && columns.all? { |column| column.size == 1 }
           columns

data/lib/snmp/open/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: snmp-open
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Ben Miller
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-03-15 00:00:00.000000000 Z
+date: 2022-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler