ffi-libarchive-binary 0.2.3-x86-linux → 0.2.4-x86-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 921ee4594fcdbbbdf4a12570f7d9d54732254376
-  data.tar.gz: 74cc129f37eb142b59644aac2036f4341035c66a
+  metadata.gz: 69e4b963b4e2b5cf3795313799bd681c1f0271d6
+  data.tar.gz: cafd44b7faf3201ce10f083b53de4e09126ec4b5
 SHA512:
-  metadata.gz: e5ab46546d698a8ce829e8e9a286dd45d84645abe74e7fd52cb038414162d21217bb96b44b52befc00dac9080bed64f554af27ccbbe7c33b0f15f8341e839f5f
-  data.tar.gz: 9d9c5bac889c1df489e6336348c52e9ce1422523cd1fa55db966dd3268218e6441f16c6ebc08856f313f1c5a0405bb45c60d25c2cf53ee22dcbf2ea816a6f9d0
+  metadata.gz: de2f29f5f066dd81a6ec2607e33b52abd612528676e2ee276c2b5417685fd1ab0f6a6291772e2269b1e552fb9acf562ab5e7409d7175dfb6e2da0da127a0bca5
+  data.tar.gz: c6cf8b691032ccc95ab133df119fac91bc7a39e90e0a4f95265977dab3f600bd667f7a77c416f2922aa81adfab9d1056be820d2dadec4ab8f9f876c8a4cf9461

data/Rakefile

@@ -12,9 +12,6 @@ end
 desc "Define the gem task to build on any platform (compile on install)"
 task "platform:any" do
   spec = Gem::Specification::load("ffi-libarchive-binary.gemspec").dup
-  spec.extensions = ['ext/extconf.rb']
-  spec.add_runtime_dependency("mini_portile2", "~> 2.0")
-
   task = Gem::PackageTask.new(spec)
   task.define
 end
@@ -39,6 +36,8 @@ platforms.each do |platform, host, lib|
     spec = Gem::Specification::load("ffi-libarchive-binary.gemspec").dup
     spec.platform = Gem::Platform.new(platform)
     spec.files += ["lib/ffi-libarchive-binary/#{lib}"]
+    spec.extensions = []
+    spec.dependencies.reject! { |d| d.name == "mini_portile2" }
 
     task = Gem::PackageTask.new(spec)
     task.define

data/ffi-libarchive-binary.gemspec

@@ -25,6 +25,8 @@ Gem::Specification.new do |spec|
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
+  spec.extensions    = ['ext/extconf.rb']
 
   spec.add_runtime_dependency "ffi-libarchive", "~> 1.0"
+  spec.add_runtime_dependency "mini_portile2", "~> 2.0"
 end

data/lib/ffi-libarchive-binary.rb

@@ -7,18 +7,32 @@ module LibarchiveBinary
   class Error < StandardError; end
 
   LIBRARY_PATH = Pathname.new(File.join(__dir__, "ffi-libarchive-binary"))
+
+  def self.lib_path
+    LIBRARY_PATH.join(lib_filename).to_s
+  end
+
+  def self.lib_filename
+    if FFI::Platform.windows?
+      "libarchive-13.dll"
+    elsif FFI::Platform.mac?
+      "libarchive.dylib"
+    else
+      "libarchive.so"
+    end
+  end
 end
 
 module Archive
   module C
     def self.ffi_lib(*args)
       prefixed = args.map do |names|
-        filenames = names.is_a?(Array) ? names : [names]
-        with_path = filenames.map(&:to_s).map do |filename|
-          LibarchiveBinary::LIBRARY_PATH.join(FFI.map_library_name(filename)).to_s
+        paths = names.is_a?(Array) ? names : [names]
+        if paths.any? { |f| f.include?("libarchive") }
+          [LibarchiveBinary.lib_path] + paths
+        else
+          names
         end
-
-        with_path + filenames
       end
 
       super(*prefixed)

data/lib/ffi-libarchive-binary/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module LibarchiveBinary
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ffi-libarchive-binary
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: x86-linux
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-04-03 00:00:00.000000000 Z
+date: 2021-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi-libarchive