libusb 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6ebc972537614783fdc012824abb12ca1f3f6be8
-  data.tar.gz: 70c26bd9f94e05484c4371045c87c910b24df7dd
+SHA256:
+  metadata.gz: 1d40d1cf55c220e3db032cf0d01264b370865fb840186ae518aeaf701dfd8434
+  data.tar.gz: d4ad70aa5044bf2a733da31b31a6d500e6faa614158095ab53dfee904cb7823a
 SHA512:
-  metadata.gz: a18f891801d3358b04da7624b234221433839d7390e30eeaebe4089906e39edf52f7820184f6f3d74c69e4a258b2acb8ee68ef45fb5e315449480c9b0bed021c
-  data.tar.gz: '007083ca903a19d73823487b946a1124e4f3336b64e95250072b0d745f305ea7cd175c993933254b7ae4e05d4c721ccfb85c094b05a48a41151f1afd88bb298f'
+  metadata.gz: 41ebadc85b22529aa2170cfd3daf282a68897148786cf9717483d7fc1e3fab663fef4f328c9c8163273558d517d34bca534f70a4874aa4564005da0a17a9a83c
+  data.tar.gz: dc0b95995415319ea711668a550e575638b180bd99ebedc796d4316022dd38a70b55ca04f2e4e7ec20531148bff0761b2278bf87fcafdfb73fb2bb9232614c4e

data/.travis.yml

@@ -3,17 +3,19 @@ sudo: false
 dist: trusty
 matrix:
   include:
-    - rvm: 2.4.1
+    - rvm: ruby-head
+      env:
+        - RUBYOPT="--enable-frozen-string-literal --debug=frozen-string-literal"
+    - rvm: 2.4.3
       env:
         - RUBYOPT="--enable-frozen-string-literal --debug=frozen-string-literal"
-    - rvm: 1.9.3
     - rvm: 2.0
     - rvm: 2.1
     - rvm: 2.2.5
     - rvm: 2.3.1
-    - rvm: jruby-1.7
     - rvm: jruby-9.1.5.0
     - rvm: rbx-3
   allow_failures:
     - rvm: rbx-3
+    - rvm: ruby-head
 script: bundle exec rake travis

data/Gemfile

@@ -9,3 +9,8 @@ group :test do
 end
 
 gem 'rake-compiler-dock', '~> 0.6.0'
+
+# For some reason this is required in addition to the gemspec
+# when 'bundle config force_ruby_platform true' is active:
+gem 'ffi'
+gem 'mini_portile2'

data/History.md

@@ -1,3 +1,22 @@
+0.6.4 / 2018-05-05
+------------------
+
+Added:
+* New function Context#set_option.
+  It is also available when running libusb < 1.0.22 and calls libusb_set_debug() in this case.
+* Add definition for SUPER_SPEED_PLUS.
+* Linux: Use system libusb even when only library but no dev package is installed.
+* Add Transfer#dev_handle and #timeout
+* Use system libusb even when no development package is installed.
+  Means "libusb-1.0-0" is enough, no need for "libusb-dev" on Ubuntu.
+
+Changed:
+* Update libusb to 1.0.22
+
+Deprecated:
+* Deprecate Context#debug= analogous to libusb_set_debug in libusb-1.0.22.
+
+
 0.6.3 / 2017-08-20
 ------------------
 * Fix compat with FreeBSD. #24

data/README.md

@@ -65,7 +65,7 @@ Prerequisites
   * Debian or Ubuntu:
 
       ```
-      $ sudo apt-get install libusb-1.0-0-dev
+      $ sudo apt-get install libusb-1.0-0
       ```
   * MacOS: install with homebrew:
 

data/Rakefile

@@ -21,7 +21,7 @@ task :test=>:compile do
   sh "ruby -w -W2 -I. -Ilib -e \"#{Dir["test/test_*.rb"].map{|f| "require '#{f}';"}.join}\" -- -v"
 end
 
-travis_tests = %w[test_libusb_capability.rb test_libusb_structs.rb test_libusb_version.rb]
+travis_tests = %w[test_libusb.rb test_libusb_structs.rb]
 task :travis=>:compile do
   sh "ruby -w -W2 -I. -Ilib -e \"#{travis_tests.map{|f| "require 'test/#{f}';"}.join}\" -- -v"
 end

data/appveyor.yml

@@ -2,6 +2,11 @@ init:
   - SET PATH=C:/Ruby%ruby_version%/bin;%PATH%
   - SET RAKEOPT=-rdevkit
 install:
+  - ps: |
+      if ($env:ruby_version -like "*head*") {
+        $(new-object net.webclient).DownloadFile("https://github.com/oneclick/rubyinstaller2/releases/download/rubyinstaller-head/rubyinstaller-$env:ruby_version.exe", "$pwd/ruby-setup.exe")
+        cmd /c ruby-setup.exe /verysilent /dir=C:/Ruby$env:ruby_version
+      }
   - ruby --version
   - gem --version
   - ps: |
@@ -10,6 +15,8 @@ install:
           $env:SSL_CERT_FILE = "$env:TMP/ca-bundle.crt"
           Write-Host "Using SSL CA list $env:SSL_CERT_FILE" -foreground Green
         }
+  - gem install bundler --conservative
+  - bundle config force_ruby_platform true
   - bundle install
 build_script:
   - bundle exec rake compile
@@ -17,21 +24,13 @@ test_script:
   - bundle exec rake travis
 environment:
   matrix:
-    - ruby_version: "24-x64"
+    - ruby_version: "head-x64"
     - ruby_version: "200"
       BROKEN_SSL: true
-    - ruby_version: "200-x64"
-      BROKEN_SSL: true
-    - ruby_version: "21"
-      BROKEN_SSL: true
     - ruby_version: "21-x64"
       BROKEN_SSL: true
     - ruby_version: "22"
       BROKEN_SSL: true
-    - ruby_version: "22-x64"
-      BROKEN_SSL: true
-    - ruby_version: "23"
-      BROKEN_SSL: true
     - ruby_version: "23-x64"
       BROKEN_SSL: true
     - ruby_version: "24"

data/ext/extconf.rb

@@ -53,7 +53,7 @@ def libusb_usable?
       prefix = FFI::Platform::LIBPREFIX.empty? ? 'lib' : FFI::Platform::LIBPREFIX
       bundled_dll = File.join(root_path, "lib/#{prefix}usb-1.0.#{ext}")
       bundled_dll_cygwin = File.join(root_path, "bin/#{prefix}usb-1.0.#{ext}")
-      ffi_lib([bundled_dll, bundled_dll_cygwin, "#{prefix}usb-1.0", "#{prefix}usb"])
+      ffi_lib([bundled_dll, bundled_dll_cygwin, "#{prefix}usb-1.0.#{ext}.0", "#{prefix}usb-1.0", "#{prefix}usb"])
     end
     true
   rescue LoadError

data/lib/libusb/call.rb

@@ -28,7 +28,7 @@ module LIBUSB
     prefix = FFI::Platform::LIBPREFIX.empty? ? 'lib' : FFI::Platform::LIBPREFIX
     bundled_dll = File.join(root_path, "lib/#{prefix}usb-1.0.#{ext}")
     bundled_dll_cygwin = File.join(root_path, "bin/#{prefix}usb-1.0.#{ext}")
-    ffi_lib([bundled_dll, bundled_dll_cygwin, "#{prefix}usb-1.0", "#{prefix}usb"])
+    ffi_lib([bundled_dll, bundled_dll_cygwin, "#{prefix}usb-1.0.#{ext}.0", "#{prefix}usb-1.0", "#{prefix}usb"])
 
     ClassCodes = enum :libusb_class_code, [
       :CLASS_PER_INTERFACE, 0,
@@ -164,12 +164,21 @@ module LIBUSB
       :ISO_SYNC_TYPE_SYNC, 3,
     ]
 
+    # Speed codes. Indicates the speed at which the device is operating.
     Speeds = enum :libusb_speed, [
+      # The OS doesn't report or know the device speed.
       :SPEED_UNKNOWN, 0,
+      # The device is operating at low speed (1.5MBit/s).
       :SPEED_LOW, 1,
+      # The device is operating at full speed (12MBit/s).
       :SPEED_FULL, 2,
+      # The device is operating at high speed (480MBit/s).
       :SPEED_HIGH, 3,
+      # The device is operating at super speed (5000MBit/s).
       :SPEED_SUPER, 4,
+      # The device is operating at super speed plus (10000MBit/s).
+      # Available since libusb-1.0.22
+      :SPEED_SUPER_PLUS, 5,
     ]
 
     # Supported speeds (wSpeedSupported) bitfield. Indicates what
@@ -250,6 +259,56 @@ module LIBUSB
       :HOTPLUG_ENUMERATE, 1,
     ]
 
+    # Log message levels.
+    #
+    # - :LOG_LEVEL_NONE (0)    : no messages ever printed by the library (default)
+    # - :LOG_LEVEL_ERROR (1)   : error messages are printed to stderr
+    # - :LOG_LEVEL_WARNING (2) : warning and error messages are printed to stderr
+    # - :LOG_LEVEL_INFO (3)    : informational messages are printed to stderr
+    # - :LOG_LEVEL_DEBUG (4)   : debug and informational messages are printed to stderr
+    LogLevels = enum :libusb_log_level, [
+      :LOG_LEVEL_NONE, 0,
+      :LOG_LEVEL_ERROR, 1,
+      :LOG_LEVEL_WARNING, 2,
+      :LOG_LEVEL_INFO, 3,
+      :LOG_LEVEL_DEBUG, 4,
+    ]
+
+    # Available option values for {Context#set_option}.
+    Options = enum :libusb_option, [
+      # Set the log message verbosity.
+      #
+      # The default level is :LOG_LEVEL_NONE, which means no messages are ever
+      # printed. If you choose to increase the message verbosity level, ensure
+      # that your application does not close the stderr file descriptor.
+      #
+      # You are advised to use level :LOG_LEVEL_WARNING. libusb is conservative
+      # with its message logging and most of the time, will only log messages that
+      # explain error conditions and other oddities. This will help you debug
+      # your software.
+      #
+      # If the +LIBUSB_DEBUG+ environment variable was set when libusb was
+      # initialized, this function does nothing: the message verbosity is fixed
+      # to the value in the environment variable.
+      #
+      # If libusb was compiled without any message logging, this function does
+      # nothing: you'll never get any messages.
+      #
+      # If libusb was compiled with verbose debug message logging, this function
+      # does nothing: you'll always get messages from all levels.
+      :OPTION_LOG_LEVEL,
+
+      # Use the UsbDk backend for a specific context, if available.
+      #
+      # This option should be set immediately after calling {Context.new}, otherwise
+      # unspecified behavior may occur.
+      #
+      # Only valid on Windows.
+      #
+      # Available since libusb-1.0.22.
+      :OPTION_USE_USBDK,
+    ]
+
     typedef :pointer, :libusb_context
     typedef :pointer, :libusb_device
     typedef :pointer, :libusb_device_handle
@@ -266,7 +325,8 @@ module LIBUSB
 
     attach_function 'libusb_init', [ :pointer ], :int
     attach_function 'libusb_exit', [ :pointer ], :void
-    attach_function 'libusb_set_debug', [:pointer, :int], :void
+    attach_function 'libusb_set_debug', [:pointer, :libusb_log_level], :void
+    try_attach_function 'libusb_set_option', [:libusb_context, :libusb_option, :varargs], :int
     try_attach_function 'libusb_has_capability', [:libusb_capability], :int
 
     attach_function 'libusb_get_device_list', [:pointer, :pointer], :ssize_t

data/lib/libusb/constants.rb

@@ -16,22 +16,28 @@
 require 'libusb/call'
 
 module LIBUSB
-  Call::ClassCodes.to_h.each{|k,v| const_set(k,v) }
-  Call::TransferTypes.to_h.each{|k,v| const_set(k,v) }
-  Call::StandardRequests.to_h.each{|k,v| const_set(k,v) }
-  Call::RequestTypes.to_h.each{|k,v| const_set(k,v) }
-  Call::DescriptorTypes.to_h.each{|k,v| const_set(k,v) }
-  Call::EndpointDirections.to_h.each{|k,v| const_set(k,v) }
-  Call::RequestRecipients.to_h.each{|k,v| const_set(k,v) }
-  Call::IsoSyncTypes.to_h.each{|k,v| const_set(k,v) }
-  Call::Speeds.to_h.each{|k,v| const_set(k,v) }
-  Call::Capabilities.to_h.each{|k,v| const_set(k,v) }
-  Call::SupportedSpeeds.to_h.each{|k,v| const_set(k,v) }
-  Call::Usb20ExtensionAttributes.to_h.each{|k,v| const_set(k,v) }
-  Call::SsUsbDeviceCapabilityAttributes.to_h.each{|k,v| const_set(k,v) }
-  Call::BosTypes.to_h.each{|k,v| const_set(k,v) }
-  Call::HotplugEvents.to_h.each{|k,v| const_set(k,v) }
-  Call::HotplugFlags.to_h.each{|k,v| const_set(k,v) }
+  [
+    Call::ClassCodes,
+    Call::TransferTypes,
+    Call::StandardRequests,
+    Call::RequestTypes,
+    Call::DescriptorTypes,
+    Call::EndpointDirections,
+    Call::RequestRecipients,
+    Call::IsoSyncTypes,
+    Call::Speeds,
+    Call::Capabilities,
+    Call::SupportedSpeeds,
+    Call::Usb20ExtensionAttributes,
+    Call::SsUsbDeviceCapabilityAttributes,
+    Call::BosTypes,
+    Call::HotplugEvents,
+    Call::HotplugFlags,
+    Call::LogLevels,
+    Call::Options,
+  ].each do |enum|
+    enum.to_h.each{|k,v| const_set(k,v) }
+  end
 
   # Base class of libusb errors
   class Error < RuntimeError

data/lib/libusb/context.rb

@@ -114,37 +114,46 @@ module LIBUSB
       Call.libusb_exit(@ctx)
     end
 
-    # Set message verbosity.
-    #
-    # * Level 0: no messages ever printed by the library (default)
-    # * Level 1: error messages are printed to stderr
-    # * Level 2: warning and error messages are printed to stderr
-    # * Level 3: informational messages are printed to stdout, warning and
-    #   error messages are printed to stderr
-    #
-    # The default level is 0, which means no messages are ever printed. If you
-    # choose to increase the message verbosity level, ensure that your
-    # application does not close the stdout/stderr file descriptors.
-    #
-    # You are advised to set level 3. libusb is conservative with its message
-    # logging and most of the time, will only log messages that explain error
-    # conditions and other oddities. This will help you debug your software.
-    #
-    # If the LIBUSB_DEBUG environment variable was set when libusb was
-    # initialized, this method does nothing: the message verbosity is
-    # fixed to the value in the environment variable.
-    #
-    # If libusb was compiled without any message logging, this method
-    # does nothing: you'll never get any messages.
-    #
-    # If libusb was compiled with verbose debug message logging, this
-    # method does nothing: you'll always get messages from all levels.
-    #
-    # @param [Fixnum] level  debug level to set
+    # @deprecated Use {Context#set_option} instead using the +:OPTION_LOG_LEVEL+ option.
     def debug=(level)
       Call.libusb_set_debug(@ctx, level)
     end
 
+    def expect_option_args(exp, is)
+      raise ArgumentError, "wrong number of arguments (given #{is+1}, expected #{exp+1})" if is != exp
+    end
+    private :expect_option_args
+
+    # Set a libusb option from the {Call::Options option list}.
+    #
+    # @param [Symbol, Fixnum] option
+    # @param args  Zero or more arguments depending on +option+
+    def set_option(option, *args)
+      if Call.respond_to?(:libusb_set_option)
+        # Available since libusb-1.0.22
+
+        ffi_args = case option
+          when :OPTION_LOG_LEVEL, LIBUSB::OPTION_LOG_LEVEL
+            expect_option_args(1, args.length)
+            [:libusb_log_level, args[0]]
+          when :OPTION_USE_USBDK, LIBUSB::OPTION_USE_USBDK
+            expect_option_args(0, args.length)
+            []
+          else
+            raise ArgumentError, "unknown option #{option.inspect}"
+        end
+
+        res = Call.libusb_set_option(@ctx, option, *ffi_args)
+        LIBUSB.raise_error res, "in libusb_set_option" if res<0
+
+      else
+        # Fallback to deprecated function, if the gem is linked to an older libusb.
+
+        raise ArgumentError, "unknown option #{option.inspect}" unless [:OPTION_LOG_LEVEL, LIBUSB::OPTION_LOG_LEVEL].include?(option)
+        Call.libusb_set_debug(@ctx, *args)
+      end
+    end
+
     def device_list
       pppDevs = FFI::MemoryPointer.new :pointer
       size = Call.libusb_get_device_list(@ctx, pppDevs)

data/lib/libusb/dependencies.rb

@@ -1,7 +1,7 @@
 module LIBUSB
-  LIBUSB_VERSION = ENV['LIBUSB_VERSION'] || '1.0.21'
+  LIBUSB_VERSION = ENV['LIBUSB_VERSION'] || '1.0.22'
   LIBUSB_SOURCE_URI = "https://github.com/libusb/libusb/releases/download/v#{LIBUSB_VERSION}/libusb-#{LIBUSB_VERSION}.tar.bz2"
-  LIBUSB_SOURCE_SHA1 = '54d71841542eb1a6f0b0420878a4d5434efe8d28'
+  LIBUSB_SOURCE_SHA1 = '10116aa265aac4273a0c894faa089370262ec0dc'
 
   MINI_PORTILE_VERSION = '~> 2.1'
 end

data/lib/libusb/transfer.rb

@@ -43,10 +43,15 @@ module LIBUSB
       end
     end
 
+    class << self
+      private :new
+    end
+
     def initialize(args={})
       @buffer = nil
       @completion_flag = Context::CompletionFlag.new
       @allow_device_memory = false
+      @dev_handle = nil
       args.each{|k,v| send("#{k}=", v) }
     end
     private :initialize
@@ -57,13 +62,23 @@ module LIBUSB
       @transfer[:dev_handle] = @dev_handle.pHandle
     end
 
-    # Timeout for this transfer in millseconds.
+    # The handle for the device to communicate with.
+    attr_reader :dev_handle
+
+    # Set timeout for this transfer in millseconds.
     #
     # A value of 0 indicates no timeout.
     def timeout=(value)
       @transfer[:timeout] = value
     end
 
+    # Get timeout for this transfer in millseconds.
+    #
+    # A value of 0 indicates no timeout.
+    def timeout
+      @transfer[:timeout]
+    end
+
     # Set the address of a valid endpoint to communicate with.
     def endpoint=(endpoint)
       endpoint = endpoint.bEndpointAddress if endpoint.respond_to? :bEndpointAddress
@@ -225,6 +240,8 @@ module LIBUSB
     #
     # Inspect {#status} to check for transfer errors.
     def submit_and_wait
+      raise ArgumentError, "#{self.class}#dev_handle not set" unless @dev_handle
+
       @completion_flag.completed = false
       submit! do |tr2|
         @completion_flag.completed = true
@@ -256,6 +273,10 @@ module LIBUSB
   end
 
   class BulkTransfer < Transfer
+    def self.new(*)
+      super
+    end
+
     def initialize(args={})
       @transfer = Call::Transfer.new Call.libusb_alloc_transfer(0)
       @transfer[:type] = TRANSFER_TYPE_BULK
@@ -272,6 +293,10 @@ module LIBUSB
     #
     # Available since libusb-1.0.19.
     class BulkStreamTransfer < Transfer
+      def self.new(*)
+        super
+      end
+
       def initialize(args={})
         @transfer = Call::Transfer.new Call.libusb_alloc_transfer(0)
         @transfer[:type] = TRANSFER_TYPE_BULK_STREAM
@@ -299,6 +324,10 @@ module LIBUSB
   end
 
   class ControlTransfer < Transfer
+    def self.new(*)
+      super
+    end
+
     def initialize(args={})
       @transfer = Call::Transfer.new Call.libusb_alloc_transfer(0)
       @transfer[:type] = TRANSFER_TYPE_CONTROL
@@ -308,6 +337,10 @@ module LIBUSB
   end
 
   class InterruptTransfer < Transfer
+    def self.new(*)
+      super
+    end
+
     def initialize(args={})
       @transfer = Call::Transfer.new Call.libusb_alloc_transfer(0)
       @transfer[:type] = TRANSFER_TYPE_INTERRUPT
@@ -339,6 +372,10 @@ module LIBUSB
   end
 
   class IsochronousTransfer < Transfer
+    def self.new(*)
+      super
+    end
+
     def initialize(num_packets, args={})
       @ptr = Call.libusb_alloc_transfer(num_packets)
       @transfer = Call::Transfer.new @ptr

data/lib/libusb/version_gem.rb

@@ -15,5 +15,5 @@
 
 module LIBUSB
   # Library version of libusb for Ruby
-  VERSION = "0.6.3"
+  VERSION = "0.6.4"
 end

data/libusb.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
   s.extensions    = ['ext/extconf.rb']
+  s.metadata["yard.run"] = "yri"
 
   s.required_ruby_version = Gem::Requirement.new(">= 1.9.3")
   s.add_runtime_dependency 'ffi', '~> 1.0'
@@ -27,4 +28,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rake-compiler', '~> 1.0'
   s.add_development_dependency 'rake-compiler-dock', '~> 0.2'
   s.add_development_dependency 'bundler', '~> 1.0'
+  s.add_development_dependency 'yard', '~> 0.6'
 end

data/test/{test_libusb_version.rb → test_libusb.rb}

@@ -16,22 +16,24 @@
 require "minitest/autorun"
 require "libusb"
 
-class TestLibusbVersion < Minitest::Test
-  def setup
-    @v = LIBUSB.version
+class TestLibusb < Minitest::Test
+  def test_has_capability
+    assert LIBUSB.has_capability?(:CAP_HAS_CAPABILITY)
   end
 
   def test_version_parts
-    assert_operator @v.major, :>=, 0
-    assert_operator @v.minor, :>=, 0
-    assert_operator @v.micro, :>=, 0
-    assert_operator @v.nano, :>=, 0
-    assert_kind_of String, @v.rc
+    v = LIBUSB.version
+    assert_operator v.major, :>=, 0
+    assert_operator v.minor, :>=, 0
+    assert_operator v.micro, :>=, 0
+    assert_operator v.nano, :>=, 0
+    assert_kind_of String, v.rc
   end
 
   def test_version_string
-    assert_match(/^\d+\.\d+\.\d+/, @v.to_s)
-    assert_match(/^#<LIBUSB::Version \d+\.\d+\.\d+/, @v.inspect)
+    v = LIBUSB.version
+    assert_match(/^\d+\.\d+\.\d+/, v.to_s)
+    assert_match(/^#<LIBUSB::Version \d+\.\d+\.\d+/, v.inspect)
   end
 
   def test_gem_version_string

data/test/{test_libusb_capability.rb → test_libusb_context.rb}

@@ -16,8 +16,26 @@
 require "minitest/autorun"
 require "libusb"
 
-class TestLibusbCapability < Minitest::Test
-  def test_version_parts
-    assert LIBUSB.has_capability?(:CAP_HAS_CAPABILITY)
+class TestLibusbContext < Minitest::Test
+  def setup
+    @c = LIBUSB::Context.new
+  end
+
+  def teardown
+    @c.exit if @c
+  end
+
+  def test_set_option
+    @c.set_option LIBUSB::OPTION_LOG_LEVEL, LIBUSB::LOG_LEVEL_NONE
+    @c.set_option LIBUSB::OPTION_LOG_LEVEL, LIBUSB::LOG_LEVEL_ERROR
+    @c.set_option LIBUSB::OPTION_LOG_LEVEL, LIBUSB::LOG_LEVEL_WARNING
+    @c.set_option LIBUSB::OPTION_LOG_LEVEL, LIBUSB::LOG_LEVEL_INFO
+    @c.set_option LIBUSB::OPTION_LOG_LEVEL, LIBUSB::LOG_LEVEL_DEBUG
+    @c.set_option :OPTION_LOG_LEVEL, :LOG_LEVEL_NONE
+  end
+
+  def test_set_debug
+    @c.debug = 4
+    @c.debug = 0
   end
 end

data/test/test_libusb_structs.rb

@@ -43,16 +43,45 @@ class TestLibusbStructs < Minitest::Test
     assert_equal 0, s[:completed]
   end
 
-  def test_Transfer
+  def test_Transfer_buffer
     t = LIBUSB::InterruptTransfer.new allow_device_memory: true
     assert_equal :TRANSFER_COMPLETED, t.status
     assert_equal true, t.allow_device_memory
-    assert_equal nil, t.memory_type
+    assert_nil t.memory_type
 
     t.alloc_buffer(10)
     assert_equal :user_space, t.memory_type, "no device assigned -> should use memory from user space"
 
     t.free_buffer
-    assert_equal nil, t.memory_type
+    assert_nil t.memory_type
+  end
+
+  def test_Transfer_new
+    assert_raises(NoMethodError){ LIBUSB::Transfer.new }
+    LIBUSB::BulkStreamTransfer.new
+    LIBUSB::BulkTransfer.new
+    LIBUSB::ControlTransfer.new
+    LIBUSB::InterruptTransfer.new
+    LIBUSB::IsochronousTransfer.new(0)
+  end
+
+  def test_ControlTransfer_attributes
+    t = LIBUSB::ControlTransfer.new
+    t.timeout = 123
+    assert_equal 123, t.timeout
+    t.allow_device_memory = true
+    assert_equal true, t.allow_device_memory
+    assert_nil t.dev_handle
+  end
+
+  def test_ControlTransfer_new_args
+    t = LIBUSB::ControlTransfer.new allow_device_memory: false, timeout: 444
+    assert_equal false, t.allow_device_memory
+    assert_equal 444, t.timeout
+  end
+
+  def test_Transfer_no_dev_handle
+    t = LIBUSB::ControlTransfer.new
+    assert_raises(ArgumentError){ t.submit_and_wait }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libusb
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - Lars Kanis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-20 00:00:00.000000000 Z
+date: 2018-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
 description: LIBUSB is a Ruby binding that gives Ruby programmers access to arbitrary
   USB devices
 email:
@@ -121,12 +135,13 @@ files:
 - lib/libusb/version_gem.rb
 - lib/libusb/version_struct.rb
 - libusb.gemspec
-- ports/archives/libusb-1.0.21.tar.bz2
+- ports/archives/libusb-1.0.22.tar.bz2
+- test/test_libusb.rb
 - test/test_libusb_bos.rb
 - test/test_libusb_bulk_stream_transfer.rb
-- test/test_libusb_capability.rb
 - test/test_libusb_compat.rb
 - test/test_libusb_compat_mass_storage.rb
+- test/test_libusb_context.rb
 - test/test_libusb_descriptors.rb
 - test/test_libusb_event_machine.rb
 - test/test_libusb_gc.rb
@@ -136,12 +151,12 @@ files:
 - test/test_libusb_mass_storage2.rb
 - test/test_libusb_structs.rb
 - test/test_libusb_threads.rb
-- test/test_libusb_version.rb
 - wireshark-usb-sniffer.png
 homepage: http://github.com/larskanis/libusb
 licenses:
 - LGPL-3.0
-metadata: {}
+metadata:
+  yard.run: yri
 post_install_message: 
 rdoc_options:
 - "--main"
@@ -161,7 +176,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Access USB devices from Ruby via libusb-1.0