rsmp 0.11.2 → 0.11.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e0f394a4f97656f2ace6156c775c7af4f35ae4023c6bd5c9ad2fd55eca06e3a
-  data.tar.gz: b5e75bf4cb30280fa51e08ee8c42507a7239dc6f7bff57fd0c6f679ca44652b8
+  metadata.gz: 5e36c6f5f96850c9ad1a07ab856efc1e094deafee596074a611a08a2535f57ec
+  data.tar.gz: efedbe0726d80f1fff7e3d37fa171fa1afe1df1705cf50e142eee0667c6e8dff
 SHA512:
-  metadata.gz: 9b8a16e7119b579f81a49d444ae3b2ee0393659eb0dbd84a5f24d4d498b31cf51e0ea355990af5618081c779e41d8c7d33aecb2778f6af2d242de1ee48569050
-  data.tar.gz: 71118e681ee613fecfb5133ec2532813abaa9026d42dd7c58ad5363acbc040cc67d14b899b6a0ab2a6907166967f5125c2d5584ed01d57a3bcaec0a9e1068337
+  metadata.gz: 6f4362c8689573a0c7ce8e91ea079c0ce06a6b8d73bc27ce964d781dd64ee53b92c271a7ba41f31e89af62475adf341ae2a5b6682418758d3558930e72c037d3
+  data.tar.gz: 9f595995ec7247fdfb2e782e235c83adb475b1db85c8834aa434a42b5bc5e1ca6f4ae8e71233473bcee21b7c722b8f5a4862a8531098f793f629e7832b0eda3c

data/Gemfile.lock

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

data/lib/rsmp/collect/collector.rb

@@ -279,12 +279,17 @@ module RSMP
       true
     end
 
+    # return a string describing the types of messages we're collecting
+    def describe_types
+      [@options[:type]].flatten.join('/')
+    end
+
     # return a string that describes whe number of messages, and type of message we're collecting
     def describe_num_and_type
       if @options[:num] && @options[:num] > 1
-        "#{@options[:num]} #{@options[:type]}s"
+        "#{@options[:num]} #{describe_types}s"
       else
-        @options[:type]
+        describe_types
       end
     end
 

data/lib/rsmp/collect/state_collector.rb

@@ -119,21 +119,95 @@ module RSMP
 
     # return a string that describes the attributes that we're looking for
     def describe_query
-      want = @queries.map {|query| "#{query.want}" }
-      "#{super} with #{want.join(', ')}"
+      "#{super} matching #{query_want_hash.to_s}"
+    end
+
+    # return a hash that describe the status of all queries
+    def progress_hash
+      h = {}
+      @queries.each do |query|
+        want = query.want
+        if want['cCI']
+          cCI = want['cCI']
+          h[cCI] ||= {}
+          cO = h['cO']
+          n = h['n']
+          v = h['v']
+          h[cCI][cO] ||= {}
+          h[cCI][cO][n] = v
+        elsif want['sCI']
+          sCI = want['sCI']
+          h[sCI] ||= {}
+          n = want['n']
+          s = want['s']
+          if query.got && query.got['s']
+            h[sCI][n] = { {s=>query.got['s']} => query.done? }
+          else
+            h[sCI][n] = { s=>nil }
+          end
+        end
+      end
+      h
     end
 
     # return a string that describe how many many messages have been collected
     def describe_progress
       num_queries = @queries.size
       num_matched =  @queries.count { |query| query.done? }
+      ".. Matched #{num_matched}/#{num_queries} with #{progress_hash.to_s}"
+    end
+
+    def query_want_hash
+      h = {}
+      @queries.each do |query|
+        item = query.want
+        if item['cCI']
+          cCI = item['cCI']
+          h[cCI] ||= {}
+          cO = item['cO']
+          h[cCI][cO] ||= {}
+          n = item['n']
+          v = item['v']
+          h[cCI][cO][n] = v || :any
+        elsif item['sCI']
+          sCI = item['sCI']
+          h[sCI] ||= {}
+          n = item['n']
+          s = item['s']
+          h[sCI][n] = s || :any
+        end
+      end
+      h
+    end
+
+    # return a hash that describe the end result
+    def query_got_hash
+      h = {}
+      @queries.each do |query|
+        want = query.want
+        got = query.got
+        if got['cCI']
+          cCI = want['cCI']
+          h[cCI] ||= {}
+          cO = want['cO']
+          h[cCI][cO] ||= {}
+          n = want['n']
+          v = got['v']
+          h[cCI][cO][n] = v
+        elsif want['sCI']
+          sCI = want['sCI']
+          h[sCI] ||= {}
+          n = want['n']
+          s = got['s']
+          h[sCI][n] = s
+        end
+      end
+      h
+    end
 
-      got = @queries.select {|query| query.done? == true }.map {|query| "#{query.got}" }
-      need = @queries.select {|query| query.done? == false }.map {|query| "#{query.want}" }
-      str = "Matched #{num_matched} of #{num_queries}".colorize(:red)
-      str << ", got #{got.join(', ')}" if got.any?
-      str << ", need #{need.join(', ')}" if need.any?
-      str
+    # log when we end collecting
+    def log_complete
+      @notifier.log "#{identifier}: Completed with #{query_got_hash.to_s}", level: :collect
     end
   end
 end

data/lib/rsmp/proxy.rb

@@ -13,9 +13,10 @@ module RSMP
     include Inspect
     include Task
 
-    attr_reader :state, :archive, :connection_info, :sxl, :collector, :ip, :port
+    attr_reader :state, :archive, :connection_info, :sxl, :collector, :ip, :port, :node
 
     def initialize options
+      @node = options[:node]
       initialize_logging options
       initialize_distributor
       initialize_task
@@ -120,7 +121,7 @@ module RSMP
     end
 
     def clock
-      node.clock
+      @node.clock
     end
 
     def ready?
@@ -203,7 +204,7 @@ module RSMP
     end
 
     def notify_error e, options={}
-      node.notify_error e, options
+      @node.notify_error e, options
     end
 
     def start_watchdog
@@ -369,7 +370,7 @@ module RSMP
     end
 
     def process_deferred
-      node.process_deferred
+      @node.process_deferred
     end
 
     def verify_sequence message
@@ -419,7 +420,7 @@ module RSMP
       close
       message
     ensure
-      node.clear_deferred
+      @node.clear_deferred
     end
 
     def process_message message
@@ -620,12 +621,8 @@ module RSMP
     def version_acknowledged
     end
 
-    def node
-      raise 'Must be overridden'
-    end
-
     def author
-      node.site_id
+      @node.site_id
     end
 
     def send_and_optionally_collect message, options, &block

data/lib/rsmp/site_proxy.rb

@@ -7,7 +7,7 @@ module RSMP
     attr_reader :supervisor, :site_id
 
     def initialize options
-      super options
+      super options.merge(node:options[:supervisor])
       initialize_components
       @supervisor = options[:supervisor]
       @settings = @supervisor.supervisor_settings.clone

data/lib/rsmp/supervisor_proxy.rb

@@ -8,7 +8,7 @@ module RSMP
     attr_reader :supervisor_id, :site
 
     def initialize options
-      super options
+      super options.merge(node:options[:site])
       @site = options[:site]
       @site_settings = @site.site_settings.clone
       @ip = options[:ip]
@@ -18,10 +18,6 @@ module RSMP
       @synthetic_id = Supervisor.build_id_from_ip_port @ip, @port
     end
 
-    def node
-      site
-    end
-
     # handle communication
     # if disconnected, then try to reconnect
     def run

data/lib/rsmp/version.rb

@@ -1,3 +1,3 @@
 module RSMP
-  VERSION = "0.11.2"
+  VERSION = "0.11.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsmp
 version: !ruby/object:Gem::Version
-  version: 0.11.2
+  version: 0.11.5
 platform: ruby
 authors:
 - Emil Tin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-03-21 00:00:00.000000000 Z
+date: 2022-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async