humble_rpi 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ef02172efd60c32a60f3d2f25375826669caae4
-  data.tar.gz: f9fdd9c800d89cec60331511d5d60aabdd6af972
+  metadata.gz: 12bfe9a1e6e0b92814f02b33bfa4067c8ce5b64f
+  data.tar.gz: db7d231f2ff614a478adc7a117fe7388ee77ba22
 SHA512:
-  metadata.gz: 811f0df96ccf1fce3b0b0ee51c744b27f7d498afef9cc26bf332e1d2a817abac2daec21bb92f3c9fd86fae2738747e691b552685d4324dff4a09407530c8b11f
-  data.tar.gz: 03163f5e89f259f44b738b8caa27daeb029da16381cd2d04c8797ea2461eafe618e188048b777b8eea2fcc31974a3f2e1de99f11f844982768214806f99cdd16
+  metadata.gz: d9166aacd59e9bc7b29ff98e705380eeca3cf5b06a10fde43f9ae2fcd9409655c6de07b2069dec70dbd1599368e344c4047320cb4f44b190e26e6703865fe301
+  data.tar.gz: 2199950e22e505c3693d0d128f1f1e4fd886cafdfad34518fce053f460515b66b8e4407144fe97f24108660cdb10b4c56c1f77ab499e775446cc1b76baaa2ccd

data/lib/humble_rpi.rb

@@ -2,169 +2,95 @@
 
 # file: humble_rpi.rb
 
-require 'rpi'
-require 'chronic_duration'
 require 'sps-pub'
-require 'rpi_lcd16x2'
-require 'websocket-eventmachine-client'
+require 'sps-sub'
 
 
-class HumbleRPi
-  include PiPiper  
+class DummyNotifier
+  
+  def notice(message)
+    puts Time.now.to_s + ' - ' + message
+  end
+  
+end
 
-  attr_reader :led, :lcd
+class HumbleRPi  
 
-  def initialize(options={})
+  def initialize(device_name: 'rpi', sps_address: nil, sps_port: 59000, \
+                                                                plugins: {})
 
-    default_options = {
-      device_name: 'rpi',
-      lcd_pins:  {},
-      led_pins:  [],
-      motion_pin: nil,
-      button_pins: [],
-      sps_address: nil, 
-      sps_port: '59000'
-    }
+    @device_name, @sps_address, @sps_port = device_name, sps_address, sps_port
+    
+    @publisher, @subscriber = sps_address ? \
+                                    initialize_sps() : [DummyNotifier.new, nil]
 
-    @opt = default_options.merge options
-    send_message :info, 'humble_rpi initialized'
-    led_pins, lcd_pins = @opt[:led_pins], @opt[:lcd_pins]
+    @plugins = initialize_plugins(plugins || [])    
+    
+  end
+
+  # triggered from a sps-sub callback
+  #
+  def ontopic(topic, msg)
+    
+    component = topic[/\w+$/]
     
-    @lcd = RpiLcd16x2.new 'ready', lcd_pins if lcd_pins.any?
-    @led = RPi.new(led_pins).led            if led_pins.any?
-    @ws = nil
+    method_name = "on_#{component}_message".to_sym
     
-    if @opt[:motion_pin] or @opt[:button_pins] then
+    @plugins.each do |x|
       
-      at_exit do
-        
-        [@opt[:motion_pin], @opt[:button_pins]].flatten.compact.each do |pin|
-
-          uexp = open("/sys/class/gpio/unexport", "w")
-          uexp.write(pin)
-          uexp.close
-        
-        end
+      if x.respond_to? method_name then          
+        x.method(method_name).call(msg)          
       end
+      
     end
-  end
+  end      
 
-  def send_message(subtopic, msg)
+  def start()
 
-    topic, address, port = @opt[:device_name], @opt[:sps_address], @opt[:sps_port]
-    fqm = "%s/%s: %s" % [topic, subtopic, msg]
-    
-    begin
-      address ? SPSPub.notice(fqm, address: address, port: port) : puts(fqm)
-    rescue
-      puts 'humble_rpi: warning, could not publish SPS notice.'
+    @plugins.each do |x|
+      if x.respond_to? :on_start then
+        puts 'starting ' + x.inspect
+        Thread.new { x.on_start() }
+      end
     end
-  end
-  
-  protected
-  
-  def button_detect()
-
-    send_message :info, 'button press detection activated'
-
-    topic = @opt[:device_name]
-    address, port = @opt[:sps_address], @opt[:sps_port]
-
-    hrpi = self
-
-    @opt[:button_pins].each.with_index do |button, i|
-      
-      puts 'button %s on GPIO %s enabled ' % [i+1, button]
-      
-      n = (i+1).to_s
-      
-      PiPiper.watch :pin => button.to_i, :invert => true do |pin|
         
-        hrpi.send_message 'buttonpressed/' + n, "value %s" % [pin.value]
-
-      end
-      
+    if @subscriber then
+      topic =  "#{@device_name}/output/#"
+      @subscriber.subscribe topic: topic
+    else
+      loop while true
     end
     
-    PiPiper.wait    
-    
-  end  
-
-  def listener(&blk)
-
-    rpi = self
-
-    c = WebSocket::EventMachine::Client
-
-    Thread.new do   
-      
-      EM.run do
-
-        @ws = c.connect(uri: "ws://%s:%s" % [@opt[:sps_address], @opt[:sps_port]])
-
-        @ws.onopen do
-          puts "Client connected"          
-        end
-
-        @ws.onmessage(&blk)
-
-        @ws.onclose do
-          puts "Client disconnected"
-        end
-
-        EventMachine.next_tick do
-          @ws.send "subscribe to topic: #{@opt[:device_name]}/output/#"
-        end
+  end
 
-        EventMachine.error_handler{ |e|
-          puts "Error raised during event loop: #{e.message}"
+  
+  private
+  
+  def initialize_sps()
+    
+    publisher = SPSPub.new address: @sps_address, port: @sps_port
+    publisher.notice @device_name + '/info: humble_rpi initialized'    
+    subscriber = SPSSub.new address: @sps_address, port: @sps_port, callback: self
         
-        }
+    [publisher, subscriber]
     
-      end
-     
-    end
-
-    alias led_listener listener
   end
+  
+  def initialize_plugins(plugins)
 
-  def motion_detect()
-
-    send_message :info, '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]
-
-    hrpi = self
-    count  = 0
-
-    after pin: @opt[:motion_pin].to_i, goes: :high do
+    @plugins = plugins.inject([]) do |r, plugin|
       
-      count += 1
+      name, settings = plugin
+      return r if settings[:active] == false and !settings[:active]
       
-      if Time.now > t1 + ChronicDuration.parse(duration='1 minute')  then
-        hrpi.send_message :motion, "detected %s times within the past %s" \
-                                                            % [count, duration]
-        t1 = Time.now
-        count = 0
-      end
-
-    end
-    PiPiper.wait    
-    
-  end
+      klass_name = 'HumbleRPiPlugin' + name.to_s
+                                
+      vars = {device_id: @device_name, notifier: @publisher}
 
+      r << Kernel.const_get(klass_name)\
+                      .new(settings: settings, variables: vars)
 
-end
-
-
-if __FILE__ == $0 then
-
-  # example of an RPi running with 1 LED and 1 motion sensor
-
-  f = HumbleRPi.new device_name: 'fortina', led_pins: [17], sps_address: '192.168.4.170', motion_pin: '7'
-
-  sleep 3 # wait for the client to connect
-  f.motion_detect 
+    end
+  end  
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: humble_rpi
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - James Robertson
@@ -31,68 +31,8 @@ cert_chain:
   999CZL08Zqxa+1DKwhW/XqeiQ9eIZ+1fLAK+XbAKgv6ghNYEPtZLUFiD73uUbsKd
   sBqeV1LF1yKYmA==
   -----END CERTIFICATE-----
-date: 2015-05-19 00:00:00.000000000 Z
+date: 2015-06-14 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rpi
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.2.0
-- !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.10.6
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.10'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.10.6
-- !ruby/object:Gem::Dependency
-  name: websocket-eventmachine-client
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.1.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: sps-pub
   requirement: !ruby/object:Gem::Requirement
@@ -114,7 +54,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.4.0
 - !ruby/object:Gem::Dependency
-  name: rpi_lcd16x2
+  name: sps-sub
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -122,7 +62,7 @@ dependencies:
         version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -132,7 +72,7 @@ dependencies:
         version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.2.0
 description: 
 email: james@r0bertson.co.uk
 executables: []
@@ -163,7 +103,6 @@ rubyforge_project:
 rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
-summary: 'Designed for a Raspberry Pi which uses GPIOs for the following: LEDs, a
-  PIR sensor, a 16x2 LCD or push buttons. Communicates with a SimplePubSub message
-  broker'
+summary: Controls components wired in through the Raspberry Pi's GPIO pins. see the
+  Humble_rpi plugins.
 test_files: []