rsmp 0.19.4 → 0.20.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f188c0b34f0877ae12b9948d0784b5e1f3f2a44e52e11995ba2adf12e299f4a
-  data.tar.gz: a2b8097b5d73897840d093ce8fbf1690bd7c8bee1e1a2102a605565d12c22ddb
+  metadata.gz: e4840e792c5220a0314e3fddc2998fe41a0072f39cff3c1ff27aec53c61a17be
+  data.tar.gz: e1e72c37a1f33780bfc069c61cb263f810e44c76a4140d38362643f7498d9c7e
 SHA512:
-  metadata.gz: '04258e76affbf8e3def87f12edaed2bde5ccf6bf36dfba175c47488082bfaa1e4e8e9c0c8c749295b098e73a39b0ca28bcb0ed4d0e0c90c054486f29a8e0d02d'
-  data.tar.gz: 516d8818dc1737648afdb7cb1496d3c96ea2e9870dc61d185d3bb5a40897ea85ecb930cfece5e5f8dbd1bf8abaf6a62244c5f6188498b082e4c896c02551b190
+  metadata.gz: 953b54b09b714a62ecab71975ae2905b054f42ddbb0822b77abbed9337533a14f23199d8c4cab4b25ad8a2af98307472abf51948af4634e4165a3678caf0a622
+  data.tar.gz: 8e7d9394ecf2b27a4137ecc6b26855c179a006bf5ef283aabd35106c2d634eb628a9bef5b1ec14faa53b39e519d60e8222b1760c197e45443695fb3c7848fe51

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.4)
-      async (~> 1.30.3)
-      async-io (~> 1.34.3)
+    rsmp (0.20.1)
+      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/alarm_state.rb

@@ -35,8 +35,6 @@ module RSMP
       @category = category || 'D'
       @priority = priority || 2
       @rvs = rvs
-
-      update_timestamp unless @timestamp
     end
 
     def to_hash
@@ -101,8 +99,9 @@ module RSMP
       false
     end
 
-    def message_is_older? message
-      Time.parse(message.attribute('aTs')) < @timestamp
+    def older_message? message
+      return false if @timestamp == nil
+      RSMP::Clock.parse(message.attribute('aTs')) < @timestamp
     end
 
     # update from rsmp message
@@ -111,11 +110,11 @@ module RSMP
       unless differ_from_message? message
         raise RepeatedAlarmError.new("no changes from previous alarm #{message.m_id_short}")
       end
-      if message_is_older? message
+      if older_message? message
         raise TimestampError.new("timestamp is earlier than previous alarm #{message.m_id_short}")
       end
     ensure
-      @timestamp = message.attribute('aTs')
+      @timestamp = RSMP::Clock.parse message.attribute('aTs')
       @acknowledged = message.attribute('ack') == 'True'
       @suspended = message.attribute('sS') == 'True'
       @active = message.attribute('aS') == 'True'

data/lib/rsmp/proxy.rb

@@ -24,6 +24,11 @@ module RSMP
       @state = :disconnected
     end
 
+
+    def now
+      node.now
+    end
+
     def disconnect
     end
 
@@ -39,8 +44,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
 
@@ -52,26 +62,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
 

data/lib/rsmp/version.rb

@@ -1,3 +1,3 @@
 module RSMP
-  VERSION = "0.19.4"
+  VERSION = "0.20.1"
 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.4
+  version: 0.20.1
 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:
   - - ">="