pngcheck 0.1.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3108a01f5219fca06fb7a8c20da83f2c022e434a03992ad0fd9490acae9b9f7d
-  data.tar.gz: d959ab0ef00e06b62d4a610ed6ea8cd2250e92fbdc2679bdc1325e9f08f08882
+  metadata.gz: 3eae7d8aff8cd89dd6841d3fa4c841c978bdff7692bd2e86dfa925fbc56cf654
+  data.tar.gz: 11369956fe046f3831b65e318cede1351f473efe5d0f3122452765cfbd45f758
 SHA512:
-  metadata.gz: 5525ee60d5c00b76fd9991d06e64f9ded140d2a88f238a7130abcb2c0e7bc96b53d4d5fda926a044198d02d2fe0ae790b0cc63a47acecaf1a9925c915b66290d
-  data.tar.gz: d210466936f5539db834065e3a5348b6e6ba2befeac712127d565bb7c05b23b06d3889a281399634c949f0193cf54182ee85324548ece65f8ce098b49690dc1b
+  metadata.gz: b6fb8b8ab2ad2ad87d3b0eeb14350e7ca82e00c22ccdfe904385b498f70c157c54ed7f71fbcc4eb74e8d1832aeb185b88248c12d67057f68054be60811f4535d
+  data.tar.gz: 1ab780793b6518ed1581b569c7f07b1fe0f5456b1be90cbfe0b63a77d3afd863ba69ed2baed5ce81c9038dd5f088628c7d4559948f2f882e5aa7deba1741a952

data/.cross_rubies

@@ -0,0 +1,7 @@
+x64-mingw32
+x86_64-linux
+x86_64-linux-musl
+aarch64-linux
+x86_64-darwin
+arm64-darwin
+x64-mingw-ucrt

data/.hound.yml

@@ -0,0 +1,3 @@
+ruby:
+  enabled: true
+  config_file: .rubocop.yml

data/Gemfile

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

data/Rakefile

@@ -2,10 +2,9 @@
 
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
+require "rubocop/rake_task"
 
 RSpec::Core::RakeTask.new(:spec)
-
-require "rubocop/rake_task"
 RuboCop::RakeTask.new
 
 task default: %i[spec rubocop]
@@ -15,3 +14,45 @@ task :compile do
 end
 
 task spec: :compile
+
+desc "Build install-compilation gem"
+task "gem:native:any" do
+  sh "rake platform:any gem"
+end
+
+require "rubygems/package_task"
+
+desc "Define the gem task to build on any platform (compile on install)"
+task "platform:any" do
+  spec = Gem::Specification::load("pngcheck.gemspec").dup
+  task = Gem::PackageTask.new(spec)
+  task.define
+end
+
+File.readlines(".cross_rubies", chomp: true).each do |platform|
+  desc "Build pre-compiled gem for the #{platform} platform"
+  task "gem:native:#{platform}" do
+    sh "rake compile platform:#{platform} gem target_platform=#{platform}"
+  end
+
+  desc "Define the gem task to build on the #{platform} platform (binary gem)"
+  task "platform:#{platform}" do
+    spec = Gem::Specification::load("pngcheck.gemspec").dup
+    spec.platform = Gem::Platform.new(platform)
+    spec.files += Dir.glob("lib/pngcheck/*.{dll,so,dylib}")
+    spec.extensions = []
+    spec.dependencies.reject! { |d| d.name == "mini_portile2" }
+
+    task = Gem::PackageTask.new(spec)
+    task.define
+  end
+end
+
+require "rake/clean"
+
+CLOBBER.include("pkg")
+CLEAN.include("ports",
+              "tmp",
+              "lib/pngcheck/*.dll",
+              "lib/pngcheck/*.dylib",
+              "lib/pngcheck/*.so")

data/ext/extconf.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 $LOAD_PATH << File.expand_path(File.join(File.dirname(__FILE__), "../lib"))
-
 require "pngcheck/recipe"
 
 recipe = PngCheck::Recipe.new

data/lib/pngcheck/recipe.rb

@@ -1,29 +1,43 @@
 # frozen_string_literal: true
 
+require "rbconfig"
 require "mini_portile2"
 require "pathname"
+require "tmpdir"
+require "shellwords"
+require "open3"
+require_relative "version"
 
 module PngCheck
   class Recipe < MiniPortile
     ROOT = Pathname.new(File.expand_path("../..", __dir__))
+    COMMON_FLAGS = "-shared -fPIC -Wall -O -DUSE_ZLIB"
 
-    def initialize
-      super("pngcheck", "3.0.3")
-
+    def files_to_load
       @files << {
         url: "http://www.libpng.org/pub/png/src/pngcheck-3.0.3.tar.gz",
         sha256: "c36a4491634af751f7798ea421321642f9590faa032eccb0dd5fb4533609dee6", # rubocop:disable Layout/LineLength
       }
+      if target_platform.eql?("aarch64-linux")
+        @files << {
+          url: "http://ports.ubuntu.com/pool/main/z/zlib/zlib1g-dev_1.2.11.dfsg-2ubuntu1.3_arm64.deb", # rubocop:disable Layout/LineLength
+          sha256: "0ebadc1ff2a70f0958d4e8e21ffa97d9fa4da23555eaae87782e963044a26fcf", # rubocop:disable Layout/LineLength
+        }
+      end
+    end
 
+    def initialize
+      super("pngcheck", "3.0.3")
+      files_to_load
       @target = ROOT.join(@target).to_s
       @printed = {}
     end
 
     def make_cmd
       if MiniPortile.windows?
-        +"gcc -shared -fPIC -Wall -O -DUSE_ZLIB -o pngcheck.dll wrapper.c -lz"
+        "gcc #{COMMON_FLAGS} -o pngcheck.dll wrapper.c -lz"
       else
-        +"gcc -shared -fPIC -Wall -O -DUSE_ZLIB -o pngcheck.so wrapper.c -lz"
+        "#{cc} #{cflags} #{COMMON_FLAGS} -o pngcheck.so wrapper.c -lz"
       end
     end
 
@@ -42,6 +56,29 @@ module PngCheck
 
     def configure
       FileUtils.cp(ROOT.join("ext", "wrapper.c"), work_path, verbose: false)
+      if target_platform.eql?("aarch64-linux")
+        extract_file("#{work_path}/../data.tar.xz", work_path.to_s)
+      end
+    end
+
+    def libs_to_verify
+      Dir.glob(ROOT.join("lib", "pngcheck",
+                         "pngcheck.{so,dylib,dll}"))
+    end
+
+    def verify_libs
+      libs_to_verify.each do |l|
+        out, st = Open3.capture2("file #{l}")
+        out = out.strip
+
+        raise "Failed to query file #{l}: #{out}" unless st.exitstatus.zero?
+
+        if out.include?(target_format)
+          message("Verifying #{l} ... OK\n")
+        else
+          raise "Invalid file format '#{out}', '#{@target_format}' expected"
+        end
+      end
     end
 
     def install
@@ -49,6 +86,7 @@ module PngCheck
         .grep(%r{/(?:lib)?[a-zA-Z0-9\-]+\.(?:so|dylib|dll)$})
 
       FileUtils.cp_r(libs, ROOT.join("lib", "pngcheck"), verbose: false)
+      verify_libs
     end
 
     def execute(action, command, command_opts = {})
@@ -65,5 +103,85 @@ module PngCheck
       @printed[pattern] = true
       super
     end
+
+    # rubocop:disable Metrics/MethodLength
+    # rubocop:disable Metrics/CyclomaticComplexity
+    def host_platform
+      @host_platform ||=
+        case @host
+        when /\Ax86_64-w64-mingw32/
+          "x64-mingw32"
+        when /\Ax86_64-w64-mingw-ucrt/
+          "x64-mingw-ucrt"
+        when /\A(arm64|aarch64).*linux/
+          "aarch64-linux"
+        when /\Ax86_64.*(darwin|macos|osx)/
+          "x86_64-darwin"
+        when /\A(arm64|aarch64).*(darwin|macos|osx)/
+          "arm64-darwin"
+        else
+          @host
+        end
+    end
+
+    def target_platform
+      @target_platform ||=
+        case ENV.fetch("target_platform", nil)
+        when /\A(arm64|aarch64).*(darwin|macos|osx)/
+          "arm64-darwin"
+        when /\Ax86_64.*(darwin|macos|osx)/
+          "x86_64-darwin"
+        when /\A(arm64|aarch64).*linux/
+          "aarch64-linux"
+        else
+          ENV.fetch("target_platform", host_platform)
+        end
+    end
+
+    def target_format
+      @target_format ||=
+        case target_platform
+        when "arm64-darwin"
+          "Mach-O 64-bit dynamically linked shared library arm64"
+        when "x86_64-darwin"
+          "Mach-O 64-bit dynamically linked shared library x86_64"
+        when "aarch64-linux"
+          "ELF 64-bit LSB shared object, ARM aarch64"
+        when /\Ax86_64.*linux.*/
+          "ELF 64-bit LSB shared object, x86-64"
+        when /\Ax64-mingw(32|-ucrt)/
+          "PE32+ executable (DLL) (console) x86-64, for MS Windows"
+        else
+          "skip"
+        end
+    end
+
+    def cc
+      @cc ||=
+        if target_platform.eql?(host_platform)
+          "gcc"
+        else
+          case target_platform
+          when "aarch64-linux"
+            "aarch64-linux-gnu-gcc"
+          when "arm64-darwin"
+            "gcc -target arm64-apple-macos11"
+          else
+            "gcc"
+          end
+        end
+    end
+
+    def cflags
+      @cflags ||=
+        if target_platform.eql?(host_platform) ||
+            !target_platform.eql?("aarch64-linux")
+          ""
+        else
+          "-I./usr/include -L./usr/lib/#{target_platform}-gnu"
+        end
+    end
+    # rubocop:enable Metrics/CyclomaticComplexity
+    # rubocop:enable Metrics/MethodLength
   end
 end

data/lib/pngcheck/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PngCheck
-  VERSION = "0.1.0"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pngcheck
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-22 00:00:00.000000000 Z
+date: 2022-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -83,11 +97,15 @@ dependencies:
 description: 
 email:
 - open.source@ribose.com
-executables: []
+executables:
+- console
+- setup
 extensions:
 - ext/extconf.rb
 extra_rdoc_files: []
 files:
+- ".cross_rubies"
+- ".hound.yml"
 - ".rspec"
 - ".rubocop.yml"
 - Gemfile
@@ -95,7 +113,6 @@ files:
 - README.adoc
 - Rakefile
 - bin/console
-- bin/rspec
 - bin/setup
 - ext/Makefile
 - ext/extconf.rb
@@ -103,7 +120,6 @@ files:
 - lib/pngcheck.rb
 - lib/pngcheck/recipe.rb
 - lib/pngcheck/version.rb
-- pngcheck.gemspec
 homepage: https://github.com/metanorma/pngcheck-ruby
 licenses:
 - BSD-2-Clause
@@ -126,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Ruby interface to pngcheck.

data/bin/rspec

@@ -1,32 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-#
-# This file was generated by Bundler.
-#
-# The application 'rspec' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-                                           Pathname.new(__FILE__).realpath)
-
-bundle_binstub = File.expand_path("bundle", __dir__)
-
-if File.file?(bundle_binstub)
-  if /This file was generated by Bundler/.match?(File.read(bundle_binstub, 300))
-    load(bundle_binstub)
-  else
-    msg <<END_HEREDOC
-    Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
-    Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.
-END_HEREDOC
-    abort(msg)
-  end
-end
-
-require "rubygems"
-require "bundler/setup"
-
-load Gem.bin_path("rspec-core", "rspec")

data/pngcheck.gemspec

@@ -1,37 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "lib/pngcheck/version"
-
-Gem::Specification.new do |spec|
-  spec.name = "pngcheck"
-  spec.version = PngCheck::VERSION
-  spec.authors = ["Ribose Inc."]
-  spec.email   = ["open.source@ribose.com"]
-
-  spec.summary  = "Ruby interface to pngcheck."
-  spec.homepage = "https://github.com/metanorma/pngcheck-ruby"
-  spec.license  = "BSD-2-Clause"
-  spec.required_ruby_version = ">= 2.7.0"
-
-  spec.metadata["homepage_uri"]    = spec.homepage
-  spec.metadata["source_code_uri"] = spec.homepage
-  spec.metadata["changelog_uri"]   = spec.homepage
-
-  spec.files = Dir.chdir(File.expand_path(__dir__)) do
-    `git ls-files -z`.split("\x0").reject do |f|
-      (f == __FILE__) || f.match(%r{\A(?:(?:test|spec|features)/|\.(?:git|github|travis|circleci)|appveyor)})  # rubocop:disable Layout/LineLength
-    end
-  end
-  spec.bindir = "bin"
-  spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-
-  spec.add_runtime_dependency "ffi", "~> 1.0"
-  spec.add_runtime_dependency "mini_portile2", "~> 2.7"
-
-  spec.add_development_dependency "libpng-ruby", "~> 0.6"
-  spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "rubocop", "~> 1.4"
-
-  spec.extensions = ["ext/extconf.rb"]
-end