sphero 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5499fdac118804bb652308ee12b8660d8e08d4bf
-  data.tar.gz: 1fd2ef026bcefc25ca15de2b712b4a78a595e2db
+  metadata.gz: 3f2540435af315c51080f81df94c0578cc1982f2
+  data.tar.gz: 5806d20195af543acd529a1f219e870c49686e1e
 SHA512:
-  metadata.gz: e148d39135d1c173e20eca97869e8342e02731a07d3ef4f9b0b928797ec1b675a9b6517e3cf11e90a75fe5ce942879eacaf0b3dbd4e928346694a7e174301e23
-  data.tar.gz: 6f24b58cbd89d6c0b3465486ba4051cd7a3917e6ad58cba38377795fedf53379f1db91e1bf83d6d07e9925fafa3c271b4db768394cfaa44586802cb34e925947
+  metadata.gz: 2ea5e1bed3a946fdb37b8b3a6293b29059a80dfe5b126e2890589c7aa5add4aa5ad2b7926f6a1526bf2073de8c22fb7a17e52f4b501175ea10dc2eba93e59f3f
+  data.tar.gz: 2d4aae14991cda4b4b06b56b27c744005f38947bc8028d42f8c8980c5951654df0f56ae7a3cdc1f92716bedac92903f2d504c3bf4a6f68ddbcf7bcffc529641b

data/.gitignore

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

data/.travis.yml

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

data/Gemfile

@@ -0,0 +1,4 @@
+# A sample Gemfile
+source "https://rubygems.org"
+
+gemspec

data/Rakefile

@@ -1,23 +1,11 @@
-# -*- ruby -*-
-
-require 'rubygems'
-require 'hoe'
-
-Hoe.plugins.delete :rubyforge
-Hoe.plugins.delete :flog
-Hoe.plugin :minitest
-Hoe.plugin :gemspec # `gem install hoe-gemspec`
-Hoe.plugin :git     # `gem install hoe-git`
-
-Hoe.spec 'sphero' do
-  developer('Hybrid Group', 'sphero@hybridgroup.com')
-  self.readme_file   = 'README.markdown'
-  self.history_file  = 'CHANGELOG.rdoc'
-  self.extra_rdoc_files  = FileList['*.{rdoc,markdown}']
-
-  self.spec_extras = {
-    :required_ruby_version => '>= 1.9.2'
-  }
+#!/usr/bin/env rake
+require "bundler/gem_tasks"
+require 'rake/testtask'
+
+Rake::TestTask.new do |t|
+  t.libs.push "lib"
+  t.test_files = FileList['test/*.rb']
+  t.verbose = true
 end
 
-# vim: syntax=ruby
+task :default => [:test]

data/lib/sphero.rb

@@ -1,10 +1,9 @@
 require 'sphero/request'
 require 'sphero/response'
 require 'thread'
+require 'rubyserial'
 
 class Sphero
-  VERSION = '1.5.0'
-
   FORWARD = 0
   RIGHT = 90
   BACKWARD = 180
@@ -21,17 +20,19 @@ class Sphero
         sphero = self.new dev
         if (block_given?)
           begin
-             sphero.instance_eval(&block)
+            sphero.instance_eval(&block)
           ensure
-             sphero.close
+            sphero.close
           end
           return nil
         end
-        return sphero      
-      rescue Errno::EBUSY
-        puts retries_left
-        retries_left = retries_left - 1
-        retry unless retries_left < 0
+        return sphero
+      rescue RubySerial::Exception => e
+        if e.message == 'EBUSY'
+          puts retries_left
+          retries_left = retries_left - 1
+          retry unless retries_left < 0
+        end
       end
     end
   end
@@ -61,7 +62,7 @@ class Sphero
       end
     }
   end
-  
+
   def close
     return if @sp.nil? || @sp.closed?
     begin
@@ -170,15 +171,15 @@ class Sphero
   # configure data streaming notification messages
   def set_data_streaming n, m, mask, pcnt, mask2
     queue_packet Request::SetDataStreaming.new(@seq, limit2(n), limit2(m),
-                                              limit4(mask), limit1(pcnt), limit4(mask2) )
+                                               limit4(mask), limit1(pcnt), limit4(mask2) )
   end
 
   # configure collision detection messages
   def configure_collision_detection meth, x_t, y_t, x_spd, y_spd, dead
     queue_packet Request::ConfigureCollisionDetection.new(@seq, limit1(meth),
-                                                         limit1(x_t),   limit1(y_t),
-                                                         limit1(x_spd), limit1(y_spd),
-                                                         limit1(dead) )
+                                                          limit1(x_t),   limit1(y_t),
+                                                          limit1(x_spd), limit1(y_spd),
+                                                          limit1(dead) )
   end
 
   private
@@ -231,12 +232,12 @@ class Sphero
 
   def flag(value)
     case value
-      when true
-        0x01
-      when false
-        0x00
-      else
-        value
+    when true
+      0x01
+    when false
+      0x00
+    else
+      value
     end
   end
 
@@ -250,15 +251,9 @@ class Sphero
   end
 
   def initialize_serialport dev
-    require 'serialport'
-    @sp = SerialPort.new dev, 115200, 8, 1, SerialPort::NONE
-    if is_windows?
-      @sp.read_timeout=1000
-      @sp.write_timeout=0
-      @sp.initial_byte_offset=5
-    end
-  rescue LoadError
-    puts "Please 'gem install hybridgroup-serialport' for serial port support."
+    @sp = Serial.new dev, 115200
+  rescue RubySerial::Exception => e
+    retry if e.message == 'EBUSY'
   end
 
   def queue_packet packet
@@ -268,19 +263,14 @@ class Sphero
   def write packet
     header, body = nil
 
-    IO.select([], [@sp], [], 1)
-    @lock.synchronize do
-      @sp.write packet.to_str
-      @seq += 1
-    end
-    IO.select([@sp], [], [], 1)
+    @sp.write packet.to_str
+    @seq += 1
     header = read_header(true)
     body = read_body(header.last, true) if header
     # pick off asynch packets and store, till we get to the message response
     while header && Response.async?(header)
       messages << Response::AsyncResponse.response(header, body)
 
-      IO.select([@sp], [], [], 1)
       header = read_header(true)
       if header
         body = read_body(header.last, true)
@@ -294,7 +284,7 @@ class Sphero
     if response.success?
       @response_queue << response
     else
-      raise "Unable to write to Sphero!"
+      puts "Unable to write to Sphero!"
     end
   end
 
@@ -302,10 +292,10 @@ class Sphero
     header = nil
     begin
       data = read_next_chunk(5, blocking)
-      return nil unless data
+      return nil unless data && data.length == 5
       header = data.unpack 'C5'
-    rescue Errno::EBUSY
-      retry
+    rescue RubySerial::Exception => e
+      retry if e.message == 'EBUSY'
     rescue Exception => e
       puts e.message
       puts e.backtrace.inspect
@@ -320,8 +310,8 @@ class Sphero
     begin
       data = read_next_chunk(len, blocking)
       return nil unless data && data.length == len
-    rescue Errno::EBUSY
-      retry
+    rescue RubySerial::Exception => e
+      retry if e.message == 'EBUSY'
     rescue Exception => e
       puts e.message
       puts e.backtrace.inspect
@@ -334,15 +324,13 @@ class Sphero
   def read_next_chunk(len, blocking=false)
     data = nil
     begin
-      @lock.synchronize do
-        if blocking || is_windows?
-          data = @sp.read(len)
-        else
-          data = @sp.read_nonblock(len)
-        end
+      if blocking || is_windows?
+        data = @sp.read(len)
+      else
+        data = @sp.read_nonblock(len)
       end
-    rescue Errno::EBUSY
-      retry
+    rescue RubySerial::Exception => e
+      retry if e.message == 'EBUSY'
     rescue Exception => e
       puts e.message
       puts e.backtrace.inspect

data/sphero.gemspec

@@ -0,0 +1,21 @@
+# -*- encoding: utf-8 -*-
+Gem::Specification.new do |gem|
+  gem.authors       = ["The Hybrid Group"]
+  gem.email         = ["sphero@hybridgroup.com"]
+  gem.description   = "A ruby gem for controlling your Sphero ball.  Sends commands over the TTY\nprovided by the bluetooth connection."
+  gem.summary       = "A ruby gem for controlling your Sphero ball"
+  gem.homepage      = "http://github.com/hybridgroup/sphero"
+
+  gem.files         = `git ls-files`.split($\)
+  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
+  gem.name          = "sphero"
+  gem.require_paths = ["lib"]
+  gem.version       = "1.5.1"
+
+  gem.add_development_dependency "rake", "~>10.0.4"
+  gem.add_development_dependency "mocha", "~>0.13.3"
+  gem.add_development_dependency "minitest", "~>5.0.8"
+
+  gem.add_runtime_dependency "rubyserial", "~>0.1.1"
+end

metadata

@@ -1,57 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: sphero
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
-- Hybrid Group
+- The Hybrid Group
 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: minitest
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 10.0.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 10.0.4
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 0.13.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 0.13.3
 - !ruby/object:Gem::Dependency
-  name: hoe
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: 5.0.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: 5.0.8
+- !ruby/object:Gem::Dependency
+  name: rubyserial
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.1
 description: |-
   A ruby gem for controlling your Sphero ball.  Sends commands over the TTY
   provided by the bluetooth connection.
@@ -60,14 +74,13 @@ email:
 executables:
 - sphero
 extensions: []
-extra_rdoc_files:
-- CHANGELOG.rdoc
-- Manifest.txt
-- README.markdown
+extra_rdoc_files: []
 files:
-- .autotest
-- .gemtest
+- ".autotest"
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.rdoc
+- Gemfile
 - Manifest.txt
 - README.markdown
 - Rakefile
@@ -75,33 +88,32 @@ files:
 - lib/sphero.rb
 - lib/sphero/request.rb
 - lib/sphero/response.rb
+- sphero.gemspec
 - test/test_sphero.rb
 - test/test_sphero_request.rb
 homepage: http://github.com/hybridgroup/sphero
 licenses: []
 metadata: {}
 post_install_message: 
-rdoc_options:
-- --main
-- README.markdown
+rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: sphero
-rubygems_version: 2.2.1
+rubyforge_project: 
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A ruby gem for controlling your Sphero ball
 test_files:
-- test/test_sphero_request.rb
 - test/test_sphero.rb
+- test/test_sphero_request.rb