ruby-debug-ide 0.7.0 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c5a25152aa63a501a44485625d761596335fa586
-  data.tar.gz: 3f1763ba485ab281aa2cc76cc67f5750d32abb5e
+SHA256:
+  metadata.gz: ddd9e5401c5afc093a33c52250939944abab7cf945d57cd2a0efd18389c0adbf
+  data.tar.gz: 78d3ec32359393c66234648a0296988c85a7309ef05348fadc4f64b4e5119e48
 SHA512:
-  metadata.gz: c8d72c31c0b1e379299410a66ba9c34b3bbc1032395b3c24f1d011cf600872e5835459cf326ea7d7a408ecdcd19df8dc60c9c727dea341e92aa3a560be20bf05
-  data.tar.gz: 15663403fe209b60cf722cd3b775d6734cfe648ec149bce6329724a83c3925eacd89b2d93adcf1a86d8d4715287d4b3b19cd733141d8d03f7698908b9b68064b
+  metadata.gz: 1d323ac8d10c8a890b7b7fec0444d346886f9ecb0ed500d6b7f498a2175726a41ecb6bb9bb48a1a9e6426f9a09be3dea6d960797fef5a02274ead00562babfb0
+  data.tar.gz: 90d54997a247fa2fc149b6ead69d56f42f61365d84f0eb12026694468aff275f53e64d3ee7bdff49948c0b4c51fac3dafba62e75c39e62165c7b48faa20ed9ae

data/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,
@@ -28,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|
@@ -67,6 +69,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
@@ -98,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

data/ext/mkrf_conf.rb

@@ -2,11 +2,6 @@ install_dir = File.expand_path("../../../..", __FILE__)
 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'
@@ -15,14 +10,14 @@ unless jruby || rbx
 
   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
 
@@ -39,7 +34,7 @@ unless jruby || rbx
       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

data/lib/ruby-debug-ide.rb

@@ -74,23 +74,29 @@ module Debugger
     end
 
     def start_server(host = nil, port = 1234, notify_dispatcher = false)
-      return if started?
-      start
-      start_control(host, port, notify_dispatcher)
+      _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)
+      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?
 
       # wait for 'start' command
       @mutex.synchronize do
         @proceed.wait(@mutex)
-      end
+      end unless options.skip_wait_for_start
     end
 
     def debug_program(options)
@@ -112,24 +118,53 @@ module Debugger
     end
 
     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
         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 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?(":")
@@ -153,8 +188,6 @@ module Debugger
       end
     end
 
-    private
-
     def notify_dispatcher_if_needed(host, port, need_notify)
       return yield port unless need_notify
 

data/lib/ruby-debug-ide/commands/condition.rb

@@ -23,7 +23,7 @@ module Debugger
         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

data/lib/ruby-debug-ide/greeter.rb

@@ -10,7 +10,7 @@ require 'ruby-debug-ide/ide_processor'
 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 @@ module Debugger
 
       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
@@ -37,4 +39,4 @@ module Debugger
     end
   end
 
-end
+end

data/lib/ruby-debug-ide/version.rb

@@ -1,3 +1,3 @@
 module Debugger
-  IDE_VERSION='0.7.0'
+  IDE_VERSION='0.7.2'
 end

data/lib/ruby-debug-ide/xml_printer.rb

@@ -161,6 +161,11 @@ module Debugger
           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

data/ruby-debug-ide.gemspec

@@ -44,8 +44,4 @@ EOF
 
   spec.required_ruby_version = '>= 1.8.2'
   spec.date = DateTime.now
-  spec.rubyforge_project = 'debug-commons'
-
-  # rdoc
-  spec.has_rdoc = false
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-debug-ide
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.2
 platform: ruby
 authors:
 - Markus Barchfeld, Martin Krauskopf, Mark Moseley, JetBrains RubyMine Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-10 00:00:00.000000000 Z
+date: 2020-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -27,7 +27,7 @@ dependencies:
 description: 'An interface which glues ruby-debug to IDEs like Eclipse (RDT), NetBeans
   and RubyMine.
 
-'
+  '
 email: rubymine-feedback@jetbrains.com
 executables:
 - rdebug-ide
@@ -103,8 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: debug-commons
-rubygems_version: 2.6.10
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: IDE interface for ruby-debug.