ffi-libarchive-binary 0.2.3-arm64-darwin → 0.2.4-arm64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6315d22282375d09ccf51dee29f240082a905c20
-  data.tar.gz: 62019d832b39354638fb913545d0fda8f64d913e
+  metadata.gz: 25b51d1937550c58e070cfbc216cee847ccf6bf9
+  data.tar.gz: f11e7a83efa785d0edece05e9dea67e0bff67944
 SHA512:
-  metadata.gz: c2a107310273c293d8de793417ff98ea6ff7ad82dbcd50ae7122295002da1b56652ad3a93aa3108dac57c51431143684b075bf6fdd75c58cbfeb7e420d26aa4f
-  data.tar.gz: b09547a824fc373682767a3d8d44f3759c3b8899685eddead6ac454e73e4ccd938a491da3c296e6a5a51f8cf259a3c2d7d9b201e5c74b86b574ca862127b08ac
+  metadata.gz: 989f7c36365413deb149c3261bdb6fade22277d5eff1f71bb3824cbe19f5726b072d405a0fe22b8fe5ce4a70722250a0891886eb49b6f02f256569ca589ea859
+  data.tar.gz: 1622ce6c13193e9bcfe5840f9e502a0bd93f513f426487fed0f8bcbe02bc182ba9de60708456a6843e3ac8b88e3eeb431824396586774b86a0bdfc1e7f726e3e

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: arm64-darwin
 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