From 1a93fbc01449ccc34e5f7738a2d2a10a99e3fb8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A1bio=20Rodrigues?= <fabio.info@gmail.com>
Date: Tue, 19 Feb 2019 14:55:19 -0300
Subject: [PATCH 01/18] Removed deprecation warning message

---
 ruby-debug-ide.gemspec | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/ruby-debug-ide.gemspec b/ruby-debug-ide.gemspec
index 7cd29ef4..47af820d 100644
--- a/ruby-debug-ide.gemspec
+++ b/ruby-debug-ide.gemspec
@@ -45,7 +45,4 @@ EOF
   spec.required_ruby_version = '>= 1.8.2'
   spec.date = DateTime.now
   spec.rubyforge_project = 'debug-commons'
-
-  # rdoc
-  spec.has_rdoc = false
 end

From 8c29caa57cd03f484c8d92b221dc6f398099d19b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A1bio=20Rodrigues?= <fabio.info@gmail.com>
Date: Tue, 19 Feb 2019 14:56:40 -0300
Subject: [PATCH 02/18] Added option to skip waitting for start

---
 bin/rdebug-ide        | 2 ++
 lib/ruby-debug-ide.rb | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/bin/rdebug-ide b/bin/rdebug-ide
index 30543534..618e291d 100755
--- a/bin/rdebug-ide
+++ b/bin/rdebug-ide
@@ -17,6 +17,7 @@ options = OpenStruct.new(
     'port'        => 1234,
     'stop'        => false,
     'tracing'     => false,
+    'skip_wait_for_start' => false,
     'int_handler' => true,
     'dispatcher_port' => -1,
     'evaluation_timeout' => 10,
@@ -67,6 +68,7 @@ EOB
 
   opts.on('--stop', 'stop when the script is loaded') {options.stop = true}
   opts.on("-x", "--trace", "turn on line tracing") {options.tracing = true}
+  opts.on("--skip_wait_for_start", "skip wait for 'start' command") {options.skip_wait_for_start = true}
   opts.on("-l", "--load-mode", "load mode (experimental)") {options.load_mode = true}
   opts.on("-d", "--debug", "Debug self - prints information for debugging ruby-debug itself") do
     Debugger.cli_debug = true
diff --git a/lib/ruby-debug-ide.rb b/lib/ruby-debug-ide.rb
index 10f70f43..97644dfc 100644
--- a/lib/ruby-debug-ide.rb
+++ b/lib/ruby-debug-ide.rb
@@ -90,7 +90,7 @@ def prepare_debugger(options)
       # wait for 'start' command
       @mutex.synchronize do
         @proceed.wait(@mutex)
-      end
+      end unless options.skip_wait_for_start
     end
 
     def debug_program(options)

From 28c3385707c7d60993ffd61c33fef3f202fdfe94 Mon Sep 17 00:00:00 2001
From: Viuginov Nickolay <nickolay.viuginov@jetbrains.com>
Date: Fri, 23 Mar 2018 01:09:51 +0300
Subject: [PATCH 03/18] check if debase installed (already_installed doesn't
 work)

---
 ext/mkrf_conf.rb | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/ext/mkrf_conf.rb b/ext/mkrf_conf.rb
index c8170ac3..ece549f4 100644
--- a/ext/mkrf_conf.rb
+++ b/ext/mkrf_conf.rb
@@ -1,11 +1,6 @@
 jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && 'jruby' == RUBY_ENGINE)
 rbx = defined?(RUBY_ENGINE) && 'rbx' == RUBY_ENGINE
 
-def already_installed(dep)
-  !Gem::DependencyInstaller.new(:domain => :local).find_gems_with_sources(dep).empty? ||
-  !Gem::DependencyInstaller.new(:domain => :local,:prerelease => true).find_gems_with_sources(dep).empty?    
-end
-
 unless jruby || rbx
   require 'rubygems'
   require 'rubygems/command.rb'
@@ -14,14 +9,14 @@ def already_installed(dep)
 
   begin
     Gem::Command.build_args = ARGV
-    rescue NoMethodError
+  rescue NoMethodError
   end
 
   if RUBY_VERSION < "1.9"
     dep = Gem::Dependency.new("ruby-debug-base", '>=0.10.4')
   elsif RUBY_VERSION < '2.0'
     dep = Gem::Dependency.new("ruby-debug-base19x", '>=0.11.30.pre15')
-  else    
+  else
     dep = Gem::Dependency.new("debase", '> 0')
   end
 
@@ -38,7 +33,7 @@ def already_installed(dep)
       puts e.backtrace.join "\n  "
       exit(1)
     end
-  end unless dep.nil? || already_installed(dep)
+  end unless dep.nil? || dep.matching_specs.any?
 end
 
 # create dummy rakefile to indicate success

From 37d0a64ffbe92245b142c4e06a09ca6de79d1cae Mon Sep 17 00:00:00 2001
From: Viuginov Nickolay <nickolay.viuginov@jetbrains.com>
Date: Tue, 2 Jul 2019 15:59:45 +0300
Subject: [PATCH 04/18] [RUBY-23972] Improve ruby-debug-ide documentation

---
 README.md        |  33 +++-
 protocol-spec.md | 406 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 435 insertions(+), 4 deletions(-)
 create mode 100644 protocol-spec.md

diff --git a/README.md b/README.md
index d0522d6e..0125c3b1 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,32 @@
-[gem]: https://rubygems.org/gems/ruby-debug-ide
-# ruby-debug-ide
-An interface which glues ruby-debug to IDEs like Eclipse (RDT), NetBeans and RubyMine.
-
 [![official JetBrains project](http://jb.gg/badges/official.svg)](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub)
 [![Gem Version](https://badge.fury.io/rb/ruby-debug-ide.svg)][gem]
 [![Build Status](https://travis-ci.org/ruby-debug/ruby-debug-ide.svg?branch=master)](https://travis-ci.org/ruby-debug/ruby-debug-ide)
+
+[gem]: https://rubygems.org/gems/ruby-debug-ide
+# ruby-debug-ide
+
+The 'ruby-debug-ide' gem provides the protocol to establish communication between the debugger engine (such as [debase](https://rubygems.org/gems/debase) or [ruby-debug-base](https://rubygems.org/gems/ruby-debug-base)) and IDEs (for example, RubyMine, Visual Studio Code, or Eclipse). 'ruby-debug-ide' redirect commands from the IDE to the debugger engine. Then, it returns answers/events received from the debugger engine to the IDE. To learn more about a communication protocol, see the following document: [ruby-debug-ide protocol](protocol-spec.md).
+
+## Install debugging gems
+Depending on the used Ruby version, you need to add/install the following debugging gems to the Gemfile:
+- Ruby 2.x - [ruby-debug-ide](https://rubygems.org/gems/ruby-debug-ide) and [debase](https://rubygems.org/gems/debase)
+- Ruby 1.9.x - [ruby-debug-ide](https://rubygems.org/gems/ruby-debug-ide) and [ruby-debug-base19x](https://rubygems.org/gems/ruby-debug-base19x)
+- jRuby or Ruby 1.8.x - [ruby-debug-ide](https://rubygems.org/gems/ruby-debug-ide) and [ruby-debug-base](https://rubygems.org/gems/ruby-debug-base)
+> For Windows, make sure that the Ruby [DevKit](https://github.com/oneclick/rubyinstaller/wiki/Development-Kit) is installed.
+  
+## Start debugging session
+To start the debugging session for a Rails application, run the following command:
+```shell
+rdebug-ide --host 0.0.0.0 --port 1234 --dispatcher-port 1234 -- bin/rails s
+```
+If you want to debug a Rails application run using Docker Compose, you need to start the Rails server from the Docker in the following way:
+```yaml
+command: bundle exec rdebug-ide --host 0.0.0.0 --port 1234 -- bin/rails s -p 3000 -b 0.0.0.0
+volumes: 
+  - .:/sample_rails_app
+ports:
+  - "1234:1234"
+  - "3000:3000"
+  - "26162:26162"
+```
+Note that all ports above should be exposed in the Dockerfile.
\ No newline at end of file
diff --git a/protocol-spec.md b/protocol-spec.md
new file mode 100644
index 00000000..b6f42c0a
--- /dev/null
+++ b/protocol-spec.md
@@ -0,0 +1,406 @@
+ruby-debug-ide protocol
+=======================
+
+* * *
+
+Next: [Summary](#Summary), Previous: [(dir)](#dir), Up: [(dir)](#dir)
+
+_ruby-debug-ide_ protocol
+-------------------------
+
+This file contains specification of the protocol used by _ruby-debug-ide_.
+
+*   [Summary](#Summary)
+*   [Specification](#Specification)
+*   [Changes](#Changes)
+
+* * *
+
+Next: [Specification](#Specification), Previous: [Top](#Top), Up: [Top](#Top)
+
+1 Summary
+---------
+
+This document describes protocol used by _ruby-debug-ide_ for communication between debugger engine and a frontend. It is a work in progress and might, and very likely will, change in the future. If you have any comments or questions please [send me](mailto:martin.krauskopf@gmail.com) an email.
+
+The communication has two parts/sides. First ones are _commands_ sent from a frontend to the debugger engine and the second is the opposite way, _answers_ and _events_ sent from the debugger engine to the frontend.
+
+_commands_ are almost the same as the ones used by CLI ruby-debug. So you might want to contact [the _ruby-debug-ide_ document](http://bashdb.sourceforge.net/ruby-debug.html).
+
+_answers_ and _events_ are sent in XML format described in the specification [below](#Specification).
+
+**Specification is far from complete.** Will be completed as time permits. In the meantime, source code is always the best spec.
+
+* * *
+
+Next: [Changes](#Changes), Previous: [Summary](#Summary), Up: [Top](#Top)
+
+2 Specification
+---------------
+
+*   [Commands](#Commands)
+*   [Events](#Events)
+
+Terms:
+
+*   _Command_ is what frontend sends to the debugger engine
+*   _Answer_ is what debugger engine sends back to the frontend
+*   _Example_ shows simple example
+
+* * *
+
+Next: [Events](#Events), Up: [Specification](#Specification)
+
+### 2.1 Commands
+
+*   [Adding Breakpoint](#Adding-Breakpoint)
+*   [Deleting Breakpoint](#Deleting-Breakpoint)
+*   [Enabling Breakpoint](#Enabling-Breakpoint)
+*   [Disabling Breakpoint](#Disabling-Breakpoint)
+*   [Condition](#Condition)
+*   [Catchpoint](#Catchpoint)
+*   [Threads](#Threads)
+*   [Frames](#Frames)
+*   [Variables](#Variables)
+
+* * *
+
+Next: [Deleting Breakpoint](#Deleting-Breakpoint), Up: [Commands](#Commands)
+
+#### 2.1.1 Adding Breakpoint
+
+Command:
+
+       break <script>:<line\_no>
+
+Answer:
+
+       <breakpointAdded no="<id>" location="<script>:<line\_no>"/>
+
+Example:
+
+       C: break test.rb:2
+       A: <breakpointAdded no="1" location="test.rb:2"/>
+
+* * *
+
+Next: [Enabling Breakpoint](#Enabling-Breakpoint), Previous: [Adding Breakpoint](#Adding-Breakpoint), Up: [Commands](#Commands)
+
+#### 2.1.2 Deleting Breakpoint
+
+Command:
+
+       delete <breakpoint\_id>
+
+Answer:
+
+       <breakpointDeleted no="<id>"/>
+
+Example:
+
+       C: delete 2
+       A: <breakpointDeleted no="2"/>
+
+* * *
+
+Next: [Disabling Breakpoint](#Disabling-Breakpoint), Previous: [Deleting Breakpoint](#Deleting-Breakpoint), Up: [Commands](#Commands)
+
+#### 2.1.3 Enabling Breakpoint
+
+Supported **since** _ruby-debug-ide_ **0.2.0**
+
+Command:
+
+       enable <breakpoint\_id>
+
+Answer:
+
+       <breakpointEnabled bp\_id="<id>"/>
+
+Example:
+
+       C: enable 2
+       A: <breakpointEnabled bp\_id="2"/>
+
+* * *
+
+Next: [Condition](#Condition), Previous: [Enabling Breakpoint](#Enabling-Breakpoint), Up: [Commands](#Commands)
+
+#### 2.1.4 Disabling Breakpoint
+
+Supported **since** _ruby-debug-ide_ **0.2.0**
+
+Command:
+
+       disable <breakpoint\_id>
+
+Answer:
+
+       <breakpointDisabled bp\_id="<id>"/>
+
+Example:
+
+       C: disable 2
+       A: <breakpointDisabled bp\_id="2"/>
+
+* * *
+
+Next: [Catchpoint](#Catchpoint), Previous: [Disabling Breakpoint](#Disabling-Breakpoint), Up: [Commands](#Commands)
+
+#### 2.1.5 Setting Condition on Breakpoint
+
+Supported **since** _ruby-debug-ide_ **0.2.0**
+
+Command:
+
+       condition <script>:<line\_no>
+
+Answer:
+
+       <conditionSet bp\_id="<id>"/>
+
+Example:
+
+       C: condition 1 x>5   # Stop on breakpoint 1 only if x>5 is true.
+       A: <conditionSet bp\_id="1"/>
+
+* * *
+
+Next: [Threads](#Threads), Previous: [Condition](#Condition), Up: [Commands](#Commands)
+
+#### 2.1.6 Exception Breakpoint
+
+Command:
+
+       catch <exception\_class\_name>
+
+Answer:
+
+       <catchpointSet exception="<exception\_class\_name>"/>
+
+Example:
+
+       C: catch ZeroDivisionError
+       A: <catchpointSet exception="ZeroDivisionError"/>
+
+* * *
+
+Next: [Frames](#Frames), Previous: [Catchpoint](#Catchpoint), Up: [Commands](#Commands)
+
+#### 2.1.7 Threads Listing
+
+Command:
+
+       thread list
+
+Answer:
+
+       <threads>
+         <thread id="<id>" status="<status>"/>
+         ....
+       </threads>
+
+Example:
+
+       C: thread list
+       A: <threads>
+            <thread id="1" status="run"/>
+            <thread id="2" status="sleep"/>
+          </threads>
+
+* * *
+
+Next: [Variables](#Variables), Previous: [Threads](#Threads), Up: [Commands](#Commands)
+
+#### 2.1.8 Frames Listing
+
+Command:
+
+       where
+
+Answer:
+
+       <frames>
+         <frame no="<frame\_no>" file="<script>" line="<line\_no>" current="<boolean>"/>
+         <frame no="<frame\_no>" file="<script>" line="<line\_no>"/>
+         ...
+       </frames>
+
+Example:
+
+       C: where
+       A: <frames>
+            <frame no="1" file="/path/to/test2.rb" line="3" current="true" />
+            <frame no="2" file="/path/to/test.rb" line="3" />
+          </frames>
+
+* * *
+
+Previous: [Frames](#Frames), Up: [Commands](#Commands)
+
+#### 2.1.9 Variables Listing
+
+##### 2.1.9.1 Local Variables
+
+Example:
+
+       C: var local
+       A: <variables>
+            <variable name="array" kind="local" value="Array (2 element(s))" type="Array" hasChildren="true" objectId="-0x2418a904"/>
+          </variables>
+
+##### 2.1.9.2 Instance Variables
+
+Example:
+
+       C: var instance some\_array
+       A: <variables>
+            <variable name="\[0\]" kind="instance" value="1" type="Fixnum" hasChildren="false" objectId="+0x3"/>
+            <variable name="\[1\]" kind="instance" value="2" type="Fixnum" hasChildren="false" objectId="+0x5"/>
+          </variables>
+
+     
+       C: var instance some\_object
+       A: <variables>
+            <variable name="@y" kind="instance" value="5" type="Fixnum" hasChildren="false" objectId="+0xb"/>
+          </variables>
+
+* * *
+
+Previous: [Commands](#Commands), Up: [Specification](#Specification)
+
+### 2.2 Events
+
+*   [Breakpoint](#Breakpoint)
+*   [Suspension](#Suspension)
+*   [Exception](#Exception)
+*   [Message](#Message)
+
+* * *
+
+Next: [Suspension](#Suspension), Up: [Events](#Events)
+
+#### 2.2.1 Breakpoint
+
+Event example:
+
+       <breakpoint file="test.rb" line="1" threadId="1"/>
+
+* * *
+
+Next: [Exception](#Exception), Previous: [Breakpoint](#Breakpoint), Up: [Events](#Events)
+
+#### 2.2.2 Suspension
+
+Event example:
+
+       <suspended file="/path/to/test.rb" line="2" threadId="1" frames="1"/>
+
+* * *
+
+Next: [Message](#Message), Previous: [Suspension](#Suspension), Up: [Events](#Events)
+
+#### 2.2.3 Exception
+
+Event example:
+
+       <exception file="/path/to/test.rb" line="2" type="ZeroDivisionError" message="divided by 0" threadId="1"/>
+
+* * *
+
+Previous: [Exception](#Exception), Up: [Events](#Events)
+
+#### 2.2.4 Message
+
+Event example:
+
+       <message>some text</message>
+       <message debug='true'>some debug text</message>
+
+* * *
+
+Previous: [Specification](#Specification), Up: [Top](#Top)
+
+3 Changes
+---------
+
+Mentions also related changes in the _ruby-debug-ide_ gem implementation.
+
+### 3.1 Changes between 0.4.9 and 0.4.10
+
+*   Fixes possible NoSuchMethodException
+
+### 3.2 Changes between 0.4.5 and 0.4.6
+
+*   added Debugger::start\_server (ticket #25972)
+
+### 3.3 Changes between 0.4.4 and 0.4.5
+
+*   possibility to remove catchpoints
+*   bugfix: syntax error with Ruby 1.9
+
+### 3.4 Changes between 0.4.3 and 0.4.4
+
+*   bugfix: print out backtrace when debuggee fails
+
+### 3.5 Changes between 0.4.2 and 0.4.3
+
+*   depends on the "~> 0.10.3.x", rather then on 0.10.3 exactly to be compatible with future ruby-debug-base 0.10.3.x releases
+
+### 3.6 Changes between 0.4.1 and 0.4.2
+
+*   Dependency changed to ruby-debug-base-0.10.3 which fixes various bugs and contains bunch of RFEs
+
+### 3.7 Changes between 0.4.0 and 0.4.1
+
+*   '–stop' switch: stop at the first line when the script is loaded. Utilized by remote debugging
+*   Making '-x' switch actually work. Commenting out sending of <trace> elements to the debugger. To be decided. There are large amount of such events. For now serves rather for ruby-debug-ide developers.
+*   ensure 'file' attribute contains absolute path
+*   fixing CLI verbose when -d is used. Some unused code
+
+### 3.8 Changes between 0.3.1 and 0.4.0
+
+*   Support for debug attribute in message element. Emitted by backend when –xml-debug (new since 0.4.0) option is used.
+*   More robust failures handling in DebugThread
+
+### 3.9 Changes between 0.3.4 and 0.3.5
+
+*   bugfix: syntax error with Ruby 1.9
+
+### 3.10 Changes between 0.3.3 and 0.3.4
+
+*   bugfix: print out backtrace when debuggee fails
+
+### 3.11 Changes between 0.3.2 and 0.3.3
+
+*   depends on the "~> 0.10.3.x", rather then on 0.10.3 exactly to be compatible with future ruby-debug-base 0.10.3.x releases
+
+### 3.12 Changes between 0.3.1 and 0.3.2
+
+*   Dependency changed to ruby-debug-base-0.10.3 which fixes various bugs and contains bunch of RFEs
+
+### 3.13 Changes between 0.3.0 and 0.3.1
+
+*   Support for _–load-mode_ option. Hotfix, likely workaround, for GlassFish debugging. Experimental, might be removed in the future. If option is used, it calls Debugger#debug\_load with increment\_start=true
+
+### 3.14 Changes between 0.2.1 and 0.3.0
+
+*   [Catchpoint](#Catchpoint) now answers with <conditionSet> instead of just <message> providing better control at frontend side
+*   Dependency changed to ruby-debug-base-0.10.2
+*   Bugfixes (see ChangeLog)
+
+### 3.15 Changes between 0.2.0 and 0.2.1
+
+*   Hotfixing/workarounding problem with connection on some Mac OSes, see [Debugger timing out](http://ruby.netbeans.org/servlets/BrowseList?list=users&by=thread&from=861334) thread.
+
+### 3.16 Changes between 0.1.10 and 0.2.0
+
+#### 3.16.1 New Features
+
+*   [Condition](#Condition)
+*   [Enabling Breakpoint](#Enabling-Breakpoint)
+*   [Disabling Breakpoint](#Disabling-Breakpoint)
+
+#### 3.16.2 Uncompatible Changes
+
+*   _catch off_ does not work anymore, since _ruby-debug-base_s support multiple catchpoints since 0.10.1, not just one. **Note:** however _ruby-debug-base_s in version 0.10.1 suffers with [bug](http://rubyforge.org/tracker/index.php?func=detail&aid=20237&group_id=1900&atid=7436) that it is not possible to remove catchpoints. So catchpoints removing must be workarounded in higher layers. The bug is fixed in _ruby-debug-base_s 0.10.2 and above.
\ No newline at end of file

From 0f58b1ed421307864fffe55575b22065eb783ab3 Mon Sep 17 00:00:00 2001
From: Viuginov Nickolay <nickolay.viuginov@jetbrains.com>
Date: Thu, 26 Sep 2019 16:37:37 +0300
Subject: [PATCH 05/18] bump version

---
 lib/ruby-debug-ide/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ruby-debug-ide/version.rb b/lib/ruby-debug-ide/version.rb
index 43d918bb..d482befa 100755
--- a/lib/ruby-debug-ide/version.rb
+++ b/lib/ruby-debug-ide/version.rb
@@ -1,3 +1,3 @@
 module Debugger
-  IDE_VERSION='0.7.0'
+  IDE_VERSION='0.7.1.beta1'
 end

From 9f2f7dc64f84f4b2c4da03cbcb5d188a8806fe34 Mon Sep 17 00:00:00 2001
From: Tom Dyas <tom.dyas@gmail.com>
Date: Tue, 15 Oct 2019 11:48:55 -0700
Subject: [PATCH 06/18] add unix domain socket support

---
 bin/rdebug-ide                       |  6 +++-
 lib/ruby-debug-ide.rb                | 39 ++++++++++++++++--------
 lib/ruby-debug-ide/greeter.rb        |  4 ++-
 test-base/catchpoint_test.rb         | 21 +++++++++++++
 test-base/enable_disable_test.rb     | 44 ++++++++++++++++++++++++++++
 test-base/test_base.rb               | 40 +++++++++++++++++++++++--
 test/rd_basic_test.rb                |  5 ++++
 test/rd_catchpoint_test.rb           | 19 +++++-------
 test/rd_condition_test.rb            |  4 +++
 test/rd_enable_disable_test.rb       | 40 ++++---------------------
 test/rd_expression_info_test.rb      |  4 +++
 test/rd_inspect_test.rb              |  4 +++
 test/rd_stepping_breakpoints_test.rb |  4 +++
 test/rd_test_base.rb                 | 11 +++++--
 test/rd_threads_and_frames_test.rb   |  4 +++
 test/rd_variables_test.rb            |  4 +++
 16 files changed, 187 insertions(+), 66 deletions(-)
 create mode 100644 test-base/catchpoint_test.rb
 create mode 100644 test-base/enable_disable_test.rb

diff --git a/bin/rdebug-ide b/bin/rdebug-ide
index 618e291d..fce28c94 100755
--- a/bin/rdebug-ide
+++ b/bin/rdebug-ide
@@ -29,7 +29,8 @@ options = OpenStruct.new(
     'value_as_nested_element' => false,
     'attach_mode' => false,
     'cli_debug' => false,
-    'key_value_mode' => false
+    'key_value_mode' => false,
+    'socket_path' => nil
 )
 
 opts = OptionParser.new do |opts|
@@ -100,6 +101,9 @@ EOB
   opts.on("--value-as-nested-element", "Allow to pass variable's value as nested element instead of attribute") do
     options.value_as_nested_element = true
   end
+  opts.on("--socket-path PATH", "Listen for debugger on the given UNIX domain socket path") do |path|
+    options.socket_path = path
+  end
   opts.separator ""
   opts.separator "Common options:"
   opts.on_tail("-v", "--version", "Show version") do
diff --git a/lib/ruby-debug-ide.rb b/lib/ruby-debug-ide.rb
index 97644dfc..ffa58dca 100644
--- a/lib/ruby-debug-ide.rb
+++ b/lib/ruby-debug-ide.rb
@@ -73,17 +73,17 @@ def interrupt_last
       end
     end
 
-    def start_server(host = nil, port = 1234, notify_dispatcher = false)
+    def start_server(host = nil, port = 1234, notify_dispatcher = false, socket_path: nil)
       return if started?
       start
-      start_control(host, port, notify_dispatcher)
+      start_control(host, port, notify_dispatcher, socket_path: socket_path)
     end
 
     def prepare_debugger(options)
       @mutex = Mutex.new
       @proceed = ConditionVariable.new
 
-      start_server(options.host, options.port, options.notify_dispatcher)
+      start_server(options.host, options.port, options.notify_dispatcher, socket_path: options.socket_path)
 
       raise "Control thread did not start (#{@control_thread}}" unless @control_thread && @control_thread.alive?
 
@@ -111,25 +111,38 @@ def run_prog_script
       end
     end
 
-    def start_control(host, port, notify_dispatcher)
+    def start_control(host, port, notify_dispatcher, socket_path: nil)
       raise "Debugger is not started" unless started?
       return if @control_thread
       @control_thread = DebugThread.new do
         begin
-          # 127.0.0.1 seemingly works with all systems and with IPv6 as well.
-          # "localhost" and nil have problems on some systems.
-          host ||= '127.0.0.1'
-
-          server = notify_dispatcher_if_needed(host, port, notify_dispatcher) do |real_port, port_changed|
-            s = TCPServer.new(host, real_port)
-            print_greeting_msg $stderr, host, real_port, port_changed ? "Subprocess" : "Fast" if defined? IDE_VERSION
-            s
+          if socket_path.nil?
+            # 127.0.0.1 seemingly works with all systems and with IPv6 as well.
+            # "localhost" and nil have problems on some systems.
+            host ||= '127.0.0.1'
+
+            server = notify_dispatcher_if_needed(host, port, notify_dispatcher) do |real_port, port_changed|
+              s = TCPServer.new(host, real_port)
+              print_greeting_msg $stderr, host, real_port, port_changed ? "Subprocess" : "Fast" if defined? IDE_VERSION
+              s
+            end
+          else
+            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
           end
 
           return unless server
 
           while (session = server.accept)
-            $stderr.puts "Connected from #{session.peeraddr[2]}" if Debugger.cli_debug
+            if Debugger.cli_debug
+              if session.peeraddr == 'AF_INET'
+                $stderr.puts "Connected from #{session.peeraddr[2]}"
+              else
+                $stderr.puts "Connected from local client"
+              end
+            end
             dispatcher = ENV['IDE_PROCESS_DISPATCHER']
             if dispatcher
               ENV['IDE_PROCESS_DISPATCHER'] = "#{session.peeraddr[2]}:#{dispatcher}" unless dispatcher.include?(":")
diff --git a/lib/ruby-debug-ide/greeter.rb b/lib/ruby-debug-ide/greeter.rb
index 7e3dd93f..50a75c3b 100644
--- a/lib/ruby-debug-ide/greeter.rb
+++ b/lib/ruby-debug-ide/greeter.rb
@@ -10,7 +10,7 @@
 module Debugger
 
   class << self
-    def print_greeting_msg(stream, host, port, debugger_name = "Fast")
+    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'
@@ -27,6 +27,8 @@ def print_greeting_msg(stream, host, port, debugger_name = "Fast")
 
       if host && port
         listens_on = " listens on #{host}:#{port}\n"
+      elsif socket_path
+        listens_on = " listens on #{socket_path}\n"
       else
         listens_on = "\n"
       end
diff --git a/test-base/catchpoint_test.rb b/test-base/catchpoint_test.rb
new file mode 100644
index 00000000..f8b18a1c
--- /dev/null
+++ b/test-base/catchpoint_test.rb
@@ -0,0 +1,21 @@
+#!/usr/bin/env ruby
+
+$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
+
+require 'test_base'
+
+module CatchpointTest
+
+  def test_catchpoint_basics
+    create_socket ['sleep 0.01', '5/0', 'sleep 0.01']
+    run_to_line(1)
+    send_next
+    assert_suspension(@test_path, 2, 1)
+    send_ruby('catch ZeroDivisionError')
+    assert_catchpoint_set('ZeroDivisionError')
+    send_next
+    assert_exception(@test_path, 2, 'ZeroDivisionError')
+    send_next
+  end
+
+end
diff --git a/test-base/enable_disable_test.rb b/test-base/enable_disable_test.rb
new file mode 100644
index 00000000..a6239d35
--- /dev/null
+++ b/test-base/enable_disable_test.rb
@@ -0,0 +1,44 @@
+#!/usr/bin/env ruby
+
+$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
+
+require 'test_base'
+
+module EnableDisableTest
+
+  def test_enable_disable_basics
+    create_socket ['1.upto(10) do', 'sleep 0.01', 'sleep 0.01', 'end']
+
+    send_test_breakpoint(2)
+    assert_breakpoint_added_no(1)
+    send_test_breakpoint(3)
+    assert_breakpoint_added_no(2)
+
+    start_debugger
+    assert_test_breakpoint(2)
+    send_cont
+    assert_test_breakpoint(3)
+    send_cont
+    assert_test_breakpoint(2)
+    send_ruby('disable 2')
+    assert_breakpoint_disabled(2)
+    send_cont
+    assert_test_breakpoint(2)
+    send_cont
+    assert_test_breakpoint(2)
+    send_ruby('enable 2')
+    assert_breakpoint_enabled(2)
+    send_cont
+    assert_test_breakpoint(3)
+    send_cont
+    assert_test_breakpoint(2)
+    send_cont
+    assert_test_breakpoint(3)
+    send_ruby('disable 1')
+    assert_breakpoint_disabled(1)
+    send_ruby('disable 2')
+    assert_breakpoint_disabled(2)
+    send_cont
+  end
+
+end
diff --git a/test-base/test_base.rb b/test-base/test_base.rb
index c0267500..a9719b4e 100644
--- a/test-base/test_base.rb
+++ b/test-base/test_base.rb
@@ -7,6 +7,7 @@
 require 'socket'
 require 'readers'
 require 'test/unit'
+require 'thread'
 require 'tmpdir'
 require 'open3'
 require 'yaml'
@@ -24,6 +25,14 @@ def initialize(name)
     @port = nil
     @parser = nil
     @fast_fail = nil
+    @socket_path = nil
+  end
+
+  module UseUNIXDomainSocket
+    def setup
+      super
+      @use_unix_socket = true
+    end
   end
 
   def setup
@@ -36,6 +45,9 @@ def setup
 
     # XXX: tmpdir unique to test, probably parse out from self.name
     FileUtils.mkdir_p(TMP_DIR)
+
+    @use_unix_socket = false
+    @socket_path = nil
   end
   
   # Loads key from the _config_._yaml_ file.
@@ -83,8 +95,12 @@ def debug_jruby?
   end
 
   def start_ruby_process(script, additional_opts = '')
-    @port = TestBase.find_free_port
-    cmd = debug_command(script, @port, additional_opts)
+    if !@use_unix_socket
+      @port = TestBase.find_free_port
+    else
+      @socket_path = TestBase.next_socket_path
+    end
+    cmd = debug_command(script, @port, @socket_path, additional_opts)
     debug "Starting: #{cmd}\n"
 
     Thread.new do
@@ -131,6 +147,17 @@ def TestBase.find_free_port(port = 1098)
     end
   end
 
+  @@socket_path_seq_mutex = Mutex.new
+  @@socket_path_sequence_num = 0
+  def self.next_socket_path
+    seq_num = @@socket_path_seq_mutex.synchronize do
+      i = @@socket_path_sequence_num
+      @@socket_path_sequence_num += 1
+      i
+    end
+    File.join(TMP_DIR, "d#{seq_num}.sock")
+  end
+
   def create_file(script_name, lines)
     file = File.join(TMP_DIR, script_name)
     script_path = RUBY_VERSION >= "1.9" ? File.realdirpath(file) : file.to_s
@@ -161,11 +188,18 @@ def socket
       debug "Trying to connect to the debugger..."
       (config_load('server_start_up_timeout')*4).downto(1) do |i|
         begin
-          @socket = TCPSocket.new("127.0.0.1", @port)
+          if @socket_path
+            @socket = UNIXSocket.new(@socket_path)
+          else
+            @socket = TCPSocket.new("127.0.0.1", @port)
+          end
           break
         rescue Errno::ECONNREFUSED
           debug '.'
           sleep 0.5
+        rescue Errno::ENOENT
+          debug '.'
+          sleep 0.5
         end
       end
       debug "\n"
diff --git a/test/rd_basic_test.rb b/test/rd_basic_test.rb
index 5bafdcce..83b684a3 100644
--- a/test/rd_basic_test.rb
+++ b/test/rd_basic_test.rb
@@ -7,4 +7,9 @@ class RDSteppingAndBreakpointsTest < RDTestBase
 
   include BasicTest
 
+end
+
+class RDUNIXSteppingAndBreakpointsTest < RDTestBase
+  include TestBase::UseUNIXDomainSocket
+  include BasicTest
 end
\ No newline at end of file
diff --git a/test/rd_catchpoint_test.rb b/test/rd_catchpoint_test.rb
index 1eea686e..c55d2a3d 100644
--- a/test/rd_catchpoint_test.rb
+++ b/test/rd_catchpoint_test.rb
@@ -1,20 +1,15 @@
 #!/usr/bin/env ruby
 
 require 'rd_test_base'
+require 'catchpoint_test'
 
 class RDCatchpointTest < RDTestBase
 
-  def test_catchpoint_basics
-    create_socket ['sleep 0.01', '5/0', 'sleep 0.01']
-    run_to_line(1)
-    send_next
-    assert_suspension(@test_path, 2, 1)
-    send_ruby('catch ZeroDivisionError')
-    assert_catchpoint_set('ZeroDivisionError')
-    send_next
-    assert_exception(@test_path, 2, 'ZeroDivisionError')
-    send_next
-  end
-  
+  include CatchpointTest
+
 end
 
+class RDUNIXCatchpointTest < RDTestBase
+  include TestBase::UseUNIXDomainSocket
+  include CatchpointTest
+end
diff --git a/test/rd_condition_test.rb b/test/rd_condition_test.rb
index 6fa2c4f9..aec1f40e 100644
--- a/test/rd_condition_test.rb
+++ b/test/rd_condition_test.rb
@@ -9,3 +9,7 @@ class RDConditionTest < RDTestBase
 
 end
 
+class RDUNIXConditionTest < RDTestBase
+  include TestBase::UseUNIXDomainSocket
+  include ConditionTest
+end
diff --git a/test/rd_enable_disable_test.rb b/test/rd_enable_disable_test.rb
index e7d9364e..8a829605 100644
--- a/test/rd_enable_disable_test.rb
+++ b/test/rd_enable_disable_test.rb
@@ -1,43 +1,15 @@
 #!/usr/bin/env ruby
 
 require 'rd_test_base'
+require 'enable_disable_test'
 
 class RDEnableDisableTest < RDTestBase
 
-  def test_enable_disable_basics
-    create_socket ['1.upto(10) do', 'sleep 0.01', 'sleep 0.01', 'end']
-    
-    send_test_breakpoint(2)
-    assert_breakpoint_added_no(1)
-    send_test_breakpoint(3)
-    assert_breakpoint_added_no(2)
-    
-    start_debugger
-    assert_test_breakpoint(2)
-    send_cont
-    assert_test_breakpoint(3)
-    send_cont
-    assert_test_breakpoint(2)
-    send_ruby('disable 2')
-    assert_breakpoint_disabled(2)
-    send_cont
-    assert_test_breakpoint(2)
-    send_cont
-    assert_test_breakpoint(2)
-    send_ruby('enable 2')
-    assert_breakpoint_enabled(2)
-    send_cont
-    assert_test_breakpoint(3)
-    send_cont
-    assert_test_breakpoint(2)
-    send_cont
-    assert_test_breakpoint(3)
-    send_ruby('disable 1')
-    assert_breakpoint_disabled(1)
-    send_ruby('disable 2')
-    assert_breakpoint_disabled(2)
-    send_cont
-  end
+  include EnableDisableTest
 
 end
 
+class RDUNIXEnableDisableTest < RDTestBase
+  include TestBase::UseUNIXDomainSocket
+  include EnableDisableTest
+end
diff --git a/test/rd_expression_info_test.rb b/test/rd_expression_info_test.rb
index b5d823d7..4ed70712 100644
--- a/test/rd_expression_info_test.rb
+++ b/test/rd_expression_info_test.rb
@@ -9,3 +9,7 @@ class RDExpressionInfoTest < RDTestBase
 
 end
 
+class RDUNIXExpressionInfoTest < RDTestBase
+  include TestBase::UseUNIXDomainSocket
+  include ExpressionInfoTest
+end
diff --git a/test/rd_inspect_test.rb b/test/rd_inspect_test.rb
index 90f99c98..5cd71e26 100644
--- a/test/rd_inspect_test.rb
+++ b/test/rd_inspect_test.rb
@@ -9,3 +9,7 @@ class RDInspectTest < RDTestBase
 
 end
 
+class RDUNIXInspectTest < RDTestBase
+  include TestBase::UseUNIXDomainSocket
+  include InspectTest
+end
diff --git a/test/rd_stepping_breakpoints_test.rb b/test/rd_stepping_breakpoints_test.rb
index 88e7aa1d..7ca885c9 100644
--- a/test/rd_stepping_breakpoints_test.rb
+++ b/test/rd_stepping_breakpoints_test.rb
@@ -34,3 +34,7 @@ def test_breakpoint_and_continue_from_other_file
 
 end
 
+class RDUNIXSteppingAndBreakpointsTest < RDTestBase
+  include TestBase::UseUNIXDomainSocket
+  include SteppingAndBreakpointsTest
+end
\ No newline at end of file
diff --git a/test/rd_test_base.rb b/test/rd_test_base.rb
index d5b7e4fe..d5bc369e 100644
--- a/test/rd_test_base.rb
+++ b/test/rd_test_base.rb
@@ -18,13 +18,20 @@ def setup
     end
   end
 
-  def debug_command(script, port, additional_opts='')
+  def debug_command(script, port, socket_path, additional_opts='')
+    location_arg = if !port.nil?
+                     "-p #{port}"
+                   elsif !socket_path.nil?
+                     "--socket-path #{socket_path}"
+                   else
+                     raise StandardError, "One of port and socket_path must be set"
+                   end
     cmd = "#{interpreter}"
     cmd << " --debug" if jruby?
     cmd << " -J-Xdebug -J-Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=y" if jruby? and debug_jruby?
     cmd << " -I 'lib:#{File.dirname(script)}' #{@rdebug_ide}" +
       (@verbose_server ? " -d" : "") +
-        " -p #{port} #{additional_opts} -- '#{script}'"
+        " #{location_arg} #{additional_opts} -- '#{script}'"
   end
 
   def start_debugger
diff --git a/test/rd_threads_and_frames_test.rb b/test/rd_threads_and_frames_test.rb
index 89a957b2..616266bc 100644
--- a/test/rd_threads_and_frames_test.rb
+++ b/test/rd_threads_and_frames_test.rb
@@ -9,3 +9,7 @@ class RDThreadsAndFrames < RDTestBase
 
 end
 
+class RDUNIXThreadsAndFrames < RDTestBase
+  include TestBase::UseUNIXDomainSocket
+  include ThreadsAndFrames
+end
\ No newline at end of file
diff --git a/test/rd_variables_test.rb b/test/rd_variables_test.rb
index 403640cb..0f866b48 100644
--- a/test/rd_variables_test.rb
+++ b/test/rd_variables_test.rb
@@ -9,3 +9,7 @@ class RDVariablesTest < RDTestBase
 
 end
 
+class RDUNIXVariablesTest < RDTestBase
+  include TestBase::UseUNIXDomainSocket
+  include VariablesTest
+end

From 825ae2306df6b76db73f5def4a653ab1af790b36 Mon Sep 17 00:00:00 2001
From: Tom Dyas <tom.dyas@gmail.com>
Date: Wed, 4 Dec 2019 21:25:33 -0800
Subject: [PATCH 07/18] 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.
---
 lib/ruby-debug-ide.rb         | 38 ++++++++++++++++++++++++++---------
 lib/ruby-debug-ide/greeter.rb |  4 ++--
 2 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/lib/ruby-debug-ide.rb b/lib/ruby-debug-ide.rb
index ffa58dca..bc61c90e 100644
--- a/lib/ruby-debug-ide.rb
+++ b/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
 
diff --git a/lib/ruby-debug-ide/greeter.rb b/lib/ruby-debug-ide/greeter.rb
index 50a75c3b..f47bde3b 100644
--- a/lib/ruby-debug-ide/greeter.rb
+++ b/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
\ No newline at end of file
+end

From 43ba294a99c12953cb2c038625d46fefc0758c02 Mon Sep 17 00:00:00 2001
From: Viuginov Nickolay <nickolay.viuginov@jetbrains.com>
Date: Thu, 5 Dec 2019 15:57:19 +0300
Subject: [PATCH 08/18] unescape breakpoint condition

---
 lib/ruby-debug-ide/commands/condition.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ruby-debug-ide/commands/condition.rb b/lib/ruby-debug-ide/commands/condition.rb
index f0bcaa74..d1890bde 100644
--- a/lib/ruby-debug-ide/commands/condition.rb
+++ b/lib/ruby-debug-ide/commands/condition.rb
@@ -23,7 +23,7 @@ def execute
         return unless pos
         breakpoints.each do |b|
           if b.id == pos 
-            b.expr = @match[2].empty? ? nil : @match[2]
+            b.expr = @match[2].empty? ? nil : Command.unescape_incoming(@match[2])
             print_contdition_set(b.id)
             break
           end

From 4cb0fc204dc21ab829cb788ab28cb815fd6a56d9 Mon Sep 17 00:00:00 2001
From: Viuginov Nickolay <nickolay.viuginov@jetbrains.com>
Date: Thu, 5 Dec 2019 16:05:54 +0300
Subject: [PATCH 09/18] RUBY-24836 fixup

---
 lib/ruby-debug-ide/xml_printer.rb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/ruby-debug-ide/xml_printer.rb b/lib/ruby-debug-ide/xml_printer.rb
index 416be25d..b009fddf 100644
--- a/lib/ruby-debug-ide/xml_printer.rb
+++ b/lib/ruby-debug-ide/xml_printer.rb
@@ -161,6 +161,11 @@ def do_print_hash(hash)
           else
             name = exec_with_allocation_control(k, :to_s, OverflowMessageType::EXCEPTION_MESSAGE)
           end
+
+          if k.nil?
+            name = 'nil'
+          end
+
           print_variable(name, v, 'instance')
         }
       end

From b041a2519e078a8f1cb951cca41dae2df46fe4a7 Mon Sep 17 00:00:00 2001
From: Viuginov Nickolay <nickolay.viuginov@jetbrains.com>
Date: Thu, 5 Dec 2019 16:08:52 +0300
Subject: [PATCH 10/18] bump version

---
 lib/ruby-debug-ide/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ruby-debug-ide/version.rb b/lib/ruby-debug-ide/version.rb
index d482befa..4fb8e9f1 100755
--- a/lib/ruby-debug-ide/version.rb
+++ b/lib/ruby-debug-ide/version.rb
@@ -1,3 +1,3 @@
 module Debugger
-  IDE_VERSION='0.7.1.beta1'
+  IDE_VERSION='0.7.1.beta2'
 end

From 02737f9d8e1c093d77c11dc1f839cd0c44f5df99 Mon Sep 17 00:00:00 2001
From: Viuginov Nickolay <nickolay.viuginov@jetbrains.com>
Date: Wed, 11 Dec 2019 14:13:39 +0300
Subject: [PATCH 11/18] bump version

---
 lib/ruby-debug-ide/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ruby-debug-ide/version.rb b/lib/ruby-debug-ide/version.rb
index 4fb8e9f1..5caee7df 100755
--- a/lib/ruby-debug-ide/version.rb
+++ b/lib/ruby-debug-ide/version.rb
@@ -1,3 +1,3 @@
 module Debugger
-  IDE_VERSION='0.7.1.beta2'
+  IDE_VERSION='0.7.1.beta3'
 end

From 336412613ad3b0beec491efa9da737272ddd02c3 Mon Sep 17 00:00:00 2001
From: Olle Jonsson <olle.jonsson@gmail.com>
Date: Fri, 10 Apr 2020 22:18:46 +0200
Subject: [PATCH 12/18] gemspec: Drop defunct property rubyforge_project

---
 ruby-debug-ide.gemspec | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ruby-debug-ide.gemspec b/ruby-debug-ide.gemspec
index 47af820d..354e648d 100644
--- a/ruby-debug-ide.gemspec
+++ b/ruby-debug-ide.gemspec
@@ -44,5 +44,4 @@ EOF
 
   spec.required_ruby_version = '>= 1.8.2'
   spec.date = DateTime.now
-  spec.rubyforge_project = 'debug-commons'
 end

From d92045574298f984cfbd87b7677cb538d006985d Mon Sep 17 00:00:00 2001
From: Nickolay Viuginov <nickolay.viuginov@jetbrains.com>
Date: Tue, 14 Apr 2020 03:34:10 +0300
Subject: [PATCH 13/18] bump version to 0.7.2

---
 lib/ruby-debug-ide/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ruby-debug-ide/version.rb b/lib/ruby-debug-ide/version.rb
index 5caee7df..a2f1c882 100755
--- a/lib/ruby-debug-ide/version.rb
+++ b/lib/ruby-debug-ide/version.rb
@@ -1,3 +1,3 @@
 module Debugger
-  IDE_VERSION='0.7.1.beta3'
+  IDE_VERSION='0.7.2'
 end

From 83b5d22f71879cad0a1dd0b2a9a5f1d7a9aabc5b Mon Sep 17 00:00:00 2001
From: Alexandr Evstigneev <hurricup@gmail.com>
Date: Thu, 17 Sep 2020 11:12:59 +0300
Subject: [PATCH 14/18] Removed JetBrains badge.

Supposed to be used only for projects under https://github.com/JetBrains/
---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index 0125c3b1..df075152 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,3 @@
-[![official JetBrains project](http://jb.gg/badges/official.svg)](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub)
 [![Gem Version](https://badge.fury.io/rb/ruby-debug-ide.svg)][gem]
 [![Build Status](https://travis-ci.org/ruby-debug/ruby-debug-ide.svg?branch=master)](https://travis-ci.org/ruby-debug/ruby-debug-ide)
 

From ecccbb3ac11e8bbf9819762f9f8748402d54d237 Mon Sep 17 00:00:00 2001
From: Alexandr Evstigneev <Alexandr.Evstigneev@jetbrains.com>
Date: Thu, 16 Sep 2021 14:01:40 +0300
Subject: [PATCH 15/18] Update email in the gemspec

---
 ruby-debug-ide.gemspec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ruby-debug-ide.gemspec b/ruby-debug-ide.gemspec
index 354e648d..be0917fa 100644
--- a/ruby-debug-ide.gemspec
+++ b/ruby-debug-ide.gemspec
@@ -30,8 +30,8 @@ EOF
 
   spec.version = RUBY_DEBUG_IDE_VERSION
 
-  spec.author = "Markus Barchfeld, Martin Krauskopf, Mark Moseley, JetBrains RubyMine Team"
-  spec.email = "rubymine-feedback@jetbrains.com"
+  spec.author = "Markus Barchfeld, Martin Krauskopf, Mark Moseley, Alexandr Evstigneev"
+  spec.email = "hurricup@gmail.com"
   spec.license = "MIT"
   spec.platform = Gem::Platform::RUBY
   spec.require_path = "lib"

From cd6c9648f72f39f388a9206555c85a32df971661 Mon Sep 17 00:00:00 2001
From: Alexandr Evstigneev <Alexandr.Evstigneev@jetbrains.com>
Date: Thu, 16 Sep 2021 14:03:35 +0300
Subject: [PATCH 16/18] RUBY-28068 use __send__ instead of send

---
 lib/ruby-debug-ide/thread_alias.rb | 6 +++---
 lib/ruby-debug-ide/xml_printer.rb  | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/ruby-debug-ide/thread_alias.rb b/lib/ruby-debug-ide/thread_alias.rb
index 4e10a7bd..4b2054d5 100644
--- a/lib/ruby-debug-ide/thread_alias.rb
+++ b/lib/ruby-debug-ide/thread_alias.rb
@@ -8,7 +8,7 @@ def do_thread_alias
         end
 
         Object.const_set :OldThread, ::Thread
-        Object.send :remove_const, :Thread
+        Object.__send__ :remove_const, :Thread
         Object.const_set :Thread, ::Debugger::DebugThread
       end
 
@@ -18,9 +18,9 @@ def undo_thread_alias
           return
         end
 
-        Object.send :remove_const, :Thread
+        Object.__send__ :remove_const, :Thread
         Object.const_set :Thread, ::OldThread
-        Object.send :remove_const, :OldThread
+        Object.__send__ :remove_const, :OldThread
       end
     end
   end
diff --git a/lib/ruby-debug-ide/xml_printer.rb b/lib/ruby-debug-ide/xml_printer.rb
index b009fddf..9dcf0c9d 100644
--- a/lib/ruby-debug-ide/xml_printer.rb
+++ b/lib/ruby-debug-ide/xml_printer.rb
@@ -208,13 +208,13 @@ def exec_with_timeout(sec, error_message)
     end
 
     def exec_with_allocation_control(value, exec_method, overflow_message_type)
-      return value.send exec_method unless Debugger.trace_to_s
+      return value.__send__ exec_method unless Debugger.trace_to_s
 
       memory_limit = Debugger.debugger_memory_limit
       time_limit = Debugger.inspect_time_limit
 
       if defined?(JRUBY_VERSION) || RUBY_VERSION < '2.0' || memory_limit <= 0
-        return exec_with_timeout(time_limit * 1e-3, "Timeout: evaluation of #{exec_method} took longer than #{time_limit}ms.") { value.send exec_method }
+        return exec_with_timeout(time_limit * 1e-3, "Timeout: evaluation of #{exec_method} took longer than #{time_limit}ms.") { value.__send__ exec_method }
       end
 
       require 'objspace'
@@ -245,7 +245,7 @@ def exec_with_allocation_control(value, exec_method, overflow_message_type)
           end
         end
         trace_point.enable
-        result = value.send exec_method
+        result = value.__send__ exec_method
         trace_queue << result
         trace_point.disable
       end

From 7dfebf99acc5d07966aeeae8b17f95520f7b7ba2 Mon Sep 17 00:00:00 2001
From: Alexandr Evstigneev <Alexandr.Evstigneev@jetbrains.com>
Date: Mon, 20 Sep 2021 12:25:58 +0300
Subject: [PATCH 17/18] release 0.7.3

---
 lib/ruby-debug-ide/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ruby-debug-ide/version.rb b/lib/ruby-debug-ide/version.rb
index a2f1c882..cc001a56 100755
--- a/lib/ruby-debug-ide/version.rb
+++ b/lib/ruby-debug-ide/version.rb
@@ -1,3 +1,3 @@
 module Debugger
-  IDE_VERSION='0.7.2'
+  IDE_VERSION='0.7.3'
 end

From 799cb903e744985e301d8b101d430ccf9f4846f9 Mon Sep 17 00:00:00 2001
From: Alexandr Evstigneev <Alexandr.Evstigneev@jetbrains.com>
Date: Mon, 20 Sep 2021 12:41:55 +0300
Subject: [PATCH 18/18] Added gen_travis rake task, updated .travis.yml

---
 .travis.yml | 60 ++++++++++++++++++++++++++---------------------------
 Rakefile    | 51 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 80 insertions(+), 31 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 15a86ed5..493afb05 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,39 +1,37 @@
 language: ruby
 dist: trusty
-os:
-  - linux
-  - osx
-
-rvm:
-  - 1.8.7
-  - 1.9.3
-  - 2.0.0
-  - 2.1.10
-  - 2.2.8
-  - 2.3.8
-  - 2.4.6
-  - 2.5.5
-  - 2.6.3
-  - ruby-head
-
 matrix:
   fast_finish: true
-  allow_failures:
-    - rvm: ruby-head
-
-  exclude:
+  include:
+    - os: linux
+      rvm: 3.0.1
     - os: osx
-      rvm: 1.9.3
+      rvm: 3.0.1
+    - os: linux
+      rvm: 2.7.3
     - os: osx
-      rvm: 2.0.0
-
+      rvm: 2.7.3
+    - os: linux
+      rvm: 2.6.7
+    - os: osx
+      rvm: 2.6.7
+    - os: linux
+      rvm: 2.5.9
     - os: osx
+      rvm: 2.5.9
+    - os: linux
+      rvm: 2.4.10
+    - os: osx
+      rvm: 2.4.10
+    - os: linux
+      rvm: 2.3.8
+    - os: linux
+      rvm: 2.2.10
+    - os: linux
+      rvm: 2.1.10
+    - os: linux
+      rvm: 2.0.0
+    - os: linux
+      rvm: 1.9.3
+    - os: linux
       rvm: 1.8.7
-
-#  include:
-#    - os: osx
-#      rvm: 1.9.3
-#      before_script: rvm install ruby-1.9.3 # not binary
-#    - os: osx
-#      rvm: 2.0.0
-#      before_script: rvm install ruby-2.0.0 # not binary
diff --git a/Rakefile b/Rakefile
index a169aeec..7a74d18c 100644
--- a/Rakefile
+++ b/Rakefile
@@ -39,4 +39,55 @@ task :changelog, :since_c, :until_c do |t,args|
   end
 
   puts changelog_content
+end
+
+desc "Generates travis.yaml"
+task :gen_travis do
+  versions = []
+
+  def versions.add(major:, minor:, include_macos: true)
+    self << { major: major, minor: [minor], include_macos: include_macos }
+  end
+
+  versions.add major: '3.0', minor: 1
+  versions.add major: '2.7', minor: 3
+  versions.add major: '2.6', minor: 7
+  versions.add major: '2.5', minor: 9
+  versions.add major: '2.4', minor: 10
+  versions.add major: '2.3', minor: 8, include_macos: false
+  versions.add major: '2.2', minor: 10, include_macos: false
+  versions.add major: '2.1', minor: 10, include_macos: false
+  versions.add major: '2.0', minor: 0, include_macos: false
+  versions.add major: '1.9', minor: 3, include_macos: false
+  versions.add major: '1.8', minor: 7, include_macos: false
+
+  puts <<EOM
+language: ruby
+dist: trusty
+matrix:
+  fast_finish: true
+  include:
+EOM
+
+  loop do
+    found_some = false
+
+    versions.each do |version|
+      minor = version[:minor].pop
+      if minor
+        found_some = true
+        full_version = "#{version[:major]}.#{minor}"
+        puts <<EOM
+    - os: linux
+      rvm: #{full_version}
+EOM
+        puts <<EOM if version[:include_macos]
+    - os: osx
+      rvm: #{full_version}
+EOM
+      end
+    end
+
+    break unless found_some
+  end
 end
\ No newline at end of file