artoo-sphero 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7507b0ede5639c02f83755caaf79bfcf0338ac86
-  data.tar.gz: a315842f56618f9dc23259d3cf341c7fb651de5e
+  metadata.gz: 0ae96ff0cb00e1374fbaecb2b8369007646e9537
+  data.tar.gz: 7105cb2f87e72baeeae67b6c44b1626322794d4c
 SHA512:
-  metadata.gz: 22d7e5ef84665e7aed238abc7bf13a0d878fdfebaef1f592c1975ace9f47587a7616ed91fbbe3364dd326bc733c99b6ec847143407f602359c106b989bea5ece
-  data.tar.gz: 16c97c98413658ab034aa8b98d5ab2776d08cba7c5dd3780ed7f2ce33f6042c46641028cd505a726f10dc1446e2d5ad07fa91858514bafa6315305b098fe5cd3
+  metadata.gz: 7a888596ad66ee223332a0a68bedc6f71f2fea8a860a81dbc48e00795e5994d893850d9f593812a9466b8324570f89a6fda40d02a81ffb8308d70f5bff1d0770
+  data.tar.gz: ae7e3a60e3e89783bdf13a508cada51d31cba752ca4f3a986a173aec4420bf99a83ce15509aeecd8d3b773948213a13f1f79507fe03615bbdbbf21dcfcc0a595

data/README.md

@@ -57,3 +57,30 @@ connection :sphero, :adaptor => :sphero, :port => '/dev/rfcomm0' #linux
 ### Windows
 
 We are currently working with the Celluloid team to add Windows support. Please check back soon!
+
+## Documentation
+
+Check out our [documentation](http://artoo.io/documentation/) for lots of information about how to use Artoo.
+
+If you want to help us with some documentation on the site, you can go to [artoo.io branch](https://github.com/hybridgroup/artoo/tree/artoo.io) and then, follow the instructions.
+
+## IRC
+
+Need more help? Just want to say "Hello"? Come visit us on IRC freenode #artoo
+
+## Contributing
+* All active development is in the dev branch. New or updated features must be added to the dev branch. Hotfixes will be considered on the master branch in situations where it does not alter behaviour or features, only fixes a bug.
+* 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
+
+
+(c) 2012-2014 The Hybrid Group

data/artoo-sphero.gemspec

@@ -19,7 +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.6.7'
+  s.add_runtime_dependency 'artoo', '>= 1.7.0'
   s.add_runtime_dependency 'sphero', '>= 1.5.1'
   s.add_development_dependency 'minitest', '>= 5.0'
   s.add_development_dependency 'minitest-happy', "~>1.0.0"

data/examples/sphero.rb

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

data/examples/sphero_interface.rb

@@ -0,0 +1,21 @@
+require 'artoo'
+
+connection :sphero, :adaptor => :sphero, :port => '/dev/rfcomm0' #linux
+device :sphero, :driver => :sphero
+
+work do
+  @rolling = false
+
+  every(3.seconds) do
+    puts "Rolling..." 
+    unless @rolling
+      # same as interfaces[:rover].forward(90)
+      forward(90)
+      @rolling = true
+    else
+      #  same as interfaces[:rover].backward(90)
+      backward(90)
+      @rolling = false
+    end
+  end
+end

data/lib/artoo-sphero.rb

@@ -1,3 +1,4 @@
 require 'lib/artoo/adaptors/sphero'
 require 'lib/artoo/drivers/sphero'
+require 'lib/artoo/interfaces/sphero'
 require 'lib/artoo-sphero/version'

data/lib/artoo-sphero/version.rb

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

data/lib/artoo/adaptors/sphero.rb

@@ -35,6 +35,7 @@ module Artoo
       # Closes connection with device
       # @return [Boolean]
       def disconnect
+        Logger.info "Stopping and disconnecting sphero"
         sphero.close if connected?
 
         super

data/lib/artoo/drivers/sphero.rb

@@ -16,7 +16,13 @@ module Artoo
                   :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
+                  :handle_message_events, :get_rgb, :start_calibration,
+                  :finish_calibration].freeze
+
+      def initialize(params={})
+        super
+        require_interface(:sphero)
+      end
 
       # Starts drives and required connections
 
@@ -26,6 +32,7 @@ module Artoo
       def start_driver
         begin
           detect_collisions
+          enable_stop_on_disconnect
 
           every(interval) do
             handle_message_events
@@ -117,6 +124,21 @@ module Artoo
         [rgb.r, rgb.g, rgb.b] if rgb
       end
 
+      # Starts calibration process by turning on back LED and turning off
+      # auto-stabilization
+      def start_calibration
+        connection.back_led_output = 127
+        connection.stabilization = false
+      end
+
+      # Finishes calibration process by setting the new heading, turning off back LED,
+      # and turning back on auto-stabilization
+      def finish_calibration
+        connection.heading = 0
+        connection.back_led_output = 0
+        connection.stabilization = true
+      end
+
       private
 
       # Publish collision events

data/lib/artoo/interfaces/sphero.rb

@@ -0,0 +1,36 @@
+require 'artoo/interfaces/interface'
+
+module Artoo
+  module Interfaces
+    # The Sphero Rover interface
+    class Sphero < Rover
+      def forward(speed)
+        @device.roll 0, speed
+      end
+
+      def backward(speed)
+        @device.roll 180, speed
+      end
+
+      def left(speed)
+        @device.roll 270, speed
+      end
+
+      def right(speed)
+        @device.roll 90, speed
+      end
+
+      def turn_left(degrees)
+        # TODO: implement
+      end
+
+      def turn_right(degrees)
+        # TODO: implement
+      end
+
+      def stop
+        @device.stop
+      end     
+    end
+  end
+end

data/test/drivers/sphero_test.rb

@@ -4,6 +4,7 @@ require 'artoo/drivers/sphero'
 describe Artoo::Drivers::Sphero do
   before do
     @device = mock('device')
+    @device.stubs(:require_interface)
     @driver = Artoo::Drivers::Sphero.new(:parent => @device)
     @connection = mock('connection')
     @messages = Queue.new
@@ -73,4 +74,7 @@ describe Artoo::Drivers::Sphero do
 
   end
 
+  it 'should be able to start calibration process'
+  it 'should be able to finish calibration process'
+
 end

data/test/interfaces/sphero_test.rb

@@ -0,0 +1,39 @@
+require File.expand_path(File.dirname(__FILE__) + "/../test_helper")
+require 'artoo/interfaces/sphero'
+
+describe Artoo::Interfaces::Sphero do
+  before do
+    @device = mock('device')
+    @interface = Artoo::Interfaces::Sphero.new(:device => @device)
+  end
+
+  describe "Rover interface" do
+    it 'Rover#forward' do
+      @device.expects(:roll).with(0, 30)
+      @interface.forward 30
+    end
+
+    it 'Rover#backward' do
+      @device.expects(:roll).with(180, 30)
+      @interface.backward 30
+    end
+
+    it 'Rover#right' do
+      @device.expects(:roll).with(90, 30)
+      @interface.right 30
+    end
+
+    it 'Rover#left' do
+      @device.expects(:roll).with(270, 30)
+      @interface.left 30
+    end
+
+    it 'Rover#turn_right'
+    it 'Rover#turn_left'
+    it 'Rover#stop' do
+      @device.expects(:stop)
+      @interface.stop
+    end
+
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: artoo-sphero
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Ron Evans
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-04 00:00:00.000000000 Z
+date: 2014-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: artoo
@@ -20,14 +20,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.7
+        version: 1.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.7
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: sphero
   requirement: !ruby/object:Gem::Requirement
@@ -107,6 +107,7 @@ files:
 - examples/sphero2.rb
 - examples/sphero_color.rb
 - examples/sphero_cycle.rb
+- examples/sphero_interface.rb
 - examples/sphero_messages.rb
 - examples/sphero_multiple.rb
 - examples/sphero_pebble.rb
@@ -115,8 +116,10 @@ files:
 - lib/artoo-sphero/version.rb
 - lib/artoo/adaptors/sphero.rb
 - lib/artoo/drivers/sphero.rb
+- lib/artoo/interfaces/sphero.rb
 - test/adaptors/sphero_test.rb
 - test/drivers/sphero_test.rb
+- test/interfaces/sphero_test.rb
 - test/test_helper.rb
 homepage: https://github.com/hybridgroup/artoo-sphero
 licenses: []
@@ -137,8 +140,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: artoo-sphero
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Artoo adaptor and driver for Sphero robot
-test_files: []
+test_files:
+- test/adaptors/sphero_test.rb
+- test/drivers/sphero_test.rb
+- test/interfaces/sphero_test.rb
+- test/test_helper.rb
+has_rdoc: