rdkafka 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a7bfbfeabdaa97b1c7868cb714fc1ad1e45fad3
-  data.tar.gz: 00b04579035bd5a1a47c8e798c8697fd2590dea3
+  metadata.gz: d81ac2cd0a6f14c66b39e97f71c273b154d2d8ca
+  data.tar.gz: e7eaa65937211de27685765bd3196affcf20bc27
 SHA512:
-  metadata.gz: 7224534734bea561d2c063acfb260724afaeea30c102ce5b2d244dafe1cd85387fd698cd4f85012823117291f85159e1894acb4360a81ed60559ea3f7ff6f33c
-  data.tar.gz: f6d99ec638da0612c73a7ae4abf0432ce3d367f365c84f3a1450971e0d7305d1f136cb54e9dbfdaf5a624701cc6132441e10e5349cd135ecb217440762b95fe1
+  metadata.gz: f4033f1e7717797c0ffc4b868c87b186a8648aecd8b1e0580adde6ce955be66151f9a61a467ab74d0487575825f0b077bb690c759ac643f150f347b5a6f74a70
+  data.tar.gz: 75218ad280e0d0a277958c16b61baf7f6d0ee3da35d69de78cf0c022ac03ea422f7a6e09a3e1877732c42cb9300f6109f60384ae05da374a4c95106de75cd264

data/.gitignore

@@ -1,4 +1,5 @@
 Gemfile.lock
 ext/ports
 ext/tmp
+ext/librdkafka.*
 *.gem

data/ext/Rakefile

@@ -2,14 +2,28 @@ require File.expand_path('../../lib/rdkafka/version', __FILE__)
 require "mini_portile2"
 require "fileutils"
 
-task :default do
+task :default => :clean do
+  # Download and compile librdkafka
   recipe = MiniPortile.new("librdkafka", Rdkafka::LIBRDKAFKA_VERSION)
   recipe.files = ["https://github.com/edenhill/librdkafka/archive/v#{Rdkafka::LIBRDKAFKA_VERSION}.tar.gz"]
   recipe.configure_options = ["--host=#{recipe.host}"]
   recipe.cook
+  # Move dynamic library we're interested in
+  extension = if recipe.host.include?('darwin')
+                'dylib'
+              else
+                'so'
+              end
+  lib_path = File.join(File.dirname(__FILE__), "ports/#{recipe.host}/librdkafka/#{Rdkafka::LIBRDKAFKA_VERSION}/lib/librdkafka.1.#{extension}")
+  FileUtils.mv(lib_path, File.join(File.dirname(__FILE__), "librdkafka.#{extension}"))
+  # Cleanup files created miniportile we don't need in the gem
+  FileUtils.rm_rf File.join(File.dirname(__FILE__), "tmp")
+  FileUtils.rm_rf File.join(File.dirname(__FILE__), "ports")
 end
 
 task :clean do
-  FileUtils.rm_rf "ports"
-  FileUtils.rm_rf "tmp"
+  FileUtils.rm_f File.join(File.dirname(__FILE__), "librdkafka.dylib")
+  FileUtils.rm_f File.join(File.dirname(__FILE__), "librdkafka.so")
+  FileUtils.rm_rf File.join(File.dirname(__FILE__), "ports")
+  FileUtils.rm_rf File.join(File.dirname(__FILE__), "tmp")
 end

data/lib/rdkafka/ffi.rb

@@ -1,21 +1,18 @@
 require "ffi"
-require "mini_portile2"
 
 module Rdkafka
   module FFI
     extend ::FFI::Library
 
-    def self.library_path
-      mini_portile = MiniPortile.new("librdkafka", Rdkafka::LIBRDKAFKA_VERSION)
-      extension = if mini_portile.host.include?('darwin')
-                    'dylib'
-                  else
-                    'so'
-                  end
-      "../../ext/ports/#{mini_portile.host}/librdkafka/#{Rdkafka::LIBRDKAFKA_VERSION}/lib/librdkafka.#{extension}"
+    def self.lib_extension
+      if Gem::Platform.local.os.include?("darwin")
+        'dylib'
+      else
+        'so'
+      end
     end
 
-    ffi_lib File.join(File.dirname(__FILE__), library_path)
+    ffi_lib File.join(File.dirname(__FILE__), "../../ext/librdkafka.#{lib_extension}")
 
     # Polling
 

data/lib/rdkafka/version.rb

@@ -1,4 +1,4 @@
 module Rdkafka
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
   LIBRDKAFKA_VERSION = "0.11.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdkafka
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Thijs Cadier