rsmp 0.8.4 → 0.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6e0bddb9443fd704586251f92785f5ec4d703431d587047f8a2e835fcb48b9f
-  data.tar.gz: 81b56b1687ad356177b6277d58f6db4ed4d3f8fa8e59aa0fc626a90fcc03bb86
+  metadata.gz: e12fd3ea8f7f931b3ce3269a13e8ccd1248642a89062682b0088d044732f1757
+  data.tar.gz: ff18134bf0e16210e30a5820f5bd2c27b5fb7f81bcf2f9f993e6c8aefe69d9d5
 SHA512:
-  metadata.gz: d8ba189a5602f9ec1bc7f09e821231c2f5135dd163da82ffae48b9a9f62ac79ec8d4beb114e6112d41902fc1ca06ccff2a208863d00f05e51c9a83cafb68e33c
-  data.tar.gz: 4fd8b04217edb49b3c1b929ac3d585c60194207cdb8380be7693ee00b448a28fce90cc6e55621b6cee601d773f80c6780c0d7a3a31ee8606f62f23cfce0718f8
+  metadata.gz: 3335d30f728748483d26e5d3d0c5671746b80dece2badc781064d0ae81f277fd7b899e9e508255a17d6f1cbd017a64164f6f0a21f1ca777b359c23b1fa482ebf
+  data.tar.gz: a2e457988983d9c3173f91c1269979ea6a37ce75ac5e0acc30f21fbb34d2cfab8fe81295ac43c6a6010df0f7c06e11dc9efadd01c28fc20a0e77ff6d6c580787

data/.ruby-version

@@ -1 +1 @@
-3.0.3
+3.1.0

data/Gemfile.lock

@@ -1,27 +1,21 @@
 PATH
   remote: .
   specs:
-    rsmp (0.8.4)
+    rsmp (0.8.5)
       async (~> 1.29.1)
-      async-io (~> 1.32.1)
+      async-io (~> 1.32.2)
       colorize (~> 0.8.1)
       rsmp_schemer
-      thor (~> 1.0.1)
+      thor (~> 1.2.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.4)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 1.6, < 2)
-      minitest (>= 5.1)
-      tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
-    aruba (1.1.2)
+    aruba (2.0.0)
       bundler (>= 1.17, < 3.0)
       childprocess (>= 2.0, < 5.0)
       contracts (>= 0.16.0, < 0.18.0)
-      cucumber (>= 2.4, < 7.0)
+      cucumber (>= 4.0, < 8.0)
       rspec-expectations (~> 3.4)
       thor (~> 1.0)
     async (1.29.2)
@@ -33,68 +27,56 @@ GEM
     builder (3.2.4)
     childprocess (4.1.0)
     colorize (0.8.1)
-    concurrent-ruby (1.1.9)
     console (1.14.0)
       fiber-local
     contracts (0.17)
-    cucumber (6.1.0)
+    cucumber (7.1.0)
       builder (~> 3.2, >= 3.2.4)
-      cucumber-core (~> 9.0, >= 9.0.1)
-      cucumber-create-meta (~> 4.0, >= 4.0.0)
-      cucumber-cucumber-expressions (~> 12.1, >= 12.1.1)
-      cucumber-gherkin (~> 18.1, >= 18.1.0)
-      cucumber-html-formatter (~> 13.0, >= 13.0.0)
-      cucumber-messages (~> 15.0, >= 15.0.0)
-      cucumber-wire (~> 5.0, >= 5.0.1)
+      cucumber-core (~> 10.1, >= 10.1.0)
+      cucumber-create-meta (~> 6.0, >= 6.0.1)
+      cucumber-cucumber-expressions (~> 14.0, >= 14.0.0)
+      cucumber-gherkin (~> 22.0, >= 22.0.0)
+      cucumber-html-formatter (~> 17.0, >= 17.0.0)
+      cucumber-messages (~> 17.1, >= 17.1.1)
+      cucumber-wire (~> 6.2, >= 6.2.0)
       diff-lcs (~> 1.4, >= 1.4.4)
       mime-types (~> 3.3, >= 3.3.1)
       multi_test (~> 0.1, >= 0.1.2)
       sys-uname (~> 1.2, >= 1.2.2)
-    cucumber-core (9.0.1)
-      cucumber-gherkin (~> 18.1, >= 18.1.0)
-      cucumber-messages (~> 15.0, >= 15.0.0)
-      cucumber-tag-expressions (~> 3.0, >= 3.0.1)
-    cucumber-create-meta (4.0.0)
-      cucumber-messages (~> 15.0, >= 15.0.0)
+    cucumber-core (10.1.1)
+      cucumber-gherkin (~> 22.0, >= 22.0.0)
+      cucumber-messages (~> 17.1, >= 17.1.1)
+      cucumber-tag-expressions (~> 4.1, >= 4.1.0)
+    cucumber-create-meta (6.0.4)
+      cucumber-messages (~> 17.1, >= 17.1.1)
       sys-uname (~> 1.2, >= 1.2.2)
-    cucumber-cucumber-expressions (12.1.1)
-    cucumber-gherkin (18.1.1)
-      cucumber-messages (~> 15.0, >= 15.0.0)
-    cucumber-html-formatter (13.0.0)
-      cucumber-messages (~> 15.0, >= 15.0.0)
-    cucumber-messages (15.0.0)
-      protobuf-cucumber (~> 3.10, >= 3.10.8)
-    cucumber-tag-expressions (3.0.1)
-    cucumber-wire (5.0.1)
-      cucumber-core (~> 9.0, >= 9.0.1)
-      cucumber-cucumber-expressions (~> 12.1, >= 12.1.1)
-      cucumber-messages (~> 15.0, >= 15.0.0)
-    diff-lcs (1.4.4)
+    cucumber-cucumber-expressions (14.0.0)
+    cucumber-gherkin (22.0.0)
+      cucumber-messages (~> 17.1, >= 17.1.1)
+    cucumber-html-formatter (17.0.0)
+      cucumber-messages (~> 17.1, >= 17.1.0)
+    cucumber-messages (17.1.1)
+    cucumber-tag-expressions (4.1.0)
+    cucumber-wire (6.2.1)
+      cucumber-core (~> 10.1, >= 10.1.0)
+      cucumber-cucumber-expressions (~> 14.0, >= 14.0.0)
+    diff-lcs (1.5.0)
     ecma-re-validator (0.4.0)
       regexp_parser (~> 2.2)
-    ffi (1.15.3)
+    ffi (1.15.5)
     fiber-local (1.0.0)
     hana (1.3.7)
-    i18n (1.8.10)
-      concurrent-ruby (~> 1.0)
     json_schemer (0.2.18)
       ecma-re-validator (~> 0.3)
       hana (~> 1.3)
       regexp_parser (~> 2.0)
       uri_template (~> 0.7)
-    middleware (0.1.0)
-    mime-types (3.3.1)
+    mime-types (3.4.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2021.0225)
-    minitest (5.14.4)
+    mime-types-data (3.2022.0105)
     multi_test (0.1.2)
     nio4r (2.5.8)
-    protobuf-cucumber (3.10.8)
-      activesupport (>= 3.2)
-      middleware
-      thor
-      thread_safe
-    rake (13.0.3)
+    rake (13.0.6)
     regexp_parser (2.2.0)
     rsmp_schemer (0.3.2)
       json_schemer (~> 0.2.18)
@@ -104,37 +86,33 @@ GEM
       rspec-mocks (~> 3.10.0)
     rspec-core (3.10.1)
       rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    rspec-expectations (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
+    rspec-support (3.10.3)
     sys-uname (1.2.2)
       ffi (~> 1.1)
-    thor (1.0.1)
-    thread_safe (0.3.6)
+    thor (1.2.1)
     timecop (0.9.4)
     timers (4.3.3)
-    tzinfo (2.0.4)
-      concurrent-ruby (~> 1.0)
     uri_template (0.7.0)
-    zeitwerk (2.4.2)
 
 PLATFORMS
   x86_64-darwin-20
   x86_64-darwin-21
 
 DEPENDENCIES
-  aruba (~> 1.1.2)
-  bundler (~> 2.2.21)
-  cucumber (~> 6.1.0)
-  rake (~> 13.0.3)
+  aruba (~> 2.0.0)
+  bundler (~> 2.3.6)
+  cucumber (~> 7.1.0)
+  rake (~> 13.0.6)
   rsmp!
   rspec (~> 3.10.0)
-  rspec-expectations (~> 3.10.1)
+  rspec-expectations (~> 3.10.2)
   timecop (~> 0.9.4)
 
 BUNDLED WITH
-   2.2.32
+   2.3.6

data/lib/rsmp/collect/collector.rb

@@ -51,12 +51,12 @@ module RSMP
       @status == :collecting
     end
 
-    # Is collection active?
+    # Is collection complete?
     def ok?
       @status == :ok
     end
 
-    # Has collection time out?
+    # Has collection timed out?
     def timeout?
       @status == :timeout
     end
@@ -81,6 +81,13 @@ module RSMP
       @outgoing == true
     end
 
+    # if an errors caused collection to abort, then raise it
+    # return self, so this can be tucked on to calls that return a collector
+    def ok!
+      raise @error if @error
+      self
+    end
+
     # Collect message
     # Will return once all messages have been collected, or timeout is reached
     def collect &block
@@ -94,9 +101,8 @@ module RSMP
     # Collect message
     # Returns the collected messages, or raise an exception in case of a time out.
     def collect! &block
-      if collect(&block) == :timeout
-        raise RSMP::TimeoutError.new describe_progress
-      end
+      collect(&block)
+      ok!
       @messages
     end
 
@@ -112,6 +118,7 @@ module RSMP
       end
       @status
     rescue Async::TimeoutError
+      @error = RSMP::TimeoutError.new describe_progress
       @status = :timeout
     end
 
@@ -120,7 +127,7 @@ module RSMP
     # If timeout is reached, an exceptioin is raised.
     def wait!
       wait
-      raise RSMP::TimeoutError.new(describe_progress) if timeout?
+      raise @error if timeout?
       @messages
     end
 

data/lib/rsmp/proxy.rb

@@ -587,8 +587,15 @@ module RSMP
     end
 
     def send_and_optionally_collect message, options, &block
-      if options[:collect]
-        task = @task.async { |task| yield task }
+      collect_options = options[:collect] || options[:collect!]
+      if collect_options
+        task = @task.async do |task|
+          collector = yield collect_options     # call block to create collector
+          collector.collect
+          collector.ok! if options[:collect!]   # raise any errors if the bang version was specified
+          collector
+        end
+
         send_message message, validate: options[:validate]
         { sent: message, collector: task.wait }
       else

data/lib/rsmp/site_proxy.rb

@@ -101,13 +101,11 @@ module RSMP
           "cId" => component,
           "mId" => m_id
       })
-      send_and_optionally_collect message, options do |task|
-        collector = AggregatedStatusCollector.new(
+      send_and_optionally_collect message, options do |collect_options|
+        AggregatedStatusCollector.new(
           self,
-          options[:collect].merge(task:@task,m_id: m_id, num:1)
+          collect_options.merge(task:@task,m_id: m_id, num:1)
         )
-        collector.collect
-        collector
       end
     end
 
@@ -179,14 +177,12 @@ module RSMP
           "sS" => request_list,
           "mId" => m_id
       })
-      send_and_optionally_collect message, options do |task|
-        collector = StatusCollector.new(
+      send_and_optionally_collect message, options do |collect_options|
+        StatusCollector.new(
           self,
           status_list,
-          options[:collect].merge(task:@task,m_id: m_id)
+          collect_options.merge(task:@task,m_id: m_id)
           )
-        collector.collect
-        collector
       end
     end
 
@@ -215,14 +211,12 @@ module RSMP
           "sS" => subscribe_list,
           'mId' => m_id
       })
-      send_and_optionally_collect message, options do |task|
-        collector = StatusCollector.new(
+      send_and_optionally_collect message, options do |collect_options|
+        StatusCollector.new(
           self,
           status_list,
-          options[:collect].merge(task:@task,m_id: m_id)
+          collect_options.merge(task:@task,m_id: m_id)
         )
-        collector.collect
-        collector
       end
     end
 
@@ -267,14 +261,12 @@ module RSMP
           "arg" => command_list,
           "mId" => m_id
       })
-      send_and_optionally_collect message, options do |task|
-        collector = CommandResponseCollector.new(
+      send_and_optionally_collect message, options do |collect_options|
+        CommandResponseCollector.new(
           self,
           command_list,
-          options[:collect].merge(task:@task,m_id: m_id)
+          collect_options.merge(task:@task,m_id: m_id)
           )
-        collector.collect
-        collector
       end
     end
 

data/lib/rsmp/version.rb

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

data/rsmp.gemspec

@@ -31,16 +31,16 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "async", "~> 1.29.1"
-  spec.add_dependency "async-io", "~> 1.32.1"
+  spec.add_dependency "async-io", "~> 1.32.2"
   spec.add_dependency "colorize", "~> 0.8.1"
-  spec.add_dependency "thor", "~> 1.0.1"
+  spec.add_dependency "thor", "~> 1.2.1"
   spec.add_dependency "rsmp_schemer"
 
-  spec.add_development_dependency "bundler", "~> 2.2.21"
-  spec.add_development_dependency "rake", "~> 13.0.3"
+  spec.add_development_dependency "bundler", "~> 2.3.6"
+  spec.add_development_dependency "rake", "~> 13.0.6"
   spec.add_development_dependency "rspec", "~> 3.10.0"
-  spec.add_development_dependency "rspec-expectations", "~> 3.10.1"
+  spec.add_development_dependency "rspec-expectations", "~> 3.10.2"
   spec.add_development_dependency "timecop", "~> 0.9.4"
-  spec.add_development_dependency "cucumber", "~> 6.1.0"
-  spec.add_development_dependency "aruba" , "~> 1.1.2"
+  spec.add_development_dependency "cucumber", "~> 7.1.0"
+  spec.add_development_dependency "aruba" , "~> 2.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsmp
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.8.5
 platform: ruby
 authors:
 - Emil Tin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-01-13 00:00:00.000000000 Z
+date: 2022-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.32.1
+        version: 1.32.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.32.1
+        version: 1.32.2
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: rsmp_schemer
   requirement: !ruby/object:Gem::Requirement
@@ -86,28 +86,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.21
+        version: 2.3.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.21
+        version: 2.3.6
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 13.0.3
+        version: 13.0.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 13.0.3
+        version: 13.0.6
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.10.1
+        version: 3.10.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.10.1
+        version: 3.10.2
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -156,28 +156,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 7.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 7.1.0
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 2.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 2.0.0
 description: Easy RSMP site and supervisor communication.
 email:
 - zf0f@kk.dk
@@ -269,7 +269,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: RoadSide Message Protocol (RSMP) library.