libusb 0.2.2-x86-mingw32 → 0.3.0-x86-mingw32

data/test/test_libusb_iso_transfer.rb

@@ -21,7 +21,12 @@ class TestLibusbIsoTransfer < Test::Unit::TestCase
 
   def setup
     c = Context.new
-    @dev = c.devices.first.open
+    begin
+      @dev = c.devices.first.open
+    rescue LIBUSB::ERROR_ACCESS
+      @dev = nil
+      skip "error opening device"
+    end
   end
 
   def teardown

data/test/test_libusb_mass_storage.rb

@@ -41,7 +41,7 @@ class TestLibusbMassStorage < Test::Unit::TestCase
     @asynchron = false
 
     @device = usb.devices( :bClass=>CLASS_MASS_STORAGE, :bSubClass=>[0x06,0x01], :bProtocol=>0x50 ).last
-    abort "no mass storage device found" unless @device
+    skip "no mass storage device found" unless @device
 
     @endpoint_in = @device.endpoints.find{|ep| ep.bEndpointAddress&ENDPOINT_IN != 0 }
     @endpoint_out = @device.endpoints.find{|ep| ep.bEndpointAddress&ENDPOINT_IN == 0 }
@@ -215,9 +215,15 @@ class TestLibusbMassStorage < Test::Unit::TestCase
         sleep 0.01
       end
     end
-    assert_raise(CSWError, LIBUSB::ERROR_TIMEOUT) do
-      bulk_transfer(:endpoint=>endpoint_in, :dataIn=>123)
+    assert_raise(LIBUSB::ERROR_TIMEOUT) do
+      begin
+        bulk_transfer(:endpoint=>endpoint_in, :dataIn=>123)
+      rescue LIBUSB::ERROR_TIMEOUT => err
+        assert_kind_of String, err.transferred
+        raise
+      end
     end
+
     th.kill
     dev.clear_halt(endpoint_in)
     dev.clear_halt(endpoint_out)

data/test/test_libusb_mass_storage2.rb

@@ -28,7 +28,7 @@ class TestLibusbMassStorage2 < Test::Unit::TestCase
     @usb = Context.new
     @usb.debug = 3
     @device = usb.devices( :bClass=>CLASS_MASS_STORAGE, :bSubClass=>[0x06,0x01], :bProtocol=>0x50 ).last
-    abort "no mass storage device found" unless @device
+    skip "no mass storage device found" unless @device
 
     @interface = device.interfaces.first
 

data/test/test_libusb_structs.rb

@@ -0,0 +1,45 @@
+# This file is part of Libusb for Ruby.
+#
+# Libusb for Ruby is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Libusb for Ruby is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with Libusb for Ruby.  If not, see <http://www.gnu.org/licenses/>.
+
+require "test/unit"
+require "libusb"
+
+class TestLibusbStructs < Test::Unit::TestCase
+  def test_struct_Timeval
+    s = LIBUSB::Call::Timeval.new
+    assert_equal 0, s.in_ms
+    s.in_ms = 12345678
+    assert_equal 12345, s[:tv_sec]
+    assert_equal 678000, s[:tv_usec]
+    assert_equal 12345678, s.in_ms
+
+    s.in_s = 1234.5678
+    assert_equal 1234, s[:tv_sec]
+    assert_equal 567800, s[:tv_usec]
+    assert_equal 1234.5678, s.in_s
+  end
+
+  def test_struct_CompletionFlag
+    s = LIBUSB::Context::CompletionFlag.new
+    assert_equal 0, s[:completed]
+    assert_equal false, s.completed?
+    s.completed = true
+    assert_equal 1, s[:completed]
+    assert_equal true, s.completed?
+    s.completed = false
+    assert_equal false, s.completed?
+    assert_equal 0, s[:completed]
+  end
+end

data/test/test_libusb_threads.rb

@@ -0,0 +1,89 @@
+# This file is part of Libusb for Ruby.
+#
+# Libusb for Ruby is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Libusb for Ruby is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with Libusb for Ruby.  If not, see <http://www.gnu.org/licenses/>.
+#
+# This test requires two connected, but not mounted mass storage device with
+# read/write access allowed.
+
+require "test/unit"
+require "libusb"
+
+class TestLibusbThreads < Test::Unit::TestCase
+  include LIBUSB
+
+  BOMS_GET_MAX_LUN = 0xFE
+
+  attr_accessor :usb
+  attr_accessor :devices
+  attr_accessor :devs
+  attr_accessor :endpoints_in
+  attr_accessor :endpoints_out
+
+  def setup
+    @usb = Context.new
+    @usb.debug = 3
+
+    @devices = usb.devices( :bClass=>CLASS_MASS_STORAGE, :bSubClass=>[0x06,0x01], :bProtocol=>0x50 )
+    skip "less than two mass storage devices found" unless @devices.length >= 2
+
+    @devs = @devices.map do |device|
+      dev = device.open
+      if RUBY_PLATFORM=~/linux/i && dev.kernel_driver_active?(0)
+        dev.detach_kernel_driver(0)
+      end
+      dev.claim_interface(0)
+      dev
+    end
+
+    @endpoints_in = {}
+    @endpoints_out = {}
+
+    @devs.each do |dev|
+      @endpoints_in[dev] = dev.device.endpoints.find{|ep| ep.bEndpointAddress&ENDPOINT_IN != 0 }
+      @endpoints_out[dev] = dev.device.endpoints.find{|ep| ep.bEndpointAddress&ENDPOINT_IN == 0 }
+    end
+
+    Thread.abort_on_exception = true
+  end
+
+  def teardown
+    if devs
+      devs.each do |dev|
+        dev.release_interface(0)
+        dev.close
+      end
+    end
+  end
+
+  def thread_worker(dev)
+    endpoint = endpoints_in[dev]
+    1.times do
+      st = Time.now
+      assert_raise LIBUSB::ERROR_TIMEOUT do
+        dev.bulk_transfer(:endpoint=>endpoint, :dataIn=>123, :timeout=>100)
+      end
+      assert_operator Time.now-st, :<, 5
+      dev.clear_halt(endpoint)
+    end
+  end
+
+  def test_sync_api
+    threads = devs.map do |dev|
+      Thread.new do
+        thread_worker(dev)
+      end
+    end
+    threads.map(&:join)
+  end
+end

data/test/test_libusb_version.rb

@@ -33,4 +33,8 @@ class TestLibusbVersion < Test::Unit::TestCase
     assert_match(/^\d+\.\d+\.\d+/, @v.to_s)
     assert_match(/^#<LIBUSB::Version \d+\.\d+\.\d+/, @v.inspect)
   end
+
+  def test_gem_version_string
+    assert_match(/^\d+\.\d+\.\d+/, LIBUSB::VERSION)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: libusb
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
   prerelease: 
 platform: x86-mingw32
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-19 00:00:00.000000000 Z
+date: 2013-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
-  requirement: &20360580 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,21 +21,15 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *20360580
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: &20359940 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.10'
-  type: :development
-  prerelease: false
-  version_requirements: *20359940
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
-  requirement: &20359420 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,35 +37,46 @@ dependencies:
         version: '0.6'
   type: :development
   prerelease: false
-  version_requirements: *20359420
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.6'
 - !ruby/object:Gem::Dependency
-  name: hoe
-  requirement: &20358840 !ruby/object:Gem::Requirement
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20358840
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: LIBUSB is a Ruby binding that gives Ruby programmers access to arbitrary
   USB devices
 email:
-- kanis@comcard.de
+- lars@greiz-reinsdorf.de
 executables: []
-extensions: []
-extra_rdoc_files:
-- README.rdoc
+extensions:
+- ext/extconf.rb
+extra_rdoc_files: []
 files:
-- .autotest
-- .gemtest
+- .gitignore
+- .travis.yml
 - .yardopts
 - COPYING
-- History.txt
-- Manifest.txt
-- README.rdoc
+- Gemfile
+- History.md
+- README.md
 - Rakefile
+- ext/extconf.rb
 - lib/libusb.rb
 - lib/libusb/call.rb
 - lib/libusb/compat.rb
@@ -81,27 +86,32 @@ files:
 - lib/libusb/dev_handle.rb
 - lib/libusb/device.rb
 - lib/libusb/endpoint.rb
+- lib/libusb/eventmachine.rb
 - lib/libusb/interface.rb
 - lib/libusb/setting.rb
 - lib/libusb/transfer.rb
-- lib/libusb/version.rb
+- lib/libusb/version_gem.rb
+- lib/libusb/version_struct.rb
+- libusb.gemspec
 - test/test_libusb_capability.rb
 - test/test_libusb_compat.rb
 - test/test_libusb_compat_mass_storage.rb
 - test/test_libusb_descriptors.rb
+- test/test_libusb_event_machine.rb
 - test/test_libusb_gc.rb
 - test/test_libusb_iso_transfer.rb
 - test/test_libusb_mass_storage.rb
 - test/test_libusb_mass_storage2.rb
+- test/test_libusb_structs.rb
+- test/test_libusb_threads.rb
 - test/test_libusb_version.rb
-- test/test_libusb_keyboard.rb
 - lib/libusb-1.0.dll
-homepage: 
+homepage: http://github.com/larskanis/libusb
 licenses: []
 post_install_message: 
 rdoc_options:
 - --main
-- README.rdoc
+- README.md
 - --charset=UTF-8
 require_paths:
 - lib
@@ -119,18 +129,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: libusb
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Access USB devices from Ruby via libusb-1.0
-test_files:
-- test/test_libusb_keyboard.rb
-- test/test_libusb_gc.rb
-- test/test_libusb_mass_storage2.rb
-- test/test_libusb_capability.rb
-- test/test_libusb_iso_transfer.rb
-- test/test_libusb_mass_storage.rb
-- test/test_libusb_compat.rb
-- test/test_libusb_compat_mass_storage.rb
-- test/test_libusb_version.rb
-- test/test_libusb_descriptors.rb
+test_files: []

data/.autotest

@@ -1,23 +0,0 @@
-# -*- ruby -*-
-
-require 'autotest/restart'
-
-# Autotest.add_hook :initialize do |at|
-#   at.extra_files << "../some/external/dependency.rb"
-#
-#   at.libs << ":../some/external"
-#
-#   at.add_exception 'vendor'
-#
-#   at.add_mapping(/dependency.rb/) do |f, _|
-#     at.files_matching(/test_.*rb$/)
-#   end
-#
-#   %w(TestA TestB).each do |klass|
-#     at.extra_class_map[klass] = "test/test_misc.rb"
-#   end
-# end
-
-# Autotest.add_hook :run_command do |at|
-#   system "rake build"
-# end

data/Manifest.txt

@@ -1,3 +0,0 @@
-# List of files is auto generated by 'git ls-files',
-# but let Hoe find the VERSION string:
-lib/libusb.rb

data/README.rdoc

@@ -1,115 +0,0 @@
-# -*- coding: utf-8 -*-
-
-= Access USB devices from Ruby via libusb-1.0.
-
-* http://github.com/larskanis/libusb
-
-== DESCRIPTION:
-
-LIBUSB is a Ruby binding that gives Ruby programmers access to arbitrary USB devices.
-
-* libusb[http://libusbx.org] is a library that gives full access to devices connected via the USB bus. No special kernel driver is thus necessary for accessing USB devices.
-* This Ruby binding supports the API version 1.0 of libusb[http://libusbx.org]. Note that the old "legacy" version 0.1.x of libusb uses a completely different API that is covered by the ruby extension ruby-usb[http://www.a-k-r.org/ruby-usb/] .
-
-
-LIBUSB for Ruby is covered by the GNU Lesser General Public License version 3.
-
-== FEATURES:
-* Access to descriptors of devices, configurations, interfaces, settings and endpoints
-* Synchronous and asynchronous communication for bulk, control, interrupt and isochronous transfers
-* Compatibility layer for ruby-usb[http://www.a-k-r.org/ruby-usb/] (API based on libusb-0.1). See {::USB} for description.
-
-== SYNOPSIS:
-
-  require "libusb"
-
-  usb = LIBUSB::Context.new
-  device = usb.devices(:idVendor => 0x04b4, :idProduct => 0x8613).first
-  device.open_interface(0) do |handle|
-    handle.control_transfer(:bmRequestType => 0x40, :bRequest => 0xa0, :wValue => 0xe600, :wIndex => 0x0000, :dataOut => 1.chr)
-  end
-{LIBUSB::Context#devices} is used to get all or only particular devices.
-After {LIBUSB::Device#open_interface opening and claiming} the {LIBUSB::Device} the resulting {LIBUSB::DevHandle} can be
-used to communicate with the connected USB device
-by {LIBUSB::DevHandle#control_transfer}, {LIBUSB::DevHandle#bulk_transfer},
-{LIBUSB::DevHandle#interrupt_transfer} or by using the {LIBUSB::Transfer} classes.
-
-A {LIBUSB::Device} can also be used to retrieve information about it,
-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. 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.
-An alternate setting can be used independent on each interface.
-
-Each {LIBUSB::Setting} specifies it's own set of communication endpoints.
-Each {LIBUSB::Endpoint} specifies the type of transfer, direction, polling interval and
-maximum packet size.
-
-
-== REQUIREMENTS:
-
-* Linux, MacOSX or Windows system with Ruby MRI 1.8.7/1.9.x or JRuby
-
-== INSTALL:
-
-  gem install libusb
-
-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-dev
-* OS-X: install with homebrew:
-    brew install libusb
-  or macports:
-    port install libusb
-* Windows: libusb.gem comes with a precompiled +libusb.dll+, but you need to install a device driver (see below)
-
-Latest code can be used in this way:
-
-  git clone git://github.com/larskanis/libusb.git
-  rake install_gem
-
-
-== Usage on Windows
-
-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/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.
-
-
-== 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
-git repo, cross compiled and included in the generated libusb.gem.
-
-Install mingw32. On a debian based system this should work:
-
-  apt-get install mingw32
-
-On MacOS X, if you have MacPorts installed:
-
-  port install i386-mingw32-gcc
-
-Download and cross compile libusb for win32:
-
-  rake cross gem
-
-If everything works, there should be libusb-VERSION-x86-mingw32.gem in the pkg
-directory.
-
-== Resources
-
-* API documentation of Libusb for Ruby: http://rubydoc.info/gems/libusb/frames
-* Mailinglist: http://rubyforge.org/mailman/listinfo/libusb-hackers
-* Overall introduction to USB: http://www.usbmadesimple.co.uk
-
-== Todo
-
-* add proper handling for polling and timing: http://libusb.sourceforge.net/api-1.0/group__poll.html