byebug 1.1.0 → 1.1.1

data/old_doc/test-tri2.rb

@@ -2,7 +2,7 @@
 require "test/unit"
 require "tri2.rb"
 require "rubygems"
-require "ruby-debug"
+require "byebug"
 Byebug.start
 
 class TestTri < Test::Unit::TestCase

data/test/breakpoints_test.rb

@@ -238,7 +238,6 @@ describe 'Breakpoints' do
         check_output_includes \
           '"disable" must be followed by "display", "breakpoints" or ' \
           'breakpoint numbers.', interface.error_queue
-
       end
 
       it 'must show an error if no breakpoints is set' do
@@ -367,6 +366,14 @@ describe 'Breakpoints' do
     end
   end
 
+  describe 'Help' do
+    it 'must show info about setting breakpoints when using just "break"' do
+      enter 'break', 'cont'
+      debug_file 'breakpoint1'
+      check_output_includes /b\[reak\] file:line \[if expr\]/
+    end
+  end
+
   describe 'Post Mortem' do
     it 'must be able to set breakpoints in post-mortem mode' do
       enter 'cont', 'break 12', 'cont'

data/test/frame_test.rb

@@ -125,14 +125,6 @@ describe 'Frame Command' do
     end
   end
 
-  it 'must change to frame in another thread' do
-    skip('No threads supported')
-  end
-
-  it 'must not change to frame in another thread if thread doesn\'t exist' do
-    skip('No threads supported')
-  end
-
   describe 'Post Mortem' do
     it 'must work in post-mortem mode' do
       #skip 'TODO: This test fails with \'Segmentation fault\'.'

data/test/help_test.rb

@@ -4,30 +4,26 @@ describe 'Help Command' do
   include TestDsl
   include Columnize
 
-  let(:available_commands) do
-    Byebug::Command.commands.select(&:event).
-                             map(&:help_command).flatten.uniq.sort
-  end
+  let(:available_commands) {
+    Byebug::Command.commands.select(&:event).map(&:names).flatten.uniq.sort
+  }
 
-  it 'must show help how to use "help"' do
-    temporary_change_hash_value(Byebug::HelpCommand.settings, :width, 50) do
-      enter 'help'
-      debug_file 'help'
-      check_output_includes \
-        'Type \'help <command-name>\' for help on a specific command',
-        'Available commands:',
-        columnize(available_commands, 50)
-    end
+  it '"help" alone must show how to use "help"' do
+    enter 'set width 50', 'help'
+    debug_file 'help'
+    check_output_includes \
+      'Type "help <command-name>" for help on a specific command',
+      'Available commands:', columnize(available_commands, 50)
   end
 
-  it 'must show help when use shortcut' do
+  it 'must work when shortcut used' do
     enter 'h'
     debug_file 'help'
     check_output_includes \
-      'Type \'help <command-name>\' for help on a specific command'
+      'Type "help <command-name>" for help on a specific command'
   end
 
-  it 'must show an error if undefined command is specified' do
+  it 'must show an error if an undefined command is specified' do
     enter 'help foobar'
     debug_file 'help'
     check_output_includes \
@@ -37,9 +33,7 @@ describe 'Help Command' do
   it 'must show a command\'s help' do
     enter 'help break'
     debug_file 'help'
-    check_output_includes \
-      Byebug::AddBreakpoint.help(nil).split('\n').
-                            map { |l| l.gsub(/^ +/, '') }.join('\n')
+    check_output_includes Byebug::AddBreakpoint.help(nil)
   end
 
   describe 'Post Mortem' do

data/test/info_test.rb

@@ -239,38 +239,6 @@ describe 'Info Command' do
     end
   end
 
-   describe 'Thread info' do
-     it 'must show threads info when without args' do
-       enter 'break 48', 'cont', 'info threads'
-       debug_file 'info_threads'
-       check_output_includes /#<Thread:\S+ run>/
-     end
-
-     it 'must show thread info' do
-       skip('XXX: Unreliable due to race conditions, needs fix to be reliable')
-       thread_number = nil
-       enter ->{ thread_number = context.thnum; "info thread #{context.thnum}" }
-       debug_file 'info'
-       check_output_includes '+', thread_number.to_s, /#<Thread:\S+ run>/
-     end
-
-     it 'must show verbose thread info' do
-       skip('XXX: Unreliable due to race conditions, needs fix to be reliable')
-       enter 'break 20', 'cont', ->{ "info thread #{context.thnum} verbose" }
-       debug_file 'info'
-       check_output_includes \
-         /#<Thread:\S+ run>/, '#0', 'A.a', "at #{fullpath('info')}:20"
-     end
-
-     it 'must show error when unknown parameter is used' do
-       skip('No thread support')
-       enter ->{'info thread #{context.thnum} blabla'}
-       debug_file 'info'
-       check_output_includes \
-         '"terse" or "verbose" expected. Got "blabla"', interface.error_queue
-     end
-   end
-
   describe 'Global Variables info' do
     it 'must show global variables' do
       enter 'info global_variables'
@@ -308,6 +276,14 @@ describe 'Info Command' do
     end
   end
 
+  describe 'Help' do
+    it 'must show help when typing just "info"' do
+      enter 'info', 'cont'
+      debug_file 'info'
+      check_output_includes /List of "info" subcommands:/
+    end
+  end
+
   describe 'Post Mortem' do
     it 'must work in post-mortem mode' do
       enter 'cont', 'info line'

data/test/irb_test.rb

@@ -9,7 +9,7 @@ describe 'Irb Command' do
     Signal.trap('SIGINT', 'IGNORE')
   end
 
-  def after_teardown
+  def before_teardown
     Signal.trap('SIGINT', 'DEFAULT')
   end
 
@@ -35,9 +35,8 @@ describe 'Irb Command' do
 
   describe 'autoirb' do
     it 'must call irb automatically after breakpoint' do
-      skip('Segfaulting... skip until fixed')
       irb.expects(:eval_input)
-      enter 'set autoirb', 'break 4', 'cont'
+      enter 'set autoirb', 'break 4', 'cont', 'set noautoirb'
       debug_file 'irb'
     end
   end
@@ -55,7 +54,7 @@ describe 'Irb Command' do
   describe 'setting context to $byebug_state' do
     before do
       $byebug_state = nil
-      Byebug::Command.settings[:byebugtesting] = false
+      Byebug::Command.settings[:testing] = false
     end
 
     it 'must set $byebug_state if irb is in the debug mode' do

data/test/jump_test.rb

@@ -66,11 +66,11 @@ describe "Jump Command" do
   end
 
   describe "Post Mortem" do
-    # TODO: This test fails with "Segmentation fault". Probably need to fix it
-    # somehow or forbid this command in post mortem mode. Seems like
-    # state.context.frame_file and state.context.frame_line cause that.
     it "must work in post-mortem mode" do
-      skip("No post morten mode for now")
+      skip 'No jumping for now plus this test fails with "Segmentation '     \
+           'fault". Probably need to fix it somehow or forbid this command ' \
+           'in post mortem mode. Seems like state.context.frame_file and '   \
+           'state.context.frame_line cause that.'
       enter 'cont', 'jump 12'
       debug_file 'post_mortem'
     end

data/test/save_test.rb

@@ -42,8 +42,8 @@ describe 'Save Command' do
         file_contents.must_include 'set basename off'
       end
 
-      it 'must save byebugtesting' do
-        file_contents.must_include 'set byebugtesting on'
+      it 'must save testing' do
+        file_contents.must_include 'set testing on'
       end
 
       it 'must save autolist' do

data/test/set_test.rb

@@ -63,23 +63,23 @@ describe 'Set Command' do
     end
   end
 
-  describe 'byebugtesting' do
-    it 'must set $byebug_state if byebugsetting is on' do
-      enter 'set byebugtesting', 'break 3', 'cont'
+  describe 'testing' do
+    it '$byebug_state must get set if "testing" is on' do
+      enter 'set testing', 'break 3', 'cont'
       debug_file('set') {
-        state.must_be_kind_of Byebug::CommandProcessor::State }
+        $byebug_state.must_be_kind_of Byebug::CommandProcessor::State }
     end
 
-    it 'must set basename on too' do
+    it 'basename must get set if "testing" is on' do
       temporary_change_hash_value(Byebug::Command.settings, :basename, false) do
-        enter 'set byebugtesting', 'show basename'
+        enter 'set testing', 'show basename'
         debug_file('set')
         check_output_includes 'basename is on.'
       end
     end
 
-    it 'must not set $byebug_state if byebugsetting is off' do
-      enter 'set nobyebugtesting', 'break 3', 'cont'
+    it '$byebug_state must get unset if "testing" is off' do
+      enter 'set notesting', 'break 3', 'cont'
       debug_file('set') { $byebug_state.must_be_nil }
     end
   end
@@ -165,6 +165,14 @@ describe 'Set Command' do
     end
   end
 
+  describe 'Help' do
+    it 'must show help when typing just "set"' do
+      enter 'set', 'cont'
+      debug_file 'set'
+      check_output_includes /List of "set" subcommands:/
+    end
+  end
+
   describe 'Post Mortem' do
     Byebug::Command.settings[:autolist] = 0
 

data/test/source_test.rb

@@ -33,7 +33,16 @@ describe 'Source Command' do
   it 'must show an error if file is not found' do
     enter 'source blabla'
     debug_file 'source'
-    check_output_includes /Command file '.*blabla' is not found/, interface.error_queue
+    check_output_includes /File ".*blabla" not found/, interface.error_queue
+  end
+
+  describe 'Help' do
+    it 'must show help when used without arguments' do
+      enter 'source'
+      debug_file 'source'
+      check_output_includes \
+        "source FILE\texecutes a file containing byebug commands"
+    end
   end
 
   describe 'Post Mortem' do

data/test/support/context.rb

@@ -4,7 +4,7 @@ module Byebug
 
     def inspect
       values = %w{
-        thread thnum stop_reason tracing ignored? stack_size dead? frame_line frame_file frame_self
+        stop_reason tracing ignored? stack_size dead? frame_line frame_file frame_self
       }.map do |field|
         "#{field}: #{send(field)}"
       end.join(", ")

data/test/support/mocha_extensions.rb

@@ -21,33 +21,34 @@ module Mocha
     alias_method :invoke, :invoke_with_calls
   end
 
-  class Mock
 
+  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}"
+        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)
+      if matching_expectation_allowing_invocation =
+          @expectations.match_allowing_invocation(symbol, *arguments)
         # We change this line - added arguments
         matching_expectation_allowing_invocation.invoke(arguments, &block)
-      else
-        if (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
+      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
 
+  class Call
     attr_reader :blocks
 
     def initialize(*blocks)
@@ -65,6 +66,6 @@ module Mocha
     def +(other)
       self.class.new(*(@blocks + other.blocks))
     end
-
   end
+
 end

data/test/support/test_dsl.rb

@@ -22,7 +22,7 @@ module TestDsl
   # Loads byebug default settings
   #
   def load_defaults
-    Byebug::Command.settings[:byebugtesting] = true
+    Byebug::Command.settings[:testing] = true
     Byebug::Command.settings[:basename] = false
     Byebug::Command.settings[:callstyle] = :last
     Byebug::Command.settings[:force_stepping] = false
@@ -146,7 +146,7 @@ module TestDsl
   end
 
   def context
-    state.context
+    $byebug_state.context
   end
 
   def force_set_const(klass, const, value)

data/test/trace_test.rb

@@ -54,51 +54,6 @@ describe 'Trace Command' do
       end
     end
 
-    describe 'tracing on all threads' do
-      describe 'enabling' do
-        it 'must trace execution by setting trace to on' do
-          skip('XXX: No thread support')
-          th = nil
-          enter 'trace on all'
-          debug_file('trace_threads') { th = context.thnum }
-          check_output_includes \
-            "Tracing(#{th}):#{fullpath('trace_threads')}:4 @break1 = false",
-            "Tracing(#{th}):#{fullpath('trace_threads')}:5 @break2 = false"
-          check_output_includes \
-            /Tracing\(\d+\):#{fullpath('trace_threads')}:8 until @break1/
-        end
-
-        it 'must show a message it is on' do
-          skip('XXX: No thread support')
-          enter 'trace on all'
-          debug_file 'trace'
-          check_output_includes 'Tracing on all threads.'
-        end
-      end
-
-      describe 'disabling' do
-        it 'must stop tracing by setting trace to off' do
-          skip('XXX: No thread support')
-          th = nil
-          enter 'trace on all', 'break 19', 'cont', 'trace off all'
-          debug_file('trace_threads') { th = context.thnum }
-          check_output_includes \
-            /Tracing\(\d+\):#{fullpath('trace_threads')}:8 until @break1/
-          check_output_includes \
-            "Tracing(#{th}):#{fullpath('trace_threads')}:19 t1.join"
-          check_output_doesnt_include \
-            "Tracing(#{th}):#{fullpath('trace_threads')}:20 t1"
-        end
-
-        it 'must show a message it is off' do
-          skip('XXX: No thread support')
-          enter 'trace off'
-          debug_file 'trace'
-          check_output_includes 'Tracing off on current thread.'
-        end
-      end
-    end
-
     describe 'tracing global variables' do
       it 'must track global variable' do
         enter 'trace variable $bla'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: byebug
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - David Rodríguez
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-30 00:00:00.000000000 Z
+date: 2013-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: columnize
@@ -88,14 +88,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.7.3
+        version: 4.7.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.7.3
+        version: 4.7.4
 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
@@ -125,7 +125,6 @@ files:
 - ext/byebug/byebug.h
 - ext/byebug/context.c
 - ext/byebug/extconf.rb
-- ext/byebug/locker.c
 - lib/byebug.rb
 - lib/byebug/command.rb
 - lib/byebug/commands/breakpoints.rb
@@ -154,7 +153,6 @@ files:
 - lib/byebug/commands/skip.rb
 - lib/byebug/commands/source.rb
 - lib/byebug/commands/stepping.rb
-- lib/byebug/commands/threads.rb
 - lib/byebug/commands/trace.rb
 - lib/byebug/commands/variables.rb
 - lib/byebug/context.rb
@@ -186,11 +184,9 @@ files:
 - test/examples/eval.rb
 - test/examples/finish.rb
 - test/examples/frame.rb
-- test/examples/frame_threads.rb
 - test/examples/help.rb
 - test/examples/info.rb
 - test/examples/info2.rb
-- test/examples/info_threads.rb
 - test/examples/irb.rb
 - test/examples/jump.rb
 - test/examples/kill.rb
@@ -207,10 +203,8 @@ files:
 - test/examples/show.rb
 - test/examples/source.rb
 - test/examples/stepping.rb
-- test/examples/thread.rb
 - test/examples/tmate.rb
 - test/examples/trace.rb
-- test/examples/trace_threads.rb
 - test/examples/variables.rb
 - test/finish_test.rb
 - test/frame_test.rb