gem-ext-zig_builder 0.1.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bfa1cdba6ede4366c9bbc5fd0973a1ff102e5284b25aafc5d18c6af6ab7d967e
-  data.tar.gz: 3fb02e99621c79b78df6a7fe8d61e08b316bbdefb97f10941116d4a198946995
+  metadata.gz: 67f8fea71de7a4772677938160444683b01d4d3aa96e55b1f719d108aa99c0d8
+  data.tar.gz: 06b828adf36c78a949231c482130021d91022fcf625635b23750e92417b8ae36
 SHA512:
-  metadata.gz: 4e55584a1a5e0997645c978d21b308d0a3c0f69158eddfd7c84300d6f457a1f11e0c7d231eb41449f09d2f603fb745ca9cd1d38bd3e99e8fa43c5c6a820705db
-  data.tar.gz: 2e8f94cf078dd2b0a571feaa8a4f983eb485e09c730469820ffbc40066dda7bf9e2dd04c2e9e0b538891376ea9d304b13e271a70de058530d351ab04bf41daed
+  metadata.gz: 5c2088d9a06d0efaf5e17cdbc421b967b05e55077f0c95428ac5b8e9c283b9181c13599848b4639cec0f9b9a9783d2b235075edc49b8ca22ab6d8802071a380e
+  data.tar.gz: 8ca3d7df154f3eadc672c88be8ea0ed3e88fa88dd7602528a9687c47fa067a3471c610268bcbc4cfa76e228df7748915f72c7bc77b54696eb75c376f428996e7

data/lib/gem/ext/zig_builder/version.rb

@@ -2,7 +2,7 @@ module Gem
   module Ext
     class Builder; end
     class ZigBuilder < Builder
-      VERSION = '0.1.1'
+      VERSION = '0.2.2'
     end
   end
 end

data/lib/gem/ext/zig_builder.rb

@@ -4,6 +4,7 @@ require 'rubygems/ext/builder'
 require 'rubygems/command'
 require 'shellwords'
 require 'rbconfig'
+require 'tmpdir'
 
 class Gem::Ext::ZigBuilder < Gem::Ext::Builder
   module PatchBuilderLookup
@@ -12,24 +13,81 @@ class Gem::Ext::ZigBuilder < Gem::Ext::Builder
     end
   end
 
-  def self.build(extension, dest_path, results, args=[], lib_dir=nil, extension_dir=nil)
-    # older versions of ruby do not support the 5th `env` argument to run,
-    # so pollute the global ENV as a cheap workaround
-    ENV['PKG_CONFIG_PATH'] = "#{RbConfig::CONFIG['libdir']}/pkgconfig"
-    ENV['RUBY_PC'        ] = "#{File.basename(RbConfig::CONFIG['ruby_pc'], '.pc')}"
+  class <<self
+    def build(extension, dest_path, results, args=[], lib_dir=nil, extension_dir=nil)
+      _set_vars
 
-    run(
+      tmp_dir = Dir.mktmpdir
+      cmd     = _build_command(tmp_dir)
+      env     = _build_env
+
+      _run(cmd, results, 'zig', extension_dir, env)
+      _install_artifacts(tmp_dir, dest_path)
+
+      results
+    ensure
+      FileUtils.remove_entry tmp_dir if tmp_dir
+    end
+
+    private
+
+    def _set_vars
+      @dlext           = RbConfig::CONFIG['DLEXT']
+      @target_vendor   = RbConfig::CONFIG['target_vendor']
+      @pkg_config_path = "#{RbConfig::CONFIG['libdir']}/pkgconfig"
+      @ruby_pc         = "#{File.basename(RbConfig::CONFIG['ruby_pc'], '.pc')}"
+    end
+
+    def _build_command(tmp_dir)
       [].tap {|c|
         c << 'zig' << 'build' << '-Doptimize=ReleaseSafe'
-        c << '--prefix-lib-dir' << dest_path
+        c << '--prefix-lib-dir' << tmp_dir
         c << 'test' << 'install'
-      },
-      results,
-      'zig',
-      extension_dir
-    )
+      }
+    end
 
-    results
+    def _build_env
+      {
+        'PKG_CONFIG_PATH' => @pkg_config_path,
+        'RUBY_PC'         => @ruby_pc,
+      }.tap do |env|
+      end
+    end
+
+    def _run(command, results, command_name, dir, env)
+      case method(:run).parameters.count
+      when 3
+        # old versions do not support the 4th `dir` arg
+        # old versions do not support the 5th `env` arg
+        _pollute_env(env)
+        run(command, results, command_name)
+      when 4
+        # old versions do not support the 5th `env` arg
+        _pollute_env(env)
+        run(command, results, command_name, dir)
+      when 5
+        run(command, results, command_name, dir, env)
+      else
+        raise ArgumentError.new('wrong number of arguments')
+      end
+    end
+
+    def _pollute_env(env)
+      env.each do |k,v| ENV[k] = v end
+    end
+
+    def _install_artifacts(tmp_dir, dest_path)
+      Dir.chdir tmp_dir do
+        if @target_vendor == 'apple' && @dlext == 'bundle'
+          # zig builds a .dylib but ruby wants to load a .bundle
+          Dir.glob('*.dylib').each do |dylib|
+            FileUtils.mv dylib, "#{File.basename(dylib, '.dylib')}.bundle"
+          end
+        end
+
+        FileUtils.mv Dir.glob("*.#@dlext"), dest_path
+      end
+    end
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gem-ext-zig_builder
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Frank J. Cameron
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-05-08 00:00:00.000000000 Z
+date: 2023-05-12 00:00:00.000000000 Z
 dependencies: []
 description: ''
 email: