libusb 0.1.3 → 0.2.0

data/lib/libusb/version.rb

@@ -0,0 +1,63 @@
+# 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 'libusb/call'
+
+module LIBUSB
+  class Version < FFI::Struct
+    layout :major, :uint16,
+        :minor, :uint16,
+        :micro, :uint16,
+        :nano, :uint16,
+        :rc, :pointer,
+        :describe, :pointer
+
+    # Library major version.
+    def major
+      self[:major]
+    end
+    # Library minor version.
+    def minor
+      self[:minor]
+    end
+    # Library micro version.
+    def micro
+      self[:micro]
+    end
+    # Library nano version.
+    def nano
+      self[:nano]
+    end
+
+    # Library release candidate suffix string, e.g. "-rc4".
+    def rc
+      self[:rc].read_string
+    end
+
+    # For ABI compatibility only.
+    def describe
+      self[:describe].read_string
+    end
+
+    # Version string, e.g. "1.2.3-rc4"
+    def to_s
+      "#{major}.#{minor}.#{micro}#{rc}"
+    end
+
+    def inspect
+      "\#<#{self.class} #{to_s}>"
+    end
+  end
+end

data/test/test_libusb_capability.rb

@@ -0,0 +1,23 @@
+# 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 TestLibusbCapability < Test::Unit::TestCase
+  def test_version_parts
+    assert LIBUSB.has_capability?(:CAP_HAS_CAPABILITY)
+  end
+end

data/test/test_libusb_descriptors.rb

@@ -161,6 +161,19 @@ class TestLibusbDescriptors < Test::Unit::TestCase
         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.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")
+        path = dev.port_path
+        assert_kind_of Array, path, "#{dev.inspect} should have a port_path"
+        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"
+        end
       end
     end
   end

data/test/test_libusb_version.rb

@@ -0,0 +1,36 @@
+# 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 TestLibusbVersion < Test::Unit::TestCase
+  def setup
+    @v = LIBUSB.version
+  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
+  end
+
+  def test_version_string
+    assert_match(/^\d+\.\d+\.\d+/, @v.to_s)
+    assert_match(/^#<LIBUSB::Version \d+\.\d+\.\d+/, @v.inspect)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: libusb
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-15 00:00:00.000000000 Z
+date: 2012-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
-  requirement: &11238960 !ruby/object:Gem::Requirement
+  requirement: &21755140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *11238960
+  version_requirements: *21755140
 - !ruby/object:Gem::Dependency
   name: rake-compiler
-  requirement: &11254720 !ruby/object:Gem::Requirement
+  requirement: &21777860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0.6'
   type: :development
   prerelease: false
-  version_requirements: *11254720
+  version_requirements: *21777860
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &11254160 !ruby/object:Gem::Requirement
+  requirement: &21777240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,27 +43,38 @@ dependencies:
         version: '2.12'
   type: :development
   prerelease: false
-  version_requirements: *11254160
-description: LIBUSB is a Ruby binding that gives Ruby programmers access to all functionality
-  of libusb, version 1.0
+  version_requirements: *21777240
+description: LIBUSB is a Ruby binding that gives Ruby programmers access to arbitrary
+  USB devices
 email:
 - kanis@comcard.de
 executables: []
 extensions: []
 extra_rdoc_files:
-- History.txt
-- Manifest.txt
 - README.rdoc
 files:
 - .autotest
 - .gemtest
+- .yardopts
 - COPYING
 - History.txt
 - Manifest.txt
 - README.rdoc
 - Rakefile
 - lib/libusb.rb
+- lib/libusb/call.rb
 - lib/libusb/compat.rb
+- lib/libusb/configuration.rb
+- lib/libusb/constants.rb
+- lib/libusb/context.rb
+- lib/libusb/dev_handle.rb
+- lib/libusb/device.rb
+- lib/libusb/endpoint.rb
+- lib/libusb/interface.rb
+- lib/libusb/setting.rb
+- lib/libusb/transfer.rb
+- lib/libusb/version.rb
+- test/test_libusb_capability.rb
 - test/test_libusb_compat.rb
 - test/test_libusb_compat_mass_storage.rb
 - test/test_libusb_descriptors.rb
@@ -71,7 +82,7 @@ files:
 - test/test_libusb_iso_transfer.rb
 - test/test_libusb_mass_storage.rb
 - test/test_libusb_mass_storage2.rb
-- test/test_libusb_keyboard.rb
+- test/test_libusb_version.rb
 homepage: http://github.com/larskanis/libusb
 licenses: []
 post_install_message: 
@@ -100,11 +111,12 @@ 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_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_iso_transfer.rb
 - test/test_libusb_mass_storage2.rb
+- test/test_libusb_descriptors.rb
 - test/test_libusb_mass_storage.rb
+- test/test_libusb_capability.rb
+- test/test_libusb_compat_mass_storage.rb
+- test/test_libusb_version.rb
+- test/test_libusb_gc.rb

data/test/test_libusb_keyboard.rb

@@ -1,50 +0,0 @@
-# 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