hybridgroup-sphero 1.1.5 → 1.1.6

data/lib/sphero.rb

@@ -4,7 +4,7 @@ require 'sphero/response'
 require 'thread'
 
 class Sphero
-  VERSION = '1.1.5'
+  VERSION = '1.1.6'
 
   FORWARD = 0
   RIGHT = 90
@@ -14,8 +14,15 @@ class Sphero
   class << self
     def start(dev, &block)
       sphero = self.new dev
-      sphero.instance_eval(&block) if block_given?
-      sphero
+      if (block_given?)
+        begin
+           sphero.instance_eval(&block)
+        ensure
+           sphero.close
+        end
+        return nil
+      end
+      return sphero
     rescue Errno::EBUSY
       retry
     end
@@ -28,6 +35,12 @@ class Sphero
     @lock = Mutex.new
   end
   
+  def close
+    @lock.synchronize do
+      @sp.close
+    end
+  end
+
   def ping
     write Request::Ping.new(@seq)
   end
@@ -107,6 +120,7 @@ class Sphero
       false
     end
   end
+
   def initialize_serialport dev
     @sp = SerialPort.new dev, 115200, 8, 1, SerialPort::NONE
     if is_windows?

data/test/test_sphero.rb

@@ -13,12 +13,13 @@ class TestSphero < MiniTest::Unit::TestCase
     assert_kind_of Sphero, Sphero.start('someport')
   end
 
-	def test_start_sphero_executes_block
-		Sphero.any_instance.expects(:ping)
+  def test_start_sphero_executes_block
+    Sphero.any_instance.expects(:ping)
+    Sphero.any_instance.expects(:close)
     Sphero.start('someport') do
-			ping
-		end
-	end
+      ping
+    end
+  end
 
   def test_ping
   	Sphero::Request::Ping.expects(:new).with(@seq)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hybridgroup-sphero
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-11 00:00:00.000000000 Z
+date: 2013-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hybridgroup-serialport