byebug 1.0.2 → 1.0.3

data/test/show_test.rb

@@ -4,33 +4,27 @@ describe "Show Command" do
   include TestDsl
 
   describe "annotate" do
-    temporary_change_method_value(Byebug, :annotate, nil)
-
-    it "must show annotate setting" do
-      enter 'show annotate'
-      debug_file 'show'
-      check_output_includes "Annotation level is 0"
-    end
-
     it "must show annotate setting" do
       enter 'show annotate'
       debug_file 'show'
       Byebug.annotate.must_equal 0
+      check_output_includes "Annotation level is 0"
     end
   end
 
   describe "args" do
-    temporary_change_hash_value(Byebug::Command.settings, :argv, %w{foo bar})
+    before do
+      Byebug::Command.settings[:argv] = %w{foo bar}
+    end
 
     it "must show args" do
-      Byebug.send(:remove_const, "RDEBUG_SCRIPT") if Byebug.const_defined?("RDEBUG_SCRIPT")
       enter 'show args'
       debug_file 'show'
       check_output_includes 'Argument list to give program being debugged when it is started is "foo bar".'
     end
 
-    it "must not show the first arg if RDEBUG_SCRIPT is defined" do
-      temporary_set_const(Byebug, "RDEBUG_SCRIPT", "bla") do
+    it "must not show the first arg if BYEBUG_SCRIPT is defined" do
+      temporary_set_const(Byebug, "BYEBUG_SCRIPT", "bla") do
         enter 'show args'
         debug_file 'show'
         check_output_includes 'Argument list to give program being debugged when it is started is "bar".'
@@ -133,7 +127,7 @@ describe "Show Command" do
     temporary_change_hash_value(Byebug::Command.settings, :listsize, 10) do
       enter 'show listsize'
       debug_file 'show'
-      check_output_includes 'Number of source lines to list by default is 10.'
+      check_output_includes 'Number of source lines to list is 10.'
     end
   end
 
@@ -276,13 +270,11 @@ describe "Show Command" do
   end
 
   describe "Post Mortem" do
-    temporary_change_hash_value(Byebug::Command.settings, :autolist, 0)
-
     it "must work in post-mortem mode" do
       skip("No post morten mode for now")
       enter 'cont', "show autolist"
       debug_file 'post_mortem'
-      check_output_includes "autolist is off."
+      check_output_includes "autolist is on."
     end
   end
 

data/test/stepping_test.rb

@@ -52,7 +52,8 @@ describe "Stepping Commands" do
     end
 
     describe "Post Mortem" do
-      temporary_change_hash_value(Byebug::Command.settings, :autoeval, false)
+      before { Byebug::Command.settings[:autoeval] = 0 }
+
       it "must not work in post-mortem mode" do
         skip("No post morten mode for now")
         enter 'cont', "next"
@@ -106,7 +107,8 @@ describe "Stepping Commands" do
     end
 
     describe "Post Mortem" do
-      temporary_change_hash_value(Byebug::Command.settings, :autoeval, false)
+      before { Byebug::Command.settings[:autoeval] = 0 }
+
       it "must not work in post-mortem mode" do
         skip("No post morten mode for now")
         enter 'cont', "step"

data/test/support/test_dsl.rb

@@ -10,18 +10,41 @@ module TestDsl
 
   def self.included(base)
     base.class_eval do
-      extend ClassMethods
       before do
-        Byebug::Command.settings[:byebugtesting] = true
+        load_defaults
         Byebug.interface = TestInterface.new
         Byebug.handler.display.clear
       end
-      after do
-        Byebug.handler.display.clear
-      end
     end
   end
 
+  ##
+  # Loads byebug default settings
+  #
+  def load_defaults
+    Byebug::Command.settings[:byebugtesting] = 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] = 1
+    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
+  end
+
   ##
   # Adds commands to the input queue, so they will be later retrieved by
   # Processor, i.e., it emulates user's input.
@@ -102,6 +125,10 @@ module TestDsl
     queue_messages.send(check_method, messages)
   end
 
+  def check_error_includes(*args)
+    check_output :must_include_in_order, *args, interface.error_queue
+  end
+
   def check_output_includes(*args)
     check_output :must_include_in_order, *args
   end
@@ -123,10 +150,14 @@ module TestDsl
   end
 
   def force_set_const(klass, const, value)
-    klass.send(:remove_const, const) if klass.const_defined?(const)
+    force_unset_const(klass, const)
     klass.const_set(const, value)
   end
 
+  def force_unset_const(klass, const)
+    klass.send(:remove_const, const) if klass.const_defined?(const)
+  end
+
   def change_line_in_file(file, line, new_line_content)
     old_content = File.read(file)
     new_content = old_content.split("\n").tap { |c| c[line - 1] = new_line_content }.join("\n")
@@ -161,74 +192,4 @@ module TestDsl
     end
   end
 
-  def set_tmp_hash(hash, key, value)
-    @old_hashes.merge!({ hash => { key => hash[key] } }) do |k, v1, v2|
-      v1.merge(v2)
-    end
-    hash[key] = value
-  end
-
-  def restore_tmp_hash(hash, key)
-    hash[key] = @old_hashes[hash][key]
-  end
-
-  def set_tmp_const(klass, const, value)
-    @old_consts.merge!({ klass =>
-      { const => klass.const_defined?(const) ?
-                 klass.const_get(const) : :__undefined__ } }) do |k, v1, v2|
-      v1.merge(v2)
-    end
-    value == :__undefined__ ? klass.send(:remove_const, const) :
-                              force_set_const(klass, const, value)
-  end
-
-  def restore_tmp_const(klass, const)
-    @old_consts[klass][const] == :__undefined ?
-                    klass.send(:remove_const, const) :
-                    force_set_const(klass, const, @old_consts[klass][const])
-  end
-
-
-  module ClassMethods
-
-    include Shared
-
-    def temporary_change_method_value(item, method, value)
-      old_value = nil
-      before do
-        old_value = item.send(method)
-        item.send("#{method}=", value)
-      end
-      after do
-        item.send("#{method}=", old_value)
-      end
-    end
-
-    def temporary_change_hash_value(item, key, value)
-      old_value = nil
-      before do
-        old_value = item[key]
-        item[key] = value
-      end
-      after do
-        item[key] = old_value
-      end
-    end
-
-    def temporary_set_const(klass, const, value)
-      old_value = nil
-      before do
-        old_value = klass.const_defined?(const) ? klass.const_get(const) : :__undefined__
-        force_set_const(klass, const, value)
-      end
-      after do
-        if old_value == :__undefined__
-          klass.send(:remove_const, const)
-        else
-          force_set_const(klass, const, old_value)
-        end
-      end
-    end
-  end
-
 end

data/test/test_helper.rb

@@ -1,7 +1,6 @@
 require 'rubygems'
 require 'pathname'
 require 'minitest/autorun'
-require 'minitest/spec'
 require 'mocha/setup'
 require 'byebug'
 

data/test/variables_test.rb

@@ -1,13 +1,12 @@
 require_relative 'test_helper'
 
 describe "Variables Command" do
-
-  extend TestDsl::ClassMethods
-
-  temporary_change_hash_value(Byebug::Command.settings, :width, 40)
-
   include TestDsl
 
+  def after_setup
+    Byebug::Command.settings[:width] = 40
+  end
+
   describe "class variables" do
     it "must show variables" do
       enter 'break 19', 'cont', 'var class'
@@ -82,15 +81,13 @@ describe "Variables Command" do
     end
 
     it "must cut long variable values according to :width setting" do
-      Byebug::Command.settings[:width] = 20
-      enter 'break 25', 'cont', 'var instance v'
+      enter 'set width 20', 'break 25', 'cont', 'var instance v'
       debug_file 'variables'
       check_output_includes '@inst_c = "1111111111111111...'
     end
 
     it "must show fallback message if value doesn't have #to_s or #inspect methods" do
-      Byebug::Command.settings[:width] = 21
-      enter 'break 25', 'cont', 'var instance v'
+      enter 'set width 21', 'break 25', 'cont', 'var instance v'
       debug_file 'variables'
       check_output_includes '@inst_d = *Error in evaluation*'
     end
@@ -110,9 +107,9 @@ describe "Variables Command" do
   describe "Post Mortem" do
     it "must work in post-mortem mode" do
       skip("No post morten mode for now")
-      #enter 'cont', 'var local'
-      #debug_file 'post_mortem'
-      #check_output_includes "x => nil", "z => 4"
+      enter 'cont', 'var local'
+      debug_file 'post_mortem'
+      check_output_includes "x => nil", "z => 4"
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: byebug
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - David Rodríguez
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-09 00:00:00.000000000 Z
+date: 2013-04-23 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.0
+        version: 4.7.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.7.0
+        version: 4.7.3
 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