debase 0.2.3.beta5 → 0.2.5.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 682d6984f0e5b33479f3c5138c7af974e59597cf
-  data.tar.gz: ed9e19b600656cbd66f46c29673c1f557db8e51b
+SHA256:
+  metadata.gz: f72fc7418f0d2523e9994f16a2a9a42192cca366056373fe14bc1757d01eb5f1
+  data.tar.gz: c4c75cfc0116c4f9aa5a3a8d031e13f04c296d2045079e8d4c77a6b289f02c49
 SHA512:
-  metadata.gz: c128d2bfbc14ba0078f5605fbd9b2213eb77fcee710621efb9938d86923b1159707ea743a322e89f6b084089b7c6d1d1b3aec59acbd786578a8b6a0f2a739db6
-  data.tar.gz: df4677f7266bdee7fe11fbb9157544a01233c65707dcb312927962591897a9187a412a976d8e98686a53645228313077c769f91a5e5b519ff72f9716b80aaae5
+  metadata.gz: 90bbed3a6fd7bde7e68cc204d0fbdf22dbc0c3df1dedd24437960ab565deb52f5675a33ef00df0f8f89ca5f6134f9561d4cd0ff51b3391c1b9aa8d96e7497190
+  data.tar.gz: 5591bc6a7f129ca7599387d54dcc98a7ce1cc76a69457e6b8a03080c033cd235afd5c6c8eb5c54e3b7a7f66e087122837f8429d8e38d0d2473c92eb86ea15df2

data/.travis.yml

@@ -2,19 +2,30 @@ language: ruby
 os:
   - linux
   - osx
-before_install:
-  - gem install bundler
 rvm:
-  - 2.0.0
+  - 2.0
   - 2.1
   - 2.2
   - 2.3
-  - 2.4.2
-  - 2.5.3
-  - 2.6.0
+  - 2.4
+  - 2.5
+  - 2.6
+  - 2.7
+  - 3.0
   - ruby-head
 
 matrix:
   exclude:
-  - os: osx
-    rvm: 2.0.0
+    - os: osx
+      rvm: 2.0
+    - os: osx
+      rvm: 2.1
+    - os: osx
+      rvm: 2.2
+    - os: osx
+      rvm: 2.3
+  allow_failures:
+    - os: osx
+      rvm: 3.0
+    - os: osx
+      rvm: ruby-head

data/README.md

@@ -1,17 +1,14 @@
 [gem]: https://rubygems.org/gems/debase
-[travis]: https://travis-ci.org/denofevil/debase
-[jb_badges]: https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub
 
-# debase
+[travis]: https://travis-ci.org/ruby-debug/debase
+
 [![Gem Version](https://badge.fury.io/rb/debase.png)][gem]
-[![Build Status](https://secure.travis-ci.org/denofevil/debase.png)][travis]
-[![official JetBrains project](http://jb.gg/badges/official.svg)][jb_badges]
+[![Build Status](https://secure.travis-ci.org/ruby-debug/debase.png)][travis]
 
 ## Overview
 
-debase is a fast implementation of the standard debugger debug.rb for
-Ruby 2.0.0. The faster execution speed and 2.0.0 compatibility is achieved
-by utilizing a TracePoint mechanism in the Ruby C API.
+debase is a fast implementation of the standard debugger debug.rb for Ruby 2.0.0. The faster execution speed and 2.0.0
+compatibility is achieved by utilizing a TracePoint mechanism in the Ruby C API.
 
 ## Requirements
 

data/debase.gemspec

@@ -6,19 +6,17 @@ Gem::Specification.new do |s|
   s.name        = "debase"
   s.version     = Debase::VERSION
   s.license     = "MIT"
-  s.authors     = ["Dennis Ushakov"]
-  s.email       = ["dennis.ushakov@gmail.com"]
-  s.homepage    = "https://github.com/denofevil/debase"
+  s.authors     = ["Alexandr Evstigneev", "Dennis Ushakov"]
+  s.email       = ["hurricup@gmail.com", "dennis.ushakov@gmail.com"]
+  s.homepage    = "https://github.com/ruby-debug/debase"
   s.summary     = %q{debase is a fast implementation of the standard Ruby debugger debug.rb for Ruby 2.0}
   s.description = <<-EOF
-    debase is a fast implementation of the standard Ruby debugger debug.rb for Ruby 2.0.
+    debase is a fast implementation of the standard Ruby debugger debug.rb for Ruby 2.0+.
     It is implemented by utilizing a new Ruby TracePoint class. The core component
     provides support that front-ends can build on. It provides breakpoint
     handling, bindings for stack frames among other things.
   EOF
 
-  s.rubyforge_project = "debase"
-
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
@@ -28,7 +26,7 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = ">= 2.0"
 
-  s.add_dependency "debase-ruby_core_source", ">= 0.10.2"
+  s.add_dependency "debase-ruby_core_source", ">= 0.10.12"
   s.add_development_dependency "test-unit"
   s.add_development_dependency "rake"
 end

data/ext/attach/extconf.rb

@@ -29,12 +29,8 @@ require "debase/ruby_core_source"
 
 hdrs = proc {
   have_header("vm_core.h") and
-  have_header("iseq.h") and
-  have_header("version.h") and
-  have_header("vm_core.h") and
-  have_header("vm_insnhelper.h") and
-  have_header("vm_core.h") and
-  have_header("method.h")
+  (have_header("iseq.h") or have_header("iseq.h", ["vm_core.h"])) and
+  have_header("version.h")
 }
 
 # Allow use customization of compile options. For example, the

data/ext/breakpoint.c

@@ -257,7 +257,12 @@ check_breakpoint_expr(VALUE breakpoint_object, VALUE trace_point)
 
   args = rb_ary_new3(2, breakpoint->expr, binding);
   result = rb_protect(eval_expression, args, &error);
-  return !error && RTEST(result);
+  if(error){
+    rb_set_errinfo(Qnil);
+    return 0;
+  }
+
+  return RTEST(result);
 }
 
 static VALUE

data/ext/context.c

@@ -147,6 +147,7 @@ context_create(VALUE thread, VALUE cDebugThread) {
   context->stack_size = 0;
   locations = rb_funcall(thread, rb_intern("backtrace_locations"), 1, INT2FIX(1));
   context->calced_stack_size = locations != Qnil ? RARRAY_LENINT(locations) : 0;
+  context->init_stack_size = -1;
 
   context->stack = NULL;
   context->thnum = ++thnum_current;
@@ -154,6 +155,8 @@ context_create(VALUE thread, VALUE cDebugThread) {
   context->flags = 0;
   context->last_file = NULL;
   context->last_line = -1;
+  context->hit_user_code = 0;
+  context->script_finished = 0;
   context->stop_frame = -1;
   context->thread_pause = 0;
   context->stop_reason = CTX_STOP_NONE;

data/ext/debase_internals.c

@@ -303,6 +303,8 @@ remove_pause_flag(VALUE thread, VALUE context_object, VALUE ignored)
 static void 
 call_at_line(debug_context_t *context, char *file, int line, VALUE context_object)
 {
+  context->hit_user_code = 1;
+
   rb_hash_foreach(contexts, remove_pause_flag, 0);
   CTX_FL_UNSET(context, CTX_FL_STEPPED);
   CTX_FL_UNSET(context, CTX_FL_FORCE_MOVE);
@@ -311,6 +313,35 @@ call_at_line(debug_context_t *context, char *file, int line, VALUE context_objec
   rb_funcall(context_object, idAtLine, 2, rb_str_new2(file), INT2FIX(line));
 }
 
+int count_stack_size() {
+    rb_thread_t *thread = ruby_current_thread;
+    rb_control_frame_t *last_cfp = TH_CFP(thread);
+    rb_control_frame_t *start_cfp = RUBY_VM_END_CONTROL_FRAME(TH_INFO(thread));
+    rb_control_frame_t *cfp;
+
+    ptrdiff_t size, i;
+
+    start_cfp =
+      RUBY_VM_NEXT_CONTROL_FRAME(
+      RUBY_VM_NEXT_CONTROL_FRAME(start_cfp)); /* skip top frames */
+
+    if (start_cfp < last_cfp) {
+        size = 0;
+    }
+    else {
+        size = start_cfp - last_cfp + 1;
+    }
+
+    int stack_size = 0;
+    for (i=0, cfp = start_cfp; i<size; i++, cfp = RUBY_VM_NEXT_CONTROL_FRAME(cfp)) {
+        if (cfp->iseq && cfp->pc) {
+            stack_size++;
+        }
+    }
+
+    return stack_size;
+}
+
 static void
 process_line_event(VALUE trace_point, void *data)
 {
@@ -340,6 +371,11 @@ process_line_event(VALUE trace_point, void *data)
     update_stack_size(context);
     print_event(tp, context);
 
+    if(context->init_stack_size == -1) {
+        context->stack_size = count_stack_size();
+        context->init_stack_size = context->stack_size;
+    }
+
     if (context->thread_pause) {
       context->stop_next = 1;
       context->dest_frame = -1;
@@ -375,13 +411,18 @@ process_line_event(VALUE trace_point, void *data)
     breakpoint = breakpoint_find(breakpoints, path, lineno, trace_point);
     if (context->stop_next == 0 || context->stop_line == 0 || breakpoint != Qnil) {
       rb_ensure(start_inspector, context_object, stop_inspector, Qnil);
-      context->stop_reason = CTX_STOP_STEP;
-      if (breakpoint != Qnil) {
-        context->stop_reason = CTX_STOP_BREAKPOINT;
-        rb_funcall(context_object, idAtBreakpoint, 1, breakpoint);
+      if(context->stack_size <= context->init_stack_size && context->hit_user_code) {
+        context->script_finished = 1;
+      }
+      if(!context->script_finished) {
+        context->stop_reason = CTX_STOP_STEP;
+        if (breakpoint != Qnil) {
+          context->stop_reason = CTX_STOP_BREAKPOINT;
+          rb_funcall(context_object, idAtBreakpoint, 1, breakpoint);
+        }
+        reset_stepping_stop_points(context);
+        call_at_line(context, file, line, context_object);
       }
-      reset_stepping_stop_points(context);
-      call_at_line(context, file, line, context_object);
     }
   }
   cleanup(context);
@@ -553,7 +594,9 @@ Debase_debug_load(int argc, VALUE *argv, VALUE self)
   rb_load_protect(file, 0, &state);
   if (0 != state) 
   {
-      return rb_errinfo();
+      VALUE error_info = rb_errinfo();
+      rb_set_errinfo(Qnil);
+      return error_info;
   }
   return Qnil;
 }

data/ext/debase_internals.h

@@ -4,6 +4,16 @@
 #include "ruby.h"
 #include "ruby/debug.h"
 
+#include <version.h>
+#if RUBY_API_VERSION_CODE == 20500
+    #include <vm_core.h>
+    #include <iseq.h>
+#endif
+
+#if RUBY_API_VERSION_CODE >= 30000
+    #include <internal/hash.h>
+#endif
+
 typedef struct rb_trace_arg_struct rb_trace_point_t;
 
 /* Debase::Context */
@@ -60,6 +70,9 @@ typedef struct debug_context {
 
   char *last_file;
   int last_line;
+  int init_stack_size;
+  int script_finished;
+  int hit_user_code;
 } debug_context_t;
 
 typedef struct

data/ext/extconf.rb

@@ -29,12 +29,8 @@ require "debase/ruby_core_source"
 
 hdrs = proc {
   have_header("vm_core.h") and
-  have_header("iseq.h") and
-  have_header("version.h") and
-  have_header("vm_core.h") and
-  have_header("vm_insnhelper.h") and
-  have_header("vm_core.h") and
-  have_header("method.h")
+  (have_header("iseq.h") or have_header("iseq.h", ["vm_core.h"])) and
+  have_header("version.h")
 }
 
 # Allow use customization of compile options. For example, the
@@ -44,9 +40,11 @@ hdrs = proc {
 config_file = File.join(File.dirname(__FILE__), 'config_options.rb')
 load config_file if File.exist?(config_file)
 
+$CFLAGS += ' -Werror=implicit-function-declaration'
+
 if ENV['debase_debug']
-  $CFLAGS+=' -Wall -Werror' 
-  $CFLAGS+=' -g3'
+  $CFLAGS += ' -Wall -Werror'
+  $CFLAGS += ' -g3'
 end
 
 dir_config("ruby")

data/lib/debase/version.rb

@@ -1,3 +1,3 @@
 module Debase
-  VERSION = "0.2.3.beta5" unless defined? VERSION
+  VERSION = "0.2.5.beta2" unless defined? VERSION
 end

data/test/test_base.rb

@@ -25,7 +25,7 @@ class TestRubyDebug < Test::Unit::TestCase
     #              File.basename(Debugger.current_context.frame_file))
     # assert_raises(ArgumentError) {Debugger.current_context.frame_file(1, 2)}
     # assert_raises(ArgumentError) {Debugger.current_context.frame_file(15)}
-    assert_equal(19, Debugger.current_context.stack_size)
+    # assert_equal(19, Debugger.current_context.stack_size)
     # assert_equal(TestRubyDebug, Debugger.current_context.frame_class)
     assert_equal(false, Debugger.current_context.dead?, 'Not dead yet!')
   ensure

data/test/test_catchpoint.rb

@@ -5,7 +5,7 @@ require File.expand_path("helper", File.dirname(__FILE__))
   
 class TestRubyDebugCatchpoint < Test::Unit::TestCase
   def test_catchpoints
-    assert_raise(RuntimeError) {Debugger.catchpoints}
+    assert_equal({}, Debugger.catchpoints)
     Debugger.start_
     assert_equal({}, Debugger.catchpoints)
     Debugger.add_catchpoint('ZeroDivisionError')

data/test/test_load.rb

@@ -24,6 +24,9 @@ class TestDebugLoad < Test::Unit::TestCase
 
     # Without stopping
     bt = Debugger.debug_load(prog_script, false)
+    if !bt.nil? && bt.is_a?(Exception)
+      STDERR.puts bt.backtrace.join("\n")
+    end
     assert_equal(nil, bt)
     assert(Debugger.started?)
     Debugger.stop

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: debase
 version: !ruby/object:Gem::Version
-  version: 0.2.3.beta5
+  version: 0.2.5.beta2
 platform: ruby
 authors:
+- Alexandr Evstigneev
 - Dennis Ushakov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-29 00:00:00.000000000 Z
+date: 2021-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debase-ruby_core_source
@@ -16,14 +17,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.2
+        version: 0.10.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.2
+        version: 0.10.12
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
@@ -53,11 +54,12 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: |2
-      debase is a fast implementation of the standard Ruby debugger debug.rb for Ruby 2.0.
+      debase is a fast implementation of the standard Ruby debugger debug.rb for Ruby 2.0+.
       It is implemented by utilizing a new Ruby TracePoint class. The core component
       provides support that front-ends can build on. It provides breakpoint
       handling, bindings for stack frames among other things.
 email:
+- hurricup@gmail.com
 - dennis.ushakov@gmail.com
 executables: []
 extensions:
@@ -117,7 +119,7 @@ files:
 - test/test_catchpoint.rb
 - test/test_load.rb
 - test/test_reload_bug.rb
-homepage: https://github.com/denofevil/debase
+homepage: https://github.com/ruby-debug/debase
 licenses:
 - MIT
 metadata: {}
@@ -136,8 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubyforge_project: debase
-rubygems_version: 2.6.10
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: debase is a fast implementation of the standard Ruby debugger debug.rb for