pngcheck 0.2.4-x64-mingw32 → 0.2.6-x64-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e79659d5ec1a433cac6180b9e4bba525ea5e57fda53c6fc5b93aee140b916afd
-  data.tar.gz: 3f8a6f45c9db2818abde129f5baa252176c4e0653ffd252b21e2567fb38b0273
+  metadata.gz: 19e858ebfc5626d9f92a5dc16d03efd040086fb7200ef0cac049f5c0fe5298aa
+  data.tar.gz: 50874a7abc47e535220000ad3cb82ac3ec878bb4e9b4a1dd8b8f902a8c0db258
 SHA512:
-  metadata.gz: 3d244e6441b3e20c85e4bee64806ec7d3a91b8c240ee4dfcc5f0cb1e3c284b5fdf76665961191eaae64c1342e535b8aea0d033d78c03a8d165156f249d272c86
-  data.tar.gz: 3387f1e78a60f2c978fa30a43406a3f91b5a91506e165a02c4011bc464ae9d40e2df525640e6da8eb38f3e832a08bf5c597a3e35521b593319be8c39eb285858
+  metadata.gz: 32bfcb50afaa30e85225546b3341e315e960e95d04281451b5ceb398b1e523ca39c0effe33563af446edc2e832a73e21a3e4a3fbadc9daaf1822100261651e3f
+  data.tar.gz: 474ba89fc38db44b27aceb2aca4fe12f8f4cd643a3eeb77e348e80d80698f2df574f4c99319fa5ae75321b17ed8baceeedcd5d15c93a0782c32809949807a138

data/README.adoc

@@ -53,7 +53,7 @@ $ gem install pngcheck
 
 === Usage
 
-==== PngCeck status codes
+==== PngCheck status codes
 
 [source,ruby]
 ----
@@ -84,7 +84,7 @@ valid = PngCheck.check_file("spec/examples/correct.png")
 Where:
 
 * `valid` is `true` if the file is correct
-* otherwise an exception of type `PngCheck::CorruptPngError` is raised
+* otherwise an exception is raised. Possible exception types are `PngCheck::EmptyPngError`, `PngCheck::CorruptPngError`
 
 
 ==== Memory buffer processing
@@ -110,8 +110,8 @@ valid = PngCheck.check_buffer(data)
 
 Where:
 
-* `valid` is `true` if the file is correct
-* otherwise an exception of type `PngCheck::CorruptPngError` is raised
+* `valid` is `true` if the buffer is correct image
+* otherwise an exception is raised. Possible exception types are `PngCheck::EmptyPngError`, `PngCheck::CorruptPngError`
 
 
 ==== Pre-validation with libpng-ruby

data/lib/pngcheck/recipe.rb

@@ -13,12 +13,16 @@ module PngCheck
     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",
         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 +32,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
@@ -56,29 +70,25 @@ module PngCheck
 
     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 +96,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 +184,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.4"
+  VERSION = "0.2.6"
 end

data/lib/pngcheck.rb

@@ -5,8 +5,16 @@ require "tempfile"
 require_relative "pngcheck/version"
 
 module PngCheck
+  EMPTY_IMAGE = "Image is empty"
+
   class CorruptPngError < StandardError; end
 
+  class EmptyPngError < StandardError
+    def initialize(msg = EMPTY_IMAGE)
+      super
+    end
+  end
+
   STATUS_OK = 0
   STATUS_WARNING = 1        # an error in some circumstances but not in all
   STATUS_MINOR_ERROR = 3    # minor spec errors (e.g., out-of-range values)
@@ -37,25 +45,49 @@ module PngCheck
 
   class << self
     def analyze_file(path)
-      Tempfile.open("captured-stream-") do |captured_stream|
-        extra_msg = FFI::Buffer.alloc_out(EXTRA_MESSAGE_SIZE, 1, false)
-        @@semaphore.lock
-        status = pngcheck_file(path, captured_stream.path, extra_msg)
-        @@semaphore.unlock
-        # we assume that pngcheck_file returns either captured_stream
-        # or extra message but not both
-        [status, captured_stream.read + extra_msg.get_string(16)]
-      end
+      return [STATUS_CRITICAL_ERROR, EMPTY_IMAGE] if File.zero? path
+
+      do_analyze_file(path)
     end
 
     def check_file(path)
       status, info = analyze_file(path)
+      raise EmptyPngError.new if info.eql? EMPTY_IMAGE
       raise CorruptPngError.new info unless status == STATUS_OK
 
       true
     end
 
     def analyze_buffer(data)
+      return [STATUS_CRITICAL_ERROR, EMPTY_IMAGE] if data.empty?
+
+      do_analyze_buffer(data)
+    end
+
+    def check_buffer(data)
+      status, info = analyze_buffer(data)
+      raise EmptyPngError.new if info.eql? EMPTY_IMAGE
+      raise CorruptPngError.new info unless status == STATUS_OK
+
+      true
+    end
+
+    private
+
+    def do_analyze_file(path)
+      Tempfile.open("captured-stream-") do |captured_stream|
+        extra_msg = FFI::Buffer.alloc_out(EXTRA_MESSAGE_SIZE, 1, false)
+        @@semaphore.lock
+        status = pngcheck_file(path, captured_stream.path, extra_msg)
+        @@semaphore.unlock
+        # we assume that pngcheck_file returns either captured_stream
+        # or extra message but not both
+
+        [status, captured_stream.read + extra_msg.get_string(0)]
+      end
+    end
+
+    def do_analyze_buffer(data)
       Tempfile.open("captured-stream-") do |captured_stream|
         extra_msg = FFI::Buffer.alloc_out(EXTRA_MESSAGE_SIZE, 1, false)
         mem_buf = FFI::MemoryPointer.new(:char, data.bytesize)
@@ -64,15 +96,8 @@ module PngCheck
         status = pngcheck_buffer(mem_buf, data.bytesize, captured_stream.path,
                                  extra_msg)
         @@semaphore.unlock
-        [status, captured_stream.read + extra_msg.get_string(16)]
+        [status, captured_stream.read + extra_msg.get_string(0)]
       end
     end
-
-    def check_buffer(data)
-      status, info = analyze_buffer(data)
-      raise CorruptPngError.new info unless status == STATUS_OK
-
-      true
-    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pngcheck
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.6
 platform: x64-mingw32
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-08 00:00:00.000000000 Z
+date: 2022-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi