debugger 1.5.0 → 1.6.0

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 1.6.0
+* Make autoeval and autolist true the default
+* Bump ruby_core_source dependency
+* Fix printf bugs
+* Fix printer require issues
+* Fix some warnings
+
 ## 1.5.0
 * Add support for any output adapters e.g. xml
 * Bump debugger-linecache dependency

data/Gemfile

@@ -1,3 +1,3 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gemspec

data/README.md

@@ -43,12 +43,6 @@ from two locations:
 * ~/.rdebugrc (~/rdebug.ini for windows)
 * $PWD/.rdebugrc ($PWD/rdebug.ini for windows)
 
-Here's a common configuration (yeah, I should make this the default):
-
-    set autolist
-    set autoeval
-    set autoreload
-
 To see debugger's current settings, use the `set` command.
 
 ### Using Commands
@@ -98,6 +92,7 @@ tutorial](http://bashdb.sourceforge.net/ruby-debug/rdebug-emacs.html)
     * See changelog for more
 * Minor
   * The gem name matches the module namespace, Debugger, and main required file, debugger.
+  * autolist and autoeval enabled by default
   * ruby-debug-base19 and ruby-debug19 are released as one gem
   * Rake tasks have been updated
   * No more $LOAD_PATH manipulation or runtime code outside of lib
@@ -123,6 +118,7 @@ Let's keep this working for the ruby community!
   debugger commands and more
 * [debugger-xml](https://github.com/astashov/debugger-xml) - XML interface for debugger, compatible
   with ruby-debug-ide
+* [vim-ruby-debugger] - Vim plugin that uses debugger
 * [debugger-pry](https://github.com/pry/debugger-pry) - using pry within debugger
 * [pry-debugger](https://github.com/nixme/pry-debugger) - using debugger within pry
 * [ruby-debug-passenger](https://github.com/davejamesmiller/ruby-debug-passenger) - rake task to

data/debugger.gemspec

@@ -20,7 +20,7 @@ handling, bindings for stack frames among other things.
   s.extensions << "ext/ruby_debug/extconf.rb"
   s.executables = ["rdebug"]
   s.add_dependency "columnize", ">= 0.3.1"
-  s.add_dependency "debugger-ruby_core_source", '~> 1.2.0'
+  s.add_dependency "debugger-ruby_core_source", '~> 1.2.1'
   s.add_dependency "debugger-linecache", '~> 1.2.0'
   s.add_development_dependency 'rake', '~> 0.9.2.2'
   s.add_development_dependency 'rake-compiler', '~> 0.8.0'

data/lib/debugger/test/test_interface.rb

@@ -12,8 +12,8 @@ class TestInterface < Debugger::Interface
     @readline_support = false
   end
 
-  def errmsg(*args)
-    @error_queue << format(args)
+  def errmsg(value)
+    @error_queue << value
   end
 
   def read_command(*args)
@@ -25,8 +25,8 @@ class TestInterface < Debugger::Interface
     result.is_a?(Proc) ? result.call : result
   end
 
-  def print(*args)
-    @output_queue << format(args)
+  def print(value)
+    @output_queue << value
   end
 
   def confirm(message)
@@ -58,13 +58,4 @@ class TestInterface < Debugger::Interface
     ].join("\n")
   end
 
-  private
-
-    def format(args)
-      if args.size > 1
-        args.first % args[1..-1]
-      else
-        args.first
-      end
-    end
 end

data/lib/debugger/version.rb

@@ -1,5 +1,5 @@
 module Debugger
   # TODO: remove version from C ext
   send :remove_const, :VERSION if const_defined? :VERSION
-  VERSION = '1.5.0'
+  VERSION = '1.6.0'
 end

data/lib/ruby-debug.rb

@@ -4,7 +4,7 @@ require 'socket'
 require 'thread'
 require 'ruby-debug-base'
 require 'ruby-debug/processor'
-Dir.glob(File.expand_path("../ruby-debug/printers/**/*.rb", __FILE__)).each { |f| require f }
+require 'ruby-debug/printers/plain'
 
 module Debugger
   self.handler = CommandProcessor.new

data/lib/ruby-debug/command.rb

@@ -181,7 +181,7 @@ module Debugger
     # TODO: Add optional timeout
     def debug_eval(str, b = get_binding)
       begin
-        val = eval(str, b)
+        eval(str, b)
       rescue StandardError, ScriptError => e
         text_message = if Command.settings[:stack_trace_on_error]
           at = eval("caller(1)", b)

data/lib/ruby-debug/commands/eval.rb

@@ -21,7 +21,7 @@ module Debugger
       $__dbg_interface = nil
     end
   end
-  
+
   class EvalCommand < Command # :nodoc:
     register_setting_get(:autoeval) do
       EvalCommand.unknown
@@ -30,11 +30,14 @@ module Debugger
       EvalCommand.unknown = value
     end
 
+    # Set default value
+    Command.settings[:autoeval] = 1
+
     def match(input)
       @input = input
       super
     end
-    
+
     def regexp
       /^\s*(p|e(?:val)?)\s+/
     end
@@ -69,7 +72,7 @@ module Debugger
 
   class PPCommand < Command # :nodoc:
     self.allow_in_control = true
-    
+
     def regexp
       /^\s*pp\s+/
     end
@@ -80,7 +83,7 @@ module Debugger
         PP.pp(debug_eval(@match.post_match, b), out)
       end
       print out.string
-    rescue 
+    rescue
       out.puts $!.message
     end
 
@@ -99,7 +102,7 @@ module Debugger
 
   class PutLCommand < Command # :nodoc:
     self.allow_in_control = true
-    
+
     def regexp
       /^\s*putl\s+/
     end
@@ -110,13 +113,13 @@ module Debugger
         vals = debug_eval(@match.post_match, b)
         if vals.is_a?(Array)
           vals = vals.map{|item| item.to_s}
-          print "%s\n", columnize(vals, self.class.settings[:width])
+          print "#{columnize(vals, self.class.settings[:width])}\n"
         else
           PP.pp(vals, out)
           print out.string
         end
       end
-    rescue 
+    rescue
       out.puts $!.message
     end
 
@@ -132,12 +135,12 @@ module Debugger
       end
     end
   end
-  
+
   class PSCommand < Command # :nodoc:
     self.allow_in_control = true
-    
+
     include EvalFunctions
-    
+
     def regexp
       /^\s*ps\s+/
     end
@@ -148,13 +151,13 @@ module Debugger
         vals = debug_eval(@match.post_match, b)
         if vals.is_a?(Array)
           vals = vals.map{|item| item.to_s}
-          print "%s\n", columnize(vals.sort!, self.class.settings[:width])
+          print "#{columnize(vals.sort!, self.class.settings[:width])}\n"
         else
           PP.pp(vals, out)
           print out.string
         end
       end
-    rescue 
+    rescue
       out.puts $!.message
     end
 
@@ -170,5 +173,5 @@ module Debugger
       end
     end
   end
-  
+
 end

data/lib/ruby-debug/commands/info.rb

@@ -143,11 +143,9 @@ item. If \'verbose\' is given then the entire stack frame is shown.'],
         print "Num Enb What\n"
         brkpts.each do |b|
           if b.expr.nil?
-            print "%3d %s   at %s:%s\n", 
-            b.id, (b.enabled? ? 'y' : 'n'), b.source, b.pos
+            print("%3d %s   at %s:%s\n" % [b.id, (b.enabled? ? 'y' : 'n'), b.source, b.pos])
           else
-            print "%3d %s   at %s:%s if %s\n", 
-            b.id, (b.enabled? ? 'y' : 'n'), b.source, b.pos, b.expr
+            print("%3d %s   at %s:%s if %s\n" % [b.id, (b.enabled? ? 'y' : 'n'), b.source, b.pos, b.expr])
           end
           hits = b.hit_count
           if hits > 0
@@ -170,8 +168,7 @@ item. If \'verbose\' is given then the entire stack frame is shown.'],
         print "Num Enb Expression\n"
         n = 1
         for d in @state.display
-          print "%3d: %s  %s\n", n, (d[0] ? 'y' : 'n'), d[1] if
-            d[0] != nil
+          print("%3d: %s  %s\n" % [n, (d[0] ? 'y' : 'n'), d[1]]) if d[0] != nil
           n += 1
         end
       else
@@ -202,17 +199,17 @@ item. If \'verbose\' is given then the entire stack frame is shown.'],
         LineCache::cache(file, Command.settings[:reload_source_on_change])
       end
       
-      print "File %s", file
+      print("File #{file}")
       path = LineCache.path(file)
       if %w(all basic path).member?(subcmd.name) and path != file
-        print " - %s\n", path 
+        print(" - #{path}\n")
       else
         print "\n"
       end
 
       if %w(all basic lines).member?(subcmd.name)
         lines = LineCache.size(file)
-        print "\t %d lines\n", lines if lines
+        print("\t #{lines} lines\n") if lines
       end
 
       if %w(all breakpoints).member?(subcmd.name)
@@ -225,10 +222,10 @@ item. If \'verbose\' is given then the entire stack frame is shown.'],
 
       if %w(all mtime).member?(subcmd.name)
         stat = LineCache.stat(file)
-        print "\t%s\n", stat.mtime if stat
+        print("\t#{stat.mtime}\n") if stat
       end
       if %w(all sha1).member?(subcmd.name)
-        print "\t%s\n", LineCache.sha1(file)
+        print("\t#{LineCache.sha1(file)}\n")
       end
     end
     
@@ -238,13 +235,13 @@ item. If \'verbose\' is given then the entire stack frame is shown.'],
       files.uniq.sort.each do |file|
         stat = LineCache::stat(file)
         path = LineCache::path(file)
-        print "File %s", file
+        print("File #{file}")
         if path and path != file
-          print " - %s\n", path 
+          print " - #{path}\n"
         else
           print "\n"
         end
-        print "\t%s\n", stat.mtime if stat
+        print "\t#{stat.mtime}\n" if stat
       end
     end
     
@@ -262,7 +259,7 @@ item. If \'verbose\' is given then the entire stack frame is shown.'],
         errmsg "info line not available here.\n"
         return 
       end
-      print "Line %d of \"%s\"\n",  @state.line, @state.file
+      print "Line #{@state.line} of \"#{@state.file}\"\n"
     end
     
     def info_locals(*args)
@@ -310,7 +307,7 @@ item. If \'verbose\' is given then the entire stack frame is shown.'],
       when :catchpoint
         print("It stopped at a catchpoint.\n")
       else
-        print "unknown reason: %s\n" % @state.context.stop_reason.to_s
+        print "unknown reason: #{@state.context.stop_reason.to_s}\n"
       end
     end
     
@@ -347,7 +344,7 @@ item. If \'verbose\' is given then the entire stack frame is shown.'],
     def info_threads(*args)
       ok, verbose = info_thread_preamble(args[0])
       return unless ok
-      threads = Debugger.contexts.sort_by{|c| c.thnum}.each do |c|
+      Debugger.contexts.sort_by{|c| c.thnum}.each do |c|
         display_context(c, !verbose)
         if verbose and not c.ignored?
           (0...c.stack_size).each do |idx|

data/lib/ruby-debug/commands/list.rb

@@ -9,6 +9,9 @@ module Debugger
       ListCommand.always_run = value
     end
 
+    # Set autolist by default
+    Command.settings[:autolist] = 1
+
     def regexp
       /^\s* l(?:ist)? (?:\s*([-=])|\s+(.+))? $/x
     end

data/lib/ruby-debug/commands/skip.rb

@@ -29,7 +29,7 @@ module Debugger
           the "catch" command, and wish to pass the exception on to the
           code that you're debugging.
          }
-     end
+      end
     end
   end
 end

data/lib/ruby-debug/commands/variables.rb

@@ -133,7 +133,7 @@ module Debugger
     private
 
       def get_obj(match)
-        obj = if match[1]
+        if match[1]
           begin
             ObjectSpace._id2ref(match[1].hex)
           rescue RangeError

data/lib/ruby-debug/printers/plain.rb

@@ -1,4 +1,4 @@
-require_relative 'base'
+require 'ruby-debug/printers/base'
 module Printers
   class Plain < Base
     include Columnize

data/lib/ruby-debug/processor.rb

@@ -177,8 +177,7 @@ module Debugger
       file = CommandProcessor.canonic_file(file)
       unless file == @last_file and @last_line == line and
           Command.settings[:tracing_plus]
-        print "Tracing(%d):%s:%s %s",
-        context.thnum, file, line, Debugger.line_at(file, line)
+        print("Tracing(%d):%s:%s %s" % [context.thnum, file, line, Debugger.line_at(file, line)])
         @last_file = file
         @last_line = line
       end

data/test/eval_test.rb

@@ -22,13 +22,17 @@ describe "Eval Command" do
   end
 
   describe "autoeval" do
-    temporary_change_hash_value(Debugger::Command.settings, :autoeval, false)
-
-    it "must eval the expression if no matching command is found" do
-      enter 'set autoeval', '[5,6,7].inject(&:+)'
+    it "must eval the expression if no matching command is found by default" do
+      enter '[5,6,7].inject(&:+)'
       debug_file 'eval'
       check_output_includes "18"
     end
+
+    it "must not eval the expression if no matching command is found if toogled" do
+      enter 'set noautoeval', '[5,6,7].inject(&:+)'
+      debug_file 'eval'
+      check_output_doesnt_include "18"
+    end
   end
 
   describe "evaluate with error" do

data/test/list_test.rb

@@ -55,13 +55,17 @@ describe "List Command" do
   end
 
   describe "autolist" do
-    temporary_change_hash_value(Debugger::Command.settings, :autolist, 0)
-
-    it "must show the surronding lines even without 'list' command if autolist is enabled" do
-      enter 'set autolist', 'break 5', 'cont'
+    it "must show the surrounding lines even without 'list' command by default" do
+      enter 'break 5', 'cont'
       debug_file 'list'
       check_output_includes "[4, 6] in #{fullpath('list')}", "4  4", "=> 5  5", "6  6"
     end
+
+    it "must not show the surronding lines by default when autolist is toggled" do
+      enter 'set noautolist', 'break 5', 'cont'
+      debug_file 'list'
+      check_output_doesnt_include "[4, 6] in #{fullpath('list')}", "4  4", "=> 5  5", "6  6"
+    end
   end
 
   describe "specified lines" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: debugger
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-14 00:00:00.000000000 Z
+date: 2013-05-15 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: columnize
@@ -36,7 +36,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -44,7 +44,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: debugger-linecache
   requirement: !ruby/object:Gem::Requirement
@@ -357,7 +357,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.19
 signing_key: 
 specification_version: 3
 summary: Fast Ruby debugger - base + cli