humble_rpi-plugin-magneticswitch 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3881e137d35f35f75eeedde484a7d66ba591148
-  data.tar.gz: 80615bfbc04dcb9c718965fb38d0d6275104beae
+  metadata.gz: 39803a831996ad98dfb92a77dc83ade5a507a794
+  data.tar.gz: 449d5f6f18364666c9aeb6c60a5dd6fc20ab986e
 SHA512:
-  metadata.gz: 0a5e75789d29796fd26314a6de8f95febde54e8269a34596ce2cd9683306db2fb0594ab664c8f346ba52cb35fd221fe8e5f3ad6c59fcdde96cdf2e42a44264f3
-  data.tar.gz: 946ca0e54dff90a247f9f73fd49c3e0758b1e87af54e48fe12956042ddc43215d06c397d3cbe4045d3c34b725b05c0fb02c9169ad47708ee10aaf9f79a27b1ed
+  metadata.gz: f742502cf5a026513f28e0fbc70a3f7b330b683ffb4d76fd3b70dbf2ccabb7b85a5d1cac3f3bd6e8de02526a2b429b8be9cf5d30765e958c4bd30b7e8528fc7c
+  data.tar.gz: a3a2d5c677cfa7872ee421ae984ea361a14ac1a70b28866183c59fab98a0b2fc5f3756d6466ef61ff778c38edcd74d4d33472649c03c951c5cdaa0f618afdc96

data/lib/humble_rpi-plugin-magneticswitch.rb

@@ -7,6 +7,11 @@ require 'rpi_pinin'
 require 'self-defense'
 
 
+Thread.abort_on_exception=true
+
+class PluginMagneticSwitchException < Exception
+end
+
 class HumbleRPiPluginMagneticSwitch
 
 
@@ -16,6 +21,7 @@ class HumbleRPiPluginMagneticSwitch
     @pins = settings[:pins].map {|x| RPiPinIn.new x, pull: :up}
     @notifier = variables[:notifier]
     @device_id = variables[:device_id] || 'pi'      
+
     
   end
 
@@ -26,6 +32,7 @@ class HumbleRPiPluginMagneticSwitch
     nc = @nc
         
     puts 'ready to detect magnetic switches'
+
     
     @pins.each.with_index do |pin, i|
       
@@ -33,8 +40,9 @@ class HumbleRPiPluginMagneticSwitch
       
       n = (i+1).to_s
       
-      Thread.new do      
-        
+      threads = []
+      threads << Thread.new do      
+
         pin.watch do |value|
           
           state = value == 0 ? :opened : :closed
@@ -55,10 +63,10 @@ class HumbleRPiPluginMagneticSwitch
           SelfDefense.new(&strategy) if state == :opened
           
           if input_operation == :erratic then
-            
+
             notifier.notice "%s/magneticswitch/%s: " + \
                 " door error: Erratic input operation" % [device_id, i]
-            raise 'humble_rpi-plugin-magneticwitch: Erratic input operation'
+            raise PluginMagneticSwitchException, 'Erratic input operation'
           end
               
           notifier.notice "%s/magneticswitch/%s: door %s" % \
@@ -67,6 +75,7 @@ class HumbleRPiPluginMagneticSwitch
         end
         
       end
+      threads.each(&:join)
       
     end
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: humble_rpi-plugin-magneticswitch
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   bPWFwNbEi9CiEPveT/uvh62PLy8oXqUUvXHHxIjvpQICBlT6wc8vkY+Lz86rQ+xY
   nKxNwaysAN6TFg==
   -----END CERTIFICATE-----
-date: 2016-11-21 00:00:00.000000000 Z
+date: 2016-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rpi_pinin
@@ -42,7 +42,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -52,7 +52,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: self-defense
   requirement: !ruby/object:Gem::Requirement