appmap 0.83.2 → 0.83.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4cabea9f63794eb3d3efea45ec01fb05aa1437cccb419d87695b6b1877cd0b8
-  data.tar.gz: e7ea1f1b85a0ad31de59838c3e8a6c69ba4cff6e61dbbca3cad9478b4fc3ee9b
+  metadata.gz: bea854bed738de049b48a7159db72bf00050b12e59e83f24f4353ae86eec352e
+  data.tar.gz: 1560fcc80b2583b4d710e1ddfbc446d47d4b70b69b1a29db735afbfea90ecf19
 SHA512:
-  metadata.gz: 3d1b69fb940df595bcb7dba1adb9ea813073b2d6a00ffdf7be2be9eafe2e8567a0fe5e2f8d305130c5e483dec9b5812faa3800fe5bdebc39c20f532fd7ed0d3b
-  data.tar.gz: 4830ed50c519739c855d32eda77db1e6bf873f6cfc67d7a85b6abfcf0a321bd1dcef7f19af5578a58e352af752ad5bd3523ce5779ddc40a19aadb5cbe76b93c3
+  metadata.gz: c8ac080bd189b48409710623abb20363775bdd24f01be061b8f61ab199b88b04bdea674d6bd51a85b06d8dca6086ea2172e04b48d3a199971e67287229fb4c81
+  data.tar.gz: 8fc2ca5673a67d4f213744aec18eb26cf2951a7992a750659024370127b70072ae891721262a575cbaf3cffae75aa4d052061265c0687d04b4455b012887bc6e

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [0.83.3](https://github.com/applandinc/appmap-ruby/compare/v0.83.2...v0.83.3) (2022-06-03)
+
+
+### Bug Fixes
+
+* Eval handler now works correctly even when not tracing ([4c9c40a](https://github.com/applandinc/appmap-ruby/commit/4c9c40abd8c930837ce6e040c72893f284ce0899))
+
 ## [0.83.2](https://github.com/applandinc/appmap-ruby/compare/v0.83.1...v0.83.2) (2022-05-11)
 
 

data/lib/appmap/hook/method/ruby2.rb

@@ -8,9 +8,9 @@ module AppMap
     # cf. https://eregon.me/blog/2019/11/10/the-delegation-challenge-of-ruby27.html
     class Method
       ruby2_keywords def call(receiver, *args, &block)
-        return do_call(receiver, *args, &block) unless trace?
-
-        call_event = with_disabled_hook { before_hook receiver, *args }
+        call_event = trace? && with_disabled_hook { before_hook receiver, *args }
+        # note we can't short-circuit directly to do_call because then the call stack
+        # depth changes and eval handler doesn't work correctly
         trace_call call_event, receiver, *args, &block
       end
 
@@ -32,7 +32,10 @@ module AppMap
         hook_method.bind(receiver).call(*args, &block)
       end
 
+      # rubocop:disable Metrics/MethodLength
       ruby2_keywords def trace_call(call_event, receiver, *args, &block)
+        return do_call(receiver, *args, &block) unless call_event
+
         start_time = gettime
         begin
           return_value = do_call(receiver, *args, &block)
@@ -44,6 +47,7 @@ module AppMap
             if call_event
         end
       end
+      # rubocop:enable Metrics/MethodLength
 
       def hook_method_def
         this = self

data/lib/appmap/hook/method/ruby3.rb

@@ -5,9 +5,9 @@ module AppMap
     # Delegation methods for Ruby 3.
     class Method
       def call(receiver, *args, **kwargs, &block)
-        return do_call(receiver, *args, **kwargs, &block) unless trace?
-
-        call_event = with_disabled_hook { before_hook receiver, *args, **kwargs }
+        call_event = trace? && with_disabled_hook { before_hook receiver, *args, **kwargs }
+        # note we can't short-circuit directly to do_call because then the call stack
+        # depth changes and eval handler doesn't work correctly
         trace_call call_event, receiver, *args, **kwargs, &block
       end
 
@@ -34,7 +34,10 @@ module AppMap
         hook_method.bind_call(receiver, *args, **kwargs, &block)
       end
 
+      # rubocop:disable Metrics/MethodLength
       def trace_call(call_event, receiver, *args, **kwargs, &block)
+        return do_call(receiver, *args, **kwargs, &block) unless call_event
+
         start_time = gettime
         begin
           return_value = do_call(receiver, *args, **kwargs, &block)
@@ -46,6 +49,7 @@ module AppMap
             if call_event
         end
       end
+      # rubocop:enable Metrics/MethodLength
 
       def hook_method_def
         this = self

data/lib/appmap/version.rb

@@ -3,7 +3,7 @@
 module AppMap
   URL = 'https://github.com/applandinc/appmap-ruby'
 
-  VERSION = '0.83.2'
+  VERSION = '0.83.3'
 
   APPMAP_FORMAT_VERSION = '1.7.0'
 

data/spec/handler/class_with_eval.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+# rubocop:disable Style/EvalWithLocation
+
+module AppMap
+  class SpecClasses
+    class WithEval
+      eval %(def text; 'text'; end)
+    end
+  end
+end
+
+# rubocop:enable Style/EvalWithLocation

data/spec/handler/eval_spec.rb

@@ -57,6 +57,11 @@ describe 'AppMap::Handler::Eval' do
     end
     expect(new_cls.const_get(class_name)).to eq(cls)
   end
+
+  it 'works correctly when loaded even when not tracing' do
+    load "#{__dir__}/class_with_eval.rb"
+    expect { AppMap::SpecClasses::WithEval.new.text }.to_not raise_error(NameError)
+  end
 end
 
 module ClassMaker
@@ -64,3 +69,5 @@ module ClassMaker
     eval "class #{class_name}; end; #{class_name}"
   end
 end
+
+# rubocop:enable Security/Eval, Style/EvalWithLocation

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appmap
 version: !ruby/object:Gem::Version
-  version: 0.83.2
+  version: 0.83.3
 platform: ruby
 authors:
 - Kevin Gilpin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-05-11 00:00:00.000000000 Z
+date: 2022-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -707,6 +707,7 @@ files:
 - spec/fixtures/rails7_users_app/test/models/instructor_test.rb
 - spec/fixtures/rails7_users_app/test/system/.keep
 - spec/fixtures/rails7_users_app/test/test_helper.rb
+- spec/handler/class_with_eval.rb
 - spec/handler/eval_spec.rb
 - spec/hook_spec.rb
 - spec/open_spec.rb