pry-byebug 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 121ca8dcd9228688b55ebb264c755664ec8c912f
-  data.tar.gz: ceb7af746b551eb0cec30d952540fcf9e968eb7a
+  metadata.gz: e1e394709d63ed2099ec627d75981a29885c9641
+  data.tar.gz: 1a79cdd78a21fde30ff264adcbeeec8c96af877c
 SHA512:
-  metadata.gz: 03f9ce397f963ae6894b003d81df2900cba0f6a620d4a9d422896fe30484b29f3880ddeb99fbf01514bd51bd4f232d77c3866d29f7a404ff04cdf8aa43b10d9b
-  data.tar.gz: 2e2a734a5b1757eabd733fdba6036e61752060592c575b08a9aa33d28c12e80bf36fa39e3c8c1c791367b1174126bc9a2cd32c7ec0389824589cab161c0a6cc6
+  metadata.gz: 083288cd0f862524132bda50de9ac708ee173e39718bb0594ca176c043cfc49cd35eca27c8ed69b67d3ad70c5d5a3d2ff10e99ffd89c77f4ba509beb2ee7e0ff
+  data.tar.gz: 3c0224f0d2895b5f60745ef89d672fc0cc11ac260ddb19ce81ac139f5c9146d3b8615d1ddb9a6610150a01225e832884f541ce91fd77f7720828a9e85fc9db22

data/.travis.yml

@@ -0,0 +1,6 @@
+rvm:
+- 2.0.0
+- ruby-head
+matrix:
+  allow_failures:
+  - rvm: ruby-head

data/CHANGELOG.md

@@ -1,5 +1,11 @@
-## 1.1.0 (2013-06-06)
+## 1.1.1 (2013-02-07)
+
+* Adds some initial tests to the test suite
+* Fixes bug when doing "step n" or "next n" where n > 1 right after binding.pry
 
+
+## 1.1.0 (2013-06-06)
+ 
 * Adds a test suite (thanks @teeparham!)
 * Uses byebug ~> 1.4.0
 * Uses s, n, f and c aliases by default (thanks @jgakos!)

data/README.md

@@ -1,4 +1,4 @@
-pry-byebug
+pry-byebug [![Gem Version][1]][2] [![Build Status][3]][4]
 ============
 
 _Fast execution control in Pry_
@@ -112,3 +112,7 @@ file an [issue][issues]. [Project changelog][changelog].
 [issues]:             https://github.com/deivid-rodriguez/pry-byebug/issues
 [changelog]:          https://github.com/deivid-rodriguez/pry-byebug/blob/master/CHANGELOG.md
 [pry-nav]:            https://github.com/nixme/pry-nav
+[1]: https://badge.fury.io/rb/pry-byebug.png
+[2]: http://badge.fury.io/rb/pry-byebug
+[3]: https://secure.travis-ci.org/deivid-rodriguez/pry-byebug.png
+[4]: http://travis-ci.org/deivid-rodriguez/pry-byebug

data/Rakefile

@@ -1,10 +1,8 @@
-#!/usr/bin/env rake
 require 'bundler/gem_tasks'
 require 'rake/testtask'
 
 desc 'Run tests'
 Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
   t.libs << 'test'
   t.pattern = 'test/**/*_test.rb'
 end

data/lib/pry-byebug/commands.rb

@@ -48,7 +48,6 @@ module PryByebug
     end
     alias_command 'n', 'next'
 
-
     create_command 'finish' do
       description 'Execute until current stack frame returns.'
 
@@ -215,12 +214,11 @@ module PryByebug
     end
     alias_command 'breaks', 'breakpoints'
 
-
     helpers do
       def breakout_navigation(action, times = nil)
-        _pry_.binding_stack.clear     # Clear the binding stack.
-        throw :breakout_nav, {        # Break out of the REPL loop and
-          :action => action,          #   signal the tracer.
+        _pry_.binding_stack.clear # Clear the binding stack.
+        throw :breakout_nav, {    # Break out of the REPL loop and signal tracer
+          :action => action,
           :times  => times,
           :pry    => _pry_
         }

data/lib/pry-byebug/processor.rb

@@ -14,6 +14,7 @@ module PryByebug
     # Wrap a Pry REPL to catch navigational commands and act on them.
     def run(initial = true, &block)
       return_value = nil
+
       command = catch(:breakout_nav) do  # Throws from PryByebug::Commands
         return_value = yield
         {}    # Nothing thrown == no navigational command
@@ -31,18 +32,16 @@ module PryByebug
           # inside Byebug. If we step normally, it'll stop inside this
           # Processor. So jump out and stop at the above frame, then step/next
           # from our callback.
-          finish
           @delayed[command[:action]] = times
-        end
-
-        if :next == command[:action]
+          step_out 2
+        elsif :next == command[:action]
           step_over times
 
         elsif :step == command[:action]
-          step times
+          step_into times
 
         elsif :finish == command[:action]
-          finish
+          step_out
         end
       else
         stop
@@ -64,30 +63,24 @@ module PryByebug
       end
     end
 
-
     # --- Callbacks from byebug C extension ---
-
     def at_line(context, file, line)
-      # If stopped for a breakpoint or catchpoint, can't play any delayed steps
-      # as they'll move away from the interruption point. (Unsure if scenario is
-      # possible, but just keeping assertions in check.)
-      @delayed = Hash.new(0) unless :step == context.stop_reason
+       # If any delayed nexts/steps, do 'em.
+      if @delayed[:next] > 1
+        step_over @delayed[:next] - 1
 
-      if @delayed[:next] > 0     # If any delayed nexts/steps, do 'em.
-        step_over @delayed[:next]
-        @delayed = Hash.new(0)
+      elsif @delayed[:step] > 1
+        step_into @delayed[:step] - 1
 
-      elsif @delayed[:step] > 0
-        step @delayed[:step]
-        @delayed = Hash.new(0)
+      elsif @delayed[:finish] > 1
+        step_out @delayed[:finish] - 1
 
-      elsif @delayed[:finish] > 0
-        finish
-        @delayed = Hash.new(0)
-
-      else  # Otherwise, resume the pry session at the stopped line.
+      # Otherwise, resume the pry session at the stopped line.
+      else
         resume_pry context
       end
+
+      @delayed = Hash.new(0)
     end
 
     # Called when a breakpoint is triggered. Note: `at_line`` is called
@@ -99,7 +92,7 @@ module PryByebug
                            "Hit #{breakpoint.hit_count} times." )
       if (expr = breakpoint.expr)
         @pry.output.print Pry::Helpers::Text.bold("Condition: ")
-        @pry.output.puts  expr
+        @pry.output.puts expr
       end
     end
 
@@ -107,42 +100,40 @@ module PryByebug
       # TODO
     end
 
+    private
 
-   private
-
-    # Resume an existing Pry REPL at the paused point. Binding extracted from
-    # the Byebug::Context.
-    def resume_pry(context)
-      new_binding = context.frame_binding(0)
-      Byebug.stop unless @always_enabled
+      # Resume an existing Pry REPL at the paused point.
+      # Binding extracted from Byebug::Context
+      def resume_pry(context)
+        new_binding = context.frame_binding(0)
+        Byebug.stop unless @always_enabled
 
-      @pry.binding_stack.clear
-      run(false) do
-        @pry.repl new_binding
+        run(false) do
+          @pry.repl new_binding
+        end
       end
-    end
 
-    # Move execution forward.
-    def step(times)
-      Byebug.context.step_into times
-    end
+      # Move execution forward.
+      def step_into(times)
+        Byebug.context.step_into times
+      end
 
-    # Move execution forward a number of lines in the same frame.
-    def step_over(lines)
-      Byebug.context.step_over lines, 0
-    end
+      # Move execution forward a number of lines in the same frame.
+      def step_over(lines)
+        Byebug.context.step_over lines, 0
+      end
 
-    # Execute until specified frame returns.
-    def finish(frame = 0)
-      Byebug.context.step_out frame
-    end
+      # Execute until specified frame returns.
+      def step_out(frame = 0)
+        Byebug.context.step_out frame
+      end
 
-    # Cleanup when debugging is stopped and execution continues.
-    def stop
-      Byebug.stop if !@always_enabled && Byebug.started?
-      if PryByebug.current_remote_server   # Cleanup DRb remote if running
-        PryByebug.current_remote_server.teardown
+      # Cleanup when debugging is stopped and execution continues.
+      def stop
+        Byebug.stop if !@always_enabled && Byebug.started?
+        if PryByebug.current_remote_server   # Cleanup DRb remote if running
+          PryByebug.current_remote_server.teardown
+        end
       end
-    end
   end
 end

data/lib/pry-byebug/pry_ext.rb

@@ -9,7 +9,7 @@ class << Pry
     @processor ||= PryByebug::Processor.new
 
     if target.is_a?(Binding) && PryByebug.check_file_context(target)
-      # Wrap the processer around the usual Pry.start to catch navigation
+      # Wrap the processor around the usual Pry.start to catch navigation
       # commands.
       @processor.run(true) do
         start_without_pry_byebug(target, options)

data/lib/pry-byebug/version.rb

@@ -1,3 +1,3 @@
 module PryByebug
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 end

data/pry-byebug.gemspec

@@ -13,15 +13,15 @@ Gem::Specification.new do |gem|
 
   gem.files         = `git ls-files`.split("\n")
   gem.test_files    = `git ls-files -- test/*`.split("\n")
+  gem.require_paths = ['lib']
 
   # Dependencies
   gem.required_ruby_version = '>= 2.0.0'
 
   gem.add_runtime_dependency 'pry', '~> 0.9.12'
-  gem.add_runtime_dependency 'byebug', '~> 1.4.0'
+  gem.add_runtime_dependency 'byebug', '~> 1.5.0'
 
   gem.add_development_dependency 'bundler', '~> 1.3.5'
-  gem.add_development_dependency 'rake', '~> 10.0.4'
-  gem.add_development_dependency 'minitest', '~> 5.0.3'
+  gem.add_development_dependency 'rake', '~> 10.1.0'
   gem.add_development_dependency 'mocha', '~> 0.14.0'
 end

data/test/base_test.rb

@@ -1,15 +1,14 @@
 require 'test_helper'
 
-class BaseTest < Minitest::Test
+class BaseTest < MiniTest::Spec
   def test_main_file_context
     Pry.stubs eval_path: "<main>"
     assert PryByebug.check_file_context(TOPLEVEL_BINDING)
   end
-  
+
   def test_other_file_context
     Pry.stubs eval_path: "something"
-    refute PryByebug.check_file_context(TOPLEVEL_BINDING)    
+    refute PryByebug.check_file_context(TOPLEVEL_BINDING)
   end
-  
 end
 

data/test/breakpoints_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 
-class BreakpointsTest < Minitest::Test
-  
+class BreakpointsTest < MiniTest::Spec
+
   def test_add_raises_argument_error
     Pry.stubs eval_path: "something"
     File.stubs :exist?
@@ -9,6 +9,6 @@ class BreakpointsTest < Minitest::Test
       PryByebug::Breakpoints.add("file", 1)
     end
   end
-  
+
 end
 

data/test/commands_test.rb

@@ -1,6 +1,72 @@
 require 'test_helper'
 
-class CommandsTest < Minitest::Test
-  
+class CommandsTest < MiniTest::Spec
+  let(:step_file) do
+    (Pathname.new(__FILE__) + "../examples/stepping.rb").cleanpath.to_s
+  end
+
+  before do
+    Pry.color = false
+    Pry.pager = false
+    Pry.hooks = Pry::DEFAULT_HOOKS
+    @output = StringIO.new
+  end
+
+  describe 'Step Command' do
+    describe 'single step' do
+      before do
+        @input = InputTester.new('step')
+        redirect_pry_io(@input, @output) do
+          load step_file
+        end
+      end
+
+      it 'shows current line' do
+        @output.string.must_match /\=> 3:/
+      end
+    end
+
+    describe 'multiple step' do
+      before do
+        @input = InputTester.new('step 2')
+        redirect_pry_io(@input, @output) do
+          load step_file
+        end
+      end
+
+      it 'shows current line' do
+        @output.string.must_match /\=> 4:/
+      end
+    end
+  end
+
+  describe 'Next Command' do
+    describe 'single step' do
+      before do
+        @input = InputTester.new('next')
+        redirect_pry_io(@input, @output) do
+          load step_file
+        end
+      end
+
+      it 'shows current line' do
+        @output.string.must_match /\=> 3:/
+      end
+    end
+
+    describe 'multiple step' do
+      before do
+        @input = InputTester.new('next 2')
+        redirect_pry_io(@input, @output) do
+          load step_file
+        end
+      end
+
+      it 'shows current line' do
+        @output.string.must_match /\=> 20:/
+      end
+    end
+  end
+
 end
 

data/test/examples/stepping.rb

@@ -0,0 +1,25 @@
+binding.pry
+
+class SteppingExample
+  def a
+    z = 2
+    b
+  end
+
+  def b
+    v2 = 5 if 1 == 2 ; [1,2,3].map { |a| a.to_f }
+    c
+  end
+
+  def c
+    z = 4
+    5
+  end
+end
+
+ex = SteppingExample.new.a
+2.times do
+  ex += 1
+end
+
+ex

data/test/processor_test.rb

@@ -1,10 +1,6 @@
 require 'test_helper'
 
-class ProcessorTest < Minitest::Test
-  
-  def test_new
-    assert PryByebug::Processor.new    
-  end
-  
+class ProcessorTest < MiniTest::Spec
+
 end
 

data/test/pry_ext_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class PryExtTest < Minitest::Test
-  
+class PryExtTest < MiniTest::Spec
+
 end
 

data/test/pry_remote_ext_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class PryRemoteExtTest < Minitest::Test
-  
+class PryRemoteExtTest < MiniTest::Spec
+
 end
 

data/test/test_helper.rb

@@ -1,5 +1,34 @@
-require "rubygems"
-require "bundler/setup"
-require "minitest/autorun"
-require "mocha/setup"
-require "pry-byebug"
+require 'pry/test/helper'
+require 'minitest/autorun'
+require 'pry-byebug'
+require 'mocha/setup'
+
+# Set I/O streams. Out defaults to an anonymous StringIO.
+def redirect_pry_io(new_in, new_out = StringIO.new)
+  old_in = Pry.input
+  old_out = Pry.output
+
+  Pry.input = new_in
+  Pry.output = new_out
+  begin
+    yield
+  ensure
+    Pry.input = old_in
+    Pry.output = old_out
+  end
+end
+
+class InputTester
+  def initialize(*actions)
+    @orig_actions = actions.dup
+    @actions = actions
+  end
+
+  def readline(*)
+    @actions.shift
+  end
+
+  def rewind
+    @actions = @orig_actions.dup
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pry-byebug
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - David Rodríguez
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-06 00:00:00.000000000 Z
+date: 2013-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -31,14 +31,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -59,28 +59,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 10.0.4
+        version: 10.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 10.0.4
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 5.0.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 5.0.3
+        version: 10.1.0
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -105,6 +91,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .ruby-gemset
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -122,6 +109,7 @@ files:
 - test/base_test.rb
 - test/breakpoints_test.rb
 - test/commands_test.rb
+- test/examples/stepping.rb
 - test/processor_test.rb
 - test/pry_ext_test.rb
 - test/pry_remote_ext_test.rb
@@ -154,8 +142,8 @@ test_files:
 - test/base_test.rb
 - test/breakpoints_test.rb
 - test/commands_test.rb
+- test/examples/stepping.rb
 - test/processor_test.rb
 - test/pry_ext_test.rb
 - test/pry_remote_ext_test.rb
 - test/test_helper.rb
-has_rdoc: