jekyll-auto-thumbnails 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f31c670dd6951561b6711bc07c138aae058611e0f7768c19be2d31f5538954bb
-  data.tar.gz: 9ff9d5e22aa831b22e5f8f090fde89eb6b211f37913365314aca9cf0cd2ae09d
+  metadata.gz: 16ce03cdf3b6510927461c3ce6bc7c1ceb7e6146bdbf5ff5245b4c7926ab5cc9
+  data.tar.gz: 83656688c847d89c6f2319c3abe464453652c97536aadd081eb931ea8f07a94e
 SHA512:
-  metadata.gz: 422c1fd32dd150e9e27bfbec2acc0b8e3e195d4a2a160ccac90d976f965ed332cbd1f4209296b841fde725dc757a4c4a77af03efeb7c434e42de961dce49d3e5
-  data.tar.gz: bf817ba2a71bbba15e85f9b19697d5e469ed379265bd92aae2f79954048ff45b71fff14f3e5ebd93457e5d1112a223c6907d62b4f626fa31cbd5d1ab7166a99a
+  metadata.gz: b1c00316b696556de42b2c4b873becaa6b5dc95896e5c83599debbdb068947ff153682e881fcf3d6ede108fecb97d647f740c0d166c3f19e0c5649852e09e5cc
+  data.tar.gz: e2631ed452176bf5bdfccfad0b7f079bfb62578fc4d898f3e92dae0178cf015a392d3ab2f217cd35ef4b41fc0c3a3f56e4d8e745dbec2b9b76f7bbc38bc9e3bf

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [0.3.0](https://github.com/Texarkanine/jekyll-auto-thumbnails/compare/v0.2.1...v0.3.0) (2025-12-11)
+
+
+### Features
+
+* Handle imagemagick 6 or 7 interface ([#4](https://github.com/Texarkanine/jekyll-auto-thumbnails/issues/4)) ([345ac4c](https://github.com/Texarkanine/jekyll-auto-thumbnails/commit/345ac4caf45a7d112d02fb394ad58759083448cc))
+
 ## [0.2.1](https://github.com/Texarkanine/jekyll-auto-thumbnails/compare/v0.2.0...v0.2.1) (2025-12-11)
 
 

data/README.md

@@ -1,5 +1,8 @@
 # Automatic Image Thumbnails for Jekyll
 
+[![Gem Version](https://badge.fury.io/rb/jekyll-auto-thumbnails.svg)](https://rubygems.org/gems/jekyll-auto-thumbnails)
+[![code coverage](https://codecov.io/gh/Texarkanine/jekyll-auto-thumbnails/graph/badge.svg)](https://codecov.io/gh/Texarkanine/jekyll-auto-thumbnails)
+
 Scans your rendered HTML for local images with `width` or `height` attributes, then automatically generates and uses appropriately-sized thumbnails for them, if the `src` image is bigger than that.
 
 Can also take global maximum dimensions (such as for fixed-width layouts) and thumbnail images that don't have explicit size attributes, too.
@@ -22,7 +25,9 @@ Run:
 bundle install
 ```
 
-**System Requirement**: ImageMagick must be installed (gem requires the `convert` and `identify` commands to be available).
+**System Requirement**: ImageMagick must be installed. The gem supports both:
+- **ImageMagick 6**: Uses `convert` and `identify` commands directly
+- **ImageMagick 7**: Uses `magick convert` and `magick identify` (automatically detected)
 
 ## Configuration
 
@@ -104,9 +109,14 @@ sudo apt-get install imagemagick
 brew install imagemagick
 
 # Verify installation
+# ImageMagick 6:
 which convert identify
+# ImageMagick 7:
+which magick
 ```
 
+The gem automatically detects which version you have installed and uses the appropriate commands.
+
 ### Thumbnails Not Generating
 
 Check build output for warnings:

data/lib/jekyll-auto-thumbnails/generator.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "fileutils"
+require_relative "imagemagick_wrapper"
 
 module JekyllAutoThumbnails
   # Thumbnail generation via ImageMagick
@@ -16,15 +17,9 @@ module JekyllAutoThumbnails
 
     # Check if ImageMagick is available (cross-platform)
     #
-    # @return [Boolean] true if convert command found in PATH
+    # @return [Boolean] true if ImageMagick (v6 or v7) is available
     def imagemagick_available?
-      cmd_name = Gem.win_platform? ? "convert.exe" : "convert"
-      path_dirs = ENV["PATH"].to_s.split(File::PATH_SEPARATOR)
-
-      path_dirs.any? do |dir|
-        executable = File.join(dir, cmd_name)
-        File.executable?(executable)
-      end
+      ImageMagickWrapper.available?
     end
 
     # Generate thumbnail (with caching)
@@ -95,19 +90,19 @@ module JekyllAutoThumbnails
       geometry = build_geometry(width, height)
       ext = File.extname(source_path)
 
-      # Build command array (no shell interpretation)
-      cmd = ["convert", source_path, "-resize", geometry]
+      # Build arguments array
+      args = [source_path, "-resize", geometry]
 
       # Add quality for lossy formats
       if quality_needed?(ext)
-        cmd << "-quality"
-        cmd << @config.quality.to_s
+        args << "-quality"
+        args << @config.quality.to_s
       end
 
-      cmd << dest_path
+      args << dest_path
 
-      # Call system with array (bypasses shell)
-      system(*cmd)
+      # Use wrapper to execute convert (handles both v6 and v7)
+      ImageMagickWrapper.execute_convert(*args)
     end
 
     # Build ImageMagick geometry string

data/lib/jekyll-auto-thumbnails/imagemagick_wrapper.rb

@@ -0,0 +1,98 @@
+# frozen_string_literal: true
+
+require "open3"
+
+module JekyllAutoThumbnails
+  # Wrapper for ImageMagick commands supporting both version 6 and 7
+  #
+  # ImageMagick 6 uses `convert` and `identify` commands directly.
+  # ImageMagick 7 uses `magick convert` and `magick identify` (or `magick` with subcommands).
+  #
+  # This module detects the available version and provides a unified interface.
+  module ImageMagickWrapper
+    # Check if ImageMagick is available (either version 6 or 7)
+    #
+    # @return [Boolean] true if ImageMagick is available
+    def self.available?
+      version = detect_version
+      %i[v6 v7].include?(version)
+    end
+
+    # Get the convert command array for the detected ImageMagick version
+    #
+    # @return [Array<String>] command array (e.g., ["convert"] or ["magick", "convert"])
+    def self.convert_command
+      case detect_version
+      when :v7
+        %w[magick convert]
+      when :v6
+        ["convert"]
+      else
+        ["convert"] # Default fallback (will fail if not available)
+      end
+    end
+
+    # Get the identify command array for the detected ImageMagick version
+    #
+    # @return [Array<String>] command array (e.g., ["identify"] or ["magick", "identify"])
+    def self.identify_command
+      case detect_version
+      when :v7
+        %w[magick identify]
+      when :v6
+        ["identify"]
+      else
+        ["identify"] # Default fallback (will fail if not available)
+      end
+    end
+
+    # Execute convert command with arguments
+    #
+    # @param args [Array<String>] arguments to pass to convert
+    # @return [Boolean] true if command succeeded
+    def self.execute_convert(*args)
+      cmd = convert_command + args
+      system(*cmd)
+    end
+
+    # Execute identify command with arguments
+    #
+    # @param args [Array<String>] arguments to pass to identify
+    # @return [Array<String, Process::Status>] [output, status] tuple
+    def self.execute_identify(*args)
+      cmd = identify_command + args
+      Open3.capture2e(*cmd)
+    end
+
+    # Detect which ImageMagick version is available
+    #
+    # @return [Symbol] :v6, :v7, or :none
+    def self.detect_version
+      return @detected_version if defined?(@detected_version) && @detected_version
+
+      @detected_version = if command_exists?("magick")
+                            :v7
+                          elsif command_exists?("convert")
+                            :v6
+                          else
+                            :none
+                          end
+    end
+
+    # Check if a command exists in PATH
+    #
+    # @param cmd [String] command name
+    # @return [Boolean] true if command found
+    def self.command_exists?(cmd)
+      cmd_name = Gem.win_platform? ? "#{cmd}.exe" : cmd
+      path_dirs = ENV["PATH"].to_s.split(File::PATH_SEPARATOR)
+
+      path_dirs.any? do |dir|
+        # Use File.join for cross-platform path construction
+        # On Unix, this will use forward slashes even for Windows-style paths in tests
+        executable = File.join(dir, cmd_name)
+        File.executable?(executable)
+      end
+    end
+  end
+end

data/lib/jekyll-auto-thumbnails/scanner.rb

@@ -2,6 +2,7 @@
 
 require "nokogiri"
 require "open3"
+require_relative "imagemagick_wrapper"
 
 module JekyllAutoThumbnails
   # HTML scanning for images
@@ -78,7 +79,8 @@ module JekyllAutoThumbnails
     def self.image_dimensions(file_path)
       # Use ImageMagick identify command (shell-free, cross-platform)
       # Use [0] to get only first frame (important for animated GIFs)
-      output, status = Open3.capture2e("identify", "-format", "%wx%h", "#{file_path}[0]")
+      # Wrapper handles both ImageMagick v6 and v7
+      output, status = ImageMagickWrapper.execute_identify("-format", "%wx%h", "#{file_path}[0]")
       return nil unless status.success? && !output.strip.empty?
 
       width, height = output.strip.split("x").map(&:to_i)

data/lib/jekyll-auto-thumbnails/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module JekyllAutoThumbnails
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-auto-thumbnails
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Texarkanine
@@ -159,6 +159,7 @@ files:
 - lib/jekyll-auto-thumbnails/digest_calculator.rb
 - lib/jekyll-auto-thumbnails/generator.rb
 - lib/jekyll-auto-thumbnails/hooks.rb
+- lib/jekyll-auto-thumbnails/imagemagick_wrapper.rb
 - lib/jekyll-auto-thumbnails/registry.rb
 - lib/jekyll-auto-thumbnails/scanner.rb
 - lib/jekyll-auto-thumbnails/url_resolver.rb