ruby-debug-ide 0.6.1.beta9 → 0.6.1.beta11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2852711026ba805b67c3c434639bafe781c94fb
-  data.tar.gz: 67501296e2f294e1c9cb3295cef40004d628593f
+  metadata.gz: 71726a834f8abd61b5cdbacf03fb2f1b2a20dad9
+  data.tar.gz: c2c8f6e03aa09b14cd1445258a88898ef72596ad
 SHA512:
-  metadata.gz: 164dea0a96937cd8cfa702141ff3320e7c4b85469d9c26212774a8865ba21253d7560ec448ab6bb5da0d34fe760811b5a8447a0fb25ac4ce37b255a480aff473
-  data.tar.gz: 42999728cea96ed4e609acc8c51e3e37f2f3d3db96e7790c36c886da4260219e52eb7611aa658f2015c973859f19ba90bf4ac693943860da67cf1617ab6fb5b1
+  metadata.gz: 993bdd8e22ebf94d03723ff6c938d1465e3b2c903ff67f28a93908f153b830631069061465adc7141b50b85339c344ee78644f170a4a4e124c29ae4bbd601308
+  data.tar.gz: 2034542f9d716c1edca4c3459b02fce2646a4010ecde0c8ba8fbb3de0d7d7956c15ab36eafafc77b0b9d9f00510ea953c83601efa80615d488890ddc890c7a2b

data/bin/rdebug-ide

@@ -20,6 +20,9 @@ options = OpenStruct.new(
     'int_handler' => true,
     'dispatcher_port' => -1,
     'evaluation_timeout' => 10,
+    'trace_to_s' => false,
+    'debugger_memory_limit' => 10,
+    'inspect_time_limit' => 100,
     'rm_protocol_extensions' => false,
     'catchpoint_deleted_event' => false,
     'value_as_nested_element' => false,
@@ -37,21 +40,6 @@ EOB
   opts.separator ""
   opts.separator "Options:"
 
-  Debugger.trace_to_s = false
-  opts.on("--evaluation-control", "trace to_s evaluation") do
-    Debugger.trace_to_s = true
-  end
-
-  ENV['DEBUGGER_MEMORY_LIMIT'] = '10'
-  opts.on("-m", "--memory-limit LIMIT", Integer, "evaluation memory limit in mb (default: 10)") do |limit|
-    ENV['DEBUGGER_MEMORY_LIMIT'] = limit.to_s
-  end
-
-  ENV['INSPECT_TIME_LIMIT'] = '100'
-  opts.on("-t", "--time-limit LIMIT", Integer, "evaluation time limit in milliseconds (default: 100)") do |limit|
-    ENV['INSPECT_TIME_LIMIT'] = limit.to_s
-  end
-
   opts.on("-h", "--host HOST", "Host name used for remote debugging") {|host| options.host = host}
   opts.on("-p", "--port PORT", Integer, "Port used for remote debugging") {|port| options.port = port}
   opts.on("--dispatcher-port PORT", Integer, "Port used for multi-process debugging dispatcher") do |dp|
@@ -60,6 +48,22 @@ EOB
   opts.on('--evaluation-timeout TIMEOUT', Integer,'evaluation timeout in seconds (default: 10)') do |timeout|
     options.evaluation_timeout = timeout
   end
+  opts.on("--evaluation-control", "trace to_s evaluation") {options.trace_to_s = true}
+
+  opts.on("-m", "--memory-limit LIMIT", Integer, "evaluation memory limit in mb (default: 10)") do |limit|
+    if defined?(JRUBY_VERSION) || RUBY_VERSION < '2.0'
+      $stderr.puts "Evaluation memory limit is ineffective in JRuby and MRI < 2.0"
+      limit = 0
+    end
+    options.debugger_memory_limit = limit
+    options.trace_to_s ||= limit > 0
+  end
+
+  opts.on("-t", "--time-limit LIMIT", Integer, "evaluation time limit in milliseconds (default: 100)") do |limit|
+    options.inspect_time_limit = limit
+    options.trace_to_s ||= limit > 0
+  end
+
   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("-l", "--load-mode", "load mode (experimental)") {options.load_mode = true}
@@ -157,6 +161,9 @@ end
 Debugger.keep_frame_binding = options.frame_bind
 Debugger.tracing = options.tracing
 Debugger.evaluation_timeout = options.evaluation_timeout
+Debugger.trace_to_s = options.trace_to_s && (options.debugger_memory_limit > 0 || options.inspect_time_limit > 0)
+Debugger.debugger_memory_limit = options.debugger_memory_limit
+Debugger.inspect_time_limit = options.inspect_time_limit
 Debugger.catchpoint_deleted_event = options.catchpoint_deleted_event || options.rm_protocol_extensions
 Debugger.value_as_nested_element = options.value_as_nested_element || options.rm_protocol_extensions
 

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

@@ -9,7 +9,7 @@ module Debugger
     end
 
     def execute
-      string_to_parse = Command.unescape_incoming(@match.post_match) + "\n\n\n"
+      string_to_parse = Command.unescape_incoming(@match.post_match) + " \n\n\n"
       total_lines = string_to_parse.count("\n") + 1
 
       lexer = RubyLex.new

data/lib/ruby-debug-ide/multiprocess/pre_child.rb

@@ -17,7 +17,10 @@ module Debugger
             'int_handler' => true,
             'cli_debug'   => (ENV['DEBUGGER_CLI_DEBUG'] == 'true'),
             'notify_dispatcher' => true,
-            'evaluation_timeout' => 10
+            'evaluation_timeout' => 10,
+            'trace_to_s' => false,
+            'debugger_memory_limit' => 10,
+            'inspect_time_limit' => 100
         )
 
         if(options.ignore_port)
@@ -45,6 +48,9 @@ module Debugger
         Debugger.keep_frame_binding = options.frame_bind
         Debugger.tracing = options.tracing
         Debugger.evaluation_timeout = options.evaluation_timeout
+        Debugger.trace_to_s = options.trace_to_s
+        Debugger.debugger_memory_limit = options.debugger_memory_limit
+        Debugger.inspect_time_limit = options.inspect_time_limit
         Debugger.cli_debug = options.cli_debug
         Debugger.prepare_debugger(options)
       end

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

@@ -1,3 +1,3 @@
 module Debugger
-  IDE_VERSION='0.6.1.beta9'
+  IDE_VERSION='0.6.1.beta11'
 end

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

@@ -1,9 +1,6 @@
 require 'stringio'
 require 'cgi'
 require 'monitor'
-if (!defined?(JRUBY_VERSION))
-  require 'objspace'
-end
 
 module Debugger
 
@@ -153,7 +150,7 @@ module Debugger
           if k.class.name == "String"
             name = '\'' + k + '\''
           else
-            name = exec_with_allocation_control(k, ENV['DEBUGGER_MEMORY_LIMIT'].to_i, ENV['INSPECT_TIME_LIMIT'].to_i, :to_s, OverflowMessageType::EXCEPTION_MESSAGE)
+            name = exec_with_allocation_control(k, :to_s, OverflowMessageType::EXCEPTION_MESSAGE)
           end
           print_variable(name, hash[k], 'instance')
         }
@@ -188,16 +185,17 @@ module Debugger
       end
     end
 
-    def exec_with_allocation_control(value, memory_limit, time_limit, exec_method, overflow_message_type)
-      return value.send exec_method if !Debugger.trace_to_s
-      return exec_with_timeout(time_limit * 1e-3, "Timeout: evaluation of #{exec_method} took longer than #{time_limit}ms.") {value.send exec_method} if defined?(JRUBY_VERSION) || memory_limit <= 0 || (RUBY_VERSION < '2.0' && time_limit > 0)
+    def exec_with_allocation_control(value, exec_method, overflow_message_type)
+      return value.send exec_method unless Debugger.trace_to_s
 
+      memory_limit = Debugger.debugger_memory_limit
+      time_limit = Debugger.inspect_time_limit
 
-      curr_thread = Thread.current
-      control_thread = Debugger.control_thread
-
-      result = nil
+      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 }
+      end
 
+      require 'objspace'
       trace_queue = Queue.new
 
       inspect_thread = DebugThread.start do
@@ -263,7 +261,7 @@ module Debugger
       else
         has_children = !value.instance_variables.empty? || !value.class.class_variables.empty?
 
-        value_str = exec_with_allocation_control(value, ENV['DEBUGGER_MEMORY_LIMIT'].to_i, ENV['INSPECT_TIME_LIMIT'].to_i, :to_s, OverflowMessageType::EXCEPTION_MESSAGE) || 'nil' rescue "<#to_s method raised exception: #{$!}>"
+        value_str = exec_with_allocation_control(value, :to_s, OverflowMessageType::EXCEPTION_MESSAGE) || 'nil' rescue "<#to_s method raised exception: #{$!}>"
         unless value_str.is_a?(String)
           value_str = "ERROR: #{value.class}.to_s method returns #{value_str.class}. Should return String."
         end
@@ -489,7 +487,7 @@ module Debugger
     def compact_array_str(value)
       slice = value[0..10]
 
-      compact = exec_with_allocation_control(slice, ENV['DEBUGGER_MEMORY_LIMIT'].to_i, ENV['INSPECT_TIME_LIMIT'].to_i, :inspect, OverflowMessageType::NIL_MESSAGE)
+      compact = exec_with_allocation_control(slice, :inspect, OverflowMessageType::NIL_MESSAGE)
 
       if compact && value.size != slice.size
         compact[0..compact.size - 2] + ", ...]"
@@ -501,14 +499,14 @@ module Debugger
       keys_strings = Hash.new
 
       slice = value.sort_by do |k, _|
-        keys_string = exec_with_allocation_control(k, ENV['DEBUGGER_MEMORY_LIMIT'].to_i, ENV['INSPECT_TIME_LIMIT'].to_i, :to_s, OverflowMessageType::SPECIAL_SYMBOL_MESSAGE)
+        keys_string = exec_with_allocation_control(k, :to_s, OverflowMessageType::SPECIAL_SYMBOL_MESSAGE)
         keys_strings[k] = keys_string
         keys_string
       end[0..5]
 
       compact = slice.map do |kv|
         key_string = keys_strings[kv[0]]
-        value_string = exec_with_allocation_control(kv[1], ENV['DEBUGGER_MEMORY_LIMIT'].to_i, ENV['INSPECT_TIME_LIMIT'].to_i, :to_s, OverflowMessageType::SPECIAL_SYMBOL_MESSAGE)
+        value_string = exec_with_allocation_control(kv[1], :to_s, OverflowMessageType::SPECIAL_SYMBOL_MESSAGE)
         "#{key_string}: #{handle_binary_data(value_string)}"
       end.join(", ")
       "{" + compact + (slice.size != value.size ? ", ..." : "") + "}"

data/lib/ruby-debug-ide.rb

@@ -44,7 +44,8 @@ module Debugger
     end
 
     attr_accessor :attached
-    attr_accessor :cli_debug, :xml_debug, :evaluation_timeout, :trace_to_s
+    attr_accessor :cli_debug, :xml_debug, :evaluation_timeout
+    attr_accessor :trace_to_s, :debugger_memory_limit, :inspect_time_limit
     attr_accessor :control_thread
     attr_reader :interface
     # protocol extensions

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-debug-ide
 version: !ruby/object:Gem::Version
-  version: 0.6.1.beta9
+  version: 0.6.1.beta11
 platform: ruby
 authors:
 - Markus Barchfeld, Martin Krauskopf, Mark Moseley, JetBrains RubyMine Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-01 00:00:00.000000000 Z
+date: 2017-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -103,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: debug-commons
-rubygems_version: 2.5.1
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: IDE interface for ruby-debug.