rsmp 0.8.5 → 0.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e12fd3ea8f7f931b3ce3269a13e8ccd1248642a89062682b0088d044732f1757
-  data.tar.gz: ff18134bf0e16210e30a5820f5bd2c27b5fb7f81bcf2f9f993e6c8aefe69d9d5
+  metadata.gz: 437183789b08f12b23264bc2716b84fd6c2298c2abab58dfb0b64529d004ac7d
+  data.tar.gz: 5595afbb4edb5d3e66320cae10c92c98a13fd56848095bb8ec4bb3615a097b05
 SHA512:
-  metadata.gz: 3335d30f728748483d26e5d3d0c5671746b80dece2badc781064d0ae81f277fd7b899e9e508255a17d6f1cbd017a64164f6f0a21f1ca777b359c23b1fa482ebf
-  data.tar.gz: a2e457988983d9c3173f91c1269979ea6a37ce75ac5e0acc30f21fbb34d2cfab8fe81295ac43c6a6010df0f7c06e11dc9efadd01c28fc20a0e77ff6d6c580787
+  metadata.gz: f3cdc4723d2d4616cc703d18aca6432c354bdbd7e4084c443a5f17aa8c420463d567813e73dc3fb454f02461b773149970932ee1d6d84f0434d8eaf21324a0ff
+  data.tar.gz: b90f7f2c8edc5722e0044cb31107779caabc4a9acbfce8bb713dd9a7d84e7272dd96fb2aad293c7d30e2350701758fe5300cfed776a774a754798cf8ac91037c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rsmp (0.8.5)
+    rsmp (0.8.6)
       async (~> 1.29.1)
       async-io (~> 1.32.2)
       colorize (~> 0.8.1)

data/lib/rsmp/collect/aggregated_status_collector.rb

@@ -2,7 +2,7 @@ module RSMP
   # Class for waiting for an aggregated status response
   class AggregatedStatusCollector < Collector
     def initialize proxy, options={}
-      required = { type: ['AggregatedStatus','MessageNotAck'], title: 'aggregated status' }
+      required = { type: 'AggregatedStatus', title: 'aggregated status' }
       super proxy, options.merge(required)
     end
   end

data/lib/rsmp/collect/command_response_collector.rb

@@ -3,7 +3,7 @@ module RSMP
   class CommandResponseCollector < StateCollector
     def initialize proxy, want, options={}
       super proxy, want, options.merge(
-        type: ['CommandResponse','MessageNotAck'],
+        type: 'CommandResponse',
         title:'command response'
       )
     end

data/lib/rsmp/collect/status_collector.rb

@@ -2,8 +2,9 @@ module RSMP
   # Base class for waiting for status updates or responses
   class StatusCollector < StateCollector
     def initialize proxy, want, options={}
-      super proxy, want, options.merge(title: 'status response', type:['MessageNotAck'])
+      super proxy, want, options.merge(title: 'status response')
 
+      @options[:type] ||= []
       @options[:type] << 'StatusUpdate' unless options[:updates] == false
       @options[:type] << 'StatusResponse' unless options[:reponses] == false
     end

data/lib/rsmp/proxy.rb

@@ -572,20 +572,6 @@ module RSMP
       node.site_id
     end
 
-    def wait_for_acknowledgement parent_task, options={}, m_id
-      collector = Collector.new self, options.merge(task: parent_task, type: ['MessageAck','MessageNotAck'])
-      collector.collect do |message|
-        if message.is_a?(MessageNotAck)
-          if message.attribute('oMId') == m_id
-            m_id_short = RSMP::Message.shorten_m_id m_id, 8
-            raise RSMP::MessageRejected.new "Aggregated status request #{m_id_short} was rejected with '#{message.attribute('rea')}'"
-          end
-        elsif message.is_a?(MessageAck)
-          collector.complete if message.attribute('oMId') == m_id
-        end
-      end
-    end
-
     def send_and_optionally_collect message, options, &block
       collect_options = options[:collect] || options[:collect!]
       if collect_options

data/lib/rsmp/supervisor_proxy.rb

@@ -138,8 +138,8 @@ module RSMP
         "mId" => m_id,
       })
 
-      send_and_optionally_collect message, options do |task|
-        wait_for_acknowledgement task, options[:collect], m_id
+      send_and_optionally_collect message, options do |collect_options|
+        Collector.new self, collect_options.merge(task:@task, type: 'MessageAck')
       end
     end
 

data/lib/rsmp/version.rb

@@ -1,3 +1,3 @@
 module RSMP
-  VERSION = "0.8.5"
+  VERSION = "0.8.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rsmp
 version: !ruby/object:Gem::Version
-  version: 0.8.5
+  version: 0.8.6
 platform: ruby
 authors:
 - Emil Tin