ukiryu 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab84f9616d2eab1f0aa2cdf37c640ffd34d50d5007a149f1a180a2e63ab1abba
-  data.tar.gz: f1f49206a651397aff45f75fdbb9f3981eebed58ca22440cb912504d886e45ca
+  metadata.gz: 26e9a5bf049e08e07b4c435f8269327599cb5d6928c8d27c238ddb6f8ea81b1e
+  data.tar.gz: 4db1b1c05432cab64d36c0749b83e6d5d910a941c15eda604811111db748b543
 SHA512:
-  metadata.gz: a1963c9496d9183755741ff5c54a04b1c639bf1dfd951115e07eb5e428b384c51c609e4af3ffbe8011685af444d0fc041ed0e72b309f316d71ff64b02a825178
-  data.tar.gz: 7b865d4cbfce1bf8ab5c834265bebd01ea4bf9b9b49dcbeddf9954879cdc8484b323de7c82f462129cc84136478a2123ccd2668f188e9f5bb1f408cb91473587
+  metadata.gz: 9a5b3624a369f3aa3005ff91b8b502e49ed8b0c9392709dd556e39b4cfaff45a22e3f0a9fd1bda3802aa9e5633e64d20297a7792321dae9becfa22d085146aa0
+  data.tar.gz: 8160cd1815a565be6596b077e509ec0e49edb8b6e28e6d47b1baa6db22be02549887c635cbe300c833a00895874b65f2d830a44a803d8f04cdbd35d0ab5e93d2

data/lib/ukiryu/logger.rb

@@ -55,7 +55,7 @@ module Ukiryu
       def debug_enabled?(category = nil)
         case category
         when :executable
-          ENV[DEBUG_EXECUTABLE_ENV_VAR] || (Platform.windows? && ENV['CI'])
+          ENV[DEBUG_EXECUTABLE_ENV_VAR]
         else
           ENV[DEBUG_ENV_VAR]
         end

data/lib/ukiryu/models/implementation_version.rb

@@ -118,9 +118,8 @@ module Ukiryu
                               VersionDetection.from_hash(vd_data)
                             end
 
-        # Support both profiles (legacy) and execution_profiles (new)
-        profiles_data = data[:execution_profiles] || data['execution_profiles'] ||
-                        data[:profiles] || data['profiles'] || []
+        # Extract execution_profiles
+        profiles_data = data[:execution_profiles] || data['execution_profiles'] || []
 
         new(
           implements: data[:implements],

data/lib/ukiryu/register.rb

@@ -417,7 +417,7 @@ module Ukiryu
 
       # Get versions from index
       versions = list_versions(name_str)
-      return load_legacy_tool_yaml(name_str) if versions.empty?
+      return nil if versions.empty?
 
       # Return specific version or latest
       if version
@@ -486,15 +486,6 @@ module Ukiryu
 
     private
 
-    # Load legacy single-file tool YAML
-    #
-    # @param name [String] the tool name
-    # @return [String, nil] the YAML content or nil
-    def load_legacy_tool_yaml(name)
-      file = File.join(path, 'tools', "#{name}.yaml")
-      File.read(file) if File.exist?(file)
-    end
-
     # Get git information for this register
     #
     # @return [Hash, nil] git info or nil

data/lib/ukiryu/schemas/v1/tool.schema.yaml

@@ -14,7 +14,7 @@ required:
   - ukiryu_schema
   - name
   - version
-  - profiles
+  - execution_profiles
 additionalProperties: false
 
 properties:
@@ -154,9 +154,9 @@ properties:
     description: Default execution timeout in seconds
     example: 300
 
-  # === Profiles ===
+  # === Execution Profiles ===
 
-  profiles:
+  execution_profiles:
     type: array
     minItems: 1
     description: Platform/shell-specific configurations

data/lib/ukiryu/tool/loader.rb

@@ -65,7 +65,16 @@ module Ukiryu
         # @param options [Hash] options including platform and shell
         # @return [Hash, nil] hash with :implementation_name, :version, :file or nil
         def detect_implementation_and_version(index, tool_name, options = {})
-          # Try each implementation in order
+          target_platform = options[:platform]
+          current_platform = Platform.detect
+
+          # If platform is overridden to a different platform, skip detection
+          # and find an implementation that supports the target platform
+          if target_platform && target_platform.to_sym != current_platform
+            return find_implementation_for_platform(index, tool_name, target_platform, options)
+          end
+
+          # Normal detection: try each implementation in order
           index.implementations.each do |impl|
             result = try_implementation(impl, tool_name, options)
             return result if result
@@ -75,6 +84,53 @@ module Ukiryu
           fallback_to_default(index)
         end
 
+        # Find an implementation that supports the target platform
+        #
+        # @param index [Models::ImplementationIndex] the implementation index
+        # @param tool_name [String] the tool name
+        # @param target_platform [Symbol] the target platform
+        # @param options [Hash] options including shell
+        # @return [Hash, nil] implementation spec or nil
+        def find_implementation_for_platform(index, tool_name, target_platform, options = {})
+          target_platform = target_platform.to_sym if target_platform.is_a?(String)
+          target_shell = (options[:shell] || Shell.detect).to_sym
+
+          # Try each implementation and check if it has a profile for the target platform
+          index.implementations.each do |impl|
+            impl_name = impl[:name] || impl['name']
+            versions = impl[:versions] || impl['versions']
+
+            # Check each version file for platform compatibility
+            versions.each do |version_spec|
+              file = version_spec[:file] || version_spec['file']
+              next unless file
+
+              # Load the implementation version to check profiles
+              impl_version = Register.load_implementation_version(
+                tool_name,
+                impl_name,
+                file,
+                options
+              )
+              next unless impl_version
+
+              # Check if any execution profile supports the target platform/shell
+              profile = impl_version.compatible_profile(platform: target_platform, shell: target_shell)
+              if profile
+                # Found a compatible implementation
+                return {
+                  implementation_name: impl_name,
+                  version: impl_version.version,
+                  file: file
+                }
+              end
+            end
+          end
+
+          # No implementation supports the target platform
+          nil
+        end
+
         private
 
         # Try to detect version from a single implementation

data/lib/ukiryu/tool_index.rb

@@ -272,28 +272,19 @@ module Ukiryu
       @alias_to_tool.clear
 
       # Scan all tool directories for metadata
-      # New structure: tools/{tool-name}/{variant}/{version}.yaml
-      # Fallback: tools/{tool-name}/{version}.yaml (legacy structure)
+      # Structure: tools/{tool-name}/{implementation}/{version}.yaml
       tool_dirs = Dir.glob(File.join(tools_dir, '*')).select { |d| File.directory?(d) }.sort
 
       tool_dirs.each do |tool_dir|
         tool_name = File.basename(tool_dir)
         tool_sym = tool_name.to_sym
 
-        # Find YAML files in the tool directory (check both structures)
+        # Find YAML files in implementation subdirectories
         yaml_files = []
 
-        # Check for variant subdirectories (new structure: tools/ping_bsd/default/1.0.yaml)
-        variant_dirs = Dir.glob(File.join(tool_dir, '*')).select { |d| File.directory?(d) }
-        variant_dirs.each do |variant_dir|
-          Dir.glob(File.join(variant_dir, '*.yaml')).sort.each do |file|
-            yaml_files << file
-          end
-        end
-
-        # Fallback: direct YAML files in tool directory (legacy structure)
-        if yaml_files.empty?
-          Dir.glob(File.join(tool_dir, '*.yaml')).sort.each do |file|
+        impl_dirs = Dir.glob(File.join(tool_dir, '*')).select { |d| File.directory?(d) }
+        impl_dirs.each do |impl_dir|
+          Dir.glob(File.join(impl_dir, '*.yaml')).sort.each do |file|
             yaml_files << file
           end
         end
@@ -305,7 +296,7 @@ module Ukiryu
           next unless hash
 
           # Index by interface (multiple tools can implement one interface)
-          # v2: implements is an array, v1: implements is a string
+          # implements is an array of interface names
           implements_value = hash['implements']
           if implements_value
             interfaces = if implements_value.is_a?(Array)
@@ -371,28 +362,24 @@ module Ukiryu
       tool_dir = File.join(current_path, 'tools', tool_name.to_s)
       return nil unless Dir.exist?(tool_dir)
 
-      # Search for version files in both structures:
-      # New: tools/{tool-name}/{variant}/{version}.yaml
-      # Legacy: tools/{tool-name}/{version}.yaml
+      # Structure: tools/{tool-name}/{implementation}/{version}.yaml
+      impl_dirs = Dir.glob(File.join(tool_dir, '*')).select { |d| File.directory?(d) }
 
-      # First check for variant subdirectories (new structure)
-      variant_dirs = Dir.glob(File.join(tool_dir, '*')).select { |d| File.directory?(d) }
+      # Prefer 'default' implementation if present
+      impl_dirs.each do |impl_dir|
+        next unless File.basename(impl_dir) == 'default'
 
-      variant_dirs.each do |variant_dir|
-        # Prefer 'default' variant if present
-        next unless File.basename(variant_dir) == 'default'
-
-        files = Dir.glob(File.join(variant_dir, '*.yaml'))
+        files = Dir.glob(File.join(impl_dir, '*.yaml'))
         return select_latest_version_by_content(files) if files.any?
+      end
 
-        # Fall back to any variant directory
-        files = Dir.glob(File.join(variant_dir, '*.yaml'))
+      # Fall back to any implementation directory
+      impl_dirs.each do |impl_dir|
+        files = Dir.glob(File.join(impl_dir, '*.yaml'))
         return select_latest_version_by_content(files) if files.any?
       end
 
-      # Fallback: direct YAML files in tool directory (legacy structure)
-      files = Dir.glob(File.join(tool_dir, '*.yaml'))
-      files.any? ? select_latest_version_by_content(files) : nil
+      nil
     rescue StandardError
       nil
     end

data/lib/ukiryu/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Ukiryu
-  VERSION = '0.2.3'
+  VERSION = '0.2.4'
 end

data/spec/fixtures/register/tools/bzip2/default/1.0.yaml

@@ -14,7 +14,7 @@ search_paths:
   linux:
   - "/usr/bin/bzip2"
 implements: bzip2/1.0
-profiles:
+execution_profiles:
 - name: default
   platforms:
   - macos

data/spec/fixtures/register/tools/bzip2_busybox/default/1.0.yaml

@@ -11,7 +11,7 @@ search_paths:
   - "/bin/bzip2"
   - "/usr/bin/bzip2"
 implements: bzip2_busybox/1.0
-profiles:
+execution_profiles:
 - name: default
   platforms:
   - linux

data/spec/fixtures/register/tools/bzip2_gnu/default/1.0.yaml

@@ -14,7 +14,7 @@ search_paths:
   linux:
   - "/usr/bin/bzip2"
 implements: bzip2_gnu/1.0
-profiles:
+execution_profiles:
 - name: default
   platforms:
   - macos

data/spec/fixtures/register/tools/exiftool/default/1.0.yaml

@@ -14,7 +14,7 @@ search_paths:
   linux:
   - "/usr/bin/exiftool"
 implements: exiftool/1.0
-profiles:
+execution_profiles:
 - name: default
   platforms:
   - macos

data/spec/fixtures/register/tools/ffmpeg/default/1.0.yaml

@@ -19,7 +19,7 @@ search_paths:
   linux:
   - "/usr/bin/ffmpeg"
 implements: ffmpeg/1.0
-profiles:
+execution_profiles:
 - name: default
   platforms:
   - macos

data/spec/fixtures/register/tools/ghostscript/default/10.0.yaml

@@ -16,7 +16,7 @@ search_paths:
   - "C:/Program Files/gs/gs*/bin/gswin64c.exe"
   - "C:/Program Files/gs/gs*/bin/gswin32c.exe"
 implements: ghostscript/1.0
-profiles:
+execution_profiles:
 - name: unix
   platforms:
   - macos

data/spec/fixtures/register/tools/gzip/default/1.0.yaml

@@ -15,7 +15,7 @@ search_paths:
   - "/usr/bin/gzip"
   - "/bin/gzip"
 implements: gzip/1.0
-profiles:
+execution_profiles:
 - name: default
   platforms:
   - macos

data/spec/fixtures/register/tools/gzip_busybox/default/1.0.yaml

@@ -11,7 +11,7 @@ search_paths:
   - "/bin/gzip"
   - "/usr/bin/gzip"
 implements: gzip_busybox/1.0
-profiles:
+execution_profiles:
 - name: default
   platforms:
   - linux

data/spec/fixtures/register/tools/gzip_gnu/default/1.0.yaml

@@ -15,7 +15,7 @@ search_paths:
   - "/usr/bin/gzip"
   - "/bin/gzip"
 implements: gzip_gnu/1.0
-profiles:
+execution_profiles:
 - name: default
   platforms:
   - macos

data/spec/fixtures/register/tools/imagemagick/default/6.0.yaml

@@ -18,7 +18,7 @@ search_paths:
   windows:
   - C:/Program Files/ImageMagick*/convert.exe
 implements: imagemagick/1.0
-profiles:
+execution_profiles:
 - name: default
   platforms:
   - macos

data/spec/fixtures/register/tools/imagemagick/default/6.9.yaml

@@ -33,7 +33,7 @@ search_paths:
   - C:/Program Files/ImageMagick-*/identify.exe
   - C:/Program Files/ImageMagick-*/mogrify.exe
 implements: imagemagick/1.0
-profiles:
+execution_profiles:
 - name: unix
   platforms:
   - macos

data/spec/fixtures/register/tools/imagemagick/default/7.1.yaml

@@ -34,7 +34,7 @@ search_paths:
   - "%LOCALAPPDATA%/Programs/ImageMagick-*/magick.exe"
   - "~/AppData/Local/Programs/ImageMagick-*/magick.exe"
 implements: imagemagick/1.0
-profiles:
+execution_profiles:
 - name: modern_unix
   platforms:
   - macos

data/spec/fixtures/register/tools/inkscape/default/0.92.yaml

@@ -35,7 +35,7 @@ search_paths:
   - "%LOCALAPPDATA%/Inkscape/bin/inkscape.exe"
   - "~/AppData/Local/Inkscape/bin/inkscape.exe"
 implements: inkscape/1.0
-profiles:
+execution_profiles:
 - name: legacy_unix
   platforms:
   - macos

data/spec/fixtures/register/tools/inkscape/default/1.0.yaml

@@ -38,7 +38,7 @@ search_paths:
   - "%LOCALAPPDATA%/Inkscape/bin/inkscape.exe"
   - "~/AppData/Local/Inkscape/bin/inkscape.exe"
 implements: inkscape/1.0
-profiles:
+execution_profiles:
 - name: modern_unix
   platforms:
   - macos

data/spec/fixtures/register/tools/jq/default/1.0.yaml

@@ -15,7 +15,7 @@ search_paths:
   linux:
   - "/usr/bin/jq"
 implements: jq/1.0
-profiles:
+execution_profiles:
 - name: default
   platforms:
   - macos

data/spec/fixtures/register/tools/pdf2ps/default/1.0.yaml

@@ -19,7 +19,7 @@ search_paths:
   - C:/Program Files (x86)/gs/gs*/bin/pdf2ps.bat
   - C:/Program Files (x86)/gs/gs*/bin/pdf2ps.cmd
 implements: pdf2ps/1.0
-profiles:
+execution_profiles:
 - name: default
   platforms:
   - macos

data/spec/fixtures/register/tools/ping/bsd/1.0.yaml

@@ -31,7 +31,7 @@ search_paths:
   - "/sbin/ping"
   - "/usr/sbin/ping"
 implements: ping
-profiles:
+execution_profiles:
 - name: default
   platforms:
   - macos

data/spec/fixtures/register/tools/ping/gnu/2024.01.17.yaml

@@ -16,7 +16,7 @@ search_paths:
   - "/sbin/ping"
   - "/usr/sbin/ping"
 implements: ping
-profiles:
+execution_profiles:
 - name: default
   platforms:
   - linux

data/spec/fixtures/register/tools/ping/windows/1.0.yaml

@@ -18,7 +18,7 @@ search_paths:
   - "C:/Windows/System32/ping.exe"
   - "C:/Windows/SysWOW64/ping.exe"
 implements: ping
-profiles:
+execution_profiles:
 - name: windows
   platforms:
   - windows

data/spec/fixtures/register/tools/ping_bsd/default/1.0.yaml

@@ -9,7 +9,7 @@ aliases:
 version_detection:
 search_paths:
 implements: ping_bsd/1.0
-profiles:
+execution_profiles:
 - name: default
   platforms:
   - macos

data/spec/fixtures/register/tools/ping_gnu/default/1.0.yaml

@@ -9,7 +9,7 @@ aliases:
 version_detection:
 search_paths:
 implements: ping_gnu/1.0
-profiles:
+execution_profiles:
 - name: default
   platforms:
   - linux

data/spec/fixtures/register/tools/ping_windows/default/1.0.yaml

@@ -15,7 +15,7 @@ version_detection:
   modern_threshold: '1.0'
 search_paths:
 implements: ping_windows/1.0
-profiles:
+execution_profiles:
 - name: windows
   platforms:
   - windows

data/spec/fixtures/register/tools/sort/default/1.0.yaml

@@ -15,7 +15,7 @@ search_paths:
   - "/usr/bin/sort"
   - "/bin/sort"
 implements: sort/1.0
-profiles:
+execution_profiles:
 - name: default
   platforms:
   - macos

data/spec/fixtures/register/tools/tar/default/1.0.yaml

@@ -15,7 +15,7 @@ search_paths:
   - "/usr/bin/tar"
   - "/bin/tar"
 implements: tar/1.0
-profiles:
+execution_profiles:
 - name: default
   platforms:
   - macos

data/spec/fixtures/register/tools/unzip/default/1.0.yaml

@@ -14,7 +14,7 @@ search_paths:
   linux:
   - "/usr/bin/unzip"
 implements: unzip/1.0
-profiles:
+execution_profiles:
 - name: default
   platforms:
   - macos

data/spec/fixtures/register/tools/unzip/default/6.0.yaml

@@ -22,7 +22,7 @@ search_paths:
   - C:/Program Files/Git/usr/bin/unzip.exe
   - C:/msys64/usr/bin/unzip.exe
 implements: unzip/1.0
-profiles:
+execution_profiles:
 - name: unix
   platforms:
   - macos

data/spec/fixtures/register/tools/yq/default/1.0.yaml

@@ -14,7 +14,7 @@ search_paths:
   linux:
   - "/usr/bin/yq"
 implements: yq/1.0
-profiles:
+execution_profiles:
 - name: default
   platforms:
   - macos

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ukiryu
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Ribose Inc.