debugger-xml 0.3.3 → 0.4.0

data/test/vim/interface_test.rb

@@ -1,10 +1,10 @@
 require_relative '../test_helper'
-require 'debugger/xml/vim/interface'
+require 'debugger_xml/vim/interface'
 
-describe Debugger::Xml::Vim::Interface do
+describe DebuggerXml::Vim::Interface do
   include TestDsl
 
-  let(:klass) { Debugger::Xml::Vim::Interface }
+  let(:klass) { DebuggerXml::Vim::Interface }
   let(:options) do
     stub(debug_mode: false, file: filename, separator: "--sep--")
   end
@@ -22,7 +22,7 @@ describe Debugger::Xml::Vim::Interface do
   end
 
   it "must send command to Vim" do
-    Debugger::Xml::Vim::Notification.expects(:new).with("receive_command", options).returns(notification)
+    DebuggerXml::Vim::Notification.expects(:new).with("receive_command", options).returns(notification)
     subject.print("foo")
     subject.print("bar")
     subject.send_response
@@ -30,7 +30,7 @@ describe Debugger::Xml::Vim::Interface do
   end
 
   it "must clear the queue after sending response" do
-    Debugger::Xml::Vim::Notification.stubs(:new).with("receive_command", options).returns(notification)
+    DebuggerXml::Vim::Notification.stubs(:new).with("receive_command", options).returns(notification)
     subject.print("foo")
     subject.print("bar")
     subject.send_response
@@ -40,7 +40,7 @@ describe Debugger::Xml::Vim::Interface do
   end
 
   it "must not send any command if there is nothing to send" do
-    Debugger::Xml::Vim::Notification.expects(:new).never
+    DebuggerXml::Vim::Notification.expects(:new).never
     subject.send_response
     File.read(filename).strip.must_equal ""
   end

data/test/vim/notification_test.rb

@@ -1,10 +1,10 @@
 require_relative '../test_helper'
-require 'debugger/xml/vim/notification'
+require 'debugger_xml/vim/notification'
 
-describe Debugger::Xml::Vim::Notification do
+describe DebuggerXml::Vim::Notification do
   include TestDsl
 
-  let(:klass) { Debugger::Xml::Vim::Notification }
+  let(:klass) { DebuggerXml::Vim::Notification }
   let(:options) do
     stub(vim_executable: "vim", vim_servername: "VIM", debug_mode: true, logger_file: filename)
   end

data/test/vim/processor_test.rb

@@ -1,24 +1,24 @@
 require_relative '../test_helper'
-require 'debugger/xml/vim/processor'
+require 'debugger_xml/vim/processor'
 
-describe Debugger::Xml::Vim::Processor do
+describe DebuggerXml::Vim::Processor do
   include TestDsl
 
   before { Thread.stubs(:stop) }
 
-  let(:klass) { Debugger::Xml::Vim::Processor }
+  let(:klass) { DebuggerXml::Vim::Processor }
   let(:interface) { TestInterface.new }
   let(:breakpoint) { stub }
   let(:context) { stub(thread: nil, stop_reason: nil, thnum: 1, stack_size: 2) }
   let(:file) { fullpath('jump') }
-  subject { klass.new(interface) }
+  subject { klass.new(interface, $proxy) }
 
   describe "#at_line" do
     it "must send response" do
       processor = stub
       processor.stubs(:process_command).with("where")
-      processor.stubs(:process_command).with("var local")
-      Debugger::Xml::Vim::ControlCommandProcessor.stubs(:new).with(interface).returns(processor)
+      processor.stubs(:process_command).with("var ide")
+      DebuggerXml::Vim::ControlCommandProcessor.stubs(:new).with(interface, $proxy).returns(processor)
       interface.expects(:send_response)
       subject.at_line(context, file, 30)
     end
@@ -26,8 +26,8 @@ describe Debugger::Xml::Vim::Processor do
     it "must process additional commands" do
       processor = stub
       processor.expects(:process_command).with("where")
-      processor.expects(:process_command).with("var local")
-      Debugger::Xml::Vim::ControlCommandProcessor.expects(:new).with(interface).returns(processor)
+      processor.expects(:process_command).with("var ide")
+      DebuggerXml::Vim::ControlCommandProcessor.expects(:new).with(interface, $proxy).returns(processor)
       interface.stubs(:send_response)
       subject.at_line(context, file, 30)
     end

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: debugger-xml
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
 platform: ruby
 authors:
 - Anton Astashov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-05 00:00:00.000000000 Z
+date: 2014-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: debugger
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.2
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.2
+        version: '0'
 - !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
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.2.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.2.2
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.12.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.12.1
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.13.0
 description: XML interface for debugger
@@ -89,7 +89,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -98,37 +98,50 @@ files:
 - bin/rdebug-ide
 - bin/rdebug-vim
 - debugger-xml.gemspec
+- lib/byebug/commands/frame.rb
+- lib/byebug/commands/help.rb
+- lib/byebug/commands/info.rb
+- lib/byebug/commands/inspect.rb
+- lib/byebug/commands/kill.rb
+- lib/byebug/commands/start.rb
+- lib/byebug/commands/threads.rb
+- lib/byebug/commands/trace.rb
+- lib/byebug/commands/variables.rb
+- lib/byebug/context_xml.rb
+- lib/byebug/printers/texts/xml.yml
+- lib/byebug/printers/xml.rb
+- lib/debugger/command_processor.rb
+- lib/debugger/commands/edit.rb
+- lib/debugger/commands/frame.rb
+- lib/debugger/commands/help.rb
+- lib/debugger/commands/info.rb
+- lib/debugger/commands/inspect.rb
+- lib/debugger/commands/irb.rb
+- lib/debugger/commands/kill.rb
+- lib/debugger/commands/start.rb
+- lib/debugger/commands/threads.rb
+- lib/debugger/commands/tmate.rb
+- lib/debugger/commands/trace.rb
+- lib/debugger/commands/variables.rb
 - lib/debugger/printers/texts/xml.yml
 - lib/debugger/printers/xml.rb
-- lib/debugger/xml.rb
-- lib/debugger/xml/extensions/commands/edit.rb
-- lib/debugger/xml/extensions/commands/frame.rb
-- lib/debugger/xml/extensions/commands/help.rb
-- lib/debugger/xml/extensions/commands/info.rb
-- lib/debugger/xml/extensions/commands/inspect.rb
-- lib/debugger/xml/extensions/commands/irb.rb
-- lib/debugger/xml/extensions/commands/kill.rb
-- lib/debugger/xml/extensions/commands/threads.rb
-- lib/debugger/xml/extensions/commands/tmate.rb
-- lib/debugger/xml/extensions/commands/trace.rb
-- lib/debugger/xml/extensions/commands/variables.rb
-- 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/multiprocess/monkey.rb
-- lib/debugger/xml/multiprocess/pre_child.rb
-- lib/debugger/xml/multiprocess/starter.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
+- lib/debugger_xml.rb
+- lib/debugger_xml/byebug_proxy.rb
+- lib/debugger_xml/debugger_proxy.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/multiprocess/monkey.rb
+- lib/debugger_xml/multiprocess/pre_child.rb
+- lib/debugger_xml/multiprocess/starter.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
 - test/conditions_test.rb
 - test/continue_test.rb
@@ -192,17 +205,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.2.2
 signing_key: 
 specification_version: 4
 summary: Implements XML interface for the 'debugger' gem, compatible with ruby-debug-ide

data/lib/debugger/xml.rb

@@ -1,11 +0,0 @@
-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/ide_server.rb

@@ -1,33 +0,0 @@
-module Debugger
-  class << self
-    attr_accessor :wait_for_start, :control_thread
-
-    def start_remote_ide(host, port)
-      return if @control_thread
-      @mutex = Mutex.new
-      @proceed = ConditionVariable.new
-      start
-      @control_thread = DebugThread.new do
-        server = TCPServer.new(host, port)
-        $stderr.printf "Fast Debugger (debugger-xml #{Xml::VERSION}) listens on #{host}:#{port}\n"
-        while (session = server.accept)
-          dispatcher = ENV['IDE_PROCESS_DISPATCHER']
-          if dispatcher && !dispatcher.include?(":")
-            ENV['IDE_PROCESS_DISPATCHER'] = "#{session.peeraddr[2]}:#{dispatcher}"
-          end
-          interface = Xml::Ide::Interface.new(session)
-          processor = Xml::Ide::ControlCommandProcessor.new(interface)
-          self.handler = Xml::Ide::Processor.new(interface)
-          processor.process_commands
-        end
-      end
-      @mutex.synchronize { @proceed.wait(@mutex) } if wait_for_start
-    end
-
-    def proceed
-      return unless @mutex
-      @mutex.synchronize { @proceed.signal }
-    end
-
-  end
-end

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

@@ -1,56 +0,0 @@
-require_relative 'ide_server'
-
-module Debugger
-  class << self
-
-    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
-          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
-      @mutex.synchronize { @proceed.wait(@mutex) } if wait_for_start
-    end
-
-    private
-
-      def daemonize!
-        pid = Process.fork
-        if pid
-          print pid
-          exit
-        end
-      end
-
-  end
-end

data/lib/debugger/xml/fake_logger.rb

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

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

@@ -1,81 +0,0 @@
-module Debugger
-  module Xml
-    module Ide
-
-      class ControlCommandProcessor < Debugger::Processor
-
-        def initialize(interface)
-          @interface = interface
-        end
-
-        def process_commands
-          while input = @interface.read_command
-            process_input(input)
-          end
-        rescue IOError, Errno::EPIPE
-        rescue Exception
-          print "INTERNAL ERROR!!! #{$!}\n" rescue nil
-          print $!.backtrace.map{|l| "\t#{l}"}.join("\n") rescue nil
-        ensure
-          @interface.close
-        end
-
-        def process_command(cmd)
-          catch(:debug_error) do
-            if matched_cmd = control_commands.find { |c| c.match(cmd) }
-              matched_cmd.execute
-            else
-              process_context_commands(cmd)
-            end
-          end
-        end
-
-        private
-
-          def control_commands
-            @control_commands = begin
-              control_command_classes = Command.commands.select(&:allow_in_control)
-              state = Debugger::ControlCommandProcessor::State.new(@interface, control_command_classes)
-              control_command_classes.map { |cmd| cmd.new(state) }
-            end
-          end
-
-          def process_input(input)
-            split_commands(input).each do |cmd|
-              process_command(cmd)
-            end
-          end
-
-          def process_context_commands(input)
-            unless Debugger.handler.at_line?
-              errmsg pr("base.errors.no_suspended_thread", input: input)
-              return
-            end
-            event_command_classes = Command.commands.select(&:event)
-            state = Debugger::CommandProcessor::State.new do |s|
-              s.context = Debugger.handler.context
-              s.file    = Debugger.handler.file
-              s.line    = Debugger.handler.line
-              s.binding = Debugger.handler.context.frame_binding(0)
-              s.interface = @interface
-              s.commands = event_command_classes
-            end
-            event_commands = event_command_classes.map { |cls| cls.new(state) }
-            catch(:debug_error) do
-              if cmd = event_commands.find { |c| c.match(input) }
-                if state.context.dead? && cmd.class.need_context
-                  print pr("base.errors.command_unavailable")
-                else
-                  cmd.execute
-                end
-              else
-                print pr("base.errors.unknown_command", input: input)
-              end
-            end
-            state.context.thread.run if state.proceed?
-          end
-      end
-
-    end
-  end
-end