ruby-debug-ide 0.6.0 → 0.6.1.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e240a0ba279540609ab7e9cf087cd0af6ba36897
-  data.tar.gz: 3885abc21b8134affb85f1f8a269ccd5f6fcb838
+  metadata.gz: c595acd0041d7e04f8a165c1c50538e1f9d30929
+  data.tar.gz: 1448c05343af9063bdd3b51442e8067849e8cc45
 SHA512:
-  metadata.gz: b337c9c7019dc4e723418167097d2d10dcf8b6f11f1b652cc119e9f9c14f9ef9408f185476870163578f28765c31729053ee0da71db75e7a07fa67941ea34c9e
-  data.tar.gz: 0c51e61c5f915cd87f49a0493b9fab13c2b72d8d9633e29a08b865711642f7dc52d2e9b27dd97bcbebe6a95e62afdc9c225a04ba6e2ce0928506c950cc6798d4
+  metadata.gz: 61810c4fac4c0f03b155063ccc06e0012ddb34c5c38990e0570a0c91069780f1ea907bf63a2578c8878a30ad29b0fe914d7ab5911094856182555d114005d7dd
+  data.tar.gz: a40a067d48e1c5444d94559a783f1173bdd5670a23d0d7e2161a1bea450a63f91dba56b47b7af8c2ff30408203200a61e8b4abacfc405d6a5b28dc3671ca5797

data/ChangeLog.md

@@ -1,4 +1,8 @@
-## [master](https://github.com/ruby-debug/ruby-debug-ide/compare/v0.5.0...master)
+## [master](https://github.com/ruby-debug/ruby-debug-ide/compare/v0.6.0...master)
+
+* let's use Debugger#remove_catchpoint and Debugger#clear_catchpoints if available
+
+## [0.6.0](https://github.com/ruby-debug/ruby-debug-ide/compare/v0.5.0...0.6.0)
 
 * "file-filter on|off" command added
 * "include file|dir" command added

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

@@ -16,21 +16,20 @@ module Debugger
       elsif not @match[2]
         # One arg given.
         if 'off' == excn
-          Debugger.catchpoints.clear
+          clear_catchpoints
         else
           Debugger.add_catchpoint(excn)
           print_catchpoint_set(excn)
         end
       elsif @match[2] != 'off'
         errmsg "Off expected. Got %s\n", @match[2]
-      elsif Debugger.catchpoints.member?(excn)
-        Debugger.catchpoints.delete(excn)
+      elsif remove_catchpoint(excn)
         print_catchpoint_deleted(excn)
       else
         errmsg "Catch for exception %s not found.\n", excn
       end
     end
-    
+
     class << self
       def help_command
         'catch'
@@ -45,5 +44,21 @@ module Debugger
         }
       end
     end
+
+    private
+
+    def clear_catchpoints
+      if Debugger.respond_to?(:clear_catchpoints)
+        Debugger.clear_catchpoints
+      else
+        Debugger.catchpoints.clear
+      end
+    end
+
+    def remove_catchpoint(excn)
+      return Debugger.remove_catchpoint(excn) if Debugger.respond_to?(:remove_catchpoint)
+      return Debugger.catchpoints.delete(excn) if Debugger.catchpoints.member?(excn)
+      false
+    end
   end
 end

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

@@ -1,3 +1,3 @@
 module Debugger
-  IDE_VERSION='0.6.0'
+  IDE_VERSION='0.6.1.beta2'
 end

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

@@ -199,13 +199,13 @@ module Debugger
     def print_breakpoints(breakpoints)
       print_element 'breakpoints' do
         breakpoints.sort_by{|b| b.id }.each do |b|
-          print "<breakpoint n=\"%d\" file=\"%s\" line=\"%s\" />", b.id, b.source, b.pos.to_s
+          print "<breakpoint n=\"%d\" file=\"%s\" line=\"%s\" />", b.id, CGI.escapeHTML(b.source), b.pos.to_s
         end
       end
     end
     
     def print_breakpoint_added(b)
-      print "<breakpointAdded no=\"%s\" location=\"%s:%s\"/>", b.id, b.source, b.pos
+      print "<breakpointAdded no=\"%s\" location=\"%s:%s\"/>", b.id, CGI.escapeHTML(b.source), b.pos
     end
     
     def print_breakpoint_deleted(b)
@@ -289,14 +289,14 @@ module Debugger
     # Events
     
     def print_breakpoint(_, breakpoint)
-      print("<breakpoint file=\"%s\" line=\"%s\" threadId=\"%d\"/>", 
-      breakpoint.source, breakpoint.pos, Debugger.current_context.thnum)
+      print("<breakpoint file=\"%s\" line=\"%s\" threadId=\"%d\"/>",
+      CGI.escapeHTML(breakpoint.source), breakpoint.pos, Debugger.current_context.thnum)
     end
     
     def print_catchpoint(exception)
       context = Debugger.current_context
       print("<exception file=\"%s\" line=\"%s\" type=\"%s\" message=\"%s\" threadId=\"%d\"/>", 
-      context.frame_file(0), context.frame_line(0), exception.class, CGI.escapeHTML(exception.to_s), context.thnum)
+      CGI.escapeHTML(context.frame_file(0)), context.frame_line(0), exception.class, CGI.escapeHTML(exception.to_s), context.thnum)
     end
     
     def print_trace(context, file, line)
@@ -401,7 +401,11 @@ module Debugger
     end
 
     def safe_to_string(value)
-      str = value.to_s
+      begin
+        str = value.to_s
+      rescue NoMethodError
+        str = "(Object doesn't support #to_s)"
+      end
       return str unless str.nil?
 
       string_io = StringIO.new

data/ruby-debug-ide.gemspec

@@ -32,6 +32,7 @@ EOF
 
   spec.author = "Markus Barchfeld, Martin Krauskopf, Mark Moseley, JetBrains RubyMine Team"
   spec.email = "rubymine-feedback@jetbrains.com"
+  spec.license = "MIT"
   spec.platform = Gem::Platform::RUBY
   spec.require_path = "lib"
   spec.bindir = "bin"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-debug-ide
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1.beta2
 platform: ruby
 authors:
 - Markus Barchfeld, Martin Krauskopf, Mark Moseley, JetBrains RubyMine Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-18 00:00:00.000000000 Z
+date: 2016-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -24,8 +24,10 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.1
-description: |
-  An interface which glues ruby-debug to IDEs like Eclipse (RDT), NetBeans and RubyMine.
+description: 'An interface which glues ruby-debug to IDEs like Eclipse (RDT), NetBeans
+  and RubyMine.
+
+'
 email: rubymine-feedback@jetbrains.com
 executables:
 - rdebug-ide
@@ -72,7 +74,8 @@ files:
 - lib/ruby-debug-ide/xml_printer.rb
 - ruby-debug-ide.gemspec
 homepage: https://github.com/ruby-debug/ruby-debug-ide
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -85,12 +88,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.8.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: debug-commons
-rubygems_version: 2.4.4
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: IDE interface for ruby-debug.