hybridgroup-pebblewatch 0.0.4 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6375eee495aa881fd8f68ee492eb66b58d858882
-  data.tar.gz: 4d82b1ce5d795c947f8689a53a588acf30488201
+  metadata.gz: 54c276fa2e663e29012d6e027950abcfeef02896
+  data.tar.gz: ce72a9e9663757673ce68525a9021c469dee3f46
 SHA512:
-  metadata.gz: 861a4f51687d2e181db15de7ff446788d4404b4d0312ce21bbdc3642c5c68b734bf095db59c676c8cb998ce3f931fa45f4833b795ea9c4a83dab2f797f3d5976
-  data.tar.gz: 02db86e888204b22994965b279878f8b362a37a4d49b54962b4d0597fa48ffc288de4de0911af0456c38c057c184b97df1c8c1cd4846b940b03980ddaaf2b418
+  metadata.gz: 643c2c113aa4b3d3760b7cf8511394e34932e2e14507e506d5e907f40b382d9232674957c51538d747026d74c5121a8cd2c323fe9f5af52c78e48d49632609f8
+  data.tar.gz: cb1f125ad54d773c16d683257bd38c32dc1a6dcfff17ed798f78b0cff363e6749a52c5197b5cfd0c751ae80c263c3ae0ac4e70b3f1b75c9ee8947723395b87cf

data/lib/pebble/protocol.rb

@@ -1,5 +1,3 @@
-require "serialport"
-
 module Pebble
   class Protocol
     module Errors
@@ -10,6 +8,7 @@ module Pebble
 
     attr_reader :connected
     attr_reader :message_handlers
+    attr_reader :messages
 
     def self.open(port)
       protocol = new(port)
@@ -29,12 +28,14 @@ module Pebble
       @connected          = false
       @send_message_mutex = Mutex.new
       @message_handlers   = Hash.new { |hash, key| hash[key] = [] }
+      @messages = Queue.new
+      @use_message_queue = false
     end
 
     def connect
       if @port.is_a?(String)
+        require 'serialport'
         @serial_port = SerialPort.new(@port, baudrate: 115200)
-        @serial_port.read_timeout = 500
       else
         @serial_port = @port
       end
@@ -45,6 +46,8 @@ module Pebble
       @receive_messages_thread = Thread.new(&method(:receive_messages))
 
       true
+    rescue LoadError
+      puts "Please 'gem install hybridgroup-serialport' for serial port support."      
     end
 
     def disconnect
@@ -58,10 +61,15 @@ module Pebble
       true
     end
 
-    def listen_for_messages
+    def listen_for_messages(sync=true)
       raise Errors::NotConnected unless @connected
 
-      @receive_messages_thread.join
+      if sync
+        @receive_messages_thread.join
+      else
+        @use_message_queue = true
+        @receive_messages_thread.run
+      end
     end
 
     def on_receive(endpoint = :any, &handler)
@@ -129,6 +137,7 @@ module Pebble
           raise Errors::MalformedResponse if header.length < 4
 
           size, endpoint = header.unpack("S>S>")
+          next if endpoint == 0
           message = @serial_port.read(size)
 
           Pebble.logger.debug "Received #{Endpoints.for_code(endpoint) || endpoint}: #{message.inspect}"
@@ -146,6 +155,8 @@ module Pebble
       end
 
       def trigger_received(endpoint, message)
+        @messages.push(event_for(endpoint, message)) if @use_message_queue
+
         @message_handlers[:any].each do |handler|
           Thread.new(handler) do |handler|
             handler.call(endpoint, message)
@@ -158,5 +169,16 @@ module Pebble
           end
         end
       end
+
+      def event_for(endpoint, message)
+        events = {
+          Pebble::Endpoints::LOGS => [:log, Pebble::Watch::LogEvent],
+          Pebble::Endpoints::SYSTEM_MESSAGE => [:system_message, Pebble::Watch::SystemMessageEvent],
+          Pebble::Endpoints::MUSIC_CONTROL => [:media_control, Pebble::Watch::MediaControlEvent],
+          Pebble::Endpoints::APPLICATION_MESSAGE => [:app_message, Pebble::Watch::AppMessageEvent]
+        }
+
+        [events[endpoint][0], events[endpoint][1].parse(message)]
+      end
   end
 end

data/lib/pebble/version.rb

@@ -1,3 +1,3 @@
 module Pebble
-  VERSION = "0.0.4"
+  VERSION = "0.1.0"
 end

data/lib/pebble/watch.rb

@@ -62,11 +62,12 @@ module Pebble
       @protocol.disconnect
     end
 
-    def listen_for_events
-      @protocol.listen_for_messages
+    def listen_for_events(sync=true)
+      @protocol.listen_for_messages(sync)
     end
 
     def on_event(event = :any, &handler)
+      Pebble.logger.info "adding handler for #{event}"
       @event_handlers[event] << handler
       handler
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hybridgroup-pebblewatch
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors:
 - Douwe Maan
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-26 00:00:00.000000000 Z
+date: 2013-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: serialport
+  name: hybridgroup-serialport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement