debase 0.2.3.beta2 → 0.2.3.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6d0b4ffcf1b88d08e500071b97bd7d2679119dd8
-  data.tar.gz: aea5553eb0fbac211cf081807605bf4226dfd08c
+SHA256:
+  metadata.gz: 54843a17de6b5740fea57e2c8ca1759d071748beed251dd0a13a4f3737dbd898
+  data.tar.gz: 6f60ddfba72e780a4da776300b35f9a0d66b077d09e8453ba586175a3175c0e6
 SHA512:
-  metadata.gz: 7e8c2f94ef8590ee3e94214f641434e5e9d67dc8eb8094830502666772a1896b8df22d9733e885213d6c28018eff2c524e680d12c906baeb7e47f68effdac90b
-  data.tar.gz: a562cc46f2128e1fe54a71052aed7451687c6a2d28a238a7ae7994e8cc2499e23de94c6c93d5fc00c53eb7a718128cd92b543582e7061d78f9e688a3aae1c03b
+  metadata.gz: 1d6c8944d7e52516ac50f75b913f7680ff5af7b84563f4b12c74308d6b5677a0b629fd2d941f4a4b82d9374535a66ff5d2760c50e7e903cde1db40f40599a142
+  data.tar.gz: a007f10480e1f457a7aefd38ef947804dfc9712f41359c49ad2d6e45610ec489759467197e5e29f9214621fbd5dbdcabb9bef3e8114b3b24b19ee5c9a91696ce

data/.travis.yml

@@ -10,7 +10,8 @@ rvm:
   - 2.2
   - 2.3
   - 2.4.2
-  - 2.5.0
+  - 2.5.3
+  - 2.6.0
   - ruby-head
 
 matrix:

data/ext/debase_internals.c

@@ -637,7 +637,7 @@ Debase_enable_file_filtering(VALUE self, VALUE value)
   return value;
 }
 
-#if RUBY_API_VERSION_CODE >= 20500
+#if RUBY_API_VERSION_CODE >= 20500 && !(RUBY_RELEASE_YEAR == 2017 && RUBY_RELEASE_MONTH == 10 && RUBY_RELEASE_DAY == 10)
     static const rb_iseq_t *
     my_iseqw_check(VALUE iseqw)
     {
@@ -654,17 +654,28 @@ Debase_enable_file_filtering(VALUE self, VALUE value)
     }
 
     static void
-    Debase_set_trace_flag_to_iseq(VALUE self, VALUE rb_iseq)
-    {
+    Debase_set_trace_flag_to_iseq(VALUE self, VALUE rb_iseq) {
         if (!SPECIAL_CONST_P(rb_iseq) && RBASIC_CLASS(rb_iseq) == rb_cISeq) {
             rb_iseq_t *iseq = my_iseqw_check(rb_iseq);
             rb_iseq_trace_set(iseq, RUBY_EVENT_TRACEPOINT_ALL);
         }
     }
+
+    static void
+    Debase_unset_trace_flags(VALUE self, VALUE rb_iseq) {
+        if (!SPECIAL_CONST_P(rb_iseq) && RBASIC_CLASS(rb_iseq) == rb_cISeq) {
+            rb_iseq_t *iseq = my_iseqw_check(rb_iseq);
+            rb_iseq_trace_set(iseq, RUBY_EVENT_NONE);
+        }
+    }
 #else
       static void
       Debase_set_trace_flag_to_iseq(VALUE self, VALUE rb_iseq) {
       }
+
+      static void
+      Debase_unset_trace_flags(VALUE self, VALUE rb_iseq) {
+      }
 #endif
 
 static VALUE
@@ -712,6 +723,9 @@ Init_debase_internals()
   rb_define_module_function(mDebase, "init_variables", Debase_init_variables, 0);
   rb_define_module_function(mDebase, "set_trace_flag_to_iseq", Debase_set_trace_flag_to_iseq, 1);
 
+  //use only for tests
+  rb_define_module_function(mDebase, "unset_iseq_flags", Debase_unset_trace_flags, 1);
+
   idAlive = rb_intern("alive?");
   idAtLine = rb_intern("at_line");
   idAtBreakpoint = rb_intern("at_breakpoint");

data/ext/debase_internals.h

@@ -2,12 +2,7 @@
 #define DEBASE_INTERNALS
 
 #include "ruby.h"
-#include "vm_core.h"
-#include "version.h"
-#include "iseq.h"
-#include "vm_insnhelper.h"
-#include "method.h"
-#include <ruby/debug.h>
+#include "ruby/debug.h"
 
 typedef struct rb_trace_arg_struct rb_trace_point_t;
 

data/lib/debase.rb

@@ -30,7 +30,7 @@ module Debase
       class << RubyVM::InstructionSequence
         def self.prepend(mod, *smth)
           super
-          if mod.to_s.include? 'Bootsnap'
+          if mod.to_s.include?('Bootsnap') && RUBY_VERSION >= "2.5"
             prepend InstructionSequenceMixin
           end
         end
@@ -107,7 +107,7 @@ module Debase
 
       def do_set_flags(iseq)
         Debugger.set_trace_flag_to_iseq(iseq)
-        iseq.each_child{|child_iseq| do_set_flags(child_iseq)}
+        iseq.each_child { |child_iseq| do_set_flags(child_iseq) } if iseq.respond_to? :each_child
       end
     end
   end

data/lib/debase/version.rb

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

data/test/example/bootsnap/a.rb

@@ -0,0 +1,5 @@
+class A
+  def foo(a)
+    puts a
+  end
+end

data/test/example/bootsnap/bootsnap.rb

@@ -0,0 +1,3 @@
+require_relative 'a.rb'
+
+A.new.foo('hi')

data/test/test_load.rb

@@ -3,6 +3,9 @@ require File.expand_path("helper", File.dirname(__FILE__))
 
 # Test of Debugger.debug_load in C extension ruby_debug.so
 class TestDebugLoad < Test::Unit::TestCase
+
+  self.test_order = :defined
+
   class << self
     def at_line(file, line)
       @@at_line = [File.basename(file), line]
@@ -41,4 +44,35 @@ class TestDebugLoad < Test::Unit::TestCase
   ensure
     Debugger.stop if Debugger.started?
   end
+
+  module MyBootsnap
+    def load_iseq(path)
+      iseq = RubyVM::InstructionSequence.compile_file(path)
+
+      Debugger.unset_iseq_flags(iseq)
+      iseq
+    end
+  end
+
+  def test_bootsnap
+    @@at_line = nil
+    src_dir = File.dirname(__FILE__)
+    prog_script = File.join(src_dir, 'example', 'bootsnap', 'bootsnap.rb')
+
+    class << RubyVM::InstructionSequence
+      prepend MyBootsnap
+    end
+    bt = Debugger.debug_load(prog_script, true)
+    assert_equal(nil, bt)
+    assert_not_nil(@@at_line)
+    if RUBY_VERSION >= '2.5'
+      assert_equal(['debase.rb', 101], @@at_line)
+    end
+
+    assert(Debugger.started?)
+    Debugger.stop
+
+    class << RubyVM::InstructionSequence; self end.class_eval { undef_method :load_iseq }
+
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: debase
 version: !ruby/object:Gem::Version
-  version: 0.2.3.beta2
+  version: 0.2.3.beta3
 platform: ruby
 authors:
 - Dennis Ushakov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-30 00:00:00.000000000 Z
+date: 2019-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debase-ruby_core_source
@@ -94,6 +94,8 @@ files:
 - test/example/a/example.rb
 - test/example/at-exit.rb
 - test/example/b/example.rb
+- test/example/bootsnap/a.rb
+- test/example/bootsnap/bootsnap.rb
 - test/example/bp_loop_issue.rb
 - test/example/breakpoints-basename.rb
 - test/example/brkpt-class-bug.rb
@@ -134,10 +136,35 @@ 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.0.1
 signing_key: 
 specification_version: 4
 summary: debase is a fast implementation of the standard Ruby debugger debug.rb for
   Ruby 2.0
-test_files: []
+test_files:
+- test/example/a/example.rb
+- test/example/at-exit.rb
+- test/example/b/example.rb
+- test/example/bootsnap/a.rb
+- test/example/bootsnap/bootsnap.rb
+- test/example/bp_loop_issue.rb
+- test/example/breakpoints-basename.rb
+- test/example/brkpt-class-bug.rb
+- test/example/classes.rb
+- test/example/dollar-0.rb
+- test/example/except-bug1.rb
+- test/example/file with space.rb
+- test/example/gcd.rb
+- test/example/info-var-bug.rb
+- test/example/info-var-bug2.rb
+- test/example/null.rb
+- test/example/output.rb
+- test/example/pm-bug.rb
+- test/example/pm.rb
+- test/example/raise.rb
+- test/helper.rb
+- test/test_base.rb
+- test/test_breakpoints.rb
+- test/test_catchpoint.rb
+- test/test_load.rb
+- test/test_reload_bug.rb