rsmp 0.12.1 → 0.12.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 278c4df55b2efbff06abd016ab49e09e6dec047cf873ad77a73346d7de08c54f
-  data.tar.gz: bbd4ee23b200713574c483461be11116c35b7f08be0000e3eb008dbdf7c2c224
+  metadata.gz: 34c922ce1e22f31aabc3b476f1aa3d9a6eeaa4b89e4550255f237c5f5810b4e8
+  data.tar.gz: 95590c49d1ba70af34dfd913808239cea39b5dae0324003deb921c21a0bf0aa2
 SHA512:
-  metadata.gz: 8373359d1b9401273e6b71cadb0f5eb634c40239bc1054c0602c92fe5de9d1ca70cbd307362278f802369201f68e4d6702c5f962124d88fe9ec80c1cbb1513a9
-  data.tar.gz: a20bd432dd787c6b50b507dde36b76aff0592fd9a8f97126ab2ce5684c2f8209c8402fd500e9a67e075b99ec35e388abafec40761e59724eb6a4fdd56ceec868
+  metadata.gz: 3d1c8bfd469ae45764292bf3e2615bf95b1904229d34c2df0eb18ad496a7d1b6ecfd0aeff594f07a0bbf59c34d7b6247fc566e1a94d65412f78719e3f4f42b1b
+  data.tar.gz: 66edc8044373bca92cc52641f49c78f3336d4e5c6caa8615a8da05aad6176d8e2c6161a5d835716fe7feac38948a059b4de6ec1f772de3c1f992d8c7f76bc8e0

data/Gemfile.lock

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

data/lib/rsmp/alarm_state.rb

@@ -21,5 +21,13 @@ module RSMP
     def resume
       @suspended = false
     end
+
+    def activate
+      @active = true
+    end
+
+    def deactivate
+      @active = false
+    end
   end
 end

data/lib/rsmp/component.rb

@@ -20,31 +20,35 @@ module RSMP
     end
 
     def suspend_alarm alarm_code
-      alarm_state = get_alarm_state alarm_code
-      if alarm.suspended == false
-        log "Suspending alarm #{alarm_code}", level: :info
-        alarm.suspend
-        @node.alarm_suspended_or_resumed alarm
-      else
-        log "Alarm #{alarm_code} already suspended", level: :info
-      end
+      alarm = get_alarm_state alarm_code
+      return if alarm.suspended
+      log "Suspending alarm #{alarm_code}", level: :info
+      alarm.suspend
+      @node.alarm_changed alarm
     end
 
     def resume_alarm alarm_code
-      alarm_state = get_alarm_state alarm_code
-      if alarm.suspended
-        log "Resuming alarm #{alarm_code}", level: :info
-        alarm.resume
-        @node.alarm_suspended_or_resumed alarm
-      else
-        log "Alarm #{alarm_code} not suspended", level: :info
-      end
+      alarm = get_alarm_state alarm_code
+      return unless alarm.suspended
+      log "Resuming alarm #{alarm_code}", level: :info
+      alarm.resume
+      @node.alarm_changed alarm
     end
 
-    # send alarm
-    def send_alarm code:, status:
-      @node.alarm_changed self, alarm
+    def activate_alarm alarm_code
+      alarm = get_alarm_state alarm_code
+      return if alarm.active
+      log "Activating alarm #{alarm_code}", level: :info
+      alarm.activate
+      @node.alarm_changed alarm
     end
 
+    def deactivate_alarm alarm_code
+      alarm = get_alarm_state alarm_code
+      return unless alarm.active
+      log "Deactivating alarm #{alarm_code}", level: :info
+      alarm.deactivate
+      @node.alarm_changed alarm
+    end
   end
 end

data/lib/rsmp/site.rb

@@ -108,7 +108,7 @@ module RSMP
       )
     end
 
-    def alarm_suspended_or_resumed alarm_state
+    def alarm_changed alarm_state
       alarm = alarm_state_to_message alarm_state
       @proxies.each do |proxy|
         proxy.send_message alarm if proxy.ready?

data/lib/rsmp/tlc/traffic_controller.rb

@@ -264,10 +264,10 @@ module RSMP
           alarm_code = actions['raise']
           if change
             log "Activating alarm #{alarm_code}, because input #{input} was activated", level: :info
-            send_alarm code:alarm_code, status:'Active'
+            activate_alarm alarm_code
           else
             log "Deactivating alarm #{alarm_code}, because input #{input} was deactivated", level: :info
-            send_alarm code:alarm_code, status:'inActive'
+            deactivate_alarm alarm_code
           end
         end
       end

data/lib/rsmp/version.rb

@@ -1,3 +1,3 @@
 module RSMP
-  VERSION = "0.12.1"
+  VERSION = "0.12.2"
 end

metadata

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