ffi-libarchive-binary 0.2.3-x64-mingw32 → 0.2.4-x64-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 930696592076ceeab4eb7373fd6bcfe3e1b20f41
-  data.tar.gz: cfeaf6dfb10c638e5c11a0d77dbc882725f2a128
+  metadata.gz: 636de6eb033d449723c44d244bd8a257ed3a7a80
+  data.tar.gz: e6954fd68d7b8c102e0b7f6f76aa860f527dba86
 SHA512:
-  metadata.gz: 2ccbac3cd0ce7232e924319f4aea4e99f453890999e14c5ad3e3e60ea6514cad7d8230e24841eda14d110b2327248c27eff2bacf7772a2d0e7993858aa75144a
-  data.tar.gz: f4c54d926f42d7bbb22a875b95649406d088903838214059484e0292419ba5a68b5497a72f0d125edfcc1635561673936b61260155301920cff674fdbb71ced9
+  metadata.gz: 738ad73c087c16dd97e89dfb8ff84dd0c2f06708a9380fcd00e6e4fcd5b1385ad2e01f920e3032b0199d4c90067e55a6296bd54c6494f01b791c88b9e4944b4e
+  data.tar.gz: 1319e72010331e2825c8cf9fbe7a1e1b1ad51109bd1d1078274e7074d9bf62cc2f14ce550103ad53e16a45eb819b6371d792895fc0912ddbbec7691745de5228

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: x64-mingw32
 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