libusb 0.4.0-x86-mingw32 → 0.4.1-x86-mingw32

data/.travis.yml

@@ -3,8 +3,8 @@ rvm:
   - "1.8.7"
   - "1.9.3"
   - "2.0.0"
+  - "2.1"
   - jruby-18mode # JRuby in 1.8 mode
   - jruby-19mode # JRuby in 1.9 mode
-  - rbx-18mode
-  - rbx-19mode
+  - rbx-2.2.6
 script: bundle exec rake travis

data/Gemfile

@@ -7,11 +7,3 @@ group :test do
   gem 'eventmachine'
   gem 'minitest'
 end
-
-platforms :rbx do
-  # travis currently runs a slightly older version of rbx,
-  # that needs this special ffi version.
-  if ENV['TRAVIS']
-    gem 'ffi', :git => "git://github.com/ffi/ffi.git", :ref => '5f31908'
-  end
-end

data/History.md

@@ -1,3 +1,8 @@
+0.4.1 / 2014-05-17
+------------------
+* Update bundled libusb version to 1.0.18.
+* Change libusbx references back to libusb, since they have merged again.
+
 0.4.0 / 2013-11-20
 ------------------
 * Add support for device hotplug notifications.

data/README.md

@@ -7,8 +7,8 @@ Access USB devices from Ruby
 
 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](http://libusb.info) 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://libusb.info). 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.
@@ -59,16 +59,16 @@ Prerequisites
 -------------
 
 * Linux, MacOSX or Windows system with Ruby MRI 1.8.7/1.9/2.0, JRuby or recent version of Rubinius
-* Optionally: [libusb](http://libusb.org) or [libusbx](http://libusbx.org) library version 1.0.8+ :
+* Optionally: [libusb](http://libusb.info) or [libusbx](http://libusbx.org) library version 1.0.8+ :
   * Debian or Ubuntu:
 
       ```
       $ sudo apt-get install libusb-1.0-0-dev
       ```
-  * OS-X: install with homebrew (note the `x`):
+  * OS-X: install with homebrew:
 
       ```
-      $ brew install libusbx
+      $ brew install libusb
       ```
     or macports:
 
@@ -83,7 +83,7 @@ Install
     $ gem install libusb
 
 While ```gem install``` the system is checked for a usable libusb(x) library installation.
-If none could be found, a bundled libusbx version is built and used, instead.
+If none could be found, a bundled libusb version is built and used, instead.
 
 Latest code can be used in this way:
 

data/Rakefile

@@ -25,9 +25,9 @@ COMPILE_HOME               = Pathname( "./tmp" ).expand_path
 STATIC_SOURCESDIR          = COMPILE_HOME + 'sources'
 
 # Fetch tarball from sourceforge
-# LIBUSB_VERSION            = ENV['LIBUSB_VERSION'] || '1.0.9'
-# 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 )
+LIBUSB_VERSION            = ENV['LIBUSB_VERSION'] || '1.0.18'
+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 )
 
 # Fetch tarball from git repo
 # LIBUSB_VERSION            = ENV['LIBUSB_VERSION'] || '295c9d1'
@@ -35,9 +35,9 @@ STATIC_SOURCESDIR          = COMPILE_HOME + 'sources'
 # LIBUSB_TARBALL            = STATIC_SOURCESDIR + "libusb-#{LIBUSB_VERSION}.tar.bz2"
 
 # Fetch tarball from libusbx
-LIBUSB_VERSION            = ENV['LIBUSB_VERSION'] || '1.0.17'
-LIBUSB_SOURCE_URI         = URI( "http://downloads.sourceforge.net/project/libusbx/releases/#{LIBUSB_VERSION[/^\d+\.\d+\.\d+/]}/source/libusbx-#{LIBUSB_VERSION}.tar.bz2" )
-LIBUSB_TARBALL            = STATIC_SOURCESDIR + File.basename( LIBUSB_SOURCE_URI.path )
+# LIBUSB_VERSION            = ENV['LIBUSB_VERSION'] || '1.0.17'
+# LIBUSB_SOURCE_URI         = URI( "http://downloads.sourceforge.net/project/libusbx/releases/#{LIBUSB_VERSION[/^\d+\.\d+\.\d+/]}/source/libusbx-#{LIBUSB_VERSION}.tar.bz2" )
+# LIBUSB_TARBALL            = STATIC_SOURCESDIR + File.basename( LIBUSB_SOURCE_URI.path )
 
 # Fetch tarball from Pete Batard's git repo
 # LIBUSB_VERSION            = ENV['LIBUSB_VERSION'] || '4cc72d0'
@@ -172,10 +172,10 @@ CrossLibraries = [
   CrossLibrary.new ruby_platform, host_platform
 end
 
-desc "Download and update bundled libusb(x)"
+desc "Download and update bundled libusb"
 task :update_libusb => LIBUSB_TARBALL do
-  sh 'rm', '-r', (EXT_BUILDDIR + "libusbx-*").to_s do end
-  sh 'git', 'rm', '-rfq', (EXT_BUILDDIR + "libusbx-*").to_s do end
+  sh 'rm', '-r', (EXT_BUILDDIR + "libusb-*").to_s do end
+  sh 'git', 'rm', '-rfq', (EXT_BUILDDIR + "libusb-*").to_s do end
   sh 'tar', '-xjf', LIBUSB_TARBALL.to_s, '-C', EXT_LIBUSB_BUILDDIR.parent.to_s
   drops = %w[msvc].map{|f| (EXT_LIBUSB_BUILDDIR+f).to_s }
   sh 'rm', '-r', '-f', *drops

data/lib/libusb/version_gem.rb

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

data/libusb.gemspec

@@ -20,12 +20,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.extensions    = ['ext/extconf.rb']
 
-  # travis currently runs a slightly older version of rbx,
-  # that needs a special ffi version.
-  unless ENV['TRAVIS'] && defined?(RUBY_ENGINE) && RUBY_ENGINE=='rbx'
-    s.add_runtime_dependency 'ffi', '>= 1.0'
-  end
-
+  s.add_runtime_dependency 'ffi', '>= 1.0'
   s.add_development_dependency 'rake-compiler', '>= 0.6'
   s.add_development_dependency 'bundler'
 end

metadata

@@ -1,76 +1,62 @@
 --- !ruby/object:Gem::Specification
 name: libusb
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
+  prerelease: 
 platform: x86-mingw32
 authors:
 - Lars Kanis
 autorequire: 
 bindir: bin
-cert_chain:
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIDPDCCAiSgAwIBAgIBADANBgkqhkiG9w0BAQUFADBEMQ0wCwYDVQQDDARsYXJz
-  MR8wHQYKCZImiZPyLGQBGRYPZ3JlaXotcmVpbnNkb3JmMRIwEAYKCZImiZPyLGQB
-  GRYCZGUwHhcNMTMwMzExMjAyMjIyWhcNMTQwMzExMjAyMjIyWjBEMQ0wCwYDVQQD
-  DARsYXJzMR8wHQYKCZImiZPyLGQBGRYPZ3JlaXotcmVpbnNkb3JmMRIwEAYKCZIm
-  iZPyLGQBGRYCZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDZb4Uv
-  RFJfRu/VEWiy3psh2jinETjiuBrL0NeRFGf8H7iU9+gx/DI/FFhfHGLrDeIskrJx
-  YIWDMmEjVO10UUdj7wu4ZhmU++0Cd7Kq9/TyP/shIP3IjqHjVLCnJ3P6f1cl5rxZ
-  gqo+d3BAoDrmPk0rtaf6QopwUw9RBiF8V4HqvpiY+ruJotP5UQDP4/lVOKvA8PI9
-  P0GmVbFBrbc7Zt5h78N3UyOK0u+nvOC23BvyHXzCtcFsXCoEkt+Wwh0RFqVZdnjM
-  LMO2vULHKKHDdX54K/sbVCj9pN9h1aotNzrEyo55zxn0G9PHg/G3P8nMvAXPkUTe
-  brhXrfCwWRvOXA4TAgMBAAGjOTA3MAsGA1UdDwQEAwIEsDAJBgNVHRMEAjAAMB0G
-  A1UdDgQWBBRAHK81igrXodaDj8a8/BIKsaZrETANBgkqhkiG9w0BAQUFAAOCAQEA
-  Iswhcol3ytXthaUH3k5LopZ09viZrZHzAw0QleI3Opl/9QEGJ2BPV9+93iC0OrNL
-  hmnxig6vKK1EeJ5PHXJ8hOI3nTZBrOmQcEXNBqyToP1FHMWZqwZ8wiBPXtiCqDBR
-  ePQ25J9xFNzQ1ItgzNSpx5cs67QNKrx5woocoBHD6kStFbshZPJx4axl3GbUFQd5
-  H//3YdPQOH3jaVeUXhS+pz/gfbx8fhFAtsQ+855A3HO7g2ZRIg/atAp/0MFyn5s5
-  0rq+VHOIPyvxF5khT0mYAcNmZTC8z1yPsqdgwfYNDjsSWwiIRSPUSmJRvfjM8hsW
-  mMFp4kPUHbWOqCp2mz9gCA==
-  -----END CERTIFICATE-----
-date: 2013-11-20 00:00:00.000000000 Z
+cert_chain: []
+date: 2014-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0.6'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   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
@@ -121,7 +107,6 @@ files:
 - lib/libusb-1.0.dll
 homepage: http://github.com/larskanis/libusb
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options:
 - --main
@@ -130,19 +115,21 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: libusb
-rubygems_version: 2.0.3
+rubygems_version: 1.8.24
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Access USB devices from Ruby via libusb-1.0
 test_files: []

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: e6ff0b9c57f1c86dac3f6cd56e804112c96bf4b5
-  data.tar.gz: 27a4286d64b7a0be89793787e8e447b0a9fe96df
-SHA512:
-  metadata.gz: 1d2a8e51e6c846d4d9405687fc6fd8db2fe775517cdd71b4288345bdde938ab0ad3bbed1f3817aaa6156175de523b22f6cbbd1fa2e4b37c5ad5495d3e5e9b3e7
-  data.tar.gz: 05d689eca61ab92c98ea799a42146877573103e7811e1dae5832940726be47f783405fa44700a4724e6d2091bd6df46198248d3a9977b42fd885455527270785