extract_ttc 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6d17daa99ebfce9bef022ad42667c35c183a687e0aac23436971dd946a98d45
-  data.tar.gz: 0e08cddcb9547b00eb95fd54f1df55669cfc5e3572604874f0f208ad93e36034
+  metadata.gz: f31d7599e2b7b67d9602cacfefbf05d52fc5edfe6f7f268efd498b6bd74f11de
+  data.tar.gz: 9037cc4122a727931eebe8dba4690c84b370e91ed5b307788037fb039c0544b5
 SHA512:
-  metadata.gz: 8b94ad46a8aa508e7a48d310a88de0888ca39cb9c7e0b4e58b9a68327332ce036f82c69fd60ca0da2f00dc828e87b1cc689eecf48b3c4e474d04ba0538bc608c
-  data.tar.gz: 60d2eec18035282b015ce768900147f2af35852592f050f8c5fa000f1c16da5c0766fe4be2cc279f0b7b13a0100269d48fb4fc4f12567a718a5074a63aaf69bf
+  metadata.gz: 5115bdd8b6930ff785a39ddc0f147146fda59c4353f0b1e5faf5a54367a41a2d63c43a0e67b53c50835fadc007402cdc93ab7528a4b08447e82c447342385db2
+  data.tar.gz: 8ab4fe679de26be9396bbf20f263ee11aaf9c520aaf125073b498bb7624b816be7c8fc0e57a909fa987835223b6f64d0b36a6434a28b41694a593f483259f602

data/.gitignore

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

data/.rubocop.yml

@@ -1,5 +1,5 @@
 inherit_from:
   - 'https://raw.githubusercontent.com/fontist/oss-guides/master/ci/rubocop.yml'
 
-Rails:
-  Enabled: false
+AllCops:
+  SuggestExtensions: false

data/Gemfile

@@ -2,5 +2,3 @@ source "https://rubygems.org"
 
 # Specify your gem's dependencies in extract_ttc.gemspec
 gemspec
-
-gem "rake", "~> 12.0"

data/Rakefile

@@ -1,23 +1,38 @@
 require "bundler/gem_tasks"
-task default: :compile
+require "rspec/core/rake_task"
+require "rake/clean"
+require "rake/extensiontask"
 
-desc "Build stripttc C library"
-task :compile do
-  print "Building stripttc..."
-  Dir.chdir("ext/stripttc") do
-    `make`
-  end
-  puts " done."
+require "rubygems"
+require "rubygems/package_task"
+
+require "rubocop/rake_task"
+
+RSpec::Core::RakeTask.new(:spec)
+RuboCop::RakeTask.new
+
+task default: :spec
+task spec: :compile
+
+spec = Gem::Specification.load("extract_ttc.gemspec")
+
+# add your default gem packing task
+Gem::PackageTask.new(spec) do |pkg|
 end
 
-desc "Recompile the stripttc C library"
-task recompile: %i[clean compile]
+# HACK: Prevent rake-compiler from overriding required_ruby_version,
+# because the shared library here is Ruby-agnostic.
+# See https://github.com/rake-compiler/rake-compiler/issues/153
+module FixRequiredRubyVersion
+  def required_ruby_version=(*); end
+end
+Gem::Specification.prepend(FixRequiredRubyVersion)
 
-desc "Remove compiled stripttc library"
-task :clean do
-  print "Cleaning stripttc..."
-  Dir.glob("ext/stripttc/*.{o,so}") do |path|
-    File.delete(path)
+Rake::ExtensionTask.new("stripttc", spec) do |ext|
+  ext.lib_dir = "lib"
+  ext.cross_compile = true
+  ext.cross_platform = %w[x64-mingw32 x64-mingw-ucrt x86_64-linux x86_64-darwin]
+  ext.cross_compiling do |s|
+    s.files.reject! { |path| File.fnmatch?("ext/*", path) }
   end
-  puts " done."
 end

data/bin/rspec

@@ -10,12 +10,12 @@
 
 require "pathname"
 ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
+                                           Pathname.new(__FILE__).realpath)
 
-bundle_binstub = File.expand_path("../bundle", __FILE__)
+bundle_binstub = File.expand_path("bundle", __dir__)
 
 if File.file?(bundle_binstub)
-  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+  if /This file was generated by Bundler/.match?(File.read(bundle_binstub, 300))
     load(bundle_binstub)
   else
     abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.

data/ext/stripttc/dummy.c

@@ -0,0 +1,2 @@
+// to keep linker happy
+void Init_stripttc() {}

data/ext/stripttc/extconf.rb

@@ -1 +1,6 @@
-# do nothing, Makefile is already here
+require "mkmf"
+require "rbconfig"
+
+CONFIG["LDSHARED"] << " -shared" unless RbConfig::CONFIG["host_os"].match?(/darwin/)
+
+create_makefile "stripttc"

data/ext/stripttc/stripttc.c

@@ -11,6 +11,12 @@
 
 #define CHR(ch1,ch2,ch3,ch4) (((ch1)<<24)|((ch2)<<16)|((ch3)<<8)|(ch4))
 
+#ifdef _WIN32
+#define EXPORT_API __declspec(dllexport)
+#else
+#define EXPORT_API 
+#endif
+
 static void putshort(FILE *file,int sval) {
     putc((sval>>8)&0xff,file);
     putc(sval&0xff,file);
@@ -132,7 +138,7 @@ static int handlefont(char *filename,int which,FILE *ttc,int offset) {
     return( 0 );
 }
 
-int handlefile(char *filename) {
+EXPORT_API int handlefile(char *filename) {
     FILE *ttc = fopen(filename,"rb");
     int version, cnt, e, i;
     int *offsets;

data/extract_ttc.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.description   = "Extract font collection to separate font files"
   spec.homepage      = "https://github.com/fontist/extract_ttc"
   spec.license       = "BSD-3-Clause"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.6.0")
 
   spec.metadata["homepage_uri"]    = spec.homepage
   spec.metadata["source_code_uri"] = "https://github.com/fontist/extract_ttc"
@@ -18,19 +18,23 @@ Gem::Specification.new do |spec|
 
   spec.files = Dir.chdir(__dir__) do
     `git ls-files -z`
-      .split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+      .split("\x0").reject { |f| f.match(%r{^(.github|test|spec|features)/}) }
   end
 
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "ffi"
+  spec.add_runtime_dependency "ffi", "~> 1.0"
 
+  spec.add_development_dependency "bundler", "~> 2.0"
+  spec.add_development_dependency "rake", "~> 13"
+  spec.add_development_dependency "rake-compiler", "~> 1"
   spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "rubocop", "0.75.0"
-  spec.add_development_dependency "rubocop-performance"
-  spec.add_development_dependency "rubocop-rails"
+  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"
 end

data/lib/extract_ttc/version.rb

@@ -1,3 +1,3 @@
 module ExtractTtc
-  VERSION = "0.1.0".freeze
+  VERSION = "0.2.0".freeze
 end

data/lib/extract_ttc.rb

@@ -4,13 +4,25 @@ require "tempfile"
 
 module ExtractTtc
   class Error < StandardError; end
+
   class ReadFileError < Error; end
+
   class InvalidFileError < Error; end
+
   class WriteFileError < Error; end
+
   class UnknownResultError < Error; end
 
   extend FFI::Library
-  ffi_lib File.expand_path("../ext/stripttc/stripttc.so", __dir__)
+  # 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"
+             else
+               "stripttc.so"
+             end
+  ffi_lib File.join(File.dirname(__FILE__), lib_name)
   attach_function :handlefile, [:string], :int
 
   def self.extract(path)
@@ -62,6 +74,6 @@ module ExtractTtc
   end
 
   def self.fetch_filenames(stdout)
-    stdout.split("=>").last.split(" ")
+    stdout.split("=>").last.split
   end
 end

metadata

@@ -1,29 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: extract_ttc
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-11-09 00:00:00.000000000 Z
+date: 2022-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !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'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -42,44 +84,44 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.75.0
+        version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.75.0
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.10'
 - !ruby/object:Gem::Dependency
   name: rubocop-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.9'
 description: Extract font collection to separate font files
 email:
 - operations@ribose.com
@@ -88,9 +130,6 @@ extensions:
 - ext/stripttc/extconf.rb
 extra_rdoc_files: []
 files:
-- ".github/workflows/macosx.yml"
-- ".github/workflows/ubuntu.yml"
-- ".github/workflows/windows.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -102,7 +141,7 @@ files:
 - bin/rspec
 - bin/setup
 - ext/stripttc/LICENSE
-- ext/stripttc/Makefile
+- ext/stripttc/dummy.c
 - ext/stripttc/extconf.rb
 - ext/stripttc/stripttc.c
 - extract_ttc.gemspec
@@ -115,7 +154,8 @@ metadata:
   homepage_uri: https://github.com/fontist/extract_ttc
   source_code_uri: https://github.com/fontist/extract_ttc
   changelog_uri: https://github.com/fontist/extract_ttc
-post_install_message:
+  rubygems_mfa_required: 'false'
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -123,15 +163,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: Extract TTC file to TTF files
 test_files: []

data/.github/workflows/macosx.yml

@@ -1,30 +0,0 @@
-name: macos
-
-on:
-  push:
-    branches:
-      - master
-
-  pull_request:
-    branches:
-      - master
-
-jobs:
-  build:
-    runs-on: macos-latest
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6
-
-      - name: Install bundler
-        run: gem install bundler
-
-      - name: Setup
-        run: bin/setup
-
-      - name: Run tests
-        run: bin/rspec

data/.github/workflows/ubuntu.yml

@@ -1,30 +0,0 @@
-name: ubuntu
-
-on:
-  push:
-    branches:
-      - master
-
-  pull_request:
-    branches:
-      - master
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6
-
-      - name: Install bundler
-        run: gem install bundler
-
-      - name: Setup
-        run: bin/setup
-
-      - name: Run tests
-        run: bin/rspec

data/.github/workflows/windows.yml

@@ -1,32 +0,0 @@
-name: windows
-
-on:
-  push:
-    branches:
-      - master
-
-  pull_request:
-    branches:
-      - master
-
-jobs:
-  build:
-    runs-on: windows-latest
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6
-
-      - name: Setup
-        shell: pwsh
-        run: |
-          gem install bundler
-          bundle config --local path vendor/bundle
-          bundle install --jobs 4 --retry 3
-          bundle exec rake compile
-
-      - name: Run tests
-        run: bundle exec rspec

data/ext/stripttc/Makefile

@@ -1,16 +0,0 @@
-# stripttc.c originates from:
-# https://github.com/fontforge/fontforge/blob/master/contrib/fonttools/stripttc.c
-
-default: stripttc.so
-
-stripttc.so: stripttc.o
-	gcc -shared -o $@ $<
-
-stripttc.o: stripttc.c
-	gcc -c -fPIC -o $@ $<
-
-install:
-	: # do nothing, we'll load the lib directly
-
-clean:
-	-rm *.so *.o