pngcheck 0.2.5 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8538794c331c3eefe5a4aff7c853db22e20aaebcc042a27842faaf1b885756f7
-  data.tar.gz: f94d9281e7c0a4f473a58cba444fe99b4a2504e93525fc36d958e890d50f2d5e
+  metadata.gz: 3b01aa17b19045ada7e07600dad8b2fd070472d8f5673a10840d642b9556e32c
+  data.tar.gz: 25a9d1e18338c3b10edbade539bda19e58e50ecbfb3de547dec1cda22099e713
 SHA512:
-  metadata.gz: 4bed6f839abd1c4a0a597d451fb4d3271019b29b13200c394a0fb820175afe3b154d8b27db95d48f19cb2ec35f051616b87c286b10d9193de13b4bb01e7e5e37
-  data.tar.gz: 2a479f9dafab807d5581f1511f4cfc578932c49c8f9dd4789a8065032b94fdc74c48928f3fccb7fa088256b5f0181d23b48ab1520735e936581b4bd54233fab6
+  metadata.gz: a66a56aa38c85f6dcace43e4f9d0b1931a3529c5b6a87bca43ed03b2c1d321f0752674a8db7daf2d1c78bb0dd538d1b87debdd0fb4f2c600e4f9bcf17f4bb458
+  data.tar.gz: dfbc6da9c6adcbf93c486ec7e352c6446fb2797af96231481431967b45748e2843ee98d3130ff86ff8c39ec7b7ef918571dce4f584af9fcc817f40f95babcba7

data/Rakefile

@@ -3,6 +3,7 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 require "rubocop/rake_task"
+require_relative "ext/layout"
 
 RSpec::Core::RakeTask.new(:spec)
 RuboCop::RakeTask.new
@@ -20,14 +21,24 @@ task "gem:native:any" do
   sh "rake platform:any gem"
 end
 
+desc "Download pngcheck source"
+task :pngcheck do
+  test_cmd = "test -f #{PNGCHECK_LOCAL}"
+  wget_cmd = "wget -nc -nv -O #{PNGCHECK_LOCAL} #{PNGCHECK_URI}"
+  sh "#{test_cmd} || #{wget_cmd}"
+end
+task compile: :pngcheck
+
 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
+  spec.files << PNGCHECK_LOCAL
   task = Gem::PackageTask.new(spec)
   task.define
 end
+task "gem:native:any": :pngcheck
 
 File.readlines(".cross_rubies", chomp: true).each do |platform|
   desc "Build pre-compiled gem for the #{platform} platform"
@@ -53,6 +64,7 @@ require "rake/clean"
 CLOBBER.include("pkg")
 CLEAN.include("ports",
               "tmp",
+              PNGCHECK_LOCAL,
               "lib/pngcheck/*.dll",
               "lib/pngcheck/*.dylib",
               "lib/pngcheck/*.so")

data/ext/layout.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+PNGCHECK_ARCH = "pngcheck-3.0.3.tar.gz"
+PNGCHECK_URI = "http://www.libpng.org/pub/png/src/#{PNGCHECK_ARCH}"
+PNGCHECK_LOCAL = "ext/#{PNGCHECK_ARCH}"

data/lib/pngcheck/recipe.rb

@@ -8,17 +8,23 @@ require "shellwords"
 require "open3"
 require_relative "version"
 
+ROOT = Pathname.new(File.expand_path("../..", __dir__))
+require "#{ROOT}/ext/layout.rb"
+
 module PngCheck
   class Recipe < MiniPortile
-    ROOT = Pathname.new(File.expand_path("../..", __dir__))
     COMMON_FLAGS = "-shared -fPIC -Wall -O -DUSE_ZLIB"
 
-    def files_to_load
+    def files_to_load_all
       @files << {
-        url: "http://www.libpng.org/pub/png/src/pngcheck-3.0.3.tar.gz",
+        url: "file:#{ROOT}/#{PNGCHECK_LOCAL}", # "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")
+    end
+
+    def files_to_load_cross
+      if target_platform.eql?("aarch64-linux") &&
+          !host_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
@@ -28,17 +34,27 @@ module PngCheck
 
     def initialize
       super("pngcheck", "3.0.3")
-      files_to_load
+      files_to_load_all
+      files_to_load_cross
       @target = ROOT.join(@target).to_s
       @printed = {}
     end
 
+    def lib_filename
+      @lib_filename ||=
+        if MiniPortile.windows?
+          "pngcheck.dll"
+        else
+          "pngcheck.so"
+        end
+    end
+
+    def lib_workpath
+      @lib_workpath ||= File.join(work_path, lib_filename)
+    end
+
     def make_cmd
-      if MiniPortile.windows?
-        "gcc #{COMMON_FLAGS} -o pngcheck.dll wrapper.c -lz"
-      else
-        "#{cc} #{cflags} #{COMMON_FLAGS} -o pngcheck.so wrapper.c -lz"
-      end
+      "#{cc} #{cflags} #{COMMON_FLAGS} -o #{lib_filename} wrapper.c -lz"
     end
 
     def cook_if_not
@@ -50,35 +66,40 @@ module PngCheck
       FileUtils.touch(checkpoint)
     end
 
+    def download_file_file(uri, full_path)
+      if MiniPortile.windows?
+        FileUtils.mkdir_p File.dirname(full_path)
+        FileUtils.cp uri.to_s.delete_prefix("file:"), full_path
+      else
+        super
+      end
+    end
+
     def checkpoint
       File.join(@target, "#{name}-#{version}-#{host}.installed")
     end
 
     def configure
       FileUtils.cp(ROOT.join("ext", "wrapper.c"), work_path, verbose: false)
-      if target_platform.eql?("aarch64-linux")
+      if target_platform.eql?("aarch64-linux") &&
+          !host_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?
+    def verify_lib
+      begin
+        out, = Open3.capture2("file #{lib_workpath}")
+      rescue StandardError
+        message("Failed to call file, skipped library verification ...\n")
+        return
+      end
 
-        if out.include?(target_format)
-          message("Verifying #{l} ... OK\n")
-        else
-          raise "Invalid file format '#{out}', '#{@target_format}' expected"
-        end
+      unless out.include?(target_format)
+        raise "Invalid file format '#{out.strip}', '#{@target_format}' expected"
       end
+
+      message("Verifying #{lib_workpath} ... OK\n")
     end
 
     def install
@@ -86,7 +107,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
+      verify_lib
     end
 
     def execute(action, command, command_opts = {})
@@ -174,11 +195,11 @@ module PngCheck
 
     def cflags
       @cflags ||=
-        if target_platform.eql?(host_platform) ||
-            !target_platform.eql?("aarch64-linux")
-          ""
-        else
+        if target_platform.eql?("aarch64-linux") &&
+            !host_platform.eql?("aarch64-linux")
           "-I./usr/include -L./usr/lib/#{target_platform}-gnu"
+        else
+          ""
         end
     end
     # rubocop:enable Metrics/CyclomaticComplexity

data/lib/pngcheck/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pngcheck
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.7
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-13 00:00:00.000000000 Z
+date: 2022-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -116,6 +116,8 @@ files:
 - bin/setup
 - ext/Makefile
 - ext/extconf.rb
+- ext/layout.rb
+- ext/pngcheck-3.0.3.tar.gz
 - ext/wrapper.c
 - lib/pngcheck.rb
 - lib/pngcheck/recipe.rb