byebug 1.5.0 → 1.6.0

data/test/set_test.rb

@@ -69,14 +69,14 @@ class TestSet < TestDsl::TestCase
   end
 
   describe 'testing' do
-    describe '$byebug_state' do
+    describe '$state' do
       describe 'when setting "testing" to on' do
         temporary_change_hash Byebug::Command.settings, :testing, false
 
         it 'must get set' do
           enter 'set testing', 'break 3', 'cont'
           debug_file('set') {
-            $byebug_state.must_be_kind_of Byebug::CommandProcessor::State }
+            $state.must_be_kind_of Byebug::CommandProcessor::State }
         end
       end
 
@@ -85,7 +85,7 @@ class TestSet < TestDsl::TestCase
 
         it 'must get unset' do
           enter 'set notesting', 'break 3', 'cont'
-          debug_file('set') { $byebug_state.must_be_nil }
+          debug_file('set') { $state.must_be_nil }
         end
       end
     end

data/test/show_test.rb

@@ -81,7 +81,7 @@ class TestShow < TestDsl::TestCase
     it 'must show default value' do
       enter 'show callstyle'
       debug_file 'show'
-      check_output_includes 'Frame call-display style is last.'
+      check_output_includes 'Frame call-display style is long.'
     end
   end
 

data/test/stepping_test.rb

@@ -11,17 +11,17 @@ class TestStepping < TestDsl::TestCase
 
         it 'must leave on the same line by default' do
           enter 'next'
-          debug_file('stepping') { state.line.must_equal 10 }
+          debug_file('stepping') { $state.line.must_equal 10 }
         end
 
         it 'must go to the next line if forced by "plus" sign' do
           enter 'next+'
-          debug_file('stepping') { state.line.must_equal 11 }
+          debug_file('stepping') { $state.line.must_equal 11 }
         end
 
         it 'must leave on the same line if forced by "minus" sign' do
           enter 'next-'
-          debug_file('stepping') { state.line.must_equal 10 }
+          debug_file('stepping') { $state.line.must_equal 10 }
         end
 
         describe 'when force_stepping is set' do
@@ -29,22 +29,22 @@ class TestStepping < TestDsl::TestCase
 
           it 'must go to the next line' do
             enter 'next'
-            debug_file('stepping') { state.line.must_equal 11 }
+            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 }
+            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 }
+            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 }
+            debug_file('stepping') { $state.line.must_equal 10 }
           end
         end
       end
@@ -54,7 +54,7 @@ class TestStepping < TestDsl::TestCase
 
         it 'must step over blocks' do
           enter 'next'
-          debug_file('stepping') { state.line.must_equal 25 }
+          debug_file('stepping') { $state.line.must_equal 25 }
         end
       end
 
@@ -82,17 +82,17 @@ class TestStepping < TestDsl::TestCase
 
         it 'must leave on the same line if forced by a setting' do
           enter 'step'
-          debug_file('stepping') { state.line.must_equal 10 }
+          debug_file('stepping') { $state.line.must_equal 10 }
         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 }
+          debug_file('stepping') { $state.line.must_equal 11 }
         end
 
         it 'must leave on the same line if forced to do that by "minus" sign' do
           enter 'step-'
-          debug_file('stepping') { state.line.must_equal 10 }
+          debug_file('stepping') { $state.line.must_equal 10 }
         end
 
         describe 'when force_stepping is set' do
@@ -100,17 +100,17 @@ class TestStepping < TestDsl::TestCase
 
           it 'must go to the step line if forced by a setting' do
             enter 'step'
-            debug_file('stepping') { state.line.must_equal 11 }
+            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 }
+            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 }
+            debug_file('stepping') { $state.line.must_equal 15 }
           end
         end
       end
@@ -120,10 +120,9 @@ class TestStepping < TestDsl::TestCase
 
         it 'must step into blocks' do
           enter 'step'
-          debug_file('stepping') { state.line.must_equal 22 }
+          debug_file('stepping') { $state.line.must_equal 22 }
         end
       end
-
     end
 
     describe 'Post Mortem' do

data/test/support/test_dsl.rb

@@ -1,6 +1,12 @@
 module TestDsl
 
-  class TestBase < MiniTest::Spec
+  class TestCase < MiniTest::Spec
+    include TestDsl
+
+    def setup
+      Byebug.interface = TestInterface.new
+      Byebug.handler.display.clear
+    end
 
     def self.temporary_change_hash hash, key, value
       before do
@@ -36,15 +42,6 @@ module TestDsl
     end
   end
 
-  class TestCase < TestBase
-    include TestDsl
-
-    def setup
-      Byebug.interface = TestInterface.new
-      Byebug.handler.display.clear
-    end
-  end
-
   ##
   # Expand fullpath of a given example file
   #
@@ -83,7 +80,7 @@ module TestDsl
   #   debug "ex1" # ex1 should be placed in test/examples/ex1.rb
   #
   #   enter 'b 4', 'cont'
-  #   debug("ex1") { state.line.must_equal 4 }
+  #   debug("ex1") { $state.line.must_equal 4 }
   #
   def debug_file(filename, &block)
     is_test_block_called = false
@@ -148,12 +145,8 @@ module TestDsl
     Byebug.handler.interface
   end
 
-  def state
-    $byebug_state
-  end
-
   def context
-    $byebug_state.context
+    $state.context
   end
 
   def force_set_const(klass, const, value)

data/test/trace_test.rb

@@ -84,12 +84,12 @@ class TestTrace < TestDsl::TestCase
 
     it 'must track global variable with stop' do
       enter 'trace variable $bla stop', 'break 7', 'cont'
-      debug_file('trace') { state.line.must_equal 4 }
+      debug_file('trace') { $state.line.must_equal 4 }
     end
 
     it 'must track global variable with nostop' do
       enter 'trace variable $bla nostop', 'break 7', 'cont'
-      debug_file('trace') { state.line.must_equal 7 }
+      debug_file('trace') { $state.line.must_equal 7 }
     end
 
     describe 'errors' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: byebug
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - David Rodríguez
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-21 00:00:00.000000000 Z
+date: 2013-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: columnize
@@ -163,8 +163,9 @@ files:
 - test/display_test.rb
 - test/edit_test.rb
 - test/eval_test.rb
-- test/examples/breakpoint1.rb
+- test/examples/breakpoint.rb
 - test/examples/breakpoint2.rb
+- test/examples/breakpoint_deep.rb
 - test/examples/conditions.rb
 - test/examples/continue.rb
 - test/examples/display.rb
@@ -216,7 +217,6 @@ files:
 - test/support/breakpoint.rb
 - test/support/context.rb
 - test/support/matchers.rb
-- test/support/mocha_extensions.rb
 - test/support/processor.rb
 - test/support/test_dsl.rb
 - test/support/test_interface.rb
@@ -254,8 +254,9 @@ test_files:
 - test/display_test.rb
 - test/edit_test.rb
 - test/eval_test.rb
-- test/examples/breakpoint1.rb
+- test/examples/breakpoint.rb
 - test/examples/breakpoint2.rb
+- test/examples/breakpoint_deep.rb
 - test/examples/conditions.rb
 - test/examples/continue.rb
 - test/examples/display.rb
@@ -307,7 +308,6 @@ test_files:
 - test/support/breakpoint.rb
 - test/support/context.rb
 - test/support/matchers.rb
-- test/support/mocha_extensions.rb
 - test/support/processor.rb
 - test/support/test_dsl.rb
 - test/support/test_interface.rb

data/test/support/mocha_extensions.rb

@@ -1,71 +0,0 @@
-module Mocha
-
-  class Expectation
-    # Allows to specify a block to execute when expectation will be matched.
-    # This way, we can specify dynamic values to return or just make some side effects
-    #
-    # Example:
-    #   foo.expects(:bar).with('bla').calls { 2 + 3 }
-    #   foo.bar('bla') # => 5
-    #
-    def calls(&block)
-      @calls ||= Call.new
-      @calls += Call.new(block)
-      self
-    end
-
-    def invoke_with_calls(arguments, &block)
-      invoke_without_calls(&block) || (@calls.next(arguments, &block) if @calls)
-    end
-    alias_method :invoke_without_calls, :invoke
-    alias_method :invoke, :invoke_with_calls
-  end
-
-
-  class Mock
-    # We monkey-patch that method to be able to pass arguments to
-    # Expectation#invoke method
-    def method_missing(symbol, *arguments, &block)
-      if @responder and not @responder.respond_to?(symbol)
-        raise NoMethodError,
-              "undefined method `#{symbol}' for #{self.mocha_inspect} which " \
-              "responds like #{@responder.mocha_inspect}"
-      end
-      if matching_expectation_allowing_invocation =
-          @expectations.match_allowing_invocation(symbol, *arguments)
-        # We change this line - added arguments
-        matching_expectation_allowing_invocation.invoke(arguments, &block)
-      elsif (matching_expectation = @expectations.match(symbol, *arguments)) ||
-            (!matching_expectation && !@everything_stubbed)
-        # We change this line - added arguments
-        matching_expectation.invoke(arguments, &block) if matching_expectation
-        message = UnexpectedInvocation.new(self, symbol, *arguments).to_s
-        require 'mocha/mockery'
-        message << Mockery.instance.mocha_inspect
-        raise ExpectationError.new(message, caller)
-      end
-    end
-  end
-
-
-  class Call
-    attr_reader :blocks
-
-    def initialize(*blocks)
-      @blocks = [ *blocks ]
-    end
-
-    def next(arguments, &block)
-      case @blocks.length
-        when 0 then nil
-        when 1 then @blocks.first.call(*arguments, &block)
-        else @blocks.shift.call(*arguments, &block)
-      end
-    end
-
-    def +(other)
-      self.class.new(*(@blocks + other.blocks))
-    end
-  end
-
-end