gdb 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9b16e3cec333997d16a2400dacc343110aec6a4
-  data.tar.gz: dc486d72d111cfaeac7928402ee1e39a57552bd1
+  metadata.gz: de69fa7d5ddc398f6e0bdd176061f23bd650acba
+  data.tar.gz: 5d86b5bafafa5d321226633751375a3faf9513fd
 SHA512:
-  metadata.gz: 3e8c780fe48de70df13df78fb9f987afab66d268f6f4b27b85665279f4fed43abdc512806a7b7467e77006f5e8c95f2069532fa717134503568c3f65842b9dbb
-  data.tar.gz: 92dda6f5248627108645bc55c9e3d5a3f7d476bfa2cc3295e4edc7a53e2815ca9f488712109422608fca88fdb29c9f0edec7ad8f8b88647fbf85b5007e277770
+  metadata.gz: 0a534be09b10af62159decf1793bad3c977680b9885bd4de3af3c70211d6319d3fde4720e1079d26f83e57dc2518af2f8b3ac9c0f7fac7454715705069f25d43
+  data.tar.gz: 40b8085db8abb15a5d2564b6fc4d43c185ccf21d9fa799f93e48dbb669289a2dbdb34aaf254c963351c16ce93beacf0c7badc188e3a6afbeece41bb12cc59401

data/README.md

@@ -1,4 +1,5 @@
 [![Build Status](https://travis-ci.org/david942j/gdb-ruby.svg?branch=master)](https://travis-ci.org/david942j/gdb-ruby)
+[![Gem Version](https://badge.fury.io/rb/gdb.svg)](https://badge.fury.io/rb/gdb)
 [![Code Climate](https://codeclimate.com/github/david942j/gdb-ruby/badges/gpa.svg)](https://codeclimate.com/github/david942j/gdb-ruby)
 [![Issue Count](https://codeclimate.com/github/david942j/gdb-ruby/badges/issue_count.svg)](https://codeclimate.com/github/david942j/gdb-ruby)
 [![Test Coverage](https://codeclimate.com/github/david942j/gdb-ruby/badges/coverage.svg)](https://codeclimate.com/github/david942j/gdb-ruby/coverage)

data/bin/gdb-ruby

@@ -3,4 +3,7 @@
 require 'gdb'
 require 'shellwords'
 
-GDB::GDB.new(Shellwords.join(ARGV)).interact
+argv = Shellwords.join(ARGV)
+Process.setproctitle('gdb-ruby ' + argv)
+
+GDB::GDB.new(argv).interact

data/lib/gdb/eval_context.rb

@@ -3,8 +3,16 @@ require 'pry'
 module GDB
   # For evaluation ruby code in gdb.
   class EvalContext
-    attr_reader :gdb # @return [GDB::GDB]
+    # @return [GDB::GDB] The gdb instance.
+    attr_reader :gdb
 
+    # Instantiate a {EvalContext} object.
+    #
+    # Each {GDB::GDB} should have exactly one {EvalContext}
+    # for evaluating Ruby.
+    #
+    # @param [GDB::GDB] gdb
+    #   The gdb instance.
     def initialize(gdb)
       @gdb = gdb
     end

data/lib/gdb/gdb.rb

@@ -13,11 +13,23 @@ module GDB
     # Absolute path to python scripts.
     SCRIPTS_PATH = File.join(__dir__, 'scripts').freeze
 
+    # To launch a gdb instance.
+    #
+    # @param [String] arguments
+    #   The command line arguments to pass to gdb. See examples.
+    #
+    # @param [String] gdb
+    #   Name of gdb.
+    #
+    # @example
+    #   gdb = GDB::GDB.new('-q -nh bash')
+    #   gdb = GDB::GDB.new('arm.elf', gdb: 'gdb-multiarch')
     def initialize(arguments, gdb: 'gdb')
       arguments = "--command=#{File.join(SCRIPTS_PATH, 'gdbinit.py')}" + ' ' + arguments # XXX
       @tube = spawn(gdb + ' ' + arguments)
-      @prompt = '(gdb-ruby) '
-      @tube.unget(@tube.readuntil(@prompt))
+      pre = @tube.readuntil('GDBRuby:')
+      @prompt = @tube.readuntil("\n").strip
+      @tube.unget(pre + @tube.readuntil(@prompt))
     end
 
     # Execute a command in gdb.
@@ -237,6 +249,9 @@ module GDB
 
     private
 
+    # Raise {GDBError} if process is not running.
+    #
+    # @return [nil]
     def check_alive!
       raise GDBError, 'Process is not running' unless alive?
     end
@@ -255,10 +270,12 @@ module GDB
     #
     # @return [String]
     def output_hook(output)
-      return output.gsub(@prompt, '') unless output.start_with?(COMMAND_PREFIX)
+      idx = output.index(COMMAND_PREFIX)
+      return yield output.gsub(@prompt, '') if idx.nil?
+      yield output.slice!(0, idx)
       cmd, args = output.slice(COMMAND_PREFIX.size..-1).split(' ', 2)
       # only support ruby and pry now.
-      return output unless %w[ruby pry].include?(cmd)
+      return yield output unless %w[ruby pry].include?(cmd)
       args = 'send(:invoke_pry)' if cmd == 'pry'
       # gdb by default set tty
       # hack it
@@ -268,6 +285,8 @@ module GDB
       rescue StandardError, ScriptError => e
         $stdout.puts("#{e.class}: #{e}")
       end
+      @tube.puts('END')
+      @tube.readuntil(@prompt)
       nil
     end
 

data/lib/gdb/scripts/gdbinit.py

@@ -1,5 +1,8 @@
 import gdb
-import signal
+
+import random
+import string
+import sys
 
 class GDBRuby():
     def __init__(self):
@@ -11,6 +14,7 @@ class GDBRuby():
         gdb.execute("set print elements 0")
         gdb.execute("set print pretty on")
         self.hook_gdb_prompt()
+        print('GDBRuby:' + self.gdbruby_prompt)
 
     '''
     Hook gdb prompt
@@ -18,18 +22,22 @@ class GDBRuby():
     def hook_gdb_prompt(self):
         # don't hook twice
         if gdb.prompt_hook == self._prompt_hook: return
+        self.gdbruby_prompt = self._gen_prompt()
         self._original_hook = gdb.prompt_hook
         gdb.prompt_hook = self._prompt_hook
 
-    def resume_prompt(self):
-        gdb.prompt_hook = self._original_hook
+    # private
 
     def _prompt_hook(self, current_prompt):
         if self._original_hook == None:
-            org = '(gdb) '
+            org = current_prompt.replace(self.gdbruby_prompt, '')
         else:
             org = self._original_hook(current_prompt)
-        return '(gdb-ruby) ' + org
+        return self.gdbruby_prompt + org
+
+    def _gen_prompt(self):
+        rnd = ''.join([random.choice(string.ascii_lowercase) for i in range(8)])
+        return '(gdb-ruby-%s)' % rnd
 
 __commands__ = []
 def register_command(cls):
@@ -46,6 +54,15 @@ class GDBRubyCommand(gdb.Command):
 
     def invoke(self, args, _from_tty):
         print("gdb-ruby> " + self.klass._cmdline_ + ' ' + args)
+        while True:
+            cmd = raw_input() if sys.version_info.major == 2 else input()
+            if cmd == 'END':
+                break
+            try:
+                res = gdb.execute(cmd, from_tty=True, to_string=True)
+            except gdb.error as e:
+                res = str(e)
+            sys.stdout.write(res + gdbruby.gdbruby_prompt)
 
 @register_command
 class RubyCommand():

data/lib/gdb/tube/tube.rb

@@ -8,8 +8,12 @@ module GDB
       # Batch read size.
       READ_SIZE = 4096
 
+      # Instantiate a {Tube::Tube} object.
+      #
       # @param [IO] io_in
+      #   Input.
       # @param [IO] io_out
+      #   Output.
       def initialize(io_in, io_out)
         @in = io_in
         @out = io_out
@@ -66,10 +70,14 @@ module GDB
       # Enter interactive mode.
       #
       # @param [Proc] output_hook
-      #   Called before flush the output to +$stdout+.
+      #   String received from output would be passed into this proc.
+      #   Only data yielded by this proc would be flushed to +$stdout+.
+      #
+      #   Use <tt>lambda { |s, &block| block.call(s) }</tt> or +:tap.to_proc+ (since Ruby 2.2)
+      #   for a do-nothing hook.
       #
       # @return [void]
-      def interact(output_hook = nil)
+      def interact(output_hook)
         @out.ungetc(@buffer.get)
         loop do
           io, = IO.select([$stdin, @out])
@@ -77,8 +85,7 @@ module GDB
           next unless io.include?(@out)
           begin
             recv = @out.readpartial(READ_SIZE)
-            recv = output_hook.call(recv) if output_hook
-            $stdout.write(recv) if recv
+            output_hook.call(recv) { |str| $stdout.write(str) }
             @out.ungetc(@buffer.get) unless @buffer.empty?
           rescue Errno::EIO
             break

data/lib/gdb/version.rb

@@ -1,4 +1,4 @@
 module GDB
   # The current version of GDB.
-  VERSION = '0.2.0'.freeze
+  VERSION = '0.2.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gdb
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - david942j
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-06 00:00:00.000000000 Z
+date: 2017-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -149,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: GDB Ruby-binding and Ruby command in GDB