libusb 0.2.0 → 0.2.1

data/History.txt

@@ -1,3 +1,8 @@
+=== 0.2.1 / 2012-09-25
+
+* Rename Configuration#maxPower to #bMaxPower as done in libusbx-1.0.13 and in ruby-usb.gem
+* update to libusbx-1.0.13 for windows build (with support for libusbK and libusb0)
+
 === 0.2.0 / 2012-06-15
 
 * Divide up the libusb library across multiple files, required with autoload

data/Rakefile

@@ -32,7 +32,7 @@ end
 # LIBUSB_TARBALL            = STATIC_SOURCESDIR + "libusb-#{LIBUSB_VERSION}.tar.bz2"
 
 # Fetch tarball from libusbx
-LIBUSB_VERSION            = ENV['LIBUSB_VERSION'] || '1.0.12'
+LIBUSB_VERSION            = ENV['LIBUSB_VERSION'] || '1.0.13'
 LIBUSB_SOURCE_URI         = URI( "http://downloads.sourceforge.net/project/libusbx/releases/#{LIBUSB_VERSION[/^\d+\.\d+\.\d+/]}/source/libusbx-#{LIBUSB_VERSION}.tar.bz2" )
 LIBUSB_TARBALL            = STATIC_SOURCESDIR + File.basename( LIBUSB_SOURCE_URI.path )
 

data/lib/libusb.rb

@@ -14,7 +14,7 @@
 # along with Libusb for Ruby.  If not, see <http://www.gnu.org/licenses/>.
 
 module LIBUSB
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 
   require 'libusb/call'
   require 'libusb/constants'

data/lib/libusb/compat.rb

@@ -175,7 +175,7 @@ module USB
       h = DevHandle.new(@dev.open)
       if block_given?
         begin
-          r = yield h
+          yield h
         ensure
           h.usb_close
         end
@@ -200,7 +200,7 @@ module USB
     end
 
     def_delegators :@cd, :bLength, :bDescriptorType, :wTotalLength, :bNumInterfaces,
-        :bConfigurationValue, :iConfiguration, :bmAttributes, :maxPower,
+        :bConfigurationValue, :iConfiguration, :bmAttributes, :bMaxPower,
         :inspect
 
     def <=>(o)

data/lib/libusb/configuration.rb

@@ -26,7 +26,7 @@ module LIBUSB
         :bConfigurationValue, :uint8,
         :iConfiguration, :uint8,
         :bmAttributes, :uint8,
-        :maxPower, :uint8,
+        :bMaxPower, :uint8,
         :interface, :pointer,
         :extra, :pointer,
         :extra_length, :int
@@ -76,10 +76,14 @@ module LIBUSB
     # Maximum power consumption of the USB device from this bus in this configuration when the device is fully opreation.
     #
     # @return [Integer] Maximum Power Consumption in 2mA units
-    def maxPower
-      self[:maxPower]
+    def bMaxPower
+      self[:bMaxPower]
     end
 
+    # @deprecated Use {#bMaxPower} instead.
+    alias maxPower bMaxPower
+
+
     # Extra descriptors.
     #
     # @return [String]

data/test/test_libusb_descriptors.rb

@@ -56,7 +56,8 @@ class TestLibusbDescriptors < Test::Unit::TestCase
         assert_kind_of Integer, config_desc.bConfigurationValue
         assert_kind_of Integer, config_desc.iConfiguration
         assert_kind_of Integer, config_desc.bmAttributes
-        assert_kind_of Integer, config_desc.maxPower
+        assert_kind_of Integer, config_desc.bMaxPower
+        assert_kind_of Integer, config_desc.maxPower # deprecated
         assert_kind_of String, config_desc.extra if config_desc.extra
 
         config_desc.interfaces.each do |interface|

data/test/test_libusb_keyboard.rb

@@ -0,0 +1,50 @@
+# This test requires a connected, but not mounted mass storage device with
+# read/write access allowed. Based on the following specifications:
+#   http://www.usb.org/developers/devclass_docs/usbmassbulk_10.pdf
+#   http://en.wikipedia.org/wiki/SCSI_command
+#
+
+require "test/unit"
+require "libusb"
+
+class TestLibusbKeyboard < Test::Unit::TestCase
+  include LIBUSB
+
+  attr_accessor :usb
+  attr_accessor :device
+  attr_accessor :dev
+  attr_accessor :endpoint_in
+  attr_accessor :endpoint_out
+
+  def setup
+    @usb = Context.new
+    @usb.debug = 3
+
+    @device = usb.devices( :bDeviceClass=>CLASS_HID, :bDeviceProtocol=>1 ).first
+    abort "no keyboard device found" unless @device
+
+    @endpoint_in = @device.endpoints.find{|ep| ep.bEndpointAddress&ENDPOINT_IN != 0 }.bEndpointAddress
+    @endpoint_out = @device.endpoints.find{|ep| ep.bEndpointAddress&ENDPOINT_IN == 0 }.bEndpointAddress
+
+    @dev = @device.open
+
+    if RUBY_PLATFORM=~/linux/i && dev.kernel_driver_active?(0)
+      dev.detach_kernel_driver(0)
+    end
+    dev.claim_interface(0)
+
+    # clear any pending data
+    dev.clear_halt(endpoint_in)
+  end
+
+  def teardown
+    dev.release_interface(0) if dev
+    dev.close if dev
+  end
+
+  def test_read
+    data_length = 8
+    recv = dev.interrupt_transfer(:endpoint=>endpoint_in, :dataIn=>data_length)
+    p recv
+  end
+end

data/test/test_libusb_mass_storage.rb

@@ -110,7 +110,7 @@ class TestLibusbMassStorage < Test::Unit::TestCase
     retries = 5
     buffer = begin
       bulk_transfer(:endpoint=>endpoint_in, :dataIn=>13)
-    rescue LIBUSB::ERROR_PIPE => err
+    rescue LIBUSB::ERROR_PIPE
       if (retries-=1)>=0
         dev.clear_halt(endpoint_in)
         retry
@@ -122,6 +122,7 @@ class TestLibusbMassStorage < Test::Unit::TestCase
     dCSWSignature, dCSWTag, dCSWDataResidue, bCSWStatus = buffer.unpack('a4VVC')
 
     assert_equal 'USBS', dCSWSignature, "CSW should start with USBS"
+    assert_kind_of Integer, dCSWDataResidue
     assert_equal expected_tag, dCSWTag, "CSW-tag should be like CBW-tag"
     raise CSWError, "CSW returned error #{bCSWStatus}" unless bCSWStatus==0
     buffer
@@ -154,14 +155,14 @@ class TestLibusbMassStorage < Test::Unit::TestCase
             start, 0,
             nr_blocks, 0,
             ].pack('CCNCnC')
-    data = send_mass_storage_command( cdb, expected_length )
+    send_mass_storage_command( cdb, expected_length )
   end
 
   def invalid_command
     expected_length = 0x100
     cdb = [ 0x26, 0, # invalid command
             ].pack('CC')
-    data = send_mass_storage_command( cdb, expected_length )
+    send_mass_storage_command( cdb, expected_length )
   end
 
   def mass_storage_reset

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: libusb
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-15 00:00:00.000000000 Z
+date: 2012-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
-  requirement: &21755140 !ruby/object:Gem::Requirement
+  requirement: &11618720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,21 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *21755140
+  version_requirements: *11618720
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: &11618240 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.10'
+  type: :development
+  prerelease: false
+  version_requirements: *11618240
 - !ruby/object:Gem::Dependency
   name: rake-compiler
-  requirement: &21777860 !ruby/object:Gem::Requirement
+  requirement: &11617760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,18 +43,18 @@ dependencies:
         version: '0.6'
   type: :development
   prerelease: false
-  version_requirements: *21777860
+  version_requirements: *11617760
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &21777240 !ruby/object:Gem::Requirement
+  requirement: &11617280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.12'
+        version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *21777240
+  version_requirements: *11617280
 description: LIBUSB is a Ruby binding that gives Ruby programmers access to arbitrary
   USB devices
 email:
@@ -83,7 +94,8 @@ files:
 - test/test_libusb_mass_storage.rb
 - test/test_libusb_mass_storage2.rb
 - test/test_libusb_version.rb
-homepage: http://github.com/larskanis/libusb
+- test/test_libusb_keyboard.rb
+homepage: 
 licenses: []
 post_install_message: 
 rdoc_options:
@@ -111,12 +123,13 @@ signing_key:
 specification_version: 3
 summary: Access USB devices from Ruby via libusb-1.0
 test_files:
-- test/test_libusb_compat.rb
+- test/test_libusb_compat_mass_storage.rb
+- test/test_libusb_gc.rb
 - test/test_libusb_iso_transfer.rb
-- test/test_libusb_mass_storage2.rb
-- test/test_libusb_descriptors.rb
-- test/test_libusb_mass_storage.rb
 - test/test_libusb_capability.rb
-- test/test_libusb_compat_mass_storage.rb
+- test/test_libusb_descriptors.rb
+- test/test_libusb_compat.rb
+- test/test_libusb_keyboard.rb
+- test/test_libusb_mass_storage2.rb
 - test/test_libusb_version.rb
-- test/test_libusb_gc.rb
+- test/test_libusb_mass_storage.rb