ukiryu 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3881776473c97e5296fbc0d0d62f88352dec64d5350490a1d0c413f32ace414f
-  data.tar.gz: 79130e5976a4a024ec19073d3e85e43137d02bf11bfd3cdf21ea77923b24f609
+  metadata.gz: b1cb7b872cb1bf64055841e0a8d278b1b57f97fe7bf2133a52067eeee8d51f9f
+  data.tar.gz: 200175ef0a1a88d193396363b8a6335a01ed8d3a91863d660b25767f86abab4a
 SHA512:
-  metadata.gz: c26728d9bf22917688e549deee2462d332d272d136ca4ecdceb705d618341acd65a94d35a1617bc11636fc1831f7f913775a26ab924f5fc01090be201b61fca9
-  data.tar.gz: 9c513b6900ee5d349a4d442175c8713d8f1845b5af579e43f27323dc1c8483d98153cc1581dc9a8de5a3f686f144ec4d823846febf19d9b020f12f76be2a5394
+  metadata.gz: b3a7ed29941fab82a1b5b055a246234245ae7ba7c50d6d779b107b5a64d567bdbc4a71b3480182aab57831ab0a3119c36e71fa273157ace8b6f316c6ea11467b
+  data.tar.gz: 03f7e09b741cb05f4a0188511326438671d48a54444441d8abb2d15dfb969afd2ca6eb435dc1b9f0c893bb5015cf8c44b5131cf778c2e8d06062d6ba22e3aafc

data/lib/ukiryu/shell/powershell.rb

@@ -50,6 +50,27 @@ module Ukiryu
         string.to_s.gsub(/[`"$]/) { "`#{::Regexp.last_match(0)}" }
       end
 
+      # Check if a string needs quoting for PowerShell
+      # Overrides base class to add PowerShell-specific handling
+      #
+      # In PowerShell, arguments starting with - are interpreted as PowerShell
+      # parameters when passed to the call operator (&). This causes the prefix
+      # to be stripped (e.g., -sDEVICE=pdfwrite becomes =pdfwrite).
+      # To prevent this, we must quote all arguments starting with -.
+      #
+      # @param string [String] the string to check
+      # @return [Boolean] true if quoting is needed
+      def needs_quoting?(string)
+        str = string.to_s
+        # Call super for base checks (empty, whitespace, special chars)
+        return true if super(string)
+        # PowerShell-specific: arguments starting with - must be quoted
+        # to prevent PowerShell's parameter binder from stripping the prefix
+        return true if str.start_with?('-')
+
+        false
+      end
+
       # Quote an argument for PowerShell
       # Uses single quotes for literal strings
       # Uses double quotes for executable paths (works in both cmd.exe and PowerShell)
@@ -156,7 +177,12 @@ module Ukiryu
         # Use double quotes for PowerShell -Command (works better than single quotes)
         exe_quoted = %("#{escape(executable)}")
 
-        # Quote each argument - only quote if it contains special chars or spaces
+        # Quote each argument based on needs_quoting?
+        # Note: We do NOT add special handling for -Command/-File here because
+        # this method builds a PowerShell script string (using the & call operator),
+        # not a command line for the shell. The -Command/-File handling in join()
+        # is for when building command lines where PowerShell's parameter binder
+        # would interpret -prefixed arguments.
         args_quoted = args.map do |a|
           if needs_quoting?(a)
             %("#{escape(a)}")
@@ -219,7 +245,12 @@ module Ukiryu
         # Use double quotes for PowerShell -Command (works better than single quotes)
         exe_quoted = %("#{escape(executable)}")
 
-        # Quote each argument - only quote if it contains special chars or spaces
+        # Quote each argument based on needs_quoting?
+        # Note: We do NOT add special handling for -Command/-File here because
+        # this method builds a PowerShell script string (using the & call operator),
+        # not a command line for the shell. The -Command/-File handling in join()
+        # is for when building command lines where PowerShell's parameter binder
+        # would interpret -prefixed arguments.
         args_quoted = args.map do |a|
           if needs_quoting?(a)
             %("#{escape(a)}")

data/lib/ukiryu/version.rb

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

data/spec/ukiryu/shell/powershell_spec.rb

@@ -207,6 +207,73 @@ RSpec.describe Ukiryu::Shell::PowerShell do
         expect(result).to eq('echo \'``malicious``\'')
       end
     end
+
+    context 'quoting dash-prefixed arguments' do
+      it 'quotes arguments starting with dash' do
+        result = shell.join('gswin64c.exe', '-sDEVICE=pdfwrite', 'input.eps')
+        expect(result).to eq('gswin64c.exe \'-sDEVICE=pdfwrite\' input.eps')
+      end
+
+      it 'quotes multiple dash-prefixed arguments' do
+        result = shell.join('gswin64c.exe', '-sDEVICE=pdfwrite',
+                            '-sOutputFile=output.pdf', '-dBATCH', 'input.eps')
+        expect(result).to eq('gswin64c.exe \'-sDEVICE=pdfwrite\' ' \
+                             '\'-sOutputFile=output.pdf\' \'-dBATCH\' input.eps')
+      end
+
+      it 'quotes ImageMagick-style options' do
+        result = shell.join('magick', 'input.png', '-resize', '50x50', 'output.png')
+        expect(result).to eq('magick input.png \'-resize\' 50x50 output.png')
+      end
+
+      it 'still handles -Command specially (not quoted, next arg not quoted)' do
+        result = shell.join('powershell', '-Command', 'Write-Host hello')
+        expect(result).to eq('powershell -Command Write-Host hello')
+      end
+
+      it 'still handles -File specially (not quoted, next arg not quoted)' do
+        result = shell.join('powershell', '-File', 'script.ps1')
+        expect(result).to eq('powershell -File script.ps1')
+      end
+
+      it 'quotes dash-prefixed args after -Command script' do
+        result = shell.join('powershell', '-Command', 'script.ps1', '-SomeFlag')
+        expect(result).to eq('powershell -Command script.ps1 \'-SomeFlag\'')
+      end
+    end
+  end
+
+  describe '#needs_quoting?' do
+    it 'returns true for empty strings' do
+      expect(shell.needs_quoting?('')).to be true
+    end
+
+    it 'returns true for strings with whitespace' do
+      expect(shell.needs_quoting?('hello world')).to be true
+    end
+
+    it 'returns true for strings with special characters' do
+      expect(shell.needs_quoting?('hello;world')).to be true
+      expect(shell.needs_quoting?('hello&world')).to be true
+      expect(shell.needs_quoting?('hello|world')).to be true
+    end
+
+    it 'returns true for strings starting with dash' do
+      expect(shell.needs_quoting?('-sDEVICE=pdfwrite')).to be true
+      expect(shell.needs_quoting?('-resize')).to be true
+      expect(shell.needs_quoting?('-dBATCH')).to be true
+      expect(shell.needs_quoting?('-')).to be true
+    end
+
+    it 'returns false for simple strings' do
+      expect(shell.needs_quoting?('hello')).to be false
+      expect(shell.needs_quoting?('input.eps')).to be false
+      expect(shell.needs_quoting?('output.pdf')).to be false
+    end
+
+    it 'returns false for strings with dollar sign (PowerShell treats as literal)' do
+      expect(shell.needs_quoting?('$VAR')).to be false
+    end
   end
 
   describe '#format_path' do

metadata

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