extract_ttc 0.3.5-x64-mingw-ucrt → 0.3.6-x64-mingw-ucrt

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb301c81fe0d86ad1ca747e80cf2dcab15b835dbf75a4e115f059e3ec3d535a9
-  data.tar.gz: '0936680d6de45aaffe410dd06ae0b5cb07d8536e73f4b3910c29fbf2e130f430'
+  metadata.gz: 7d8dd27521e3a315f320746f090f35fe85575825efedefe721ffe87e735c8103
+  data.tar.gz: 19d016b20e3b86afc80e4151b230744eaa3dd41566b296cdaffd7fb84ca35330
 SHA512:
-  metadata.gz: 9eb548d01e8192402a79523d59f014fc2c0a2a0426aa6185b3b458cd5d8df2f0ae769c7efdd4caf3841c9411b1133084e7c20c132c6c6568d658220f5e5cdcff
-  data.tar.gz: e1a0f0aaa9f7dc1a03e5287018b1fcf2d400839b64ba97da921ffd2780507dc5c63d1099920d4348e6ea7ef2c723c7dd2d03d5449d824131d4a9bd49991cacc9
+  metadata.gz: 6b211883958a74d45a6e353f14384f1c92d05a88608caf95e3236ca7f8f5a778f3b2ea48a5465cc1cb2bb22e84f4d20b47a6ae8c77f2b453be490862e0bc404c
+  data.tar.gz: f1e823bd37d161a22d9069f2044b5a5bd78a8907bb96a210b821e92dc7f911d5aa0018de70f33785b866258947404ce7d2b31aa4358ec72a6394d53fe49ed2cb

data/.gitignore

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

data/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"

data/Rakefile

@@ -20,7 +20,7 @@ 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
@@ -28,9 +28,18 @@ 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

data/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"

data/lib/extract_ttc/version.rb

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

data/lib/extract_ttc.rb

@@ -16,13 +16,8 @@ module ExtractTtc
   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_subdir = RUBY_VERSION.split(".").first(2).join(".")
   macos_binary = "stripttc.bundle"
-  lib_name = if File.exist?(
-    File.join(File.dirname(__FILE__), lib_subdir, macos_binary),
-  )
-               File.join(lib_subdir, macos_binary)
-             elsif File.exist?(File.join(File.dirname(__FILE__), macos_binary))
+  lib_name = if File.exist?(File.join(File.dirname(__FILE__), macos_binary))
                macos_binary
              else
                "stripttc.so"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: extract_ttc
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: x64-mingw-ucrt
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-02-13 00:00:00.000000000 Z
+date: 2023-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,90 +58,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '13'
-- !ruby/object:Gem::Dependency
-  name: rake-compiler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-- !ruby/object:Gem::Dependency
-  name: rake-compiler-dock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
-- !ruby/object:Gem::Dependency
-  name: rubocop-performance
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.10'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.10'
-- !ruby/object:Gem::Dependency
-  name: rubocop-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.9'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.9'
 description: Extract font collection to separate font files
 email:
 - operations@ribose.com
@@ -157,9 +73,9 @@ files:
 - README.adoc
 - Rakefile
 - extract_ttc.gemspec
-- lib/3.1/stripttc.so
 - lib/extract_ttc.rb
 - lib/extract_ttc/version.rb
+- lib/stripttc.so
 homepage: https://github.com/fontist/extract_ttc
 licenses:
 - BSD-3-Clause