rsmp 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33b8c859b9c8450af6a45d52a9d42d982c5becdaf1d4424f398b417bc1c387d8
-  data.tar.gz: 7f194bb392a69555f7ba30364466dfed9eeb1b04996505fa13af13d9045bb071
+  metadata.gz: 7ffe9f097053c9814ad119cbd6a01192cd20c02d3ca1fffa6269dbdf534f419b
+  data.tar.gz: 9848398d419a76f16fa8eb1f527d4c6b055b17886a5ee689b7607c891103d5a1
 SHA512:
-  metadata.gz: 2d9da45e5f1a96756cd50f58ea3ce16dc0de51138daa45aa114f432e0531595883c5cf3dba86ad63dd0a33aed7ba02d706f058378c257129a8b877eb45e2246b
-  data.tar.gz: 59965992a0e7bcdd6e401fac5baa2e8839c392713812da579865020d6cf5d9cf73d51b250f9be72cab3264fd5a9edd287e85619e2ebab0259fb303da9cfe25ff
+  metadata.gz: d974b915cbc32bee428cc7f39a1e26134c6db34f72590ad9bd67400ad71ce831037a82341601369aa6582c1e4b5ecf8d4e6f8c3249a4375716bc877ca1cc7cec
+  data.tar.gz: 301eb51aecb05c57fc3395f3a06df33846e24fdd863db2ff65e81e9fc1b7c23c4e6b40e508b15a3ec0c92e87595ce78317773cfca6e13ec72ca9609d037cb1f1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rsmp (0.6.4)
+    rsmp (0.6.5)
       async (~> 1.29.1)
       async-io (~> 1.32.1)
       colorize (~> 0.8.1)

data/lib/rsmp/component.rb

@@ -79,16 +79,17 @@ module RSMP
 
     def handle_alarm message
       code = message.attribute('aCId')
-      alarm = @alarms[code]
-      if alarm
-        if alarm.differ? message
-          @alarms[code] = alarm
-        else
-          raise RepeatedAlarmError.new("no changes from previous alarm #{alarm.m_id_short}")
+      previous = @alarms[code]
+      if previous
+        unless message.differ?(previous)
+          raise RepeatedAlarmError.new("no changes from previous alarm #{previous.m_id_short}")
+        end
+        if Time.parse(message.attribute('aTs')) < Time.parse(previous.attribute('aTs'))
+          raise RepeatedAlarmError.new("timestamp is earlier than previous alarm #{previous.m_id_short}")
         end
-      else
-        @alarms[code] = message
       end
+    ensure
+      @alarms[code] = message
     end
 
     # Handle an incoming status respone, by storing the values

data/lib/rsmp/error.rb

@@ -64,4 +64,7 @@ module RSMP
 
 	class RepeatedStatusError < Error
 	end
+
+	class TimestampError < Error
+	end
 end

data/lib/rsmp/message.rb

@@ -126,7 +126,7 @@ module RSMP
     end
 
     def initialize attributes = {}
-      @timestamp = Time.now   # this timestamp is for internal use, and does not the clock
+      @timestamp = Time.now   # this timestamp is for internal use, and does not use the clock
                               # in the node, which can be set by an rsmp supervisor
 
       @attributes = { "mType"=> "rSMsg" }.merge attributes

data/lib/rsmp/version.rb

@@ -1,3 +1,3 @@
 module RSMP
-  VERSION = "0.6.4"
+  VERSION = "0.6.5"
 end

metadata

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