debugger-xml 0.1.9 → 0.2.0

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: a332176aafda476ecc7dddaf06f1c632967b61b7
-  data.tar.gz: 59e5b2092c4c652199a33f9c6a64ecf6f77ae036
-SHA512:
-  metadata.gz: 076982a662177f29705925d1b69518456b91cc277acf679a4016f3c7d37e9d92023b2c4ffc81c207a113ab29e5614c2e62c7a9fa8f5adbdc7451434661f3cf3f
-  data.tar.gz: 32049fad88610fb205b5821a5900662e8dd445321ec1c98a07a475a99f228c7f44984f2d8e2d6f6a060b689d0711e828baa67ef9f6db775e3a38b0b81fc39a99
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    OTZiODljZjRmYmUxMzk5NTEwMTMwNzlhMWM4NWY3MjhmMGQxOTk3Mw==
+  data.tar.gz: !binary |-
+    OTM4ZDY2YzJhYzJmMDZkOGU0ZDY4MjA3MDBkZjhmYjE4NWFhZDYxOA==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    ZTFlNGRkNTdlMzlmMDQyNWEyMDgyYzk4YzJiZTVhYjA3YTU2NDlmMTY3YmJj
+    Mzk4YTFkNDdlNDA1ZjI0Mzk5M2Q5ZmYxOTNjY2EzNjk2NzQyMDNkMmQzNmJl
+    YWVhNzlmMjMxN2FiMTdiMjUwZGExNDUwZmMwMzRiOTdjZDk3OTY=
+  data.tar.gz: !binary |-
+    YzhjZDIwZmU1YzA3ZGY1MWVlN2MxYjBmZmZiM2M0YWQ0N2JlNmMxNmFmM2I2
+    MjcwNDc1MzViOTM2MmZlMTBkODQ1YzQ5ZTFmMGVmNmNlOWRjMDQ1Nzc2OTNm
+    YTgzYzU5ZjMwNWZlYjgwMzE0MWZjZjNhMmM3YTQ1ZjJlMDAzY2E=

data/bin/rdebug-ide

@@ -20,6 +20,11 @@ class RdebugIde
     Debugger.wait_connection = true
     Debugger.printer = Printers::Xml.new
     Debugger.const_set("PROG_SCRIPT", ARGV.shift)
+    Debugger::Xml.logger = if options.debug_mode
+      Debugger::Xml::Ide::Logger.new
+    else
+      Debugger::Xml::FakeLogger.new
+    end
   end
 
   def run
@@ -61,7 +66,10 @@ class RdebugIde
 
     def opts
       @opts ||= begin
-        @options = OpenStruct.new(host: "127.0.0.1", port: 12345, stop: false, tracing: false, wait_for_start: true, int_handler: true)
+        @options = OpenStruct.new(
+          host: "127.0.0.1", port: 12345, stop: false, tracing: false, wait_for_start: true,
+          int_handler: true, debug_mode: false
+        )
         opts = OptionParser.new do |opts|
           opts.banner = %{
             Using rdebug-ide
@@ -71,6 +79,7 @@ class RdebugIde
           opts.separator ""
           opts.separator "Options:"
           opts.on("-h", "--host HOST", "Host name used for remote debugging") { |host| @options.host = host }
+          opts.on("-d", "--debug", "Enable debug mode") { |host| @options.debug_mode = true }
           opts.on("--cport PORT", Integer, "Port used for control commands") { |cport| @options.cport = cport }
           opts.on("-p", "--port PORT", Integer, "Port used for remote debugging") { |port| @options.port = port }
           opts.on("--wait", String, "Wait for 'start' command") do |bool|

data/bin/rdebug-vim

@@ -16,6 +16,11 @@ class RdebugVim
     Debugger.wait_for_start = true
     Debugger.printer = Printers::Xml.new
     Debugger.const_set("PROG_SCRIPT", options.script)
+    Debugger::Xml.logger = if options.debug_mode
+       Debugger::Xml::Vim::Logger.new(options.logger_file)
+    else
+       Debugger::Xml::FakeLogger.new
+    end
   end
 
   def run

data/lib/debugger/xml.rb

@@ -1,3 +1,11 @@
 require "debugger"
 require "debugger/printers/xml"
 Dir.glob(File.expand_path("../**/*.rb", __FILE__)).each { |f| require f }
+
+module Debugger
+  module Xml
+    class << self
+      attr_accessor :logger
+    end
+  end
+end

data/lib/debugger/xml/extensions/vim_server.rb

@@ -5,29 +5,37 @@ module Debugger
 
     def start_for_vim(options)
       return if @control_thread
+      Xml.logger.puts("Going to daemonize");
       daemonize!
+      Xml.logger.puts("Successfully daemonized");
       $stdout.reopen(options.output_file, 'w')
       $stdout.sync
       $stderr.reopen($stdout)
+      Xml.logger.puts("Redirected stderr");
       @mutex = Mutex.new
       @proceed = ConditionVariable.new
       start
+      Xml.logger.puts("Started debugger");
       File.unlink(options.socket) if File.exist?(options.socket)
       server = UNIXServer.new(options.socket)
       Xml::Vim::Notification.new("establish_connection", options).send
+      Xml.logger.puts("Sent 'established_connection' command");
       @control_thread = DebugThread.new do
         begin
           while (session = server.accept)
+            Xml.logger.puts("Accepted connection");
             interface = Xml::Vim::Interface.new(session, options)
             processor = Xml::Vim::ControlCommandProcessor.new(interface)
             self.handler = Xml::Vim::Processor.new(interface)
+            Xml.logger.puts("Going to process commands");
             processor.process_commands
           end
         rescue Exception => e
-          puts "INTERNAL ERROR!!! #{$!}" rescue nil
-          puts $!.backtrace.map{|l| "\t#{l}"}.join("\n") rescue nil
+          Xml.logger.puts("INTERNAL ERROR!!! #{$!}") rescue nil
+          Xml.logger.puts($!.backtrace.map{|l| "\t#{l}"}.join("\n")) rescue nil
           raise e
         ensure
+          Xml.logger.puts("Closing server");
           server.close
         end
       end

data/lib/debugger/xml/fake_logger.rb

@@ -0,0 +1,11 @@
+module Debugger
+  module Xml
+    class FakeLogger
+      def initialize(*args)
+      end
+
+      def puts(*args)
+      end
+    end
+  end
+end

data/lib/debugger/xml/ide/interface.rb

@@ -50,7 +50,9 @@ module Debugger
         def read_command(*args)
           result = non_blocking_gets
           raise IOError unless result
-          result.chomp
+          result.chomp.tap do |r|
+            Xml.logger.puts("Read command: #{r}")
+          end
         end
 
         def readline_support?
@@ -58,7 +60,10 @@ module Debugger
         end
 
         def print(*args)
-          @socket.printf(*escape_input(args))
+          escaped_args = escape_input(args)
+          value = escaped_args.first % escaped_args[1..-1]
+          Xml.logger.puts("Going to print: #{value}")
+          @socket.printf(value)
         end
 
       end

data/lib/debugger/xml/ide/logger.rb

@@ -0,0 +1,11 @@
+module Debugger
+  module Xml
+    module Ide
+      class Logger
+        def puts(string)
+          $stderr.puts(string)
+        end
+      end
+    end
+  end
+end

data/lib/debugger/xml/version.rb

@@ -1,5 +1,5 @@
 module Debugger
   module Xml
-    VERSION = "0.1.9"
+    VERSION = "0.2.0"
   end
 end

data/lib/debugger/xml/vim/interface.rb

@@ -11,7 +11,10 @@ module Debugger
         end
 
         def print(*args)
-          @output << sprintf(*escape_input(args))
+          escaped_args = escape_input(args)
+          value = escaped_args.first % escaped_args[1..-1]
+          Xml.logger.puts("Going to print: #{value}")
+          @output << sprintf(value)
         end
 
         def send_response

data/lib/debugger/xml/vim/logger.rb

@@ -0,0 +1,18 @@
+module Debugger
+  module Xml
+    module Vim
+      class Logger
+        def initialize(logger_file)
+          @logger_file = logger_file
+        end
+
+        def puts(string)
+          File.open(@logger_file, 'a') do |f|
+            # match vim redir style new lines, rather than trailing
+            f << "\ndebugger-xml, #{Time.now.strftime("%H:%M:%S")} : #{string.chomp}"
+          end
+        end
+      end
+    end
+  end
+end

data/test/test_helper.rb

@@ -4,3 +4,4 @@ require 'debugger/xml'
 require 'debugger/test'
 
 $debugger_test_dir = File.expand_path("..", __FILE__)
+Debugger::Xml.logger = Debugger::Xml::FakeLogger.new

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: debugger-xml
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.0
 platform: ruby
 authors:
 - Anton Astashov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-11 00:00:00.000000000 Z
+date: 2013-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debugger
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.6.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.6.2
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.0.0
 - !ruby/object:Gem::Dependency
@@ -114,12 +114,15 @@ files:
 - lib/debugger/xml/extensions/ide_server.rb
 - lib/debugger/xml/extensions/processor.rb
 - lib/debugger/xml/extensions/vim_server.rb
+- lib/debugger/xml/fake_logger.rb
 - lib/debugger/xml/ide/control_command_processor.rb
 - lib/debugger/xml/ide/interface.rb
+- lib/debugger/xml/ide/logger.rb
 - lib/debugger/xml/ide/processor.rb
 - lib/debugger/xml/version.rb
 - lib/debugger/xml/vim/control_command_processor.rb
 - lib/debugger/xml/vim/interface.rb
+- lib/debugger/xml/vim/logger.rb
 - lib/debugger/xml/vim/notification.rb
 - lib/debugger/xml/vim/processor.rb
 - test/breakpoints_test.rb
@@ -185,17 +188,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.0.7
 signing_key: 
 specification_version: 4
 summary: Implements XML interface for the 'debugger' gem, compatible with ruby-debug-ide