libusb 0.2.1 → 0.2.2

data/History.txt

@@ -1,3 +1,9 @@
+=== 0.2.2 / 2012-10-19
+
+* Add method Interface#bInterfaceNumber
+* Fix methods (#claim_interface, #detach_kernel_driver) with Interface-type parameter
+* update to libusbx-1.0.14 for windows build
+
 === 0.2.1 / 2012-09-25
 
 * Rename Configuration#maxPower to #bMaxPower as done in libusbx-1.0.13 and in ruby-usb.gem

data/README.rdoc

@@ -39,7 +39,7 @@ by using the device descriptor attributes.
 A {LIBUSB::Device} could have several configurations. You can then decide of which
 configuration to enable. You can only enable one configuration at a time.
 
-Each {LIBUSB::Configuration} has one or more interfaces. This can be seen as functional group
+Each {LIBUSB::Configuration} has one or more interfaces. These can be seen as functional group
 performing a single feature of the device.
 
 Each {LIBUSB::Interface} has at least one {LIBUSB::Setting}. The first setting is always default.
@@ -60,7 +60,7 @@ maximum packet size.
 
 In order to use LIBUSB, you also need the libusb-1.0[http://libusbx.org] library (but not necessarily its header files).
 * Debian or Ubuntu:
-    sudo apt-get install libusb-1.0-0
+    sudo apt-get install libusb-1.0-0-dev
 * OS-X: install with homebrew:
     brew install libusb
   or macports:
@@ -77,7 +77,7 @@ Latest code can be used in this way:
 
 In contrast to Linux, any access to an USB device by LIBUSB on Windows requires a proper driver
 installed in the system. Fortunately creating such a driver is quite easy with
-Zadig[http://sourceforge.net/apps/mediawiki/libwdi/index.php?title=Main_Page]. Select the interesting USB device,
+Zadig[http://sourceforge.net/projects/libwdi/files/zadig/]. Select the interesting USB device,
 choose WinUSB driver and press "Install Driver". That's it. You may take the generated output directory
 with it's INI-file and use it for driver installation on other 32 or 64 bit Windows
 systems.

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.13'
+LIBUSB_VERSION            = ENV['LIBUSB_VERSION'] || '1.0.14'
 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.1"
+  VERSION = "0.2.2"
 
   require 'libusb/call'
   require 'libusb/constants'

data/lib/libusb/interface.rb

@@ -22,6 +22,11 @@ module LIBUSB
     layout :altsetting, :pointer,
         :num_altsetting, :int
 
+    # Number of this interface.
+    def bInterfaceNumber
+      settings.first.bInterfaceNumber
+    end
+
     def initialize(configuration, *args)
       @configuration = configuration
       super(*args)
@@ -39,6 +44,10 @@ module LIBUSB
     end
     alias settings alt_settings
 
+    def inspect
+      "\#<#{self.class} #{bInterfaceNumber}>"
+    end
+
     # The {Device} this Interface belongs to.
     def device() self.configuration.device end
     # Return all endpoints of all alternative settings as Array of {Endpoint}s.

data/lib/libusb/setting.rb

@@ -42,7 +42,7 @@ module LIBUSB
       self[:bDescriptorType]
     end
 
-    # Number of this interface.
+    # Number of the interface this setting belongs to.
     def bInterfaceNumber
       self[:bInterfaceNumber]
     end

data/test/test_libusb_mass_storage2.rb

@@ -22,6 +22,7 @@ class TestLibusbMassStorage2 < Test::Unit::TestCase
 
   attr_accessor :usb
   attr_accessor :device
+  attr_accessor :interface
 
   def setup
     @usb = Context.new
@@ -29,10 +30,13 @@ class TestLibusbMassStorage2 < Test::Unit::TestCase
     @device = usb.devices( :bClass=>CLASS_MASS_STORAGE, :bSubClass=>[0x06,0x01], :bProtocol=>0x50 ).last
     abort "no mass storage device found" unless @device
 
+    @interface = device.interfaces.first
+
     # Ensure kernel driver is detached
     device.open do |dev|
-      if RUBY_PLATFORM=~/linux/i && dev.kernel_driver_active?(0)
-        dev.detach_kernel_driver(0)
+      if RUBY_PLATFORM=~/linux/i && dev.kernel_driver_active?(interface)
+        assert dev.kernel_driver_active?(0), "DevHandle#kernel_driver_active? may be called with an Interface instance or a Fixnum"
+        dev.detach_kernel_driver(interface)
       end
     end
   end
@@ -49,7 +53,7 @@ class TestLibusbMassStorage2 < Test::Unit::TestCase
 
   def test_claim_interface_with_block
     res = device.open do |dev|
-      dev.claim_interface(0) do |dev2|
+      dev.claim_interface(interface) do |dev2|
         assert_kind_of DevHandle, dev2
         assert_kind_of String, dev2.string_descriptor_ascii(1)
         12345
@@ -59,7 +63,7 @@ class TestLibusbMassStorage2 < Test::Unit::TestCase
   end
 
   def test_open_interface
-    res = device.open_interface(0) do |dev|
+    res = device.open_interface(interface) do |dev|
       assert_kind_of DevHandle, dev
       assert_kind_of String, dev.string_descriptor_ascii(1)
       12345

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: libusb
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-25 00:00:00.000000000 Z
+date: 2012-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
-  requirement: &11618720 !ruby/object:Gem::Requirement
+  requirement: &18919580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *11618720
+  version_requirements: *18919580
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &11618240 !ruby/object:Gem::Requirement
+  requirement: &18918980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *11618240
+  version_requirements: *18918980
 - !ruby/object:Gem::Dependency
   name: rake-compiler
-  requirement: &11617760 !ruby/object:Gem::Requirement
+  requirement: &18918460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0.6'
   type: :development
   prerelease: false
-  version_requirements: *11617760
+  version_requirements: *18918460
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &11617280 !ruby/object:Gem::Requirement
+  requirement: &18917960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *11617280
+  version_requirements: *18917960
 description: LIBUSB is a Ruby binding that gives Ruby programmers access to arbitrary
   USB devices
 email:
@@ -123,13 +123,13 @@ signing_key:
 specification_version: 3
 summary: Access USB devices from Ruby via libusb-1.0
 test_files:
-- test/test_libusb_compat_mass_storage.rb
+- test/test_libusb_keyboard.rb
 - test/test_libusb_gc.rb
-- test/test_libusb_iso_transfer.rb
+- test/test_libusb_mass_storage2.rb
 - test/test_libusb_capability.rb
-- test/test_libusb_descriptors.rb
+- test/test_libusb_iso_transfer.rb
+- test/test_libusb_mass_storage.rb
 - test/test_libusb_compat.rb
-- test/test_libusb_keyboard.rb
-- test/test_libusb_mass_storage2.rb
+- test/test_libusb_compat_mass_storage.rb
 - test/test_libusb_version.rb
-- test/test_libusb_mass_storage.rb
+- test/test_libusb_descriptors.rb