libusb 0.1.0-x86-mingw32 → 0.1.1-x86-mingw32

data/History.txt

@@ -1,4 +1,8 @@
-=== 0.1.0 / 2011-04-xx
+=== 0.1.1 / 2011-12-09
+
+* avoid ffi calls with :blocking=>true, als long as it isn't stable on win32
+
+=== 0.1.0 / 2011-10-01
 
 * add test suite based on mass storage devices
 * usable async transfers

data/README.rdoc

@@ -3,7 +3,7 @@
 = Access USB devices from Ruby via libusb-1.0.
 
 * http://github.com/larskanis/libusb
-* API documentation: http://libusb.rubyforge.org/libusb
+* API documentation: http://rubydoc.info/gems/libusb/frames
 
 == DESCRIPTION:
 
@@ -84,7 +84,7 @@ with it's INI-file and use it for driver installation on other 32 or 64 bit Wind
 systems.
 
 
-== Cross compiling for mswin32
+== Cross compiling for Windows
 
 Libusb-gem can be build on a linux or darwin host for the win32 platform,
 using the mingw cross compiler collection. Libusb is downloaded from source
@@ -102,7 +102,7 @@ Download and cross compile libusb for win32:
 
   rake cross gem
 
-If everything works, there should be libusb-VERSION-x86-mswin32.gem in the pkg
+If everything works, there should be libusb-VERSION-x86-mingw32.gem in the pkg
 directory.
 
 == Todo

data/Rakefile

@@ -25,7 +25,7 @@ STATIC_BUILDDIR            = COMPILE_HOME + 'builds'
 # LIBUSB_TARBALL            = STATIC_SOURCESDIR + "libusb-#{LIBUSB_VERSION}.tar.bz2"
 
 # Fetch tarball from Pete Batard's git repo
-LIBUSB_VERSION            = ENV['LIBUSB_VERSION'] || '52a0e18'
+LIBUSB_VERSION            = ENV['LIBUSB_VERSION'] || '4cc72d0'
 LIBUSB_SOURCE_URI         = URI( "http://git.libusb.org/?p=libusb-pbatard.git;a=snapshot;h=#{LIBUSB_VERSION};sf=tbz2" )
 LIBUSB_TARBALL            = STATIC_SOURCESDIR + "libusb-pbatard-#{LIBUSB_VERSION}.tar.bz2"
 

data/lib/libusb.rb

@@ -18,7 +18,7 @@ require 'ffi'
 
 
 module LIBUSB
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 
   module Call
     extend FFI::Library
@@ -186,7 +186,7 @@ module LIBUSB
     attach_function 'libusb_cancel_transfer', [:pointer], :int
     attach_function 'libusb_free_transfer', [:pointer], :void
 
-    attach_function 'libusb_handle_events', [:libusb_context], :int, :blocking=>true
+    attach_function 'libusb_handle_events', [:libusb_context], :int
 
 
     callback :libusb_transfer_cb_fn, [:pointer], :void
@@ -959,10 +959,8 @@ module LIBUSB
 
     def initialize context, pDev
       @context = context
-      class << pDev
-        def unref_device(id)
-          Call.libusb_unref_device(self)
-        end
+      def pDev.unref_device(id)
+        Call.libusb_unref_device(self)
       end
       ObjectSpace.define_finalizer(self, pDev.method(:unref_device))
       Call.libusb_ref_device(pDev)

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: libusb
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: x86-mingw32
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-01 00:00:00.000000000Z
+date: 2011-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
-  requirement: &17168580 !ruby/object:Gem::Requirement
+  requirement: &20041800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *17168580
+  version_requirements: *20041800
 - !ruby/object:Gem::Dependency
   name: rake-compiler
-  requirement: &17166840 !ruby/object:Gem::Requirement
+  requirement: &20040960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0.6'
   type: :development
   prerelease: false
-  version_requirements: *17166840
+  version_requirements: *20040960
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &17165380 !ruby/object:Gem::Requirement
+  requirement: &20040440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: '2.12'
   type: :development
   prerelease: false
-  version_requirements: *17165380
+  version_requirements: *20040440
 description: LIBUSB is a Ruby binding that gives Ruby programmers access to all functionality
   of libusb, version 1.0
 email:
@@ -70,6 +70,7 @@ files:
 - test/test_libusb_gc.rb
 - test/test_libusb_iso_transfer.rb
 - test/test_libusb_mass_storage.rb
+- test/test_libusb_keyboard.rb
 - lib/libusb-1.0.dll
 homepage: http://github.com/larskanis/libusb
 licenses: []
@@ -94,14 +95,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: libusb
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 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_descriptors.rb
+- test/test_libusb_compat.rb
+- test/test_libusb_keyboard.rb
 - test/test_libusb_mass_storage.rb
-- test/test_libusb_compat_mass_storage.rb
-- test/test_libusb_gc.rb