humble_rpi 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a16d197f2224abbf7e20ad307da8bae3e5ac6b74
-  data.tar.gz: 893d5eb884d273ced2572a753a7156a3d061964d
+  metadata.gz: c91dbb08a6a98e3420395c3acb830c83b41b3193
+  data.tar.gz: fdbd48f13dbd94249e584983c4c80c3995e01098
 SHA512:
-  metadata.gz: c569f97098ec3574f0336947de82e05d06646e082ae523a4970ccdb28f58a9077fbe76a4ac00a9d1681b6031c7e57b8e0a2cf72372d687cba00e5ded6454ebdb
-  data.tar.gz: fbecd49aed12065c564ea78bd7730ea3f94c9b395f8caa7dd904324db3402829573157de87a9c2c1d9afe5bfe010899b58ec1226c8df841805a9660abd4ecf02
+  metadata.gz: 58cbdc3345a12e858abe42d1c69d6dc256cc19982941fdefe9aac89c96dd2516cdd93bfbc49a09ecb02e016adb32644a51790eda7e461205374150ade6706e14
+  data.tar.gz: 04da06fa0baf46a4f433318cedf19e97bfde3a2a825cf93e10b0615e962bc17e94f079d46f8f5b0940ecdcf5a0ea501448bf8c094077e3e36c86787d48fb6f69

data/lib/humble_rpi.rb

@@ -4,7 +4,7 @@
 
 require 'rpi'
 require 'chronic_duration'
-require 'websocket-eventmachine-client'
+require 'sps-pub'
 
 
 class HumbleRPi < RPi
@@ -12,20 +12,29 @@ class HumbleRPi < RPi
 
   def initialize(options={})
 
-    puts 'inside humble_rpi'
     default_options = {
       device_name: 'rpi',
-      led_pins: [],
+      led_pins:  [],
       motion_pin: nil, 
       sps_address: nil, 
       sps_port: '59000'
     }
 
     @opt = default_options.merge options
+    send_message 'humble_rpi initialized'
     super @opt[:led_pins]
     @ws = nil
   end
+
+  def send_message(msg)
+
+    topic, address, port = @opt[:device_name], @opt[:sps_address], @opt[:sps_port]
+    fqm = (topic + ': ' + msg)
+    address ? SPSPub.notice(fqm, address: address, port: port) : puts(fqm)
+  end
   
+  protected
+
   def led_listener(&blk)
     rpi = self
 
@@ -64,15 +73,17 @@ class HumbleRPi < RPi
 
   def motion_detect()
 
-    t1 = Time.now
-    ws, opt = @ws, @opt
-    #puts 'inside motion //'
-    after pin: opt[:motion_pin].to_i, goes: :high do
+    send_message 'motion detection activated'
+    t1 = Time.now - ChronicDuration.parse('1 minute and 10 seconds')
+    topic = @opt[:device_name]
+    address, port = @opt[:sps_address], @opt[:sps_port]
 
-      #puts Time.now.to_s + ' : motion detected'
+    hrpi = self
+
+    after pin: @opt[:motion_pin].to_i, goes: :high do
 
       if Time.now > t1 + ChronicDuration.parse('1 minute')  then
-        ws.send opt[:device_name] + ': motion detected'
+        hrpi.send_message 'motion detected'
         t1 = Time.now
       end
 
@@ -80,6 +91,7 @@ class HumbleRPi < RPi
     PiPiper.wait    
     
   end
+
 end
 
 
@@ -120,4 +132,4 @@ if __FILE__ == $0 then
   sleep 3 # wait for the client to connect
   f.motion_detect 
 
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: humble_rpi
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - James Robertson
@@ -31,50 +31,88 @@ cert_chain:
   K97Fz/NM76+KNaPEa6pYgH+JF/i/VxG6aln5EavRfNdLWM0pBirSt/kpw9jDToHo
   YglbilVTUndGuw==
   -----END CERTIFICATE-----
-date: 2013-12-01 00:00:00.000000000 Z
+date: 2014-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: chronic_duration
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.4
 - !ruby/object:Gem::Dependency
   name: websocket-eventmachine-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.1
+- !ruby/object:Gem::Dependency
+  name: sps-pub
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.0
 description: 
 email: james@r0bertson.co.uk
 executables: []
@@ -94,7 +132,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.1.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -102,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0.rc.2
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Designed for a Raspberry Pi which uses GPIO LEDs, 1 motion sensor and communicates