libusb 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e5f9e0c5d8b081434798fc6043348862276ed6c
-  data.tar.gz: d7d1324fd8f0718c83abd011cf2840b8259cfda5
+  metadata.gz: d10e2e32a39c91c08f9616235af0a6e20553caa5
+  data.tar.gz: 5c2984d326011377c7c4524a9bc67efdd5d6a92c
 SHA512:
-  metadata.gz: bcff1f67a785ea9b9605c031153fec3c457bb5b33c283ac3c0228a1d78c20050922cf798fb2d3dc75c3676702f9e97c99a4a5fae0f036e0fbce1e138f5527155
-  data.tar.gz: d11ed544f2813e8c221b232e19b6ad393c94a31dc9d0e66995c0f5dc28cb4261cb61b391bfd8e1096fe47ae681066cf5bf668e71f717106717233b573bb0d40b
+  metadata.gz: 14d47a300ad5cd0300e613d06a935d235a4e11313f5eedc5e8949c06d10a45696a2ac10585e1a4a64b35bc27465d3e8866ab610c0a10ebdd0fca4ced96b73772
+  data.tar.gz: b9c5c9c227b3564cc4afbba4c6334532e923070ed3ce139f051c82ec4c0ead653b140b728aad702f58412fbbdf155fa6a1158bfbeacb9ed8edb864cab9d5c66f

data/History.md

@@ -1,3 +1,7 @@
+0.6.1 / 2016-12-18
+------------------
+* Fix installation of bundled libusb library in source gem.
+
 0.6.0 / 2016-12-09
 ------------------
 * Update bundled libusb version to 1.0.21.

data/Rakefile

@@ -1,18 +1,20 @@
 # -*- coding: utf-8 -*-
 # -*- ruby -*-
 
-require 'bundler/gem_tasks'
+require 'bundler/gem_helper'
 require 'rubygems/package_task'
 require 'pathname'
 require 'uri'
 require 'ostruct'
 require 'rake/clean'
 require 'rake_compiler_dock'
-require_relative 'ext/libusb_recipe'
+require_relative 'lib/libusb/libusb_recipe'
+require_relative 'lib/libusb/gem_helper'
 
 task :gem => :build
 task :compile do
-  sh "ruby ext/extconf.rb --disable-system-libusb"
+  sh "ruby -C ext extconf.rb --disable-system-libusb"
+  sh "make -C ext install RUBYARCHDIR=../lib"
 end
 
 task :test=>:compile do
@@ -25,123 +27,24 @@ task :travis=>:compile do
 end
 task :default => :test
 
-task "release:tag" do
-  hfile = "History.md"
-  version = LIBUSB::VERSION
-  reldate = Time.now.strftime("%Y-%m-%d")
-  headline = '([^\w]*)(\d+\.\d+\.\d+)([^\w]+)([2Y][0Y][0-9Y][0-9Y]-[0-1M][0-9M]-[0-3D][0-9D])([^\w]*|$)'
-
-  hin = File.read(hfile)
-  hout = hin.sub(/#{headline}/) do
-    raise "#{hfile} isn't up-to-date for version #{version}" unless $2==version
-    $1 + $2 + $3 + reldate + $5
-  end
-  if hout != hin
-    Bundler.ui.confirm "Updating #{hfile} for release."
-    File.write(hfile, hout)
-    sh "git", "commit", hfile, "-m", "Update release date in #{hfile}"
-  end
-
-  Bundler.ui.confirm "Tag release with annotation:"
-  m = hout.match(/(?<annotation>#{headline}.*?)#{headline}/m) || raise("Unable to find release notes in #{hfile}")
-  Bundler.ui.info(m[:annotation].gsub(/^/, "    "))
-  IO.popen(["git", "tag", "--file=-", version], "w") do |fd|
-    fd.write m[:annotation]
-  end
-end
-
-task "release:guard_clean" => "release:tag"
-
-task "release:rubygem_push" => "gem:native" do
-  CrossLibraries.each do |ruby_platform, _|
-    gh = Bundler::GemHelper.new
-    gh.send(:rubygem_push, "pkg/#{gh.gemspec.name}-#{gh.gemspec.version}-#{ruby_platform}.gem")
-  end
-end
-
 task 'gem:native' do
   sh "bundle package"
   RakeCompilerDock.sh <<-EOT
-    sudo apt-get update &&
-    sudo apt-get -y install libudev-dev libudev-dev:i386 &
     bundle --local &&
     rake cross gem
   EOT
 end
 
-class CrossLibrary < OpenStruct
-  include Rake::DSL
-
-  def initialize(ruby_platform, host_platform, libusb_dllname)
-    super()
-
-    self.ruby_platform = ruby_platform
-    self.recipe = LibusbRecipe.new
-    recipe.host = host_platform
-    recipe.configure_options << "--host=#{recipe.host}"
-    self.libusb_dll = Pathname.new(recipe.path) + libusb_dllname
-
-    file libusb_dll do
-      recipe.cook
-    end
-
-    task "libusb_dll:#{ruby_platform}" => libusb_dll
-
-    desc 'Cross compile libusb for win32'
-    task :cross => [ "libusb_dll:#{ruby_platform}" ] do |t|
-      spec = Gem::Specification::load("libusb.gemspec").dup
-      spec.platform = Gem::Platform.new(ruby_platform)
-      spec.extensions = []
-
-      # Remove files unnecessary for native gems
-      spec.files -= `git ls-files ext`.split("\n")
-      spec.files.reject!{|f| f.start_with?('ports') }
-      spec_text_files = spec.files.dup
-
-      # Add native libusb-dll
-      spec.files << "lib/#{libusb_dll.basename}"
-
-      # MiniPortile isn't required for native gems
-      spec.dependencies.reject!{|d| d.name=="mini_portile2" }
-
-      # Generate a package for this gem
-      pkg = Gem::PackageTask.new(spec) do |pkg|
-        pkg.need_zip = false
-        pkg.need_tar = false
-        # Do not copy any files per PackageTask, because
-        # we need the files from the platform specific directory
-        pkg.package_files.clear
-      end
-
-      # copy files of the gem to pkg directory
-      file pkg.package_dir_path => spec_text_files do
-        spec_text_files.each do |fn|
-          f = File.join(pkg.package_dir_path, fn)
-          fdir = File.dirname(f)
-          mkdir_p(fdir) if !File.exist?(fdir)
-          rm_f f
-          safe_ln(fn, f)
-        end
-
-        # copy libusb.dll to pkg directory
-        f = "#{pkg.package_dir_path}/lib/#{libusb_dll.basename}"
-        mkdir_p File.dirname(f)
-        rm_f f
-        safe_ln libusb_dll.realpath, f
-      end
-
-      file "lib/#{libusb_dll.basename}" => [libusb_dll]
-    end
-  end
-end
-
 CrossLibraries = [
   ['x86-mingw32', 'i686-w64-mingw32', 'bin/libusb-1.0.dll'],
   ['x64-mingw32', 'x86_64-w64-mingw32', 'bin/libusb-1.0.dll'],
   ['x86-linux', 'i686-linux-gnu', 'lib/libusb-1.0.so'],
   ['x86_64-linux', 'x86_64-linux-gnu', 'lib/libusb-1.0.so'],
-].each do |ruby_platform, host_platform, libusb_dll|
-  CrossLibrary.new ruby_platform, host_platform, libusb_dll
+].map do |ruby_platform, host_platform, libusb_dll|
+  LIBUSB::CrossLibrary.new ruby_platform, host_platform, libusb_dll
 end
 
+LIBUSB::GemHelper.install_tasks
+Bundler::GemHelper.instance.cross_platforms = CrossLibraries.map(&:ruby_platform)
+
 # vim: syntax=ruby

data/ext/extconf.rb

@@ -68,21 +68,31 @@ def build_bundled_libusb(have_udev)
   # without hot-plugging.
   have_udev &&= have_header('libudev.h') && have_library('udev', 'udev_new')
 
-  require_relative 'libusb_recipe'
-  recipe = LibusbRecipe.new
+  require_relative '../lib/libusb/libusb_recipe'
+  recipe = LIBUSB::LibusbRecipe.new
   recipe.configure_options << "--disable-udev" unless have_udev
   recipe.cook_and_activate
-
-  cp_r File.join(recipe.path, '.'), '.', verbose: true, remove_destination: true
+  recipe.path
 end
 
 unless enable_config('system-libusb', libusb_usable?)
   # Unable to load libusb library on this system,
   # so we build our bundled version:
-  build_bundled_libusb(have_udev)
+  libusb_path = build_bundled_libusb(have_udev)
 end
 
-File.open("Makefile", "w") do |mf|
-  mf.puts "# Dummy makefile since libusb-1.0 is usable on this system"
-  mf.puts "all install::\n"
+# Create a Makefile which copies the libusb library files to the gem's lib dir.
+File.open("Makefile", "wb") do |mf|
+  mf.puts <<-EOT
+RUBYARCHDIR = #{RbConfig::MAKEFILE_CONFIG['sitearchdir'].dump}
+all:
+clean:
+install:
+EOT
+
+  if libusb_path
+    mf.puts <<-EOT
+	cp -r #{File.join(libusb_path, "lib").dump}/* $(RUBYARCHDIR)
+    EOT
+  end
 end

data/lib/libusb/gem_helper.rb

@@ -0,0 +1,147 @@
+# 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 "bundler/gem_helper"
+
+module LIBUSB
+  class GemHelper < Bundler::GemHelper
+    attr_accessor :cross_platforms
+
+    def install
+      super
+
+      task "release:guard_clean" => ["release:update_history"]
+
+      task "release:update_history" do
+        update_history
+      end
+
+      task "release:rubygem_push" => ["gem:native"]
+    end
+
+    def hfile
+      "History.md"
+    end
+
+    def headline
+      '([^\w]*)(\d+\.\d+\.\d+)([^\w]+)([2Y][0Y][0-9Y][0-9Y]-[0-1M][0-9M]-[0-3D][0-9D])([^\w]*|$)'
+    end
+
+    def reldate
+      Time.now.strftime("%Y-%m-%d")
+    end
+
+    def update_history
+      hin = File.read(hfile)
+      hout = hin.sub(/#{headline}/) do
+        raise "#{hfile} isn't up-to-date for version #{version}" unless $2==version.to_s
+        $1 + $2 + $3 + reldate + $5
+      end
+      if hout != hin
+        Bundler.ui.confirm "Updating #{hfile} for release."
+        File.write(hfile, hout)
+        Rake::FileUtilsExt.sh "git", "commit", hfile, "-m", "Update release date in #{hfile}"
+      end
+    end
+
+    def tag_version
+      Bundler.ui.confirm "Tag release with annotation:"
+      m = File.read(hfile).match(/(?<annotation>#{headline}.*?)#{headline}/m) || raise("Unable to find release notes in #{hfile}")
+      Bundler.ui.info(m[:annotation].gsub(/^/, "    "))
+      IO.popen(["git", "tag", "--file=-", version_tag], "w") do |fd|
+        fd.write m[:annotation]
+      end
+      yield if block_given?
+    rescue
+      Bundler.ui.error "Untagging #{version_tag} due to error."
+      sh_with_code "git tag -d #{version_tag}"
+      raise
+    end
+
+    def rubygem_push(path)
+      cross_platforms.each do |ruby_platform|
+        super(path.gsub(/\.gem\z/, "-#{ruby_platform}.gem"))
+      end
+      super(path)
+    end
+  end
+
+
+  class CrossLibrary < OpenStruct
+    include Rake::DSL
+
+    def initialize(ruby_platform, host_platform, libusb_dllname)
+      super()
+
+      self.ruby_platform = ruby_platform
+      self.recipe = LIBUSB::LibusbRecipe.new
+      recipe.host = host_platform
+      recipe.configure_options << "--host=#{recipe.host}"
+      self.libusb_dll = Pathname.new(recipe.path) + libusb_dllname
+
+      file libusb_dll do
+        recipe.cook
+      end
+
+      task "libusb_dll:#{ruby_platform}" => libusb_dll
+
+      desc 'Cross compile libusb for win32'
+      task :cross => [ "libusb_dll:#{ruby_platform}" ] do |t|
+        spec = Gem::Specification::load("libusb.gemspec").dup
+        spec.platform = Gem::Platform.new(ruby_platform)
+        spec.extensions = []
+
+        # Remove files unnecessary for native gems
+        spec.files -= `git ls-files ext`.split("\n")
+        spec.files.reject!{|f| f.start_with?('ports') }
+        spec_text_files = spec.files.dup
+
+        # Add native libusb-dll
+        spec.files << "lib/#{libusb_dll.basename}"
+
+        # MiniPortile isn't required for native gems
+        spec.dependencies.reject!{|d| d.name=="mini_portile2" }
+
+        # Generate a package for this gem
+        pkg = Gem::PackageTask.new(spec) do |pkg|
+          pkg.need_zip = false
+          pkg.need_tar = false
+          # Do not copy any files per PackageTask, because
+          # we need the files from the platform specific directory
+          pkg.package_files.clear
+        end
+
+        # copy files of the gem to pkg directory
+        file pkg.package_dir_path => spec_text_files do
+          spec_text_files.each do |fn|
+            f = File.join(pkg.package_dir_path, fn)
+            fdir = File.dirname(f)
+            mkdir_p(fdir) if !File.exist?(fdir)
+            rm_f f
+            safe_ln(fn, f)
+          end
+
+          # copy libusb.dll to pkg directory
+          f = "#{pkg.package_dir_path}/lib/#{libusb_dll.basename}"
+          mkdir_p File.dirname(f)
+          rm_f f
+          safe_ln libusb_dll.realpath, f
+        end
+
+        file "lib/#{libusb_dll.basename}" => [libusb_dll]
+      end
+    end
+  end
+end

data/lib/libusb/libusb_recipe.rb

@@ -0,0 +1,30 @@
+require_relative 'dependencies'
+require 'rubygems'
+# Keep the version constraint in sync with libusb.gemspec
+gem "mini_portile2", LIBUSB::MINI_PORTILE_VERSION
+require "mini_portile2"
+
+module LIBUSB
+  class LibusbRecipe < MiniPortile
+    ROOT = File.expand_path('../../..', __FILE__)
+
+    def initialize
+      super("libusb", LIBUSB_VERSION)
+      self.target = File.join(ROOT, "ports")
+      self.files = [url: LIBUSB_SOURCE_URI, sha1: LIBUSB_SOURCE_SHA1]
+      self.configure_options = []
+    end
+
+    def cook_and_activate
+      checkpoint = File.join(self.target, "#{self.name}-#{self.version}-#{self.host}.installed")
+      unless File.exist?(checkpoint)
+        self.cook
+        FileUtils.touch checkpoint
+      end
+      self.activate
+      self
+    end
+
+    public :files_hashs
+  end
+end

data/lib/libusb/version_gem.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libusb
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Lars Kanis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-09 00:00:00.000000000 Z
+date: 2016-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -99,7 +99,6 @@ files:
 - Rakefile
 - appveyor.yml
 - ext/extconf.rb
-- ext/libusb_recipe.rb
 - lib/libusb.rb
 - lib/libusb/bos.rb
 - lib/libusb/call.rb
@@ -112,7 +111,9 @@ files:
 - lib/libusb/device.rb
 - lib/libusb/endpoint.rb
 - lib/libusb/eventmachine.rb
+- lib/libusb/gem_helper.rb
 - lib/libusb/interface.rb
+- lib/libusb/libusb_recipe.rb
 - lib/libusb/setting.rb
 - lib/libusb/ss_companion.rb
 - lib/libusb/stdio.rb

data/ext/libusb_recipe.rb

@@ -1,29 +0,0 @@
-require_relative '../lib/libusb/dependencies'
-require 'rubygems'
-# NOTE: Keep this version constraint in sync with libusb.gemspec
-gem "mini_portile2", LIBUSB::MINI_PORTILE_VERSION
-require "mini_portile2"
-
-class LibusbRecipe < MiniPortile
-  include LIBUSB
-  ROOT = File.expand_path('../..', __FILE__)
-
-  def initialize
-    super("libusb", LIBUSB_VERSION)
-    self.target = File.join(ROOT, "ports")
-    self.files = [url: LIBUSB_SOURCE_URI, sha1: LIBUSB_SOURCE_SHA1]
-    self.configure_options = []
-  end
-
-  def cook_and_activate
-    checkpoint = File.join(self.target, "#{self.name}-#{self.version}-#{self.host}.installed")
-    unless File.exist?(checkpoint)
-      self.cook
-      FileUtils.touch checkpoint
-    end
-    self.activate
-    self
-  end
-
-  public :files_hashs
-end