appmap 0.83.1 → 0.83.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14e329b0f8ab9095d4c90804976dfd50aa1dd5a9a16edae5e617eae656cd28d8
-  data.tar.gz: e1d95435d0c77329270f645f7e4230676b46711cbb4ecec4611d4cc9e00a3581
+  metadata.gz: fc72653227c79221b4461962b65a221a454c63b564dc713b97ae6c9bb7724e94
+  data.tar.gz: df9594b7e3043183d9ddec1ad9c7e767aa72b8b60a4c7923a030f51dffb2a7ab
 SHA512:
-  metadata.gz: 7446aee80e06c3796c6d68e2e157baf644995d83e50279930946a0e5a2124ab2daf12eba19a7853cbb53cdc909e96d95f4c7587273a0a36595be3d3df03e2526
-  data.tar.gz: 3840c616f9bc8829688a91cd3ac5c3e7e15bbc5e17418220681102b07dbad36702e1aa45305bb73e55cf13166ca3f7bc08a7dac9e051225ff42955c200af7a8a
+  metadata.gz: ac66c69ecb0564856a2ea6eebc0c9d81e7e78c583cb7cb33a271d51969c15985b1335eb5e2d7ae4c348f0dfada0ff7ae3e7f7df45fa53eae8e99b945e0e32a3b
+  data.tar.gz: 2173330d318f11cc5577c997516414809cd4fa27c0121592f9b6041d7b2eb27b12bc1e7aa3ab19dadf6a26afff255c484ad019bb61502f40813a14553e805dfd

data/CHANGELOG.md

@@ -1,3 +1,24 @@
+## [0.83.4](https://github.com/applandinc/appmap-ruby/compare/v0.83.3...v0.83.4) (2022-06-22)
+
+
+### Bug Fixes
+
+* Exclude AppMaps from the gem when packaging ([a0634f0](https://github.com/applandinc/appmap-ruby/commit/a0634f07db264daf51c6192b74ccbc08664ccac6))
+
+## [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)
+
+
+### Bug Fixes
+
+* Only warn if Hook::LOG is true ([0ffd29e](https://github.com/applandinc/appmap-ruby/commit/0ffd29ea3a49d70af64193250c633668eb45c9ab))
+
 ## [0.83.1](https://github.com/applandinc/appmap-ruby/compare/v0.83.0...v0.83.1) (2022-05-05)
 
 

data/appmap.gemspec

@@ -19,7 +19,8 @@ Gem::Specification.new do |spec|
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
   spec.files         = `git ls-files --no-deleted`.split("
-")
+").grep_v(/appmap\.json$/)
+
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
 

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/hook/method.rb

@@ -75,7 +75,7 @@ module AppMap
 
         return cls if cls
 
-        warn "#{hook_method.name} not found on #{hook_class}"
+        warn "#{hook_method.name} not found on #{hook_class}" if Hook::LOG
       end
 
       def gettime

data/lib/appmap/version.rb

@@ -3,7 +3,7 @@
 module AppMap
   URL = 'https://github.com/applandinc/appmap-ruby'
 
-  VERSION = '0.83.1'
+  VERSION = '0.83.4'
 
   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.1
+  version: 0.83.4
 platform: ruby
 authors:
 - Kevin Gilpin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-05-05 00:00:00.000000000 Z
+date: 2022-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -447,12 +447,10 @@ files:
 - spec/fixtures/depends/app/models/configuration.rb
 - spec/fixtures/depends/app/models/show.rb
 - spec/fixtures/depends/app/models/user.rb
-- spec/fixtures/depends/revoke_api_key.appmap.json
 - spec/fixtures/depends/spec/actual_rspec_test.rb
 - spec/fixtures/depends/spec/api_spec.rb
 - spec/fixtures/depends/spec/user_spec.rb
 - spec/fixtures/depends/test/actual_minitest_test.rb
-- spec/fixtures/depends/user_page_scenario.appmap.json
 - spec/fixtures/hook/.gitignore
 - spec/fixtures/hook/app/controllers/api/api_keys_controller.rb
 - spec/fixtures/hook/app/controllers/organizations_controller.rb
@@ -474,12 +472,10 @@ files:
 - spec/fixtures/hook/prepended_override.rb
 - spec/fixtures/hook/protected_method.rb
 - spec/fixtures/hook/report_parameters.rb
-- spec/fixtures/hook/revoke_api_key.appmap.json
 - spec/fixtures/hook/singleton_method.rb
 - spec/fixtures/hook/spec/api_spec.rb
 - spec/fixtures/hook/spec/user_spec.rb
 - spec/fixtures/hook/sub_packages.rb
-- spec/fixtures/hook/user_page_scenario.appmap.json
 - spec/fixtures/rack_users_app/.dockerignore
 - spec/fixtures/rack_users_app/.gitignore
 - spec/fixtures/rack_users_app/Gemfile
@@ -707,6 +703,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