split start_server into start_server and start_server_unix variants

Pre 2.0 versions of Ruby cannot handle keyword arguments and thus the
introduction of a socket_path keyword argument, even if defaulted to
nil, will cause errors.

Solution: Add `start_server_unix` and `start_control_unix` functions
and then share implementation with the original methods by
refactoring the implementations into common methods.

Author: tdyas

lib/ruby-debug-ide.rb

@@ -73,17 +73,23 @@ def interrupt_last
       end
     end
 
-    def start_server(host = nil, port = 1234, notify_dispatcher = false, socket_path: nil)
-      return if started?
-      start
-      start_control(host, port, notify_dispatcher, socket_path: socket_path)
+    def start_server(host = nil, port = 1234, notify_dispatcher = false)
+      _start_server_common(host, port, nil, notify_dispatcher)
+    end
+
+    def start_server_unix(socket_path, notify_dispatcher = false)
+      _start_server_common(nil, 0, socket_path, notify_dispatcher)
     end
 
     def prepare_debugger(options)
       @mutex = Mutex.new
       @proceed = ConditionVariable.new
 
-      start_server(options.host, options.port, options.notify_dispatcher, socket_path: options.socket_path)
+      if options.socket_path.nil?
+        start_server(options.host, options.port, options.notify_dispatcher)
+      else
+        start_server_unix(options.socket_path, options.notify_dispatcher)
+      end
 
       raise "Control thread did not start (#{@control_thread}}" unless @control_thread && @control_thread.alive?
 
@@ -111,7 +117,23 @@ def run_prog_script
       end
     end
 
-    def start_control(host, port, notify_dispatcher, socket_path: nil)
+    def start_control(host, port, notify_dispatcher)
+      _start_control_common(host, port, nil, notify_dispatcher)
+    end
+
+    def start_control_unix(socket_path, notify_dispatcher)
+      _start_control_common(nil, 0, socket_path, notify_dispatcher)
+    end
+
+    private
+
+    def _start_server_common(host, port, socket_path, notify_dispatcher)
+      return if started?
+      start
+      _start_control_common(host, port, socket_path, notify_dispatcher)
+    end
+
+    def _start_control_common(host, port, socket_path, notify_dispatcher)
       raise "Debugger is not started" unless started?
       return if @control_thread
       @control_thread = DebugThread.new do
@@ -130,7 +152,7 @@ def start_control(host, port, notify_dispatcher, socket_path: nil)
             raise "Cannot specify host and socket_file at the same time" if host
             File.delete(socket_path) if File.exist?(socket_path)
             server = UNIXServer.new(socket_path)
-            print_greeting_msg $stderr, nil, nil, "Fast", socket_path: socket_path if defined? IDE_VERSION
+            print_greeting_msg $stderr, nil, nil, "Fast", socket_path if defined? IDE_VERSION
           end
 
           return unless server
@@ -166,8 +188,6 @@ def start_control(host, port, notify_dispatcher, socket_path: nil)
       end
     end
 
-    private
-
     def notify_dispatcher_if_needed(host, port, need_notify)
       return yield port unless need_notify
 

lib/ruby-debug-ide/greeter.rb

@@ -10,7 +10,7 @@
 module Debugger
 
   class << self
-    def print_greeting_msg(stream, host, port, debugger_name = "Fast", socket_path: nil)
+    def print_greeting_msg(stream, host, port, debugger_name = "Fast", socket_path = nil)
       base_gem_name = if defined?(JRUBY_VERSION) || RUBY_VERSION < '1.9.0'
                         'ruby-debug-base'
                       elsif RUBY_VERSION < '2.0.0'
@@ -39,4 +39,4 @@ def print_greeting_msg(stream, host, port, debugger_name = "Fast", socket_path:
     end
   end
 
-end
+end