libusb 0.6.4-x64-mingw32 → 0.7.0-x64-mingw32

data/test/test_libusb_context.rb

@@ -38,4 +38,51 @@ class TestLibusbContext < Minitest::Test
     @c.debug = 4
     @c.debug = 0
   end
+
+  def test_left_references
+    @test_devs = @c.devices
+    assert_raises(LIBUSB::RemainingReferencesError) do
+      @c.exit
+    end
+    @c = nil
+  end
+
+  def test_double_exit
+    @c.exit
+  end
+
+  def test_log_callback
+    skip "only supported on Linux" unless RUBY_PLATFORM=~/linux/
+    skip "libusb version older than 1.0.27" if Gem::Version.new(LIBUSB.version) < Gem::Version.new("1.0.27")
+
+    LIBUSB.set_options OPTION_LOG_CB: [nil], OPTION_LOG_LEVEL: LIBUSB::LOG_LEVEL_NONE
+    begin
+      called = Hash.new { |h, k| h[k] = [] }
+      LIBUSB.set_options OPTION_LOG_CB: proc{|*a| called[:global] << a }, OPTION_LOG_LEVEL: LIBUSB::LOG_LEVEL_DEBUG
+
+      c = LIBUSB::Context.new OPTION_LOG_CB: proc{|*a| called[:ctx1] << a }, OPTION_NO_DEVICE_DISCOVERY: nil
+      c.devices
+      c.set_log_cb(LIBUSB::LOG_CB_CONTEXT){|*a| called[:ctx2] << a }
+      c.devices
+
+      #pp called
+      assert_nil called[:global][0][0]
+      assert_equal :LOG_LEVEL_DEBUG, called[:global][0][1], called[:global][0][2]
+      assert_match(/libusb_init_context/, called[:global].join)
+      assert_match(/no device discovery/, called[:global].join)
+
+      assert_operator called[:ctx1].size, :>, called[:ctx2].size
+      assert_equal c, called[:ctx1][-1][0]
+      assert_equal :LOG_LEVEL_DEBUG, called[:ctx1][-1][1]
+      assert_match(/libusb_get_device_list/, called[:ctx1][-1][2])
+      assert_match(/no device discovery/, called[:ctx1].join)
+
+      assert_equal c, called[:ctx2][-1][0]
+      assert_equal :LOG_LEVEL_DEBUG, called[:ctx2][-1][1]
+      assert_match(/libusb_get_device_list/, called[:ctx2][-1][2])
+
+    ensure
+      LIBUSB.set_options OPTION_LOG_CB: [nil], OPTION_LOG_LEVEL: LIBUSB::LOG_LEVEL_NONE
+    end
+  end
 end

data/test/test_libusb_descriptors.rb

@@ -119,7 +119,7 @@ class TestLibusbDescriptors < Minitest::Test
 
     usb.devices.each do |dev|
       dev.endpoints.each do |ep|
-        if dev.device_speed == :SPEED_SUPER
+        if [:SPEED_SUPER, :SPEED_SUPER_PLUS].include?(dev.device_speed)
           ss = ep.ss_companion
           assert_match(/SsCompanion/, ss.inspect, "SsCompanion#inspect should work")
 
@@ -172,14 +172,19 @@ class TestLibusbDescriptors < Minitest::Test
   def test_device_filter_hubs
     devs1 = []
     usb.devices.each do |dev|
-      dev.settings.each do |if_desc|
-        if if_desc.bInterfaceClass == CLASS_HUB
-          devs1 << dev
+      if dev.bDeviceClass==CLASS_PER_INTERFACE
+        dev.settings.each do |if_desc|
+          if if_desc.bInterfaceClass==CLASS_HUB
+            devs1 << dev
+          end
         end
+      else
+        devs1 << dev if dev.bDeviceClass == CLASS_HUB
       end
     end
 
     devs2 = usb.devices( bClass: CLASS_HUB )
+
     assert_equal devs1.sort, devs2.sort, "devices and devices with filter should deliver the same device"
   end
 
@@ -189,11 +194,11 @@ class TestLibusbDescriptors < Minitest::Test
       if ep
         assert_operator dev.max_packet_size(ep), :>, 0, "#{dev.inspect} should have a usable packet size"
         assert_operator dev.max_packet_size(ep.bEndpointAddress), :>, 0, "#{dev.inspect} should have a usable packet size"
-        assert_operator dev.max_iso_packet_size(ep), :>, 0, "#{dev.inspect} should have a usable iso packet size"
-        assert_operator dev.max_iso_packet_size(ep.bEndpointAddress), :>, 0, "#{dev.inspect} should have a usable iso packet size"
+        assert_operator dev.max_iso_packet_size(ep), :>=, 0, "#{dev.inspect} should have a usable iso packet size"
+        assert_operator dev.max_iso_packet_size(ep.bEndpointAddress), :>=, 0, "#{dev.inspect} should have a usable iso packet size"
         assert_operator dev.bus_number, :>=, 0, "#{dev.inspect} should have a bus_number"
         assert_operator dev.device_address, :>=, 0, "#{dev.inspect} should have a device_address"
-        assert_operator([:SPEED_UNKNOWN, :SPEED_LOW, :SPEED_FULL, :SPEED_HIGH, :SPEED_SUPER], :include?, dev.device_speed, "#{dev.inspect} should have a device_speed")
+        assert_operator([:SPEED_UNKNOWN, :SPEED_LOW, :SPEED_FULL, :SPEED_HIGH, :SPEED_SUPER, :SPEED_SUPER_PLUS], :include?, dev.device_speed, "#{dev.inspect} should have a device_speed")
         path = dev.port_numbers
         assert_kind_of Array, path, "#{dev.inspect} should have port_numbers"
         path = dev.port_path
@@ -201,12 +206,40 @@ class TestLibusbDescriptors < Minitest::Test
         path.each do |port|
           assert_operator port, :>, 0, "#{dev.inspect} should have proper port_path entries"
         end
-        assert_equal path[-1], dev.port_number, "#{dev.inspect} should have a port number out of the port_path"
-        if parent=dev.parent
-          assert_kind_of Device, parent, "#{dev.inspect} should have a parent"
-          assert_equal path[-2], parent.port_number, "#{dev.inspect} should have a parent port number out of the port_path"
+        if path.empty?
+          assert_nil dev.port_number
+        else
+          assert_equal path[-1], dev.port_number, "#{dev.inspect} should have a port number out of the port_path"
+          if parent=dev.parent
+            assert_kind_of Device, parent, "#{dev.inspect} should have a parent"
+            assert_equal path[-2], parent.port_number, "#{dev.inspect} should have a parent port number out of the port_path" if parent.port_number
+          end
         end
       end
     end
   end
+
+  def test_wrap_sys_device
+    skip unless RUBY_PLATFORM =~ /linux/
+    d = usb.devices[0]
+    File.open(format("/dev/bus/usb/%03d/%03d", d.bus_number, d.device_address), "w+") do |io|
+      devh = usb.wrap_sys_device(io)
+      devh.kernel_driver_active?(0)
+      devh.close
+
+      usb.wrap_sys_device(io) do |devh|
+        devh.kernel_driver_active?(0)
+      end
+    end
+  end
+
+  def test_wrap_sys_device_failure
+    skip unless RUBY_PLATFORM =~ /linux/
+    d = usb.devices[0]
+    assert_raises(LIBUSB::ERROR_OTHER) do
+      File.open(format("/dev/bus/usb/%03d/%03d", d.bus_number, d.device_address), "r") do |io|
+        usb.wrap_sys_device(io).kernel_driver_active?(0)
+      end
+    end
+  end
 end

data/test/test_libusb_gc.rb

@@ -34,4 +34,19 @@ class TestLibusbGc < Minitest::Test
     GC.start
     assert_equal ps, ep.wMaxPacketSize, "GC should not free EndpointDescriptor"
   end
+
+  def test_log_cb
+    LIBUSB.set_options OPTION_LOG_CB: proc{}, OPTION_LOG_LEVEL: LIBUSB::LOG_LEVEL_DEBUG
+
+    c = LIBUSB::Context.new OPTION_LOG_CB: proc{}, OPTION_NO_DEVICE_DISCOVERY: nil
+    GC.start
+    c.devices
+    c.set_log_cb(LIBUSB::LOG_CB_CONTEXT){}
+    c.devices
+    GC.start
+    c.devices
+
+  ensure
+    LIBUSB.set_options OPTION_LOG_CB: [nil], OPTION_LOG_LEVEL: LIBUSB::LOG_LEVEL_NONE
+  end
 end

data/test/test_libusb_hotplug.rb

@@ -26,7 +26,9 @@ class TestLibusbHotplug < Minitest::Test
   end
 
   def teardown
-    @ctx.exit
+    # No need to release the LIBUSB::Context any longer.
+    # It is cleaned up by the GC.
+    # @ctx.exit
   end
 
   def test_enumerate

data/test/test_libusb_iso_transfer.rb

@@ -47,4 +47,10 @@ class TestLibusbIsoTransfer < Minitest::Test
       tr.submit!
     end
   end
+
+  def test_max_alt_packet_size
+    d = Context.new.devices[0]
+    size = d.max_alt_packet_size d.interfaces[0], d.settings[0], d.endpoints[0]
+    assert_operator 0, :<=, size
+  end
 end

data/test/test_libusb_mass_storage.rb

@@ -61,7 +61,7 @@ class TestLibusbMassStorage < Minitest::Test
     dev.close if dev
   end
 
-  def do_transfer(method, args)
+  def do_transfer(method, **args)
     if @asynchron
       stop = false
       transfer = dev.send(method, args) do |tr|
@@ -78,14 +78,14 @@ class TestLibusbMassStorage < Minitest::Test
       end
       transfer.result
     else
-      dev.send(method, args)
+      dev.send(method, **args)
     end
   end
-  def control_transfer(args)
-    do_transfer(:control_transfer, args)
+  def control_transfer(**args)
+    do_transfer(:control_transfer, **args)
   end
-  def bulk_transfer(args)
-    do_transfer(:bulk_transfer, args)
+  def bulk_transfer(**args)
+    do_transfer(:bulk_transfer, **args)
   end
 
   def send_mass_storage_command(cdb, data_length, direction=ENDPOINT_IN)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libusb
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.7.0
 platform: x64-mingw32
 authors:
 - Lars Kanis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-05 00:00:00.000000000 Z
+date: 2024-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -24,62 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: rake-compiler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: rake-compiler-dock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !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:
@@ -88,6 +32,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".appveyor.yml"
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".travis.yml"
 - ".yardopts"
@@ -96,7 +42,6 @@ files:
 - History.md
 - README.md
 - Rakefile
-- appveyor.yml
 - lib/libusb-1.0.dll
 - lib/libusb.rb
 - lib/libusb/bos.rb
@@ -105,6 +50,7 @@ files:
 - lib/libusb/configuration.rb
 - lib/libusb/constants.rb
 - lib/libusb/context.rb
+- lib/libusb/context_reference.rb
 - lib/libusb/dependencies.rb
 - lib/libusb/dev_handle.rb
 - lib/libusb/device.rb
@@ -152,15 +98,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: Access USB devices from Ruby via libusb-1.0

data/appveyor.yml

@@ -1,36 +0,0 @@
-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: |
-        if ($env:BROKEN_SSL -eq "true") {
-          $(New-Object Net.WebClient).DownloadFile('https://raw.githubusercontent.com/bagder/ca-bundle/master/ca-bundle.crt', "$env:TMP/ca-bundle.crt")
-          $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
-test_script:
-  - bundle exec rake travis
-environment:
-  matrix:
-    - ruby_version: "head-x64"
-    - ruby_version: "200"
-      BROKEN_SSL: true
-    - ruby_version: "21-x64"
-      BROKEN_SSL: true
-    - ruby_version: "22"
-      BROKEN_SSL: true
-    - ruby_version: "23-x64"
-      BROKEN_SSL: true
-    - ruby_version: "24"