pebblewatch 0.0.2 → 0.0.3

data/README.md

@@ -1,4 +1,4 @@
-# pebble-ruby
+# pebblewatch
 
 A Ruby library for communicating with your Pebble smartwatch.
 
@@ -21,7 +21,7 @@ gem install pebblewatch
 
 ## Usage
 
-Make sure your Pebble is paired to your computer and set up as a serial port. We're going to need the path or index of the port, which in the case of OS X looks like `/dev/tty.Pebble7F30-SerialPortSe` for Pebble ID `7F30`. 
+Make sure your Pebble is paired with your computer and set up as a serial port. We're going to need the path or index of the port, which in the case of OS X looks like `/dev/tty.Pebble7F30-SerialPortSe` for Pebble ID `7F30`. 
 
 ```ruby
 require "pebble"
@@ -56,11 +56,11 @@ handler = watch.on_event(:media_control) do |event|
   end
 end
 
-# Suddenly got a change of heart? Just cover your ears.
+# Suddenly had a change of heart? Just cover your ears.
 watch.stop_listening(:media_control, handler)
 
 # To make sure we don't miss any events, we haven't connected yet. 
-# To be able to *send* stuff to the watch, we will now.
+# Because we also want to *send* stuff to the watch, we will now.
 watch.connect
 
 
@@ -116,8 +116,18 @@ watch.listen_for_events
 watch.disconnect
 ```
 
+Oh, and if you want to do some lower level stuff, have a look at [`Pebble::Protocol`](lib/pebble/protocol.rb) which you can access through `watch.protocol`.
+
+```ruby
+watch.protocol.on_receive(endpoint) do |message|
+  # Do whatever
+end
+
+watch.protocol.send_message(endpoint, message)
+```
+
 ## Examples
-Check out the `examples/` folder for two examples that I actually use myself. They're kind of similar, but should give you an idea of how this whole thing works.
+Check out the [`examples/`](examples) folder for two examples that I actually use myself. They're kind of similar, but should give you an idea of how this whole thing works.
 
 ## License
 Copyright (c) 2013 Douwe Maan

data/lib/pebble.rb

@@ -1,3 +1,22 @@
+require "logger"
+
+module Pebble
+  def self.logger=(new_logger)
+    @@logger = new_logger
+  end
+
+  def self.logger
+    return @@logger if defined?(@@logger)
+    @@logger = default_logger
+  end
+
+  def self.default_logger
+    logger = Logger.new(STDOUT)
+    logger.level = Logger::INFO
+    logger
+  end
+end
+
 require "pebble/version"
 require "pebble/endpoints"
 require "pebble/capabilities"

data/lib/pebble/protocol.rb

@@ -32,13 +32,11 @@ module Pebble
     end
 
     def connect
-      puts "Connecting with port #{@port}"
-
       @serial_port = SerialPort.new(@port, baudrate: 115200)
       @serial_port.read_timeout = 500
 
       @connected = true
-      puts "Connected"
+      Pebble.logger.debug "Connected to port #{@port}"
       
       @receive_messages_thread = Thread.new(&method(:receive_messages))
 
@@ -79,7 +77,7 @@ module Pebble
 
       message ||= ""
 
-      puts "Sending #{Endpoints.for_code(endpoint)}: #{message.inspect}"
+      Pebble.logger.debug "Sending #{Endpoints.for_code(endpoint)}: #{message.inspect}"
 
       data = [message.size, endpoint].pack("S>S>") + message
 
@@ -119,7 +117,7 @@ module Pebble
 
     private
       def receive_messages
-        puts "Waiting for messages"
+        Pebble.logger.debug "Waiting for messages"
         while @connected
           header = @serial_port.read(4)
           next unless header
@@ -129,18 +127,18 @@ module Pebble
           size, endpoint = header.unpack("S>S>")
           message = @serial_port.read(size)
 
-          puts "Received #{Endpoints.for_code(endpoint)}: #{message.inspect}"
+          Pebble.logger.debug "Received #{Endpoints.for_code(endpoint)}: #{message.inspect}"
 
           trigger_received(endpoint, message)
         end
       rescue IOError => e
         if @connected
-          puts "Lost connection"
+          Pebble.logger.debug "Lost connection"
           @connected = false
           raise Errors::LostConnection
         end
       ensure
-        puts "Finished waiting for messages"
+        Pebble.logger.debug "Finished waiting for messages"
       end
 
       def trigger_received(endpoint, message)

data/lib/pebble/version.rb

@@ -1,3 +1,3 @@
 module Pebble
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/pebble/watch.rb

@@ -9,14 +9,14 @@ module Pebble
     def self.autodetect
       return nil unless RUBY_PLATFORM =~ /darwin/
 
-      devices = Dir.glob("/dev/tty.Pebble????-SerialPortSe")
+      watches = Dir.glob("/dev/tty.Pebble????-SerialPortSe")
 
-      raise NoWatchesFound if devices.length == 0
-      puts "Found multiple watches" if devices.length > 1
+      raise Errors::NoWatchesFound if watches.length == 0
+      Pebble.logger.debug "Found multiple watches: #{watches}" if watches.length > 1
 
-      port = devices.first
+      port = watches.first
       id = port[15, 4]
-      puts "Found watch with ID #{id}"
+      Pebble.logger.debug "Detected watch with ID #{id}"
 
       return new(id, port)
     end
@@ -50,8 +50,8 @@ module Pebble
       @client_capabilities  = Capabilities::Client::TELEPHONY | Capabilities::Client::SMS | Capabilities::Client::ANDROID
 
       answer_phone_version_message
-      
       receive_event_messages
+      log_log_events
     end
 
     def connect
@@ -177,7 +177,7 @@ module Pebble
     end
 
     def system_message(code)
-      puts "Sending system message #{SystemMessages.for_code(code)}"
+      Pebble.logger.debug "Sending system message #{SystemMessages.for_code(code)}"
 
       message = [code].pack("S>")
 
@@ -213,8 +213,25 @@ module Pebble
         end
       end
 
+      def log_log_events
+        on_event(:log) do |event|
+          case event.level
+          when :error
+            Pebble.logger.error event.message
+          when :warning
+            Pebble.logger.warn event.message
+          when :info
+            Pebble.logger.info event.message
+          when :debug, :verbose
+            Pebble.logger.debug event.message
+          else
+            Pebble.logger.info event.message
+          end
+        end
+      end
+
       def trigger_event(name, event)
-        puts "Event '#{name}': #{event.inspect}"
+        Pebble.logger.debug "Triggering event '#{name}': #{event.inspect}"
 
         @event_handlers[:any].each do |handler|
           Thread.new(handler) do |handler|

data/lib/pebble/watch/event.rb

@@ -1,7 +1,9 @@
 module Pebble
   class Watch
     class Event
-
+      def self.parse(message)
+        new
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pebblewatch
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2013-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: serialport
-  requirement: &70119208390380 !ruby/object:Gem::Requirement
+  requirement: &70177874616340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70119208390380
+  version_requirements: *70177874616340
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70119208388900 !ruby/object:Gem::Requirement
+  requirement: &70177874615460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70119208388900
+  version_requirements: *70177874615460
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70119208388220 !ruby/object:Gem::Requirement
+  requirement: &70177874613320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70119208388220
+  version_requirements: *70177874613320
 description: A Ruby library for communicating with your Pebble smartwatch.
 email: douwe@selenight.nl
 executables: []
@@ -81,7 +81,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4433695980679618883
+      hash: -467314085737445579
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -90,7 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4433695980679618883
+      hash: -467314085737445579
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.6