build_watcher 0.1.3 → 0.1.4

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.1.4 / 2010-04-22 / 4530cc52ffee5af001bb2c167714cc8c6724ac15
+
+* Adding retries for failed serial IO attempts
+
 === 0.1.3 / 2010-04-22
 
 * Updated hoe spec so dependencies work correctly

data/lib/build_watcher.rb

@@ -6,7 +6,7 @@ require 'build_watcher/message'
 require 'serialport'
 
 module BuildWatcher
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 
   class AppropriateMessageTypeNotFound < StandardError; end
 end

data/lib/build_watcher/zigbee_device.rb

@@ -1,5 +1,6 @@
 module BuildWatcher
   class ZigbeeDevice
+    MAX_SERIAL_DEVICE_ATTEMPTS = 5
     def initialize(device)
       @device = device
       @connection = "USE #serial_device INSTEAD OF CONNECTION DIRECTLY"
@@ -56,7 +57,6 @@ module BuildWatcher
           raise AppropriateMessageTypeNotFound, "No 'project info' message type found on serial buffer."
         end
 
-        #Struct.new("ProjectInfo", :public_key, :private_key)
         Struct::ProjectInfo.new(*project_info.split(/#{Message::MSG_SEP}/).slice(1,3))
       end
 
@@ -71,7 +71,15 @@ module BuildWatcher
       def serial_device(&block)
         @connection = SerialPort.new(@device, 9600)
         @connection.read_timeout = -1
-        yield @connection
+
+        i = 1
+        begin
+          yield @connection
+        rescue AppropriateMessageTypeNotFound => e
+          i += 1
+          retry unless i > MAX_SERIAL_DEVICE_ATTEMPTS
+          raise e
+        end
       ensure
         @connection.close
       end

data/spec/update_listeners_cli_spec.rb

@@ -2,14 +2,17 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 require 'update_listeners/cli'
 
 describe UpdateListeners::CLI, "execute" do
+  def execute_script
+    UpdateListeners::CLI.execute(STDOUT, ['-d', '/dev/some_device'])
+  end
+
   before(:each) do
-    @serial_port = FakeSerialPort.new
-    @zgb_device = BuildWatcher::ZigbeeDevice.new('/dev/something')
+    @zigbee_device = BuildWatcher::ZigbeeDevice.new('/dev/something')
     @project = CodeFumes::Project.new(:public_key => 'pub', :private_key => 'priv')
     @project.stub!(:build_status).and_return("running")
 
-    SerialPort.stub!(:new).and_return(@serial_port)
-    BuildWatcher::ZigbeeDevice.stub!(:new).and_return(@zgb_device)
+    SerialPort.stub!(:new).and_return(FakeSerialPort.new)
+    BuildWatcher::ZigbeeDevice.stub!(:new).and_return(@zigbee_device)
     CodeFumes::Project.stub!(:find).and_return(@project)
   end
 
@@ -21,25 +24,25 @@ describe UpdateListeners::CLI, "execute" do
     end
 
     it "requests the quantity of projects from the serial device" do
-      @zgb_device.should_receive(:project_quantity).and_return(@project_quantity)
-      UpdateListeners::CLI.execute(STDOUT, ["-d", "/dev/something"])
+      @zigbee_device.should_receive(:project_quantity).and_return(@project_quantity)
+      execute_script
     end
 
     it "requests the project information from the serial device for each project" do
       project_info = OpenStruct.new({:private_key => 'priv', :public_key => 'pub'})
-      @zgb_device.should_receive(:project_info).exactly(3).times.and_return(project_info)
-      UpdateListeners::CLI.execute(STDOUT, [])
+      @zigbee_device.should_receive(:project_info).exactly(3).times.and_return(project_info)
+      execute_script
     end
 
     it "it requests the project build status from CodeFumes for each project" do
       CodeFumes::Project.should_receive(:find).exactly(@project_quantity).times.and_return(@project)
       @project.should_receive(:build_status).exactly(@project_quantity).times.and_return('running')
-      UpdateListeners::CLI.execute(STDOUT, [])
+      execute_script
     end
 
     it "it broadcasts the status of each project via the serial device" do
-      @zgb_device.should_receive(:broadcast_status).exactly(@project_quantity).times
-      UpdateListeners::CLI.execute(STDOUT, [])
+      @zigbee_device.should_receive(:broadcast_status).exactly(@project_quantity).times
+      execute_script
     end
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Tom Kersten