Merge branch 'main' of github.com:fontist/extract_ttc into main

.gitignore

@@ -8,8 +8,10 @@
 /spec/reports/
 /tmp/
 /Gemfile.lock
-**/*.so
-**/*.o
+
+/lib/*.so
+/lib/*.bundle
+/ext/*.o
 
 # remote file cache
 .rubocop-*

Gemfile

@@ -2,3 +2,10 @@ source "https://rubygems.org"
 
 # Specify your gem's dependencies in extract_ttc.gemspec
 gemspec
+
+gem "rake-compiler", "~> 1.2"
+gem "rake-compiler-dock", "~> 1.2"
+gem "rspec", "~> 3.0"
+gem "rubocop", "~> 1.5"
+gem "rubocop-performance", "~> 1.10"
+gem "rubocop-rails", "~> 2.9"

README.adoc

@@ -1,3 +1,8 @@
+image:https://img.shields.io/gem/v/extract_ttc.svg["Gem Version", link="https://rubygems.org/gems/extract_ttc"]
+image:https://github.com/fontist/extract_ttc/workflows/test-and-release/badge.svg["Build Status", link="https://github.com/fontist/extract_ttc/actions?workflow=test-and-release"]
+// image:https://codeclimate.com/github/metanorma/extract_ttc/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/fontist/extract_ttc"]
+image:https://img.shields.io/github/issues-pr-raw/fontist/extract_ttc.svg["Pull Requests", link="https://github.com/fontist/extract_ttc/pulls"]
+
 = ExtractTtc: Ruby gem to extract TTF from TTC
 
 == Purpose

Rakefile

@@ -20,17 +20,26 @@ rescue LoadError
 end
 # -- Allow rake-compiler-dock configuration without dev. dependencies
 
-R_CC_V = "RUBY_CC_VERSION=3.1.0:3.0.0:2.7.0".freeze
+ruby_cc_version = "3.1.0"
 bundler_ver = ENV["BUNDLER_VER"] || "2.3.22"
 
 task default: :spec
 task spec: :compile
 
 spec = Gem::Specification.load("extract_ttc.gemspec")
 
-ext_thru_rc_dock = %w[x86_64-linux aarch64-linux] +
-  %w[x64-mingw32 x64-mingw-ucrt x86_64-darwin arm64-darwin]
-
+ext_thru_rc_dock = %w[
+  x86_64-linux
+  aarch64-linux
+  x64-mingw32
+  x64-mingw-ucrt
+  x86_64-darwin
+  arm64-darwin
+]
+
+# TODO automate build with:
+# "rbsys/x86_64-linux-musl:latest" - for x86_64-linux-musl
+# "*" - find/create image for aarch64-linux-musl
 ext_thru_musl_cc = %w[x86_64-linux-musl aarch64-linux-musl]
 
 # HACK: Prevent rake-compiler from overriding required_ruby_version,
@@ -60,31 +69,24 @@ namespace "gem" do
     RCD
   end
 
-  desc "build native gems with rake-compiler-dock"
-  task "native" => "cache" do
-    ext_thru_rc_dock.each do |plat|
-      RakeCompilerDock.sh <<~RCD, platform: plat
-        gem install bundler:#{bundler_ver} --no-document &&
-        bundle install --local &&
-        bundle exec rake native:#{plat} gem #{R_CC_V}
-      RCD
-    end
-  end
-end
-
-namespace "gem" do
   ext_thru_rc_dock.each do |plat|
     desc "Build native gems with rake-compiler-dock in parallel"
     multitask "parallel" => plat
 
     desc "Build the native gem for #{plat}"
     task plat => "cache" do
+      ruby_cc_ver = if plat == "x64-mingw32"
+                      "3.0.0"
+                    else
+                      ruby_cc_version
+                    end
+
       RakeCompilerDock.sh <<~RCD, platform: plat
         gem install bundler:#{bundler_ver} --no-document &&
         bundle install --local &&
         bundle exec rake native:#{plat} \
           pkg/#{exttask.gem_spec.full_name}-#{plat}.gem \
-          #{R_CC_V}
+          RUBY_CC_VERSION=#{ruby_cc_ver}
       RCD
     end
   end

extract_ttc.gemspec

@@ -28,13 +28,6 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "bundler", "~> 2.3", ">= 2.3.22"
   spec.add_runtime_dependency "ffi", "~> 1.0"
   spec.add_runtime_dependency "rake", "~> 13"
-  spec.add_runtime_dependency "rake-compiler", "~> 1.2"
-  spec.add_runtime_dependency "rake-compiler-dock", "~> 1.2"
-
-  spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "rubocop", "~> 1.5"
-  spec.add_development_dependency "rubocop-performance", "~> 1.10"
-  spec.add_development_dependency "rubocop-rails", "~> 2.9"
 
   spec.extensions << "ext/stripttc/extconf.rb"
   spec.metadata["rubygems_mfa_required"] = "false"

lib/extract_ttc.rb

@@ -16,9 +16,9 @@ class UnknownResultError < Error; end
   extend FFI::Library
   # NOTE: ffi doesn't support bundles out of box https://github.com/ffi/ffi/issues/42#issuecomment-750031554
   # NOTE: rake-compiler doesn't support dylib generation https://github.com/rake-compiler/rake-compiler/issues/183
-  lib_name = if File.exists?(File.join(File.dirname(__FILE__),
-                                       "stripttc.bundle"))
-               "stripttc.bundle"
+  macos_binary = "stripttc.bundle"
+  lib_name = if File.exist?(File.join(File.dirname(__FILE__), macos_binary))
+               macos_binary
              else
                "stripttc.so"
              end

lib/extract_ttc/version.rb

@@ -1,3 +1,3 @@
 module ExtractTtc
-  VERSION = "0.3.3".freeze
+  VERSION = "0.3.6".freeze
 end