appmap 0.65.1 → 0.67.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 30c93c7dbd38cd355d2512f43d177243bba4c184e81c588bf2f99e3b7d2426f4
-  data.tar.gz: 3dd70314c48d4df781dcda082fb293260d04725228e66c4c3323ebdcb09ea35a
+  metadata.gz: 4209d3f9422b61ba07ca1776597eac220374e8308a303cdf001604c90903dd31
+  data.tar.gz: 55a755af5bd85255ce882633d3089a0ca308d137b15945e0a1fff4d5479c4994
 SHA512:
-  metadata.gz: bea8dc7d3e1f05cca6ae264b7b0cf8ab6cdddfd366c59f09131c9c98cd12989e2878f276fc01360166ccee6c16b040b6ecd3aa8c6e913407bbd93d4bb1928862
-  data.tar.gz: 5a798b37f59f39f70e69398e0d64353f66baf4b55000b45dc951be27830b04f36d17c2fe58bc4f5e86fdab368c056b90834c15a21f438535f8403ec437758d8d
+  metadata.gz: 4a7ce04424eac8292b0457c99bc3b6f699c0e80a6222450e52f37071e078c2c574c33e8a89249c584412c50da5b26d07f98864f50ecc13e0318da6272fafb879
+  data.tar.gz: 6c8ba9b9a67f09ce662d1bdf0569238537087709cff6f9be2562d50fe06d8ca4199268a2bc3c0d9136dd8a6ab6ff0e66f0d85683b4d3c15e95ba5e10dbcdeb71

data/.travis.yml

@@ -1,4 +1,5 @@
 language: ruby
+dist: bionic
 
 rbenv:
 - 2.6
@@ -15,6 +16,7 @@ services:
 - docker
 
 before_install:
+  - sudo apt-get update && sudo apt-get install apt-transport-https ca-certificates -y && sudo update-ca-certificates
   # see https://blog.travis-ci.com/docker-rate-limits 
   # and also https://www.docker.com/blog/what-you-need-to-know-about-upcoming-docker-hub-rate-limiting/
   # if we do not use authorized account, 

data/CHANGELOG.md

@@ -1,3 +1,43 @@
+# [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)
+
+
+### Bug Fixes
+
+* fix Travis for Ruby 3.0 ([8ec7359](https://github.com/applandinc/appmap-ruby/commit/8ec7359287f5b204ae9fb0724d8b683adfb79df5))
+* Fix warning of circular import ([84d456d](https://github.com/applandinc/appmap-ruby/commit/84d456d8ac26ef3fc7a81ca6517e4363aac9916d))
+* Properly handle headers which aren't mangled by Rack ([8e78e13](https://github.com/applandinc/appmap-ruby/commit/8e78e138776cb563f984e3592cf5024af16da2b7))
+* replace deprecated File.exists? method ([80ce5b5](https://github.com/applandinc/appmap-ruby/commit/80ce5b59fd010a806ca6320365f453f1e74f095d))
+* Validate presence package configuration ([f478d6b](https://github.com/applandinc/appmap-ruby/commit/f478d6b60a786608c21217755cec9a8185e084d3))
+
+## [0.66.1](https://github.com/applandinc/appmap-ruby/compare/v0.66.0...v0.66.1) (2021-09-29)
+
+
+### Bug Fixes
+
+* Fix compilation on macOS with Xcode 13 ([8c66e08](https://github.com/applandinc/appmap-ruby/commit/8c66e08393bf8d9efac9635ad7a150329797729d))
+
+# [0.66.0](https://github.com/applandinc/appmap-ruby/compare/v0.65.1...v0.66.0) (2021-09-28)
+
+
+### Features
+
+* Add option for explicit 'require' in function config ([1cf6c2a](https://github.com/applandinc/appmap-ruby/commit/1cf6c2aed8ee2d89c900f2959484b88b6fd3eb93))
+* Builtin code such as Ruby Logger can be hooked via appmap.yml ([779c9e5](https://github.com/applandinc/appmap-ruby/commit/779c9e5e4177d58ea7b63e663e7c5a0810a78c60))
+
 ## [0.65.1](https://github.com/applandinc/appmap-ruby/compare/v0.65.0...v0.65.1) (2021-09-16)
 
 

data/ext/appmap/extconf.rb

@@ -1,6 +1,17 @@
 require "mkmf"
 
+
 $CFLAGS='-Werror'
+
+# Per https://bugs.ruby-lang.org/issues/17865,
+# compound-token-split-by-macro was added in clang 12 and broke
+# compilation with some of the ruby headers. If the current compiler
+# supports the new warning, turn it off.
+new_warning = '-Wno-error=compound-token-split-by-macro'
+if try_cflags(new_warning)
+  $CFLAGS += ' ' + new_warning
+end
+
 extension_name = "appmap"
 dir_config(extension_name)
 create_makefile(File.join(extension_name, extension_name))

data/lib/appmap/config.rb

@@ -117,13 +117,15 @@ module AppMap
     # entry in appmap.yml. When the Config is initialized, each Function is converted into
     # a Package and TargetMethods. It's called a Function rather than a Method, because Function
     # is the AppMap terminology.
-    Function = Struct.new(:package, :cls, :labels, :function_names) do # :nodoc:
+    Function = Struct.new(:package, :cls, :labels, :function_names, :builtin, :package_name) do # :nodoc:
       def to_h
         {
           package: package,
+          package_name: package_name,
           class: cls,
           labels: labels,
-          functions: function_names.map(&:to_sym)
+          functions: function_names.map(&:to_sym),
+          builtin: builtin
         }.compact
       end
     end
@@ -174,8 +176,8 @@ module AppMap
       package_hooks('actionpack',
         [
           method_hook('ActionDispatch::Request::Session', %i[[] dig values fetch], %w[http.session.read]),
-          method_hook('ActionDispatch::Request::Session', %i[destroy[]= clear update delete merge], %w[http.session.write]),
-          method_hook('ActionDispatch::Cookies::CookieJar', %i[[]= clear update delete recycle], %w[http.session.read]),
+          method_hook('ActionDispatch::Request::Session', %i[destroy []= clear update delete merge], %w[http.session.write]),
+          method_hook('ActionDispatch::Cookies::CookieJar', %i[[] fetch], %w[http.session.read]),
           method_hook('ActionDispatch::Cookies::CookieJar', %i[[]= clear update delete recycle], %w[http.session.write]),
           method_hook('ActionDispatch::Cookies::EncryptedCookieJar', %i[[]= clear update delete recycle], %w[http.cookie crypto.encrypt])
         ],
@@ -244,7 +246,7 @@ module AppMap
       @depends_config = depends_config
       @hook_paths = Set.new(packages.map(&:path))
       @exclude = exclude
-      @builtin_hooks = BUILTIN_HOOKS
+      @builtin_hooks = BUILTIN_HOOKS.dup
       @functions = functions
 
       @hooked_methods = METHOD_HOOKS.each_with_object(Hash.new { |h,k| h[k] = [] }) do |cls_target_methods, hooked_methods|
@@ -254,7 +256,15 @@ module AppMap
       functions.each do |func|
         package_options = {}
         package_options[:labels] = func.labels if func.labels
-        @hooked_methods[func.cls] << TargetMethods.new(func.function_names, Package.build_from_path(func.package, **package_options))
+        package_options[:package_name] = func.package_name
+        package_options[:package_name] ||= func.package if func.builtin
+        hook = TargetMethods.new(func.function_names, Package.build_from_path(func.package, **package_options))
+        if func.builtin
+          @builtin_hooks[func.cls] ||= []
+          @builtin_hooks[func.cls] << hook
+        else
+          @hooked_methods[func.cls] << hook
+        end
       end
 
       @hooked_methods.each_value do |hooks|
@@ -277,7 +287,7 @@ module AppMap
           LOGO
         end
 
-        config_present = true if File.exists?(config_file_name)
+        config_present = true if File.exist?(config_file_name)
 
         config_data = if config_present
           YAML.safe_load(::File.read(config_file_name))
@@ -300,6 +310,7 @@ module AppMap
           MISSING_FILE_MSG
           {}
         end
+
         load(config_data).tap do |config|
           config_yaml = {
             'name' => config.name,
@@ -324,15 +335,22 @@ module AppMap
 
         if config_data['functions']
           config_params[:functions] = config_data['functions'].map do |function_data|
-            package = function_data['package']
-            cls = function_data['class']
-            functions = function_data['function'] || function_data['functions']
-            raise %q(AppMap config 'function' element should specify 'package', 'class' and 'function' or 'functions') unless package && cls && functions
+            function_name = function_data['name']
+            package, cls, functions = []
+            if function_name
+              package, cls, _, function = Util.parse_function_name(function_name)
+              functions = Array(function)
+            else
+              package = function_data['package']
+              cls = function_data['class']
+              functions = function_data['function'] || function_data['functions']
+              raise %q(AppMap config 'function' element should specify 'package', 'class' and 'function' or 'functions') unless package && cls && functions
+            end
 
             functions = Array(functions).map(&:to_sym)
             labels = function_data['label'] || function_data['labels']
             labels = Array(labels).map(&:to_s) if labels
-            Function.new(package, cls, labels, functions)
+            Function.new(package, cls, labels, functions, function_data['builtin'], function_data['require'])
           end
         end
 
@@ -342,6 +360,7 @@ module AppMap
               gem = package['gem']
               path = package['path']
               raise %q(AppMap config 'package' element should specify 'gem' or 'path', not both) if gem && path
+              raise %q(AppMap config 'package' element should specify 'gem' or 'path') unless gem || path
 
               if gem
                 shallow = package['shallow']

data/lib/appmap/depends/api.rb

@@ -63,7 +63,7 @@ module AppMap
         removed = []
         out_of_date_appmaps.each do |appmap_path|
           mtime_path = File.join(appmap_path, 'mtime')
-          next unless File.exists?(mtime_path)
+          next unless File.exist?(mtime_path)
 
           appmap_mtime = File.read(mtime_path).to_i
           if appmap_mtime < since_ms

data/lib/appmap/depends/configuration.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'appmap'
-
 module AppMap
   module Depends
     class Configuration

data/lib/appmap/depends/util.rb

@@ -16,7 +16,7 @@ module AppMap
       def delete_appmap(appmap_path)
         FileUtils.rm_rf(appmap_path)
         appmap_file_path = [ appmap_path, 'appmap.json' ].join('.')
-        File.unlink(appmap_file_path) if File.exists?(appmap_file_path)
+        File.unlink(appmap_file_path) if File.exist?(appmap_file_path)
       rescue
         warn "Unable to delete AppMap: #{$!}"
       end

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
@@ -27,7 +28,7 @@ module AppMap
 
         self.request_method = request.method
         self.url = url
-        self.headers = AppMap::Util.select_headers(NetHTTP.request_headers(request))
+        self.headers = NetHTTP.copy_headers(request)
         self.params = Rack::Utils.parse_nested_query(query)
       end
 
@@ -55,22 +56,25 @@ module AppMap
     end
 
     class HTTPClientResponse < AppMap::Event::MethodReturnIgnoreValue
-      attr_accessor :status, :mime_type, :headers
+      attr_accessor :status, :headers
 
       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 = AppMap::Util.select_headers(NetHTTP.response_headers(response))
       end
 
       def to_h
         super.tap do |h|
           h[:http_client_response] = {
             status_code: status,
-            mime_type: mime_type,
             headers: headers
           }.compact
         end
@@ -79,17 +83,15 @@ module AppMap
 
     class NetHTTP
       class << self
-        def request_headers(request)
+        def copy_headers(obj)
           {}.tap do |headers|
-            request.each_header do |k,v|
-              key = [ 'HTTP', Util.underscore(k).upcase ].join('_')
-              headers[key] = v
+            obj.each_header do |key, value|
+              key = key.split('-').map(&:capitalize).join('-')
+              headers[key] = value
             end
           end
         end
-    
-        alias response_headers request_headers
-    
+
         def handle_call(defined_class, hook_method, receiver, args)
           # request will call itself again in a start block if it's not already started.
           return unless receiver.started?

data/lib/appmap/handler/rails/request_handler.rb

@@ -9,16 +9,14 @@ module AppMap
     module Rails
       module RequestHandler
         class HTTPServerRequest < AppMap::Event::MethodEvent
-          attr_accessor :normalized_path_info, :request_method, :path_info, :params, :mime_type, :headers, :authorization
+          attr_accessor :normalized_path_info, :request_method, :path_info, :params, :headers
 
           def initialize(request)
             super AppMap::Event.next_id_counter, :call, Thread.current.object_id
 
             self.request_method = request.request_method
             self.normalized_path_info = normalized_path(request)
-            self.mime_type = request.headers['Content-Type']
-            self.headers = AppMap::Util.select_headers(request.env)
-            self.authorization = request.headers['Authorization']
+            self.headers = AppMap::Util.select_rack_headers(request.env)
             self.path_info = request.path_info.split('?')[0]
             # ActionDispatch::Http::ParameterFilter is deprecated
             parameter_filter_cls = \
@@ -35,9 +33,7 @@ module AppMap
               h[:http_server_request] = {
                 request_method: request_method,
                 path_info: path_info,
-                mime_type: mime_type,
                 normalized_path_info: normalized_path_info,
-                authorization: authorization,
                 headers: headers,
               }.compact
 
@@ -72,23 +68,21 @@ module AppMap
         end
 
         class HTTPServerResponse < AppMap::Event::MethodReturnIgnoreValue
-          attr_accessor :status, :mime_type, :headers
+          attr_accessor :status, :headers
 
           def initialize(response, parent_id, elapsed)
             super AppMap::Event.next_id_counter, :return, Thread.current.object_id
 
             self.status = response.status
-            self.mime_type = response.headers['Content-Type']
             self.parent_id = parent_id
             self.elapsed = elapsed
-            self.headers = AppMap::Util.select_headers(response.headers)
+            self.headers = response.headers.dup
           end
 
           def to_h
             super.tap do |h|
               h[:http_server_response] = {
                 status_code: status,
-                mime_type: mime_type,
                 headers: headers
               }.compact
             end

data/lib/appmap/hook.rb

@@ -89,7 +89,7 @@ module AppMap
 
       config.builtin_hooks.each do |class_name, hooks|
         Array(hooks).each do |hook|
-          require hook.package.package_name if hook.package.package_name
+          require hook.package.package_name if hook.package.package_name && hook.package.package_name != 'ruby'
           Array(hook.method_names).each do |method_name|
             method_name = method_name.to_sym
             base_cls = class_from_string.(class_name)

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/swagger/configuration.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'yaml'
 
 module AppMap

data/lib/appmap/util.rb

@@ -21,6 +21,16 @@ module AppMap
     WHITE   = "\e[37m"
 
     class << self
+      def parse_function_name(name)
+        package_tokens = name.split('/')
+
+        class_and_name = package_tokens.pop
+        class_name, function_name, static = class_and_name.include?('.') ? class_and_name.split('.', 2) + [ true ] : class_and_name.split('#', 2) + [ false ]
+
+        raise "Malformed fully-qualified function name #{name}" unless function_name
+        [ package_tokens.empty? ? 'ruby' : package_tokens.join('/'), class_name, static, function_name ]
+      end
+
       # scenario_filename builds a suitable file name from a scenario name.
       # Special characters are removed, and the file name is truncated to fit within
       # shell limitations.
@@ -98,8 +108,18 @@ module AppMap
         event
       end
 
-      def select_headers(env)
+      def select_rack_headers(env)
+        finalize_headers = lambda do |headers|
+          blank?(headers) ? nil : headers
+        end
+
         # Rack prepends HTTP_ to all client-sent headers.
+
+        if !env['rack.version']
+          warn "Request headers does not contain rack.version. HTTP_ prefix is not expected."
+          return finalize_headers.call(env.dup)
+        end
+
         matching_headers = env
           .select { |k,v| k.start_with? 'HTTP_'}
           .reject { |k,v| blank?(v) }
@@ -108,7 +128,7 @@ module AppMap
             value = kv[1]
             memo[key] = value
           end
-        blank?(matching_headers) ? nil : matching_headers
+        finalize_headers.call(matching_headers)
       end
 
       def normalize_path(path)

data/lib/appmap/version.rb

@@ -3,7 +3,7 @@
 module AppMap
   URL = 'https://github.com/applandinc/appmap-ruby'
 
-  VERSION = '0.65.1'
+  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/spec/config_spec.rb

@@ -55,6 +55,34 @@ describe AppMap::Config, docker: false do
     expect(config.to_h.deep_stringify_keys!).to eq(config_expectation)
   end
 
+  it 'interprets a function in canonical name format' do
+    config_data = {
+      name: 'test',
+      packages: [],
+      functions: [
+        {
+          name: 'pkg/cls#fn',
+        }
+      ]
+    }.deep_stringify_keys!
+    config = AppMap::Config.load(config_data)
+
+    config_expectation = {
+      exclude: [],
+      name: 'test',
+      packages: [],
+      functions: [
+        {
+          package: 'pkg',
+          class: 'cls',
+          functions: [ :fn ],
+        }
+      ]
+    }.deep_stringify_keys!
+
+    expect(config.to_h.deep_stringify_keys!).to eq(config_expectation)
+  end
+
   context do
     let(:warnings) { @warnings ||= [] }
     let(:warning) { warnings.join }

data/spec/depends/api_spec.rb

@@ -93,9 +93,9 @@ describe 'Depends API' do
 
         test_report.clean_appmaps
 
-        expect(File.exists?(new_spec_file)).to be_falsey
+        expect(File.exist?(new_spec_file)).to be_falsey
       ensure
-        FileUtils.rm_f new_spec_file if File.exists?(new_spec_file)
+        FileUtils.rm_f new_spec_file if File.exist?(new_spec_file)
         FileUtils.rm_rf new_spec_file.split('.')[0]
       end
     end

data/spec/fixtures/config/missing_path_or_gem.yml

@@ -0,0 +1,3 @@
+name: name
+packages:
+  - dogs: are friendly

data/spec/fixtures/rails5_users_app/appmap.yml

@@ -5,3 +5,7 @@ packages:
   - path: app/controllers
     labels: [ mvc.controller ]
   - gem: sequel
+functions:
+  - name: logger/Logger::LogDevice#write
+    builtin: true
+    label: log

data/spec/fixtures/rails6_users_app/appmap.yml

@@ -5,6 +5,10 @@ packages:
   - path: app/controllers
     labels: [ mvc.controller ]
   - gem: sequel
+functions:
+  - name: logger/Logger::LogDevice#write
+    builtin: true
+    label: log
 swagger:
   project_version: 1.1.0
   output_dir: tmp/swagger

data/spec/rails_recording_spec.rb

@@ -1,7 +1,11 @@
 require 'rails_spec_helper'
 
+def default_rails_versions
+  ruby_2? ? [ 5, 6 ] : [ 6 ]
+end
+
 # Rails5 doesn't work with Ruby 3.x
-RailsVersions = ruby_2? ? [ 5, 6 ] : [ 6 ]
+RailsVersions = ENV['RAILS_VERSIONS'] || default_rails_versions
 
 describe 'Rails' do
   RailsVersions.each do |rails_major_version| # rubocop:disable Metrics/BlockLength
@@ -54,7 +58,7 @@ describe 'Rails' do
               hash_including(
                 'http_server_response' => hash_including(
                   'status_code' => 201,
-                  'mime_type' => 'application/json; charset=utf-8',
+                  'headers' => hash_including('Content-Type' => 'application/json; charset=utf-8'),
                 )
               )
             )
@@ -91,6 +95,15 @@ describe 'Rails' do
             )
           end
 
+          it 'captures log events' do
+            expect(events).to include hash_including(
+              'event' => 'call',
+              'defined_class' => 'Logger::LogDevice',
+              'method_id' => 'write',
+              'static' => false
+            )
+          end
+
           context 'with an object-style message' do
             let(:appmap_json_file) { 'Api_UsersController_POST_api_users_with_required_parameters_with_object-style_parameters_creates_a_user.appmap.json' }
 

data/test/agent_setup_validate_test.rb

@@ -6,6 +6,7 @@ class AgentSetupValidateTest < Minitest::Test
   NON_EXISTING_CONFIG_FILENAME = '123.yml'
   INVALID_YAML_CONFIG_FILENAME = 'spec/fixtures/config/invalid_yaml_config.yml'
   INVALID_CONFIG_FILENAME = 'spec/fixtures/config/invalid_config.yml'
+  MISSING_PATH_OR_GEM_CONFIG_FILENAME = 'spec/fixtures/config/missing_path_or_gem.yml'
 
   def test_init_when_config_exists
     output = `./exe/appmap-agent-validate`
@@ -72,4 +73,22 @@ class AgentSetupValidateTest < Minitest::Test
     ])
     assert_equal expected, output.strip
   end
+
+  def test_init_with_missing_package_key
+    output = `./exe/appmap-agent-validate -c #{MISSING_PATH_OR_GEM_CONFIG_FILENAME}`
+    assert_equal 0, $CHILD_STATUS.exitstatus
+    expected = JSON.pretty_generate([
+      {
+        level: :error,
+        message: 'AppMap auto-configuration is currently not available for non Rails projects'
+      },
+      {
+        level: :error,
+        filename: MISSING_PATH_OR_GEM_CONFIG_FILENAME,
+        message: "AppMap configuration #{MISSING_PATH_OR_GEM_CONFIG_FILENAME} could not be loaded",
+        detailed_message: "AppMap config 'package' element should specify 'gem' or 'path'"
+      }
+    ])
+    assert_equal expected, output.strip
+  end
 end

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.65.1
+  version: 0.67.0
 platform: ruby
 authors:
 - Kevin Gilpin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-09-16 00:00:00.000000000 Z
+date: 2021-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -3462,6 +3462,7 @@ files:
 - spec/fixtures/config/incomplete_config.yml
 - spec/fixtures/config/invalid_config.yml
 - spec/fixtures/config/invalid_yaml_config.yml
+- spec/fixtures/config/missing_path_or_gem.yml
 - spec/fixtures/config/valid_config.yml
 - spec/fixtures/depends/.gitignore
 - spec/fixtures/depends/app/controllers/api/api_keys_controller.rb
@@ -3698,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
@@ -3714,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
@@ -3738,7 +3744,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Record the operation of a Ruby program, using the AppLand 'AppMap' format.