artoo-pebble 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c42dd7b0cbedf235cdc1de1e6a7bc58146c8c969
-  data.tar.gz: 3070dbf47b8157a3795709fead12cdbaa660834d
+  metadata.gz: 5b0fe323364f1b8d8d8f16ba036d1b47fe0417f0
+  data.tar.gz: 876b3ebc8d94e2526aa7894f6a9e5fb77b6e5194
 SHA512:
-  metadata.gz: 8eb882849f35a4fb08c7756d5517760de7d673629e679ca7b8022c8430f134329c80141e4f6698666e2e253ee1a6469364a1c6e92e27cc324934451c413986ee
-  data.tar.gz: 10056e171a13b5318c88b1a1c8c374bca87cbd729844a53dc5ec2e74a478bb146bd018a91dd6be0ed4ac921922d62a54dbe580c18f8120b3435f290a636acf60
+  metadata.gz: 9426ee6977de983bb205242faa8bf3f9ea98ff0e2522937c42262d6ac75123829ab6424277dad3af8c564ea924d658b805ac27d471eb4f5c22ea934c9546325f
+  data.tar.gz: 2591141a06f6e8785653151ea8e7c871b680888cb7c38c0fdbd591076f6d5a821debba5898b191f45f7c0df5edd763de65683d8c3bf6297b2f253157aac9a29a

data/.travis.yml

@@ -2,5 +2,6 @@ language: ruby
 rvm:
   - 2.0.0
   - 1.9.3
-  - jruby-19mode
-  - rbx-19mode
+  - jruby-1.7.9
+  - rbx-2.1.1
+  

data/Gemfile.lock

@@ -1,55 +1,54 @@
 PATH
   remote: .
   specs:
-    artoo-pebble (1.1.0)
-      artoo (>= 1.2.2)
-      hybridgroup-pebblewatch (>= 0.1.2)
+    artoo-pebble (1.2.0)
+      artoo (>= 1.6.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    artoo (1.2.2)
+    artoo (1.6.0)
       celluloid (~> 0.15.0)
       celluloid-io (~> 0.15.0)
       multi_json (~> 1.6)
       pry (~> 0.9)
       rake
       reel (~> 0.4.0)
+      robeaux (~> 0.0.3)
       thor (~> 0.18.1)
-    celluloid (0.15.1)
+    celluloid (0.15.2)
       timers (~> 1.1.0)
     celluloid-io (0.15.0)
       celluloid (>= 0.15.0)
       nio4r (>= 0.5.0)
-    coderay (1.0.9)
+    coderay (1.1.0)
     http (0.5.0)
       http_parser.rb
-    http_parser.rb (0.6.0.beta.2)
-    hybridgroup-pebblewatch (0.1.2)
+    http_parser.rb (0.6.0)
     metaclass (0.0.1)
     method_source (0.8.2)
     minitest (5.0.6)
     minitest-happy (1.0.0)
     mocha (0.14.0)
       metaclass (~> 0.0.1)
-    multi_json (1.8.0)
-    nio4r (0.5.0)
-    pry (0.9.12.2)
-      coderay (~> 1.0.5)
+    multi_json (1.8.4)
+    nio4r (1.0.0)
+    pry (0.9.12.6)
+      coderay (~> 1.0)
       method_source (~> 0.8)
       slop (~> 3.4)
-    rake (10.1.0)
+    rake (10.1.1)
     reel (0.4.0)
       celluloid (>= 0.15.1)
       celluloid-io (>= 0.15.0)
       http (>= 0.5.0)
       http_parser.rb (>= 0.6.0.beta.2)
       websocket_parser (>= 0.1.4)
-    slop (3.4.6)
+    robeaux (0.0.3)
+    slop (3.4.7)
     thor (0.18.1)
     timers (1.1.0)
-    websocket_parser (0.1.4)
-      http
+    websocket_parser (0.1.6)
 
 PLATFORMS
   ruby

data/README.md

@@ -1,6 +1,6 @@
 # Artoo Adaptor For Pebble
 
-This repository contains the Artoo (http://artoo.io/) adaptor for the Pebble smart watch (http://getpebble.com/). It uses the pebblewatch gem (https://github.com/hybridgroup/pebblewatch) to perform all communication.
+This repository contains the Artoo (http://artoo.io/) adaptor and driver for the Pebble smart watch (http://getpebble.com/). It uses the Pebble 2.0 SDK, and requires the 2.0 iOS or Android app, and that the "Chomps" app (https://github.com/hybridgroup/chomps) has been installed on the Pebble watch.
 
 Artoo is a open source micro-framework for robotics using Ruby.
 
@@ -19,74 +19,45 @@ gem install artoo-pebble
 ```ruby
 require 'artoo'
 
-connection :pebble, :adaptor => :pebble, :port => "127.0.0.1:4567", :id => "378B"
+connection :pebble, :adaptor => :pebble
 device :watch, :driver => :pebble
 
-def button_push(*data)
-  puts data[1].button unless data[1].nil?
-end
-
 work do
-  on watch, :media_control => :button_push
-
-  watch.set_nowplaying_metadata("Artoo", "Hello", Time.now.to_s)
-  every(5.seconds) do
-    watch.set_nowplaying_metadata("Artoo", "Update...", Time.now.to_s)
+  c = 100
+  every 1.second do
+    c++
+    str = "c: \#{c}"
+    pebble.message_queue.push(str)
+    Logger.info(pebble.last_message)
   end
 end
 ```
 
 ## Connecting to Pebble
 
-This software requires version 1.12.0 of the Pebble watch firmware.
-
-### OSX
-
-The main steps are:
-- Pair your computer and the Pebble
-- Use a socket to serial connection to map a TCP socket to the local port
-- Connect to the device via Artoo
-
-To figure out which port your pebble is connected to, use the `artoo connect scan` command:
-
-```
-$ artoo connect scan
-```
-
-Now you are ready to connect to the Sphero using the socket, in this example port 4567:
-
-```
-artoo connect serial pebble 4567
-```
-
-### Ubuntu
+Communication between the Pebble watch and Artoo takes place entirely using the Artoo API. This adaptor uses the Pebble 2.0 SDK, and requires the 2.0 iOS or Android app, and that the "Chomps" app (https://github.com/hybridgroup/chomps) has been installed on the Pebble watch.
 
-The main steps are:
-- Pair your computer and the Pebble
-- Map your device to a port
-- Use a socket to serial connection to map a TCP socket to the local port
-- Connect to the device via Artoo
+## Documentation
 
-You will need to pair with the Pebble, entering any needed password.
+Check out our [documentation](http://artoo.io/documentation/) for lots of information about how to use Artoo.
 
-Then you can find the Bluetooth address, for example `00:18:33:86:37:8B`, by using the `artoo connect scan` command:
+## IRC
 
-```
-$ artoo connect scan
-```
+Need more help? Just want to say "Hello"? Come visit us on IRC freenode #artoo
 
-Once you know the address, you can use the `artoo connect bind` command to map a port to the device:
+## Contributing
 
-```
-artoo connect bind 00:18:33:86:37:8B pebble
-```
-
-Now you are ready to connect to the Pebble using a socket, in this example port 4567:
-
-```
-artoo connect serial pebble 4567
-```
+* All patches must be provided under the Apache 2.0 License
+* Please use the -s option in git to "sign off" that the commit is your work and you are providing it under the Apache 2.0 License
+* Submit a Github Pull Request to the appropriate branch and ideally discuss the changes with us in IRC.
+* We will look at the patch, test it out, and give you feedback.
+* Avoid doing minor whitespace changes, renamings, etc. along with merged content. These will be done by the maintainers from time to time but they can complicate merges and should be done seperately.
+* Take care to maintain the existing coding style.
+* Add unit tests for any new or changed functionality.
+* All pull requests should be "fast forward"
+  * If there are commits after yours use “git rebase -i <new_head_branch>”
+  * If you have local changes you may need to use “git stash”
+  * For git help see [progit](http://git-scm.com/book) which is an awesome (and free) book on git
 
-### Windows
 
-We are currently working with the Celluloid team to add Windows support. Please check back soon!
+(c) 2012-2014 The Hybrid Group

data/artoo-pebble.gemspec

@@ -19,8 +19,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency 'artoo', '>= 1.2.2'
-  s.add_runtime_dependency 'hybridgroup-pebblewatch', '>= 0.1.2'
+  s.add_runtime_dependency 'artoo', '>= 1.6.0'
   s.add_development_dependency 'minitest', '>= 5.0'
   s.add_development_dependency 'minitest-happy'
   s.add_development_dependency 'mocha', '>= 0.14.0'

data/docs/commands.md

@@ -0,0 +1,17 @@
+# Commands
+
+## message_queue           
+
+Used to add or access the queue of strings being passed to the Pebble watch.
+
+##### Returns
+
+`Array` with all message strings
+
+## last_message           
+
+Returns and removes the string with the last message from the queue of messages being passed with the Pebble watch.
+
+##### Returns
+
+`String` with the last message on the queue.

data/docs/events.md

@@ -0,0 +1,5 @@
+# Events
+
+## start_driver
+
+Starts the driver.

data/examples/hello_pebble.rb

@@ -1,11 +1,14 @@
 require 'artoo'
 
-connection :pebble, :adaptor => :pebble, :port => "127.0.0.1:4567", :id => "E36E"
+connection :pebble, :adaptor => :pebble
 device :watch, :driver => :pebble
 
 work do
-  watch.set_nowplaying_metadata("Artoo", "Hello", Time.now.to_s)
-  every(5.seconds) do
-    watch.set_nowplaying_metadata("Artoo", "Update...", Time.now.to_s)
+  c = 100
+  every(1.second) do
+    c++
+    str = "c: \#{c}"
+    pebble.message_queue.push(str)
+    Logger.info(pebble.last_message)
   end
 end

data/lib/artoo-pebble/version.rb

@@ -1,5 +1,5 @@
 module Artoo
   module Pebble
-    VERSION = '1.1.0'
+    VERSION = '1.2.0'
   end
 end

data/lib/artoo/adaptors/pebble.rb

@@ -5,45 +5,6 @@ module Artoo
     # Connect to a pebble device
     # @see device documentation for more information
     class Pebble < Adaptor
-      attr_reader :pebble
-
-      # Number of retries when connecting
-      RETRY_COUNT = 5
-
-      # Creates a connection with device
-      # @return [Boolean]
-      def connect
-        @retries_left = RETRY_COUNT
-        require 'pebble' unless defined?(::Pebble)
-        begin
-          @pebble = ::Pebble::Watch.new(parent.connection_id, connect_to)
-          @pebble.connect
-          super
-          return true
-        rescue Errno::EBUSY, Errno::ECONNREFUSED => e
-          @retries_left -= 1
-          if @retries_left > 0
-            retry
-          else
-            Logger.error e.message
-            Logger.error e.backtrace.inspect
-            return false
-          end
-        end
-      end
-
-      # Closes connection with device
-      # @return [Boolean]
-      def disconnect
-        pebble.disconnect
-        super
-      end
-
-      # Uses method missing to call device actions
-      # @see Pebble documentation
-      def method_missing(method_name, *arguments, &block)
-        pebble.send(method_name, *arguments, &block)
-      end
     end
   end
 end

data/lib/artoo/drivers/pebble.rb

@@ -5,32 +5,22 @@ module Artoo
     # The pebble driver behaviors
     class Pebble < Driver
 
-      COMMANDS = [:ping, :notification_sms, :notification_email, :set_nowplaying_metadata,
-                  :get_versions, :get_installed_apps, :remove_app, :get_time, :set_time,
-                  :system_message, :reset]
+      COMMANDS = [:message_queue, :last_message]
 
       # Start driver and any required connections
+      # Public: Starts the driver.
+      #
+      # Returns null.
       def start_driver
-        begin
-          every(interval) do
-            handle_message_events
-          end
-
-          connection.listen_for_events(false)
+        @messages = []
+      end
 
-          super
-        rescue Exception => e
-          Logger.error "Error starting Pebble driver!"
-          Logger.error e.message
-          Logger.error e.backtrace.inspect
-        end
+      def message_queue
+        @messages
       end
 
-      def handle_message_events
-        while not connection.protocol.messages.empty? do 
-          e = connection.protocol.messages.pop
-          publish(event_topic_name(e[0].to_s), e[1])
-        end          
+      def last_message
+        @messages.pop
       end
     end
   end

data/test/adaptors/pebble_adaptor_test.rb

@@ -4,24 +4,16 @@ require 'artoo/adaptors/pebble'
 describe Artoo::Adaptors::Pebble do
   before do
     @connection = mock('connect')
-    @connection.stubs(:connection_id).returns("F123")
-    @port = Artoo::Port.new('/dev/awesome')
-    @adaptor = Artoo::Adaptors::Pebble.new(:port => @port, :parent => @connection)
-    @pebble = mock('pebble')
-    Pebble::Watch.stubs(:new).returns(@pebble)
+    @adaptor = Artoo::Adaptors::Pebble.new(:parent => @connection)
   end
 
   it 'Artoo::Adaptors::Pebble#connect' do
-    @pebble.expects(:connect)
     @adaptor.connect
     @adaptor.connected?.must_equal true
   end
 
   it 'Artoo::Adaptors::Pebble#disconnect' do
-    @pebble.stubs(:connect)
     @adaptor.connect
-
-    @pebble.expects(:disconnect)
     @adaptor.disconnect
     @adaptor.connected?.must_equal false
   end

data/test/test_helper.rb

@@ -1,5 +1,4 @@
 require 'artoo/robot'
-require 'pebble'
 
 require 'minitest/autorun'
 require 'mocha/setup'

metadata

@@ -1,83 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: artoo-pebble
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Ron Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-18 00:00:00.000000000 Z
+date: 2014-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: artoo
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.2
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.2
-- !ruby/object:Gem::Dependency
-  name: hybridgroup-pebblewatch
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.1.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
   name: minitest-happy
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.14.0
 description: Artoo adaptor and driver for Pebble smart watch
@@ -87,16 +73,17 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
 - artoo-pebble.gemspec
+- docs/commands.md
+- docs/events.md
 - examples/hello_pebble.rb
-- examples/media_control.rb
 - lib/artoo-pebble.rb
 - lib/artoo-pebble/version.rb
 - lib/artoo/adaptors/pebble.rb
@@ -113,17 +100,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: artoo-pebble
-rubygems_version: 2.0.3
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Artoo adaptor and driver for Pebble smart watch

data/examples/media_control.rb

@@ -1,17 +0,0 @@
-require 'artoo'
-
-connection :pebble, :adaptor => :pebble, :port => "127.0.0.1:4567", :id => "378B"
-device :watch, :driver => :pebble
-
-def button_push(*data)
-  puts data[1].button unless data[1].nil?
-end
-
-work do
-  on watch, :media_control => :button_push
-
-  watch.set_nowplaying_metadata("Artoo", "Hello", Time.now.to_s)
-  every(5.seconds) do
-    watch.set_nowplaying_metadata("Artoo", "Update...", Time.now.to_s)
-  end
-end