artoo-sphero 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd4ee78dc0212685f59e294a8e0d251a3829fe24
-  data.tar.gz: 4f7d8f33dcf7046f5eea874e3d059c36bab252ea
+  metadata.gz: 7507b0ede5639c02f83755caaf79bfcf0338ac86
+  data.tar.gz: a315842f56618f9dc23259d3cf341c7fb651de5e
 SHA512:
-  metadata.gz: 43a82c9001d6e5ec14eb2d8ceb25328ef1e9304e0eae0b14edb81203b82b985e53da0d377b1d1e034f2befba1246a0488546941a361cfb73b6cbc3a6611bbdc8
-  data.tar.gz: a903b5eae8a65898e88340533eaa312b1dcbae953d056060055630d4deb6f441452179f000ed780cf53cd6a968269a4515f33bc800462c386f10ce35310dde59
+  metadata.gz: 22d7e5ef84665e7aed238abc7bf13a0d878fdfebaef1f592c1975ace9f47587a7616ed91fbbe3364dd326bc733c99b6ec847143407f602359c106b989bea5ece
+  data.tar.gz: 16c97c98413658ab034aa8b98d5ab2776d08cba7c5dd3780ed7f2ce33f6042c46641028cd505a726f10dc1446e2d5ad07fa91858514bafa6315305b098fe5cd3

data/.gitignore

@@ -1,3 +1,4 @@
 .rvmrc
 .rbx
 pkg
+Gemfile.lock

data/.travis.yml

@@ -1,6 +1,10 @@
 language: ruby
 rvm:
   - 2.0.0
+  - 2.1.0
   - 1.9.3
-  - jruby-19mode
-  - rbx-2.1.1
+  - jruby
+  - rbx-2.2.10
+script:
+  - bundle install
+  - bundle exec rake test

data/README.md

@@ -14,18 +14,12 @@ For more information abut Artoo, check out our repo at https://github.com/hybrid
 gem install artoo-sphero
 ```
 
-Afterwards you need to install `socat` - for this please run the following command (works on both OSX and Linux):
-
-```
-artoo install socat
-```
-
 ## Using
 
 ```ruby
 require 'artoo'
 
-connection :sphero, :adaptor => :sphero, :port => '127.0.0.1:4567'
+connection :sphero, :adaptor => :sphero, :port => '/dev/rfcomm0' #linux
 device :sphero, :driver => :sphero
   
 work do
@@ -39,55 +33,25 @@ end
 ```
 ## Connecting to Sphero
 
-### OSX
-
-The main steps are:
-- Pair your computer and the Sphero
-- Use a socket to serial connection to map a TCP socket to the local unix port
-- Connect to the device via Artoo
-
-First pair your computer and Sphero. You might be prompted for a passcode, but you do not need to enter it, sinec the Sphero does not check.
-
-Once paired, use the `artoo connect scan` command to find out your connection info:
-
-```
-$ artoo connect scan
-```
-
-Now you are ready to connect to the Sphero using the socket, in this example port 4567:
-
-```
-artoo connect serial Sphero-WRW 4567
-```
-
-### Ubuntu
+### OSX / Linux
 
 The main steps are:
 - Pair your computer and the Sphero
 - Map your device to a unix port
-- Use a socket to serial connection to map a TCP socket to the local unix port
 - Connect to the device via Artoo
 
 First pair your computer and Sphero. You might be prompted for a passcode, but you do not need to enter it, sinec the Sphero does not check.
 
-Once paired, use the `artoo connect scan` command to find out your connection info:
-
-```
-$ artoo connect scan
-Scanning ...
-  00:06:66:4A:14:99 Sphero-WRW
-```
-
-Next, you need to bind the Sphero to the system port. In the above example, /dev/Sphero-WRW. The easiest way to do this is to use the `artoo connect bind` command:
+Once paired, use the `artoo scan serial` command to find out your connection info:
 
 ```
-artoo connect bind 00:06:66:4A:14:99 Sphero-WRW
+$ artoo scan serial
 ```
 
-Now you are ready to connect to the Sphero using the socket, in this example port 4567:
+Now you are ready to connect to the Sphero, update the code to use correct serial port:
 
 ```
-artoo connect serial Sphero-WRW 4567
+connection :sphero, :adaptor => :sphero, :port => '/dev/rfcomm0' #linux
 ```
 
 ### Windows

data/artoo-sphero.gemspec

@@ -19,9 +19,9 @@ 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.6.0'
-  s.add_runtime_dependency 'sphero', '>= 1.5.0'
+  s.add_runtime_dependency 'artoo', '>= 1.6.7'
+  s.add_runtime_dependency 'sphero', '>= 1.5.1'
   s.add_development_dependency 'minitest', '>= 5.0'
-  s.add_development_dependency 'minitest-happy'
+  s.add_development_dependency 'minitest-happy', "~>1.0.0"
   s.add_development_dependency 'mocha', '>= 0.14.0'
 end

data/docs/commands.md

@@ -21,7 +21,7 @@ Stops the sphero.
 
 `true or nil`
 
-## detect_collissions 
+## detect_collisions 
 
 Sets the sphero to detect collisions and report them.
 

data/examples/sphero.rb

@@ -1,8 +1,10 @@
 require 'artoo'
 
-connection :sphero, :adaptor => :sphero, :port => '127.0.0.1:4567'
+connection :sphero, :adaptor => :sphero, :port => '/dev/rfcomm0' #linux
+#connection :sphero, :adaptor => :sphero, :port => '127.0.0.1:4567'
+
 device :sphero, :driver => :sphero
-  
+
 work do
   @rolling = false
 

data/examples/sphero_color.rb

@@ -1,8 +1,9 @@
 require 'artoo'
 
-connection :sphero, :adaptor => :sphero, :port => '127.0.0.1:4560'
+connection :sphero, :adaptor => :sphero, :port => '/dev/rfcomm0' #linux
+#connection :sphero, :adaptor => :sphero, :port => '127.0.0.1:4567'
 device :sphero, :driver => :sphero
-  
+
 work do
   @count = 1
   every(3.seconds) do

data/examples/sphero_messages.rb

@@ -1,6 +1,7 @@
 require 'artoo'
 
-connection :sphero, :adaptor => :sphero, :port => '127.0.0.1:4560'
+connection :sphero, :adaptor => :sphero, :port => '/dev/rfcomm0' #linux
+#connection :sphero, :adaptor => :sphero, :port => '127.0.0.1:4567'
 device :sphero, :driver => :sphero
 
 def contact(*args)

data/examples/sphero_pebble.rb

@@ -0,0 +1,43 @@
+require 'artoo'
+
+connection :sphero, :adaptor => :sphero, :port => '/dev/rfcomm0' #linux
+#connection :sphero, :adaptor => :sphero, :port => '127.0.0.1:4567'
+device     :sphero, :driver  => :sphero
+
+connection :pebble, :adaptor => :pebble
+device     :watch,  :driver  => :pebble, :name => 'pebble'
+
+api :host => '0.0.0.0', :port => '8080'
+
+name 'pebble'
+
+def move_forward
+  p 'moving forward'
+  sphero.roll 100, 0
+  sleep 4
+  sphero.stop
+end
+
+def move_backward
+  p 'moving backward'
+  sphero.roll 100, 180
+  sleep 4
+  sphero.stop
+end
+
+def button_push(*data)
+  unless data[1].nil?
+    case data[1]
+    when 'up' then
+      move_forward
+    when 'select' then
+      sphero.set_color(rand(255),rand(255),rand(255))
+    when 'down' then
+      move_backward
+    end
+  end
+end
+
+work do
+  on pebble, :button => :button_push
+end

data/examples/sphero_pebble_accelerometer.rb

@@ -0,0 +1,34 @@
+require 'artoo'
+
+connection :sphero, :adaptor => :sphero, :port => '/dev/rfcomm0' #linux
+#connection :sphero, :adaptor => :sphero, :port => '127.0.0.1:4567'
+device     :sphero, :driver  => :sphero
+
+connection :pebble, :adaptor => :pebble
+device     :watch,  :driver  => :pebble, :name => 'pebble'
+
+api :host => '0.0.0.0', :port => '8080'
+
+name 'pebble'
+
+work do
+  on pebble, :accel => :set_direction
+
+  every(1.seconds) do
+    sphero.roll 100, heading
+  end
+end
+
+def set_direction(*data)
+  x, y = data[1].split(",")
+
+  @heading = direction(x.to_i, y.to_i)
+end
+
+def direction(x, y)
+  (180.0 - (Math.atan2(y,x) * (180.0 / Math::PI)))
+end
+
+def heading
+  @heading || 0
+end

data/lib/artoo-sphero/version.rb

@@ -1,5 +1,5 @@
 module Artoo
   module Sphero
-    VERSION = '1.3.0'
+    VERSION = '1.4.0'
   end
 end

data/lib/artoo/drivers/sphero.rb

@@ -11,7 +11,12 @@ module Artoo
       BLUE    = [0,   0,   255]
       WHITE   = [255, 255, 255]
 
-      COMMANDS = [:roll, :stop, :detect_collisions, :messages, :set_color, :color].freeze
+      COMMANDS = [:ping, :version, :bluetooth_info, :auto_reconnect,
+                  :disable_auto_reconnect, :power_state, :sphero_sleep, :roll,
+                  :stop, :heading, :stabilization, :color, :rgb, :set_color,
+                  :back_led_output, :rotation_rate, :set_power_notification,
+                  :set_data_streaming, :detect_collisions,
+                  :handle_message_events, :get_rgb].freeze
 
       # Starts drives and required connections
 
@@ -37,8 +42,8 @@ module Artoo
       # Public: Handles different message events.
       #
       # Returns sphero_event.
-      def handle_message_events         
-        while not connection.messages.empty? do        
+      def handle_message_events
+        while not connection.messages.empty? do
           evt = connection.messages.pop
           case 
           when evt.is_a?(::Sphero::Response::CollisionDetected)
@@ -74,7 +79,7 @@ module Artoo
       #
       # Returns true | nil.
       def set_color(*colors)
-        connection.rgb(*color(*colors))
+        connection.rgb(*color(*colors), true)
       end
 
       # Retrieves color
@@ -101,11 +106,22 @@ module Artoo
         end
       end
 
+      # Get the sphero color
+
+      # Public: You can retrieve current sphero color
+      #
+      # Returns array of rgb values
+      def get_rgb
+        rgb = connection.user_led
+
+        [rgb.r, rgb.g, rgb.b] if rgb
+      end
+
       private
 
       # Publish collision events
 
-      # Public: Handles collision message events.
+      # Handles collision message events.
       #
       # data - params
       #
@@ -127,7 +143,7 @@ module Artoo
 
       # Publish collision events
 
-      # Public: Handles sensor message events.
+      # Handles sensor message events.
       #
       # data - params
       #

data/test/drivers/sphero_test.rb

@@ -54,4 +54,23 @@ describe Artoo::Drivers::Sphero do
       b.must_equal 6
     end
   end
+
+  describe 'get_rgb' do
+
+    let(:rgb_color) { OpenStruct.new(r: 255, g: 254, b: 253) }
+
+    it 'returns rgb color' do
+      @connection.stubs(:user_led).returns(rgb_color)
+
+      @driver.get_rgb.must_equal [255, 254, 253]
+    end
+
+    it 'returns nil if message lost' do
+      @connection.stubs(:user_led).returns(nil)
+
+      @driver.get_rgb.must_equal nil
+    end
+
+  end
+
 end

data/test/test_helper.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: artoo-sphero
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Ron Evans
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-06 00:00:00.000000000 Z
+date: 2014-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: artoo
@@ -20,28 +20,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.6.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.6.7
 - !ruby/object:Gem::Dependency
   name: sphero
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.5.1
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -60,16 +60,16 @@ dependencies:
   name: minitest-happy
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -97,7 +97,6 @@ files:
 - ".rvmrc.example"
 - ".travis.yml"
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -110,6 +109,8 @@ files:
 - examples/sphero_cycle.rb
 - examples/sphero_messages.rb
 - examples/sphero_multiple.rb
+- examples/sphero_pebble.rb
+- examples/sphero_pebble_accelerometer.rb
 - lib/artoo-sphero.rb
 - lib/artoo-sphero/version.rb
 - lib/artoo/adaptors/sphero.rb
@@ -136,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: artoo-sphero
-rubygems_version: 2.2.1
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Artoo adaptor and driver for Sphero robot

data/Gemfile.lock

@@ -1,62 +0,0 @@
-PATH
-  remote: .
-  specs:
-    artoo-sphero (1.3.0)
-      artoo (>= 1.6.0)
-      sphero (>= 1.5.0)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    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.2)
-      timers (~> 1.1.0)
-    celluloid-io (0.15.0)
-      celluloid (>= 0.15.0)
-      nio4r (>= 0.5.0)
-    coderay (1.1.0)
-    http (0.5.0)
-      http_parser.rb
-    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.4)
-    nio4r (1.0.0)
-    pry (0.9.12.6)
-      coderay (~> 1.0)
-      method_source (~> 0.8)
-      slop (~> 3.4)
-    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)
-    robeaux (0.0.3)
-    slop (3.4.7)
-    sphero (1.5.0)
-    thor (0.18.1)
-    timers (1.1.0)
-    websocket_parser (0.1.6)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  artoo-sphero!
-  minitest (>= 5.0)
-  minitest-happy
-  mocha (>= 0.14.0)