appmap 0.66.2 → 0.67.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2dd5295e0bbe8c9a4281b27bd712b61640672e93a03d6c3e31af3e201c9ca592
-  data.tar.gz: 8fb74d28bb2367918831c6d3af029440591da8ee694f1645fc2ef8baf5b28b60
+  metadata.gz: 4209d3f9422b61ba07ca1776597eac220374e8308a303cdf001604c90903dd31
+  data.tar.gz: 55a755af5bd85255ce882633d3089a0ca308d137b15945e0a1fff4d5479c4994
 SHA512:
-  metadata.gz: ef07a3169b2d1f4dcabb406296275506250840cc767440b60a106f48ad5ee251017a9e9f7cd9769e7d0d133a3b9704f76bfef571fd69feef85163979cec80a80
-  data.tar.gz: 34c9c18e230dc46d868b759422eb7aeaba79b99fd1cca610bbc1a8bdc70a7cfa18e34a064a43cc50847c8c452bf267a6003a5b98cb3a2e2e8fa40028552fe112
+  metadata.gz: 4a7ce04424eac8292b0457c99bc3b6f699c0e80a6222450e52f37071e078c2c574c33e8a89249c584412c50da5b26d07f98864f50ecc13e0318da6272fafb879
+  data.tar.gz: 6c8ba9b9a67f09ce662d1bdf0569238537087709cff6f9be2562d50fe06d8ca4199268a2bc3c0d9136dd8a6ab6ff0e66f0d85683b4d3c15e95ba5e10dbcdeb71

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+# [0.67.0](https://github.com/applandinc/appmap-ruby/compare/v0.66.2...v0.67.0) (2021-10-21)
+
+
+### Bug Fixes
+
+* Ensure rack is available, and handle nil HTTP response ([5e81dc4](https://github.com/applandinc/appmap-ruby/commit/5e81dc4310c9b7f2d81c31339f8490639c845f76))
+* Handle WeakRef ([852ee04](https://github.com/applandinc/appmap-ruby/commit/852ee047880f9d1492be38772ed3f0cc1a670cb5))
+
+
+### Features
+
+* APPMAP_AUTOREQUIRE and APPMAP_INITIALIZE env vars to customize loading behavior ([369807e](https://github.com/applandinc/appmap-ruby/commit/369807e4c90243e296b324e70805bd09d0f5fc4a))
+* Perform GC before running each test ([84c895e](https://github.com/applandinc/appmap-ruby/commit/84c895e95fe8caa270cc1412e239599bfcc1b467))
+
 ## [0.66.2](https://github.com/applandinc/appmap-ruby/compare/v0.66.1...v0.66.2) (2021-10-07)
 
 

data/lib/appmap/event.rb

@@ -111,10 +111,12 @@ module AppMap
           rescue NoMethodError
             begin
               value.inspect
-            rescue StandardError
+            rescue
               last_resort_string.call
             end
-          rescue StandardError
+          rescue WeakRef::RefError
+            nil
+          rescue
             last_resort_string.call
           end
         end

data/lib/appmap/handler/net_http.rb

@@ -2,6 +2,7 @@
 
 require 'appmap/event'
 require 'appmap/util'
+require 'rack'
 
 module AppMap
   module Handler
@@ -60,10 +61,14 @@ module AppMap
       def initialize(response, parent_id, elapsed)
         super AppMap::Event.next_id_counter, :return, Thread.current.object_id
 
-        self.status = response.code.to_i
+        if response
+          self.status = response.code.to_i
+          self.headers = NetHTTP.copy_headers(response)
+        else
+          self.headers = {}
+        end
         self.parent_id = parent_id
         self.elapsed = elapsed
-        self.headers = NetHTTP.copy_headers(response)
       end
 
       def to_h

data/lib/appmap/minitest.rb

@@ -142,6 +142,7 @@ if AppMap::Minitest.enabled?
     alias run_without_hook run
 
     def run
+      GC.start
       AppMap::Minitest.begin_test self, name
       begin
         run_without_hook

data/lib/appmap/rspec.rb

@@ -87,6 +87,7 @@ module AppMap
         end
 
         warn "Starting recording of example #{example}@#{source_location}" if AppMap::RSpec::LOG
+        GC.start
         @trace = AppMap.tracing.trace
         @webdriver_port = webdriver_port.()
       end

data/lib/appmap/version.rb

@@ -3,7 +3,7 @@
 module AppMap
   URL = 'https://github.com/applandinc/appmap-ruby'
 
-  VERSION = '0.66.2'
+  VERSION = '0.67.0'
 
   APPMAP_FORMAT_VERSION = '1.5.1'
 

data/lib/appmap.rb

@@ -74,6 +74,6 @@ lambda do
     require 'appmap/depends'
   end
   
-end.call
+end.call unless ENV['APPMAP_AUTOREQUIRE'] == 'false'
 
-AppMap.initialize_configuration if ENV['APPMAP'] == 'true'
+AppMap.initialize_configuration if ENV['APPMAP'] == 'true' && ENV['APPMAP_INITIALIZE'] != 'false'

data/test/fixtures/mocha_mock_app/Gemfile

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gem 'appmap', git: 'applandinc/appmap-ruby', branch: `git rev-parse --abbrev-ref HEAD`.strip
+gem 'minitest'
+gem 'mocha'

data/test/fixtures/mocha_mock_app/appmap.yml

@@ -0,0 +1,5 @@
+name: mocha_mock_app
+packages:
+  - path: lib
+  - gem: mocha
+    shallow: false

data/test/fixtures/mocha_mock_app/lib/sheep.rb

@@ -0,0 +1,5 @@
+class Sheep
+  def baa
+    'baa'
+  end
+end

data/test/fixtures/mocha_mock_app/test/sheep_test.rb

@@ -0,0 +1,18 @@
+$LOAD_PATH.unshift File.expand_path('../lib', __dir__)
+
+require 'minitest/autorun'
+
+require 'appmap'
+require 'appmap/minitest' if ENV['APPMAP_AUTOREQUIRE'] == 'false'
+
+require 'sheep'
+require 'mocha/minitest'
+
+class SheepTest < Minitest::Test
+  def test_sheep
+    sheep = mock('sheep')
+    sheep.responds_like(Sheep.new)
+    sheep.expects(:baa).returns('baa')
+    sheep.baa
+  end
+end

data/test/mock_compatibility_test.rb

@@ -0,0 +1,45 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require 'test_helper'
+
+class MockCompatibilityTest < Minitest::Test
+  def perform_minitest_test(test_name, env = {})
+    Bundler.with_clean_env do
+      Dir.chdir 'test/fixtures/mocha_mock_app' do
+        FileUtils.rm_rf 'tmp'
+        system 'bundle config --local local.appmap ../../..'
+        system 'bundle'
+        system(env.merge({ 'APPMAP' => 'true' }), %(bundle exec ruby -Ilib -Itest test/#{test_name}_test.rb))
+
+        yield
+      end
+    end
+  end
+
+  def test_expectation
+    perform_minitest_test('sheep') do
+      appmap_file = 'tmp/appmap/minitest/Sheep_sheep.appmap.json'
+
+      assert File.file?(appmap_file), 'appmap output file does not exist'
+      appmap = JSON.parse(File.read(appmap_file))
+      assert_equal AppMap::APPMAP_FORMAT_VERSION, appmap['version']
+      assert_includes appmap.keys, 'metadata'
+      metadata = appmap['metadata']
+      assert_equal 'succeeded', metadata['test_status']
+    end
+  end
+
+  def test_expectation_without_autorequire
+    perform_minitest_test('sheep', 'APPMAP_AUTOREQUIRE' => 'false') do
+      appmap_file = 'tmp/appmap/minitest/Sheep_sheep.appmap.json'
+
+      assert File.file?(appmap_file), 'appmap output file does not exist'
+      appmap = JSON.parse(File.read(appmap_file))
+      assert_equal AppMap::APPMAP_FORMAT_VERSION, appmap['version']
+      assert_includes appmap.keys, 'metadata'
+      metadata = appmap['metadata']
+      assert_equal 'succeeded', metadata['test_status']
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appmap
 version: !ruby/object:Gem::Version
-  version: 0.66.2
+  version: 0.67.0
 platform: ruby
 authors:
 - Kevin Gilpin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-10-07 00:00:00.000000000 Z
+date: 2021-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -3699,6 +3699,10 @@ files:
 - test/fixtures/minitest_recorder/appmap.yml
 - test/fixtures/minitest_recorder/lib/hello.rb
 - test/fixtures/minitest_recorder/test/hello_test.rb
+- test/fixtures/mocha_mock_app/Gemfile
+- test/fixtures/mocha_mock_app/appmap.yml
+- test/fixtures/mocha_mock_app/lib/sheep.rb
+- test/fixtures/mocha_mock_app/test/sheep_test.rb
 - test/fixtures/openssl_recorder/Gemfile
 - test/fixtures/openssl_recorder/appmap.yml
 - test/fixtures/openssl_recorder/lib/openssl_cert_sign.rb
@@ -3715,6 +3719,7 @@ files:
 - test/gem_test.rb
 - test/inspect_cli_test.rb
 - test/minitest_test.rb
+- test/mock_compatibility_test.rb
 - test/openssl_test.rb
 - test/record_process_test.rb
 - test/rspec_test.rb