libusb 0.5.0-x86-mingw32 → 0.5.1-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4f2652517795475456e7dfc2dd56e54e6607896
-  data.tar.gz: 480f3a4f75a3695e9bde564a53bab6494637f41c
+  metadata.gz: ed7df63472832064810b9afba746070735f37b18
+  data.tar.gz: 8c7699ac1d4663a9de6574fa3c39bed4572edacf
 SHA512:
-  metadata.gz: 5c0ae00ef71e1b7d4b70f9c8af804770cc861fe1b06a338e3feb1d5a7eef59588c111bb52d281c21db33c1343fc54c24521644c5a2e68013edd1ba22b358cdd4
-  data.tar.gz: e272ea1f14b4c19f54be05b97e0b4a02f7d72bb602558b4e9c9b4d3fe8ae7de48a2e20676abd123be730058c43a2fe2f0e40cb0d5910851d2400db876ebc237c
+  metadata.gz: 5954178199020f79b67f52a2526c470c454d67216204b2e64c7424c833940b4e4f4ab32a9b26c834e67759d6b049e834d33e66ca60b17e2b880f90f5495be621
+  data.tar.gz: f94ca69ed5f18200d07084f38c8affc110a27bd318fc8d2f7725c1c26f870ef5b6ad900c1ba0ba49a6b8ef3f8ecfc3238b6c35b74181c62989486eacc90225d9

data/.travis.yml

@@ -1,4 +1,5 @@
 language: ruby
+sudo: false
 rvm:
   - "1.8.7"
   - "1.9.3"

data/History.md

@@ -1,3 +1,11 @@
+0.5.1 / 2015-09-29
+------------------
+* Add ability to force use of the system or builtin libusb-1.0 library.
+    Use: gem install libusb -- --enable-system-libusb / --disable-system-libusb
+* Update to libusb-1.0.20.
+* Build Windows binary gems per rake-compiler-dock.
+* Fix memory leak in Context#pollfds and use libusb_free_pollfds() if available.
+
 0.5.0 / 2015-01-08
 ------------------
 * Add support for BOS describtors of libusb-1.0.16

data/README.md

@@ -1,6 +1,6 @@
 <!-- -*- coding: utf-8 -*- -->
 
-[![Build Status](https://travis-ci.org/larskanis/libusb.png?branch=debug_travis)](https://travis-ci.org/larskanis/libusb)
+[![Build Status](https://travis-ci.org/larskanis/libusb.svg)](https://travis-ci.org/larskanis/libusb)
 
 Access USB devices from Ruby
 ============================
@@ -89,6 +89,7 @@ If none could be found, a bundled libusb version is built and used, instead.
 Latest code can be used in this way:
 
     $ git clone git://github.com/larskanis/libusb.git
+    $ bundle
     $ rake install_gem
 
 Device hotplug support
@@ -117,21 +118,10 @@ 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.
+Libusb-gem can be cross built for the win32 platform, using the [rake-compiler-dock](https://github.com/larskanis/rake-compiler-dock) .
+Just run:
 
-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
+    $ rake gem:windows
 
 If everything works, there should be `libusb-VERSION-x86-mingw32.gem` in the pkg
 directory.

data/Rakefile

@@ -7,25 +7,32 @@ require 'pathname'
 require 'uri'
 require 'ostruct'
 require 'rake/clean'
+require 'rake_compiler_dock'
 
 task :gem => :build
 task :compile do
   sh "ruby ext/extconf.rb"
 end
+
 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]
 task :travis=>:compile do
   sh "ruby -w -W2 -I. -Ilib -e \"#{travis_tests.map{|f| "require 'test/#{f}';"}.join}\" -- -v"
 end
 task :default => :test
 
+task 'gem:windows' do
+  RakeCompilerDock.sh "bundle && rake cross gem"
+end
+
 COMPILE_HOME               = Pathname( "./tmp" ).expand_path
 STATIC_SOURCESDIR          = COMPILE_HOME + 'sources'
 
 # Fetch tarball from sourceforge
-LIBUSB_VERSION            = ENV['LIBUSB_VERSION'] || '1.0.19'
+LIBUSB_VERSION            = ENV['LIBUSB_VERSION'] || '1.0.20'
 LIBUSB_SOURCE_URI         = URI( "http://downloads.sourceforge.net/project/libusb/libusb-1.0/libusb-#{LIBUSB_VERSION}/libusb-#{LIBUSB_VERSION}.tar.bz2" )
 LIBUSB_TARBALL            = STATIC_SOURCESDIR + File.basename( LIBUSB_SOURCE_URI.path )
 

data/lib/libusb.rb

@@ -26,6 +26,7 @@ module LIBUSB
   autoload :Interface, 'libusb/interface'
   autoload :Setting, 'libusb/setting'
   autoload :SsCompanion, 'libusb/ss_companion'
+  autoload :Stdio, 'libusb/stdio'
   autoload :Bos, 'libusb/bos'
   %w[ Transfer BulkTransfer BulkStreamTransfer ControlTransfer InterruptTransfer IsoPacket IsochronousTransfer ].each do |klass|
     autoload klass, 'libusb/transfer'

data/lib/libusb/call.rb

@@ -342,6 +342,7 @@ module LIBUSB
     attach_function 'libusb_get_pollfds', [:libusb_context], :pointer
     attach_function 'libusb_get_next_timeout', [:libusb_context, :pointer], :int
     attach_function 'libusb_set_pollfd_notifiers', [:libusb_context, :libusb_pollfd_added_cb, :libusb_pollfd_removed_cb, :pointer], :void
+    try_attach_function 'libusb_free_pollfds', [:pointer], :void
 
     callback :libusb_transfer_cb_fn, [:pointer], :void
 

data/lib/libusb/context.rb

@@ -260,8 +260,11 @@ module LIBUSB
         pollfds << Pollfd.new(pollfd[:fd], pollfd[:events])
         offs += FFI.type_size :pointer
       end
-      # ppPollfds has to be released by free() -> give the GC this job
-      ppPollfds.autorelease = true
+      if Call.respond_to?(:libusb_free_pollfds)
+        Call.libusb_free_pollfds(ppPollfds)
+      else
+        Stdio.free(ppPollfds)
+      end
       pollfds
     end
 

data/lib/libusb/stdio.rb

@@ -0,0 +1,25 @@
+# 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 'rubygems'
+require "ffi"
+
+module LIBUSB
+  module Stdio
+    extend FFI::Library
+    ffi_lib FFI::Platform::LIBC
+    attach_function :free, [ :pointer ], :void
+  end
+end

data/lib/libusb/version_gem.rb

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

data/libusb.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |s|
   s.extensions    = ['ext/extconf.rb']
 
   s.add_runtime_dependency 'ffi', '>= 1.0'
-  s.add_development_dependency 'rake-compiler', '>= 0.6'
+  s.add_development_dependency 'rake-compiler', '~> 0.9'
+  s.add_development_dependency 'rake-compiler-dock', '~> 0.2'
   s.add_development_dependency 'bundler'
 end

metadata

@@ -1,35 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libusb
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: x86-mingw32
 authors:
 - Lars Kanis
 autorequire: 
 bindir: bin
-cert_chain:
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIDLjCCAhagAwIBAgIBAjANBgkqhkiG9w0BAQUFADA9MQ4wDAYDVQQDDAVrYW5p
-  czEXMBUGCgmSJomT8ixkARkWB2NvbWNhcmQxEjAQBgoJkiaJk/IsZAEZFgJkZTAe
-  Fw0xNDAyMjYwOTMzMDBaFw0xNTAyMjYwOTMzMDBaMD0xDjAMBgNVBAMMBWthbmlz
-  MRcwFQYKCZImiZPyLGQBGRYHY29tY2FyZDESMBAGCgmSJomT8ixkARkWAmRlMIIB
-  IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApop+rNmg35bzRugZ21VMGqI6
-  HGzPLO4VHYncWn/xmgPU/ZMcZdfj6MzIaZJ/czXyt4eHpBk1r8QOV3gBXnRXEjVW
-  9xi+EdVOkTV2/AVFKThcbTAQGiF/bT1n2M+B1GTybRzMg6hyhOJeGPqIhLfJEpxn
-  lJi4+ENAVT4MpqHEAGB8yFoPC0GqiOHQsdHxQV3P3c2OZqG+yJey74QtwA2tLcLn
-  Q53c63+VLGsOjODl1yPn/2ejyq8qWu6ahfTxiIlSar2UbwtaQGBDFdb2CXgEufXT
-  L7oaPxlmj+Q2oLOfOnInd2Oxop59HoJCQPsg8f921J43NCQGA8VHK6paxIRDLQID
-  AQABozkwNzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUvgTdT7fe
-  x17ugO3IOsjEJwW7KP4wDQYJKoZIhvcNAQEFBQADggEBAFmIAhRT0awqLQN9e4Uv
-  ZEk+jUWv4zkb+TWiKFJXlwjPyjGbZY9gVfOwAwMibYOK/t/+57ZzW3d0L12OUwvo
-  on84NVvYtIr1/iskJFWFkMoIquAFCdi9p68stSPMQK2XcrJJuRot29fJtropsZBa
-  2cpaNd/sRYdK4oep2usdKifA1lI0hIkPb3r5nLfwG2lAqBH7WZsUICHcTgR0VEbG
-  z9Ug5qQp9Uz73xC9YdGvGiuOX53LYobHAR4MWi2xxDlHI+ER8mRz0eY2FUuNu/Wj
-  GrqF74zpLl7/KFdHC8VmzwZS18hvDjxeLVuVI2gIGnBInqnlqv05g/l4/1pISh5j
-  dS4=
-  -----END CERTIFICATE-----
-date: 2015-01-08 00:00:00.000000000 Z
+cert_chain: []
+date: 2015-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -49,16 +28,30 @@ dependencies:
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+- !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.6'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -104,6 +97,7 @@ files:
 - lib/libusb/interface.rb
 - lib/libusb/setting.rb
 - lib/libusb/ss_companion.rb
+- lib/libusb/stdio.rb
 - lib/libusb/transfer.rb
 - lib/libusb/version_gem.rb
 - lib/libusb/version_struct.rb
@@ -146,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: libusb
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Access USB devices from Ruby via libusb-1.0

data.tar.gz.sig

@@ -1,2 +0,0 @@
-c�}n�C�� ^flE챐���_o?��-��'U��D^5��'����!j��H�����
-d�\Yh�HD_�U�y��g�hX=�R�-��ɘP����!9

metadata.gz.sig

@@ -1 +0,0 @@
-pn���A�Z㄃��Zd�&x/���q�`�:8��()��/h����E�vغ��eL�^䙄r