bucaneer 0.1.0 → 0.1.1

data/lib/bucaneer/bus_pirate.rb

@@ -30,22 +30,21 @@ module Bucaneer
       raise "no mode specified"   unless mode
 
       serial_port = SerialPort.new(dev, baud)
+      bus_pirate  = Bucaneer::BusPirate.new(serial_port, mode, options)
 
-      begin
-        bus_pirate = Bucaneer::BusPirate.new(serial_port, mode, options)
-        yield bus_pirate.protocol if block_given?
-      ensure
+      if block_given?
         begin
-          if bus_pirate
-            bus_pirate.exit_bitbang_mode
-            bus_pirate.reset
+          yield bus_pirate.protocol
+        ensure
+          begin
+            bus_pirate.close
+          rescue
+            # Do nothing.
           end
-
-          serial_port.close
-        rescue
-          # Do nothing.
         end
       end
+
+      bus_pirate
     end
 
     def initialize(serial_port, mode, options)
@@ -53,6 +52,12 @@ module Bucaneer
       set_mode(mode.to_sym, options)
     end
 
+    def close
+      enter_bitbang_mode
+      reset
+      @serial_port.close
+    end
+
     def tx(byte, expected = SUCCESS)
       @serial_port.putc byte
       sleep TIMEOUT
@@ -72,10 +77,6 @@ module Bucaneer
       end until response == "BBIO1"
     end
 
-    def exit_bitbang_mode
-      tx(BITBANG_MODE)
-    end
-
     def reset
       tx(RESET)
     end
@@ -92,6 +93,7 @@ module Bucaneer
     end
 
   private
+
     # Set the BusPirate to the given mode.
     def set_mode(mode, options)
       enter_bitbang_mode

data/lib/bucaneer/protocol/i2c.rb

@@ -41,6 +41,7 @@ module Bucaneer::Protocol
     end
 
   private
+
     def start_bulk_write(length)
       @controller.tx(BULK_WRITE | (length - 1))
     end

data/lib/bucaneer/protocol/spi.rb

@@ -41,6 +41,7 @@ module Bucaneer::Protocol
     end
 
   private
+
     def set_cs(enable)
       mask  = SET_CS
       mask |= ENABLE if enable

data/lib/bucaneer/version.rb

@@ -1,3 +1,3 @@
 module Bucaneer
-  VERSION = "0.1.0" unless defined?(Bucaneer::VERSION)
+  VERSION = "0.1.1" unless defined?(Bucaneer::VERSION)
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bucaneer
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Josh Bassett
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-22 00:00:00 +10:00
+date: 2010-09-27 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency