Extract Windows cmd munging to private method

jawshooah · sds · commit dee3a93fc56d · 2015-07-22T00:40:26.000-07:00
diff --git a/lib/overcommit/subprocess.rb b/lib/overcommit/subprocess.rb
@@ -25,9 +25,7 @@ class << self
       # @option options [String] input string to pass via standard input stream
       # @return [Result]
       def spawn(args, options = {})
-        if OS.windows?
-          args.unshift('cmd.exe', '/c')
-        end
+        args = win32_prepare_args(args) if OS.windows?
 
         process = ChildProcess.build(*args)
 
@@ -57,9 +55,7 @@ def spawn(args, options = {})
       # Spawns a new process in the background using the given array of
       # arguments (the first element is the command).
       def spawn_detached(args)
-        if OS.windows?
-          args = %w[cmd.exe /c] + [args.join(' ')]
-        end
+        args = win32_prepare_args(args) if OS.windows?
 
         process = ChildProcess.build(*args)
         process.detach = true
@@ -71,6 +67,12 @@ def spawn_detached(args)
 
       private
 
+      # Necessary to run commands in the cmd.exe context.
+      # Args are joined to properly handle quotes and special characters.
+      def win32_prepare_args(args)
+        %w[cmd.exe /c] + [args.join(' ')]
+      end
+
       # @param process [ChildProcess]
       # @return [Array<IO>]
       def assign_output_streams(process)
