ruby-debug-ide 0.5.0 → 0.6.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19af121c63f42f580f9cda89f555474b65228761
-  data.tar.gz: 48bde5946752e9114fcb63aab586e11eecce005a
+  metadata.gz: f8ed6b7923a0428da925a0e086cc8b531d3e5525
+  data.tar.gz: f02a6bd75cf4328743ef299063a1af56920cd623
 SHA512:
-  metadata.gz: e4b4c1197c7ed7cb12ca07f5cb7e1b55554cf62c277f1f64b38a28593a9b44e6bc0967773cd6c02296e2c1f89441ed0eb99948973bc0741fe88659feba59ad7d
-  data.tar.gz: 6859dd48e2f420b4ccde40ab147706cd13153db92791899eeda3dc6c2d46a61506d816cccbe242c575fba581811c03dc32bc48cd22c8fc4e09281463110228b9
+  metadata.gz: ec27e725695167ce4051c57975bb45bf753815df094add1e606e84cbf21dddb817e36370f1a6c456a022be989deda445b0d4998c523cb85a4e253a66208c5267
+  data.tar.gz: 300fac86743cf25e296e766841625bc7783e5c8cc5d893fab73fa7e3baea73e1074e83d5d32ad3ccbaa34dfbaf4fbea8435109357d4737dfb59a351fa1c82fdd

data/ChangeLog.md

@@ -1,3 +1,9 @@
+## [master](https://github.com/ruby-debug/ruby-debug-ide/compare/v0.5.0...master)
+
+* "file-filter on|off" command added
+* "include file|dir" command added
+* "exclude file|dir" command added
+
 ## [0.5.0](https://github.com/ruby-debug/ruby-debug-ide/compare/v0.4.33...v0.5.0)
 
 * catchpointDeleted event added (under --catchpoint-deleted-event flag)

data/lib/ruby-debug-ide.rb

@@ -108,9 +108,7 @@ module Debugger
           # "localhost" and nil have problems on some systems.
           host ||= '127.0.0.1'
           server = TCPServer.new(host, port)
-          gem_name = (defined?(JRUBY_VERSION) || RUBY_VERSION < '1.9.0') ? 'ruby-debug-base' :
-              RUBY_VERSION < '2.0.0' ? 'ruby-debug-base19x' : 'debase'
-          $stderr.printf "Fast Debugger (ruby-debug-ide #{IDE_VERSION}, #{gem_name} #{VERSION}) listens on #{host}:#{port}\n"
+          print_greeting_msg(host, port)
           notify_dispatcher(port) if notify_dispatcher
 
           while (session = server.accept)
@@ -138,8 +136,26 @@ module Debugger
       end
     end
 
+    def print_greeting_msg(host, port)
+      base_gem_name = if defined?(JRUBY_VERSION) || RUBY_VERSION < '1.9.0'
+        'ruby-debug-base'
+      elsif RUBY_VERSION < '2.0.0'
+        'ruby-debug-base19x'
+      else
+        'debase'
+      end
+
+      file_filtering_support = if Command.file_filter_supported?
+       'supported'
+      else
+       'not supported'
+      end
+      $stderr.printf "Fast Debugger (ruby-debug-ide #{IDE_VERSION}, #{base_gem_name} #{VERSION}, file filtering is #{file_filtering_support}) listens on #{host}:#{port}\n"
+    end
+
     private
 
+
     def notify_dispatcher(port)
       return unless ENV['IDE_PROCESS_DISPATCHER']
       acceptor_host, acceptor_port = ENV['IDE_PROCESS_DISPATCHER'].split(":")

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

@@ -70,6 +70,10 @@ module Debugger
           $1 + "\n" * ($2.size / 2)
         end.gsub(/\\\\/, '\\')
       end
+
+      def file_filter_supported?
+        defined?(Debugger.file_filter)
+      end
     end
     
     def initialize(state, printer)
@@ -145,7 +149,21 @@ module Debugger
 
     def get_context(thnum)
       Debugger.contexts.find{|c| c.thnum == thnum}
-    end  
+    end
+
+    def realpath(filename)
+      is_dir = filename.end_with?(File::SEPARATOR)
+      if filename.index(File::SEPARATOR) || File::ALT_SEPARATOR && filename.index(File::ALT_SEPARATOR)
+        filename = File.expand_path(filename)
+      end
+      if (RUBY_VERSION < '1.9') || (RbConfig::CONFIG['host_os'] =~ /mswin/)
+        filename
+      else
+        filename = File.realpath(filename) rescue filename
+        filename = filename + File::SEPARATOR if is_dir && !filename.end_with?(File::SEPARATOR)
+        filename
+      end
+    end
   end
   
   Command.load_commands

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

@@ -62,17 +62,6 @@ module Debugger
         }
       end
     end
-
-    private
-      def realpath(filename)
-        filename = File.expand_path(filename) if filename.index(File::SEPARATOR) || \
-            File::ALT_SEPARATOR && filename.index(File::ALT_SEPARATOR)
-        if (RUBY_VERSION < '1.9') || (RbConfig::CONFIG['host_os'] =~ /mswin/)
-          filename
-        else
-          File.realpath(filename) rescue filename
-        end
-      end
   end
 
   class BreakpointsCommand < Command # :nodoc:

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

@@ -0,0 +1,107 @@
+module Debugger
+  class IncludeFile < Command # :nodoc:
+    self.control = true
+
+    def regexp
+      / ^\s*include\s+(.+?)\s*$/x
+    end
+
+    def execute
+      file = @match[1]
+
+      return if file.nil?
+      file = realpath(file)
+
+      if Command.file_filter_supported?
+        Debugger.file_filter.include(file)
+        print_file_included(file)
+      else
+        print_debug("file filter is not supported")
+      end
+    end
+
+    class << self
+      def help_command
+        'include'
+      end
+
+      def help(cmd)
+        %{
+          include file - adds file/dir to file filter (either remove already excluded or add as included)
+        }
+      end
+    end
+  end
+
+  class ExcludeFile < Command # :nodoc:
+    self.control = true
+
+    def regexp
+      / ^\s*exclude\s+(.+?)\s*$/x
+    end
+
+    def execute
+      file = @match[1]
+
+      return if file.nil?
+      file = realpath(file)
+
+      if Command.file_filter_supported?
+        Debugger.file_filter.exclude(file)
+        print_file_excluded(file)
+      else
+        print_debug("file filter is not supported")
+      end
+    end
+
+    class << self
+      def help_command
+        'include'
+      end
+
+      def help(cmd)
+        %{
+          exclude file - exclude file/dir from file filter (either remove already included or add as exclude)
+        }
+      end
+    end
+  end
+
+  class FileFilterCommand < Command # :nodoc:
+    self.control = true
+
+    def regexp
+      / ^\s*file-filter\s+(on|off)\s*$/x
+    end
+
+    def execute
+      action = @match[1]
+
+      if Command.file_filter_supported?
+        if 'on' == action
+          Debugger.file_filter.enable
+          print_file_filter_status(true)
+        elsif 'off' == action
+          Debugger.file_filter.disable
+          print_file_filter_status(false)
+        else
+          print_error "Unknown option '#{action}'"
+        end
+      else
+        print_debug("file filter is not supported")
+      end
+    end
+
+    class << self
+      def help_command
+        'file-filter'
+      end
+
+      def help(cmd)
+        %{
+          file-filter (on|off) - enable/disable file  filtering
+        }
+      end
+    end
+  end
+end

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

@@ -1,3 +1,3 @@
 module Debugger
-  IDE_VERSION='0.5.0'
+  IDE_VERSION='0.6.0.beta1'
 end

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

@@ -184,6 +184,18 @@ module Debugger
             CGI.escapeHTML(name), kind, CGI.escapeHTML(safe_to_string(value)))
     end
 
+    def print_file_included(file)
+      print("<fileIncluded file=\"%s\"/>", file)
+    end
+
+    def print_file_excluded(file)
+      print("<fileExcluded file=\"%s\"/>", file)
+    end
+
+    def print_file_filter_status(status)
+      print("<fileFilter status=\"%s\"/>", status)
+    end
+
     def print_breakpoints(breakpoints)
       print_element 'breakpoints' do
         breakpoints.sort_by{|b| b.id }.each do |b|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-debug-ide
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0.beta1
 platform: ruby
 authors:
 - Markus Barchfeld, Martin Krauskopf, Mark Moseley, JetBrains RubyMine Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-24 00:00:00.000000000 Z
+date: 2015-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -50,6 +50,7 @@ files:
 - lib/ruby-debug-ide/commands/enable.rb
 - lib/ruby-debug-ide/commands/eval.rb
 - lib/ruby-debug-ide/commands/expression_info.rb
+- lib/ruby-debug-ide/commands/file_filtering.rb
 - lib/ruby-debug-ide/commands/frame.rb
 - lib/ruby-debug-ide/commands/inspect.rb
 - lib/ruby-debug-ide/commands/jump.rb
@@ -84,9 +85,9 @@ 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