snmpjr 0.3.0-java → 0.3.1-java

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDY3NTgwYjc3ZTBlNDViODkyNzdiY2E4NzY5NWY3NjlhMjRhYzE0ZQ==
+    YTFjOWFjNzJhNTEwY2I0MjE0Njg3ODMwNzk0OGY2YWUyOGFkYzJhOA==
   data.tar.gz: !binary |-
-    NDQzMjc5ZTcwYzY5ZmRjNTU2NzlkMzBiZGZiY2Q3ZGZkNjJiZGEyZg==
+    MjA1NzRhZTA5MTI0MWM3NWVjZWFkZDQ0YmFlODM4NTcwOTdmZTJlNw==
 SHA512:
   metadata.gz: !binary |-
-    MDc5YzIzMWJkZGRmODI1OTU4NjQwZTdmOWZmYzU5MzRjMTc2YWQxZjYwYzQ0
-    NWNlZDhlMDQ1MWU5ZDU0NTIyOWU5ZTA0ZGViYzVmNGIzYTU5YTVhMmFiNjli
-    NjU0MDdkNDRiMWM2NmE5YjQ1ODJiMmIzNjc5Mjc5MDg0NzhhYWQ=
+    Yzc3ZmJiNWM2NGViNTE1ZTgzZGMzNmFmNjA3MWNlNmZhM2Y3ZGI0YzVjNTc5
+    MmJlZWI3YTVkYjkwZmE1MTFhNmM3Y2UzNWJkMDEwZjRjY2M1MTU2NGQxZjFk
+    ZWUzMDhlNWQ1NTEzOGI0YmRmMzdmZTcxNWEzMDI0NTY2YzA1YzI=
   data.tar.gz: !binary |-
-    OTdkZDdhZjU3NzJiNjRmNjRhYWNkYjVkMzM1Mzk2MmE3YmFiZjM2ZmRiMDNi
-    MTQzYTI5ZmVmZTZlZjJmYjkwOWJiOGM1NjJkN2ExNzhhNWQ5OTIzNDlhYTg0
-    NGM5ODNhY2QxMDczZDM4ZWE3MzYwMDhiMzlmMWEyODA4OGU1MTA=
+    M2YwNmFjMDJjMWEzZDJmNjEwMzlhMDA3YzYxNjRkYzJlZWU1NDBiYzhjZDQ5
+    ZWY2ZGViODdhZmFhNmJiMDMxODRkMTBkMGJhNTU3N2IyY2RlNjdkNWYxYmYy
+    NjQ2OTY2MjJiYWM0YzRiZmEyOTJlY2M4OTFkZTAwNDkyYTNlNmQ=

data/.semver

@@ -1,6 +1,6 @@
 ---
 :major: 0
 :minor: 3
-:patch: '0'
+:patch: 1
 :special: ''
 :metadata: ''

data/history.rdoc

@@ -1,3 +1,5 @@
+== v0.3.1 (02 December 2014)
+
 == v0.3.0 (01 December 2014)
 
 == v0.2.2 (03 November 2014)

data/lib/snmpjr/getter.rb

@@ -9,11 +9,12 @@ class Snmpjr
     end
 
     def get oids
+      #TODO: Change it to be a session do end block
       @session.start
       begin
-        results = oids.each_slice(@max_oids_per_request).map{|partial_oids|
+        results = oids.each_slice(@max_oids_per_request).flat_map{|partial_oids|
           get_request partial_oids
-        }.flatten
+        }
       ensure
         @session.close
       end

data/lib/snmpjr/pdu_v2c.rb

@@ -7,18 +7,21 @@ class Snmpjr
       GET = -96
     end
 
-    def initialize
-      @pdu = Snmpjr::Wrappers::PDU.new
-    end
-
     def create oids
+      pdu = create_new_pdu
       oids.map {|oid|
         oid = Snmpjr::Wrappers::SMI::OID.new oid
         variable_binding = Snmpjr::Wrappers::SMI::VariableBinding.new oid
-        @pdu.add variable_binding
+        pdu.add variable_binding
       }
-      @pdu.type = Snmpjr::PduV2C::Constants::GET
-      @pdu
+      pdu.type = Snmpjr::PduV2C::Constants::GET
+      pdu
+    end
+
+    private
+
+    def create_new_pdu
+      Snmpjr::Wrappers::PDU.new
     end
 
   end

data/lib/snmpjr/pdu_v3.rb

@@ -6,8 +6,15 @@ class Snmpjr
   class PduV3 < Snmpjr::PduV2C
 
     def initialize context = ''
-      @pdu = Snmpjr::Wrappers::ScopedPDU.new
-      @pdu.context_name = Snmpjr::Wrappers::SMI::OctetString.new(context)
+      @context_name = Snmpjr::Wrappers::SMI::OctetString.new(context)
+    end
+
+    private
+
+    def create_new_pdu
+      pdu = Snmpjr::Wrappers::ScopedPDU.new
+      pdu.context_name = @context_name
+      pdu
     end
 
   end

data/snmpjr.gemspec

@@ -5,7 +5,7 @@ require 'snmpjr/version'
 
 Gem::Specification.new do |spec|
   spec.name          = 'snmpjr'
-  spec.version       = '0.3.0'
+  spec.version       = '0.3.1'
   spec.authors       = ['Zen Kyprianou']
   spec.email         = ['zen@kyprianou.eu']
   spec.summary       = 'Simple SNMP interface for JRuby'

data/spec/snmpjr/getter_spec.rb

@@ -48,6 +48,21 @@ describe Snmpjr::Getter do
       end
     end
 
+    context 'when there is an uneven split of slices' do
+      before do
+        configuration.max_oids_per_request = 2
+        allow(pdu).to receive(:create).with(['1.2.3.4.5.6', '2.3.4.5.6.7']).and_return created_pdu_multiple_1
+        allow(pdu).to receive(:create).with(['6.5.4.3.2.1']).and_return created_pdu_multiple_2
+        allow(session).to receive(:send).with(created_pdu_multiple_1, target).and_return ['Foo', 'Baz']
+      end
+
+      it 'should not have duplicate results' do
+        expect(subject.get ['1.2.3.4.5.6', '2.3.4.5.6.7', '6.5.4.3.2.1']).to eq(['Foo', 'Baz', 'Bar'])
+        expect(session).to have_received(:send).with(created_pdu_multiple_1, target)
+        expect(session).to have_received(:send).with(created_pdu_multiple_2, target)
+      end
+    end
+
     it 'starts an snmp session' do
       subject.get ['1.2.3.4.5.6', '6.5.4.3.2.1']
       expect(session).to have_received(:start)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: snmpjr
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: java
 authors:
 - Zen Kyprianou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-01 00:00:00.000000000 Z
+date: 2014-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-n-bake