rsmp 0.19.5 → 0.20.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ece63f3127c2afec9954b9395079a4f6bd755c1edfa1ebd86a5b656e0eb3ae7b
-  data.tar.gz: d2649a64d7905095f0c418bc3ad8dcae3e6b5c891a784e7fbdc1841f4b17e2db
+  metadata.gz: edab8c5a4e106585dd62c4c2596a6df4cda363da8d96174bba51639e5ccad54c
+  data.tar.gz: 95bc098d37c13ff5c66c6a8da7d3f43ec5dfc1e0a4360b5b29cea7f1d41a7a69
 SHA512:
-  metadata.gz: 70a4b8297b24a0f7d5ffeba0b86ec26bae1d196e01d46d6b06a1cc8ab50b14705f28ecf50ca30f0d4e2487c790781e71e80e6a4c0c4d39dda08ccc98c8e1235c
-  data.tar.gz: f5f4071e92f737153bc989787626d09cd96cf24204f13e2aaf91a49383876cc6bb2ae6ee763f82a08f779806e908e7236790b98315076c652078e95670a04a11
+  metadata.gz: 7a39eda6d493a3f182c91851fc0c2c6f233efb1fe095f8a6d4fe0cc7c5865afad0f12e4144184e30444a1f042766c5653ead38593c506049d6e3080b088fa553
+  data.tar.gz: 286591ea4f8bac4d8a61b98e989286dfec24340c2dbc28fdd3db82d2a9b2a644428ed21410318320c6a321900461a4d45ec475e347908b9c173e71ee51c2a357

data/.github/workflows/rspec.yaml

@@ -10,7 +10,7 @@ jobs:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
         # Due to https://github.com/actions/runner/issues/849, we have to use quotes
-        ruby: ['3.0', '3.1', '3.2']
+        ruby: ['3.2']
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v2

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    rsmp (0.19.5)
-      async (~> 1.30.3)
-      async-io (~> 1.34.3)
+    rsmp (0.20.2)
+      async (~> 2.6.2)
+      async-io (~> 1.35.0)
       colorize (~> 0.8.1)
       rsmp_schema (~> 0.4.0)
       thor (~> 1.2.2)
@@ -18,11 +18,12 @@ GEM
       cucumber (>= 4.0, < 9.0)
       rspec-expectations (~> 3.4)
       thor (~> 1.0)
-    async (1.30.3)
+    async (2.6.2)
       console (~> 1.10)
-      nio4r (~> 2.3)
+      fiber-annotation
+      io-event (~> 1.1)
       timers (~> 4.1)
-    async-io (1.34.3)
+    async-io (1.35.0)
       async
     builder (3.2.4)
     childprocess (4.1.0)
@@ -62,6 +63,7 @@ GEM
     fiber-annotation (0.2.0)
     fiber-local (1.0.0)
     hana (1.3.7)
+    io-event (1.2.2)
     json_schemer (0.2.25)
       ecma-re-validator (~> 0.3)
       hana (~> 1.3)
@@ -72,7 +74,6 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2023.0218.1)
     multi_test (1.1.0)
-    nio4r (2.5.9)
     rake (13.0.6)
     regexp_parser (2.8.1)
     rsmp_schema (0.4.0)

data/lib/rsmp/proxy.rb

@@ -22,6 +22,7 @@ module RSMP
       setup options
       clear
       @state = :disconnected
+      @state_condition = Async::Notification.new
     end
 
 
@@ -44,8 +45,13 @@ module RSMP
       log "Closing connection", level: :warning
       close_stream
       close_socket
+      stop_reader
       set_state :disconnected
       notify_error DisconnectError.new("Connection was closed")
+
+      # stop timer
+      # as we're running inside the timer, code after stop_timer() will not be called,
+      # unless it's in the ensure block
       stop_timer
     end
 
@@ -57,26 +63,26 @@ module RSMP
     end
 
     def stop_timer
-      return unless @timer
-      @timer.stop
+      @timer.stop if @timer
+    ensure
       @timer = nil
     end
 
     def stop_reader
-      return unless @reader
-      @reader.stop
+      @reader.stop if @reader
+    ensure
       @reader = nil
     end
 
     def close_stream
-      return unless @stream
-      @stream.close
+      @stream.close if @stream
+    ensure
       @stream = nil
     end
 
     def close_socket
-      return unless @socket
-      @socket.close
+      @socket.close if @socket
+    ensure
       @socket = nil
     end
 
@@ -150,7 +156,6 @@ module RSMP
       @outgoing_acknowledged = {}
       @latest_watchdog_send_at = nil
 
-      @state_condition = Async::Notification.new
       @acknowledgements = {}
       @acknowledgement_condition = Async::Notification.new
     end

data/lib/rsmp/version.rb

@@ -1,3 +1,3 @@
 module RSMP
-  VERSION = "0.19.5"
+  VERSION = "0.20.2"
 end

data/rsmp.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
   spec.description   = %q{Easy RSMP site and supervisor communication.}
   spec.homepage      = "https://github.com/rsmp-nordic/rsmp"
   spec.licenses      = ['MIT']
-  spec.required_ruby_version = '>= 3.0.0'
+  spec.required_ruby_version = '>= 3.2.0'
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = "https://github.com/rsmp-nordic/rsmp"
@@ -30,8 +30,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "async", "~> 1.30.3"
-  spec.add_dependency "async-io", "~> 1.34.3"
+  spec.add_dependency "async", "~> 2.6.2"
+  spec.add_dependency "async-io", "~> 1.35.0"
   spec.add_dependency "colorize", "~> 0.8.1"
   spec.add_dependency "thor", "~> 1.2.2"
   spec.add_dependency "rsmp_schema", "~> 0.4.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsmp
 version: !ruby/object:Gem::Version
-  version: 0.19.5
+  version: 0.20.2
 platform: ruby
 authors:
 - Emil Tin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-06-16 00:00:00.000000000 Z
+date: 2023-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.30.3
+        version: 2.6.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.30.3
+        version: 2.6.2
 - !ruby/object:Gem::Dependency
   name: async-io
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.34.3
+        version: 1.35.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.34.3
+        version: 1.35.0
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
@@ -271,7 +271,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.0.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="