ruby_spriter 0.6.7 → 0.7.0.1

data/lib/ruby_spriter/metadata_manager.rb

@@ -1,116 +1,117 @@
-# frozen_string_literal: true
-
-require 'open3'
-
-module RubySpriter
-  # Manages PNG metadata for spritesheets
-  class MetadataManager
-    METADATA_PREFIX = 'SPRITESHEET'
-
-    # Embed metadata into PNG file
-    # @param input_file [String] Source PNG file
-    # @param output_file [String] Destination PNG file with metadata
-    # @param columns [Integer] Number of columns in grid
-    # @param rows [Integer] Number of rows in grid
-    # @param frames [Integer] Total number of frames
-    # @param debug [Boolean] Enable debug output
-    def self.embed(input_file, output_file, columns:, rows:, frames:, debug: false)
-      Utils::FileHelper.validate_readable!(input_file)
-
-      metadata_str = build_metadata_string(columns, rows, frames)
-      
-      cmd = build_embed_command(input_file, output_file, metadata_str)
-      
-      if debug
-        Utils::OutputFormatter.indent("DEBUG: Metadata command: #{cmd}")
-      end
-
-      stdout, stderr, status = Open3.capture3(cmd)
-
-      unless status.success?
-        raise ProcessingError, "Failed to embed metadata: #{stderr}"
-      end
-
-      Utils::FileHelper.validate_exists!(output_file)
-    end
-
-    # Read metadata from PNG file
-    # @param file [String] PNG file path
-    # @return [Hash, nil] Metadata hash or nil if not found
-    def self.read(file)
-      Utils::FileHelper.validate_readable!(file)
-
-      cmd = build_read_command(file)
-      stdout, stderr, status = Open3.capture3(cmd)
-
-      return nil unless status.success?
-
-      parse_metadata(stdout)
-    end
-
-    # Verify and print metadata from file
-    # @param file [String] PNG file path
-    def self.verify(file)
-      Utils::OutputFormatter.header("Spritesheet Metadata Verification")
-      
-      puts "File: #{file}"
-      puts "Size: #{Utils::FileHelper.format_size(File.size(file))}\n\n"
-
-      metadata = read(file)
-
-      if metadata
-        Utils::OutputFormatter.success("Metadata Found")
-        puts "\n  Grid Layout:"
-        Utils::OutputFormatter.indent("Columns: #{metadata[:columns]}")
-        Utils::OutputFormatter.indent("Rows: #{metadata[:rows]}")
-        Utils::OutputFormatter.indent("Total Frames: #{metadata[:frames]}")
-        Utils::OutputFormatter.indent("Metadata Version: #{metadata[:version]}")
-      else
-        Utils::OutputFormatter.warning("No spritesheet metadata found in this file")
-        puts "\nThis file may not have been created by Ruby Spriter,"
-        puts "or the metadata was stripped during processing."
-      end
-
-      puts "\n" + "=" * 60 + "\n"
-    end
-
-    private_class_method def self.build_metadata_string(columns, rows, frames)
-      "#{METADATA_PREFIX}|columns=#{columns}|rows=#{rows}|frames=#{frames}|version=#{METADATA_VERSION}"
-    end
-
-    private_class_method def self.build_embed_command(input_file, output_file, metadata_str)
-      magick_cmd = Platform.imagemagick_convert_cmd
-      
-      [
-        magick_cmd,
-        Utils::PathHelper.quote_path(input_file),
-        '-set', 'comment', Utils::PathHelper.quote_arg(metadata_str),
-        Utils::PathHelper.quote_path(output_file)
-      ].join(' ')
-    end
-
-    private_class_method def self.build_read_command(file)
-      magick_cmd = Platform.imagemagick_identify_cmd
-      
-      [
-        magick_cmd,
-        '-format', Utils::PathHelper.quote_arg('%c'),
-        Utils::PathHelper.quote_path(file)
-      ].join(' ')
-    end
-
-    private_class_method def self.parse_metadata(output)
-      # Look for SPRITESHEET metadata pattern
-      match = output.match(/#{METADATA_PREFIX}\|columns=(\d+)\|rows=(\d+)\|frames=(\d+)\|version=([\d.]+)/)
-      
-      return nil unless match
-
-      {
-        columns: match[1].to_i,
-        rows: match[2].to_i,
-        frames: match[3].to_i,
-        version: match[4]
-      }
-    end
-  end
-end
+# frozen_string_literal: true
+
+require 'open3'
+
+module RubySpriter
+  # Manages PNG metadata for spritesheets
+  class MetadataManager
+    METADATA_PREFIX = 'SPRITESHEET'
+    METADATA_VERSION = RubySpriter::VERSION
+
+    # Embed metadata into PNG file
+    # @param input_file [String] Source PNG file
+    # @param output_file [String] Destination PNG file with metadata
+    # @param columns [Integer] Number of columns in grid
+    # @param rows [Integer] Number of rows in grid
+    # @param frames [Integer] Total number of frames
+    # @param debug [Boolean] Enable debug output
+    def self.embed(input_file, output_file, columns:, rows:, frames:, debug: false)
+      Utils::FileHelper.validate_readable!(input_file)
+
+      metadata_str = build_metadata_string(columns, rows, frames)
+      
+      cmd = build_embed_command(input_file, output_file, metadata_str)
+      
+      if debug
+        Utils::OutputFormatter.indent("DEBUG: Metadata command: #{cmd}")
+      end
+
+      stdout, stderr, status = Open3.capture3(cmd)
+
+      unless status.success?
+        raise ProcessingError, "Failed to embed metadata: #{stderr}"
+      end
+
+      Utils::FileHelper.validate_exists!(output_file)
+    end
+
+    # Read metadata from PNG file
+    # @param file [String] PNG file path
+    # @return [Hash, nil] Metadata hash or nil if not found
+    def self.read(file)
+      Utils::FileHelper.validate_readable!(file)
+
+      cmd = build_read_command(file)
+      stdout, stderr, status = Open3.capture3(cmd)
+
+      return nil unless status.success?
+
+      parse_metadata(stdout)
+    end
+
+    # Verify and print metadata from file
+    # @param file [String] PNG file path
+    def self.verify(file)
+      Utils::OutputFormatter.header("Spritesheet Metadata Verification")
+      
+      puts "File: #{file}"
+      puts "Size: #{Utils::FileHelper.format_size(File.size(file))}\n\n"
+
+      metadata = read(file)
+
+      if metadata
+        Utils::OutputFormatter.success("Metadata Found")
+        puts "\n  Grid Layout:"
+        Utils::OutputFormatter.indent("Columns: #{metadata[:columns]}")
+        Utils::OutputFormatter.indent("Rows: #{metadata[:rows]}")
+        Utils::OutputFormatter.indent("Total Frames: #{metadata[:frames]}")
+        Utils::OutputFormatter.indent("Metadata Version: #{metadata[:version]}")
+      else
+        Utils::OutputFormatter.warning("No spritesheet metadata found in this file")
+        puts "\nThis file may not have been created by Ruby Spriter,"
+        puts "or the metadata was stripped during processing."
+      end
+
+      puts "\n" + "=" * 60 + "\n"
+    end
+
+    private_class_method def self.build_metadata_string(columns, rows, frames)
+      "#{METADATA_PREFIX}|columns=#{columns}|rows=#{rows}|frames=#{frames}|version=#{METADATA_VERSION}"
+    end
+
+    private_class_method def self.build_embed_command(input_file, output_file, metadata_str)
+      magick_cmd = Platform.imagemagick_convert_cmd
+      
+      [
+        magick_cmd,
+        Utils::PathHelper.quote_path(input_file),
+        '-set', 'comment', Utils::PathHelper.quote_arg(metadata_str),
+        Utils::PathHelper.quote_path(output_file)
+      ].join(' ')
+    end
+
+    private_class_method def self.build_read_command(file)
+      magick_cmd = Platform.imagemagick_identify_cmd
+      
+      [
+        magick_cmd,
+        '-format', Utils::PathHelper.quote_arg('%c'),
+        Utils::PathHelper.quote_path(file)
+      ].join(' ')
+    end
+
+    private_class_method def self.parse_metadata(output)
+      # Look for SPRITESHEET metadata pattern
+      match = output.match(/#{METADATA_PREFIX}\|columns=(\d+)\|rows=(\d+)\|frames=(\d+)\|version=([\d.]+)/)
+      
+      return nil unless match
+
+      {
+        columns: match[1].to_i,
+        rows: match[2].to_i,
+        frames: match[3].to_i,
+        version: match[4]
+      }
+    end
+  end
+end

data/lib/ruby_spriter/platform.rb

@@ -1,82 +1,137 @@
-# frozen_string_literal: true
-
-module RubySpriter
-  # Platform detection and configuration
-  class Platform
-    PLATFORM_TYPE = case RUBY_PLATFORM
-                    when /mingw|mswin|windows/i then :windows
-                    when /linux/i then :linux
-                    when /darwin/i then :macos
-                    else :unknown
-                    end
-
-    # GIMP executable paths by platform
-    GIMP_DEFAULT_PATHS = {
-      windows: 'C:\\Program Files\\GIMP 3\\bin\\gimp-console-3.0.exe',
-      linux: '/usr/bin/gimp',
-      macos: '/Applications/GIMP.app/Contents/MacOS/gimp'
-    }.freeze
-
-    # Alternative GIMP paths to search
-    GIMP_ALTERNATIVE_PATHS = {
-      windows: [
-        'C:\\Program Files\\GIMP 3\\bin\\gimp-console-3.0.exe',
-        'C:\\Program Files (x86)\\GIMP 3\\bin\\gimp-console-3.0.exe',
-        'C:\\Program Files\\GIMP 2\\bin\\gimp-console-2.10.exe',
-        'C:\\Program Files (x86)\\GIMP 2\\bin\\gimp-console-2.10.exe'
-      ].freeze,
-      linux: [
-        '/usr/bin/gimp',
-        '/usr/local/bin/gimp',
-        '/snap/bin/gimp',
-        '/opt/gimp/bin/gimp'
-      ].freeze,
-      macos: [
-        '/Applications/GIMP.app/Contents/MacOS/gimp',
-        '/Applications/GIMP-2.10.app/Contents/MacOS/gimp'
-      ].freeze
-    }.freeze
-
-    class << self
-      # Get the current platform type
-      def current
-        PLATFORM_TYPE
-      end
-
-      # Check if running on Windows
-      def windows?
-        PLATFORM_TYPE == :windows
-      end
-
-      # Check if running on Linux
-      def linux?
-        PLATFORM_TYPE == :linux
-      end
-
-      # Check if running on macOS
-      def macos?
-        PLATFORM_TYPE == :macos
-      end
-
-      # Get default GIMP path for current platform
-      def default_gimp_path
-        GIMP_DEFAULT_PATHS[PLATFORM_TYPE]
-      end
-
-      # Get alternative GIMP paths for current platform
-      def alternative_gimp_paths
-        GIMP_ALTERNATIVE_PATHS[PLATFORM_TYPE] || []
-      end
-
-      # Get ImageMagick convert command name
-      def imagemagick_convert_cmd
-        windows? ? 'magick convert' : 'convert'
-      end
-
-      # Get ImageMagick identify command name
-      def imagemagick_identify_cmd
-        windows? ? 'magick identify' : 'identify'
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module RubySpriter
+  # Platform detection and configuration
+  class Platform
+    PLATFORM_TYPE = case RUBY_PLATFORM
+                    when /mingw|mswin|windows/i then :windows
+                    when /linux/i then :linux
+                    when /darwin/i then :macos
+                    else :unknown
+                    end
+
+    # GIMP executable paths by platform
+    GIMP_DEFAULT_PATHS = {
+      windows: 'C:\\Program Files\\GIMP 3\\bin\\gimp-console-3.0.exe',
+      linux: '/usr/bin/gimp',
+      macos: '/Applications/GIMP.app/Contents/MacOS/gimp'
+    }.freeze
+
+    # Alternative GIMP paths to search
+    GIMP_ALTERNATIVE_PATHS = {
+      windows: [
+        'C:\\Program Files\\GIMP 3\\bin\\gimp-console-3.0.exe',
+        'C:\\Program Files (x86)\\GIMP 3\\bin\\gimp-console-3.0.exe',
+        'C:\\Program Files\\GIMP 2\\bin\\gimp-console-2.10.exe',
+        'C:\\Program Files (x86)\\GIMP 2\\bin\\gimp-console-2.10.exe'
+      ].freeze,
+      linux: [
+        '/usr/bin/gimp',
+        '/usr/local/bin/gimp',
+        '/snap/bin/gimp',
+        '/opt/gimp/bin/gimp',
+        'flatpak:org.gimp.GIMP'  # Flatpak GIMP
+      ].freeze,
+      macos: [
+        '/Applications/GIMP.app/Contents/MacOS/gimp',
+        '/Applications/GIMP-2.99.app/Contents/MacOS/gimp',  # GIMP 3.x dev
+        '/Applications/GIMP-3.0.app/Contents/MacOS/gimp',   # GIMP 3.x release
+        '/Applications/GIMP-2.10.app/Contents/MacOS/gimp'
+      ].freeze
+    }.freeze
+
+    class << self
+      # Get the current platform type
+      def current
+        PLATFORM_TYPE
+      end
+
+      # Check if running on Windows
+      def windows?
+        PLATFORM_TYPE == :windows
+      end
+
+      # Check if running on Linux
+      def linux?
+        PLATFORM_TYPE == :linux
+      end
+
+      # Check if running on macOS
+      def macos?
+        PLATFORM_TYPE == :macos
+      end
+
+      # Get default GIMP path for current platform
+      def default_gimp_path
+        GIMP_DEFAULT_PATHS[PLATFORM_TYPE]
+      end
+
+      # Get alternative GIMP paths for current platform
+      def alternative_gimp_paths
+        GIMP_ALTERNATIVE_PATHS[PLATFORM_TYPE] || []
+      end
+
+      # Get ImageMagick convert command name
+      def imagemagick_convert_cmd
+        windows? ? 'magick convert' : 'convert'
+      end
+
+      # Get ImageMagick identify command name
+      def imagemagick_identify_cmd
+        windows? ? 'magick identify' : 'identify'
+      end
+
+      # Detect GIMP version from version string output
+      # @param version_output [String] Output from gimp --version command
+      # @return [Hash] Version information with :major, :minor, :patch, :full keys, or nil if parse fails
+      def detect_gimp_version(version_output)
+        return nil if version_output.nil? || version_output.empty?
+
+        # Match version pattern: "version X.Y.Z" or "version X.Y"
+        match = version_output.match(/version\s+(\d+)\.(\d+)(?:\.(\d+))?/i)
+        return nil unless match
+
+        {
+          major: match[1].to_i,
+          minor: match[2].to_i,
+          patch: match[3]&.to_i || 0,
+          full: match[1..3].compact.join('.')
+        }
+      end
+
+      # Get GIMP version from executable path
+      # @param gimp_path [String] Path to GIMP executable or flatpak:app.id
+      # @return [Hash] Version information, or nil if detection fails
+      def get_gimp_version(gimp_path)
+        return nil if gimp_path.nil? || gimp_path.empty?
+
+        require 'open3'
+
+        # Handle Flatpak GIMP
+        if gimp_path.start_with?('flatpak:')
+          flatpak_app = gimp_path.sub('flatpak:', '')
+          stdout, stderr, status = Open3.capture3("flatpak run #{flatpak_app} --version")
+          return nil unless status.success?
+          return detect_gimp_version(stdout + stderr)
+        end
+
+        return nil unless File.exist?(gimp_path)
+
+        stdout, stderr, status = Open3.capture3("#{quote_path_simple(gimp_path)} --version")
+        return nil unless status.success?
+
+        detect_gimp_version(stdout + stderr)
+      rescue StandardError
+        nil
+      end
+
+      private
+
+      # Simple path quoting helper for Platform module
+      def quote_path_simple(path)
+        return path unless path.include?(' ')
+        windows? ? "\"#{path}\"" : "'#{path}'"
+      end
+    end
+  end
+end