byebug 1.1.1 → 1.2.0

data/test/source_test.rb

@@ -3,18 +3,14 @@ require_relative 'test_helper'
 describe 'Source Command' do
   include TestDsl
 
-  let(:filename) { 'source_example.txt' }
+  before { File.open(filename, 'w') do |f|
+             f.puts 'break 2'
+             f.puts 'break 3 if true'
+           end }
 
-  def after_setup
-    File.open(filename, 'w') do |f|
-      f.puts 'break 2'
-      f.puts 'break 3 if true'
-    end
-  end
+  after { FileUtils.rm(filename) }
 
-  def before_teardown
-    FileUtils.rm(filename)
-  end
+  let(:filename) { 'source_example.txt' }
 
   it 'must run commands from file' do
     enter "source #{filename}"

data/test/stepping_test.rb

@@ -6,33 +6,13 @@ describe 'Stepping Commands' do
   describe 'Next Command' do
 
     describe 'Usual mode' do
-      before do
-        enter 'break 10', 'cont'
-      end
-
-      it 'must go to the next line if forced by a setting' do
-        Byebug::Command.settings[:force_stepping] = true
-        enter 'next'
-        debug_file('stepping') { state.line.must_equal 11 }
-      end
-
-      it 'must go to the next line if forced by a setting (by shortcut)' do
-        Byebug::Command.settings[:force_stepping] = true
-        enter 'n'
-        debug_file('stepping') { state.line.must_equal 11 }
-      end
+      before { enter 'break 10', 'cont' }
 
       it 'must leave on the same line by default' do
         enter 'next'
         debug_file('stepping') { state.line.must_equal 10 }
       end
 
-      it 'must go the specified number of lines forward by default' do
-        Byebug::Command.settings[:force_stepping] = true
-        enter 'next 2'
-        debug_file('stepping') { state.line.must_equal 21 }
-      end
-
       it 'must go to the next line if forced by "plus" sign' do
         enter 'next+'
         debug_file('stepping') { state.line.must_equal 11 }
@@ -43,15 +23,33 @@ describe 'Stepping Commands' do
         debug_file('stepping') { state.line.must_equal 10 }
       end
 
-      it 'must ignore the setting if "minus" is specified' do
-        Byebug::Command.settings[:force_stepping] = true
-        enter 'next-'
-        debug_file('stepping') { state.line.must_equal 10 }
+      describe 'when force_stepping is set' do
+        temporary_change_hash Byebug::Command.settings, :force_stepping, true
+
+        it 'must go to the next line' do
+          enter 'next'
+          debug_file('stepping') { state.line.must_equal 11 }
+        end
+
+        it 'must go to the next line (by shortcut)' do
+          enter 'n'
+          debug_file('stepping') { state.line.must_equal 11 }
+        end
+
+        it 'must go the specified number of lines forward by default' do
+          enter 'next 2'
+          debug_file('stepping') { state.line.must_equal 21 }
+        end
+
+        it 'must ignore it if "minus" is specified' do
+          enter 'next-'
+          debug_file('stepping') { state.line.must_equal 10 }
+        end
       end
     end
 
     describe 'Post Mortem' do
-      before { Byebug::Command.settings[:autoeval] = false }
+      temporary_change_hash Byebug::Command.settings, :autoeval, false
 
       it 'must not work in post-mortem mode' do
         enter 'cont', 'next'
@@ -65,34 +63,13 @@ describe 'Stepping Commands' do
   describe 'Step Command' do
 
     describe 'Usual mode' do
-
-      before do
-        enter 'break 10', 'cont'
-      end
-
-      it 'must go to the step line if forced by a setting' do
-        Byebug::Command.settings[:force_stepping] = true
-        enter 'step'
-        debug_file('stepping') { state.line.must_equal 11 }
-      end
-
-      it 'must go to the next line if forced by a setting (by shortcut)' do
-        Byebug::Command.settings[:force_stepping] = true
-        enter 's'
-        debug_file('stepping') { state.line.must_equal 11 }
-      end
+      before { enter 'break 10', 'cont' }
 
       it 'must leave on the same line if forced by a setting' do
         enter 'step'
         debug_file('stepping') { state.line.must_equal 10 }
       end
 
-      it 'must go the specified number of lines forward by default' do
-        Byebug::Command.settings[:force_stepping] = true
-        enter 'step 2'
-        debug_file('stepping') { state.line.must_equal 15 }
-      end
-
       it 'must go to the step line if forced to do that by "plus" sign' do
         enter 'step+'
         debug_file('stepping') { state.line.must_equal 11 }
@@ -102,10 +79,29 @@ describe 'Stepping Commands' do
         enter 'step-'
         debug_file('stepping') { state.line.must_equal 10 }
       end
+
+      describe 'when force_stepping is set' do
+        temporary_change_hash Byebug::Command.settings, :force_stepping, true
+
+        it 'must go to the step line if forced by a setting' do
+          enter 'step'
+          debug_file('stepping') { state.line.must_equal 11 }
+        end
+
+        it 'must go to the next line if forced by a setting (by shortcut)' do
+          enter 's'
+          debug_file('stepping') { state.line.must_equal 11 }
+        end
+
+        it 'must go the specified number of lines forward by default' do
+          enter 'step 2'
+          debug_file('stepping') { state.line.must_equal 15 }
+        end
+      end
     end
 
     describe 'Post Mortem' do
-      before { Byebug::Command.settings[:autoeval] = false }
+      temporary_change_hash Byebug::Command.settings, :autoeval, false
 
       it 'must not work in post-mortem mode' do
         enter 'cont', 'step'

data/test/support/test_dsl.rb

@@ -1,17 +1,9 @@
 module TestDsl
 
-  module Shared
-    def fullpath(filename)
-      (Pathname.new(__FILE__) + "../../examples/#{filename}.rb").cleanpath.to_s
-    end
-  end
-
-  include Shared
-
   def self.included(base)
     base.class_eval do
+      extend ClassUtils
       before do
-        load_defaults
         Byebug.interface = TestInterface.new
         Byebug.handler.display.clear
       end
@@ -19,30 +11,10 @@ module TestDsl
   end
 
   ##
-  # Loads byebug default settings
+  # Expand fullpath of a given example file
   #
-  def load_defaults
-    Byebug::Command.settings[:testing] = true
-    Byebug::Command.settings[:basename] = false
-    Byebug::Command.settings[:callstyle] = :last
-    Byebug::Command.settings[:force_stepping] = false
-    Byebug::Command.settings[:full_path] = true
-    Byebug::Command.settings[:listsize] = 10
-    Byebug::Command.settings[:stack_trace_on_error] = false
-    Byebug::Command.settings[:tracing_plus] = false
-    Byebug::Command.settings[:width] =
-      ENV['COLUMNS'].to_i > 10 ? ENV['COLUMNS'].to_i : 80
-    Byebug::Command.settings[:argv] = Byebug::ARGV
-    Byebug::Command.settings[:autolist] = 1
-    Byebug::Command.settings[:autoeval] = true
-    Byebug::Command.settings[:reload_source_on_change] = 1
-    force_unset_const Byebug, 'BYEBUG_SCRIPT'
-    force_set_const Byebug, 'DEFAULT_START_SETTINGS',
-                    init: true, post_mortem: false, tracing: nil
-    force_set_const Byebug, 'ARGV', ARGV.clone
-    force_set_const Byebug, 'PROG_SCRIPT', $0
-    force_set_const Byebug, 'INITIAL_DIR', Dir.pwd
-    Byebug.annotate = 0
+  def fullpath(filename)
+    (Pathname.new(__FILE__) + "../../examples/#{filename}.rb").cleanpath.to_s
   end
 
   ##
@@ -164,31 +136,51 @@ module TestDsl
     File.open(file, 'w') { |f| f.write(new_content) }
   end
 
-  def temporary_change_method_value(item, method, value)
-    old = item.send(method)
-    item.send("#{method}=", value)
-    yield
-  ensure
-    item.send("#{method}=", old)
-  end
 
-  def temporary_change_hash_value(item, key, value)
-    old_value = item[key]
-    item[key] = value
-    yield
-  ensure
-    item[key] = old_value
-  end
+  module ClassUtils
+    def temporary_change_hash hash, key, value
+      mod = Module.new do
+        extend Minitest::Spec::DSL
+
+        before do
+          @old_hashes ||= {}
+          @old_hashes.merge!({ hash => { key => hash[key] } }) do |k, v1, v2|
+            v1.merge(v2)
+          end
+          hash[key] = value
+        end
+
+        after do
+          hash[key] = @old_hashes[hash][key]
+        end
+      end
+
+      include mod
+    end
+
+    def temporary_change_const klass, const, value
+      mod = Module.new do
+        extend Minitest::Spec::DSL
+
+        before do
+          @old_consts ||= {}
+          old_value = klass.const_defined?(const) ?
+                      klass.const_get(const) : :__undefined__
+          @old_consts.merge!({ klass => { const => old_value } }) do |k, v1, v2|
+            v1.merge(v2)
+          end
+          klass.send :remove_const, const if klass.const_defined?(const)
+          klass.const_set const, value unless value == :__undefined__
+        end
+
+        after do
+          klass.send :remove_const, const if klass.const_defined?(const)
+          klass.const_set const, @old_consts[klass][const] unless
+            @old_consts[klass][const] == :__undefined__
+        end
+      end
 
-  def temporary_set_const(klass, const, value)
-    old_value = klass.const_defined?(const) ? klass.const_get(const) : :__undefined__
-    force_set_const(klass, const, value)
-    yield
-  ensure
-    if old_value == :__undefined__
-      klass.send(:remove_const, const)
-    else
-     force_set_const(klass, const, old_value)
+      include mod
     end
   end
 

data/test/test_helper.rb

@@ -1,9 +1,9 @@
 require 'rubygems'
-require 'pathname'
 require 'minitest/autorun'
+require 'pathname'
 require 'mocha/setup'
 require 'byebug'
 
 Dir.glob(File.expand_path("../support/*.rb", __FILE__)).each { |f| require f }
 
-Byebug.annotate = 2
+Byebug::Command.settings[:testing] = true

data/test/trace_test.rb

@@ -16,7 +16,7 @@ describe 'Trace Command' do
         it 'must trace execution by setting trace to on' do
           enter 'trace on', 'cont 7', 'trace off'
           debug_file 'trace'
-          check_output_includes 'Tracing is on',
+          check_output_includes 'line tracing is on.',
                                 "Tracing: #{fullpath('trace')}:4 $bla = 4",
                                 "Tracing: #{fullpath('trace')}:7 $bla = 7"
         end
@@ -24,7 +24,7 @@ describe 'Trace Command' do
         it 'must be able to use a shortcut' do
           enter 'tr on', 'cont 7', 'trace off'
           debug_file 'trace'
-          check_output_includes 'Tracing is on',
+          check_output_includes 'line tracing is on.',
                                 "Tracing: #{fullpath('trace')}:4 $bla = 4",
                                 "Tracing: #{fullpath('trace')}:7 $bla = 7"
         end
@@ -49,7 +49,7 @@ describe 'Trace Command' do
         it 'must show a message when turned off' do
           enter 'trace off'
           debug_file 'trace'
-          check_output_includes 'Tracing is off'
+          check_output_includes 'line tracing is off.'
         end
       end
     end
@@ -99,7 +99,7 @@ describe 'Trace Command' do
       it 'must work in post-mortem mode' do
         enter 'cont', 'trace on'
         debug_file 'post_mortem'
-        check_output_includes 'Tracing is on'
+        check_output_includes 'line tracing is on.'
       end
     end
 

data/test/variables_test.rb

@@ -3,9 +3,7 @@ require_relative 'test_helper'
 describe 'Variables Command' do
   include TestDsl
 
-  def after_setup
-    Byebug::Command.settings[:width] = 40
-  end
+  temporary_change_hash Byebug::Command.settings, :width, 40
 
   describe 'class variables' do
     it 'must show variables' do
@@ -80,14 +78,18 @@ describe 'Variables Command' do
       check_output_includes '@inst_a = 1', '@inst_b = 2'
     end
 
-    it 'must cut long variable values according to :width setting' do
-      enter 'set width 20', 'break 25', 'cont', 'var instance v'
-      debug_file 'variables'
-      check_output_includes '@inst_c = "1111111111111111...'
+    describe 'when width is too small' do
+      temporary_change_hash Byebug::Command.settings, :width, 20
+
+      it 'must cut long variable values according it' do
+        enter 'break 25', 'cont', 'var instance v'
+        debug_file 'variables'
+        check_output_includes '@inst_c = "1111111111111111...'
+      end
     end
 
     it 'must show error if value doesn\'t have #to_s/#inspect methods' do
-      enter 'set width 21', 'break 25', 'cont', 'var instance v'
+      enter 'break 25', 'cont', 'var instance v'
       debug_file 'variables'
       check_output_includes '@inst_d = *Error in evaluation*'
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: byebug
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - David Rodríguez
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-07 00:00:00.000000000 Z
+date: 2013-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: columnize
@@ -74,28 +74,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.13.3
+        version: 0.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.13.3
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.7.4
+        version: 5.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.7.4
+        version: 5.0.1
 description: |-
   Byebug is a Ruby 2.0 debugger. It's implemented using the
       Ruby 2.0 TracePoint C API. The C extension was forked from debase whereas
@@ -114,6 +114,7 @@ files:
 - .travis.yml
 - CHANGELOG.md
 - CONTRIBUTING.md
+- GUIDE.md
 - Gemfile
 - LICENSE
 - README.md
@@ -140,13 +141,13 @@ files:
 - lib/byebug/commands/frame.rb
 - lib/byebug/commands/help.rb
 - lib/byebug/commands/info.rb
-- lib/byebug/commands/irb.rb
 - lib/byebug/commands/jump.rb
 - lib/byebug/commands/kill.rb
 - lib/byebug/commands/list.rb
 - lib/byebug/commands/method.rb
 - lib/byebug/commands/quit.rb
 - lib/byebug/commands/reload.rb
+- lib/byebug/commands/repl.rb
 - lib/byebug/commands/save.rb
 - lib/byebug/commands/set.rb
 - lib/byebug/commands/show.rb
@@ -160,7 +161,6 @@ files:
 - lib/byebug/interface.rb
 - lib/byebug/processor.rb
 - lib/byebug/version.rb
-- old_doc/Makefile
 - old_doc/byebug.1
 - old_doc/byebug.texi
 - old_doc/hanoi.rb
@@ -180,7 +180,6 @@ files:
 - test/examples/continue.rb
 - test/examples/display.rb
 - test/examples/edit.rb
-- test/examples/edit2.rb
 - test/examples/eval.rb
 - test/examples/finish.rb
 - test/examples/frame.rb
@@ -210,7 +209,6 @@ files:
 - test/frame_test.rb
 - test/help_test.rb
 - test/info_test.rb
-- test/irb_test.rb
 - test/jump_test.rb
 - test/kill_test.rb
 - test/list_test.rb
@@ -218,6 +216,7 @@ files:
 - test/post_mortem_test.rb
 - test/quit_test.rb
 - test/reload_test.rb
+- test/repl_test.rb
 - test/restart_test.rb
 - test/save_test.rb
 - test/set_test.rb