appmap 0.75.0 → 0.77.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 322b607426359e9dcebd46ea4a565550c75413e785275b736530149e19f493c4
-  data.tar.gz: 34b81b8f50e4312b0d1b3e54ad58bb86666812eafaba19338aca73ed12f12c37
+  metadata.gz: b186892e87c9138a6bd540c82dd899e5d9b4671748ba7219c7d685175509d625
+  data.tar.gz: 0f917bd67d06fab65b568b55c68405206fdf942cd72854a6cff845e021970d80
 SHA512:
-  metadata.gz: ac8aa369f84bd56aa5b2fddba6211eb528beb9c79d710738e9b7feb20198922a35a98e7b57bb615979ad186d7920b358f3ef06f9ced9d4b9289c5627cc660512
-  data.tar.gz: 9e1c7ab9a501fd4043b31843291f62f71257d3d946a46d8b4c08e3330546a6680cdb53ac512b23ce81ac525e1d35178cc491b5a72113e23a93649c8f87948dab
+  metadata.gz: afb2787068a4b7dca1c7b5226f82864c1ce8e5d32c88db7caf554f7c9d6cfbcd1d817e37f1ac691a573d36da4da53ea057c4c3d39c0e985e0969cfed9c63f7ae
+  data.tar.gz: 3b7f117ebe7f4b732cc81bd412bea46dd51b356db78a228561b3b9cf5c581b05d91e081b6cd699ad31d33e82fbd3d31548ccb91478c0fe7648357c947d6ef18a

data/.travis.yml

@@ -1,10 +1,13 @@
 language: ruby
 dist: bionic
 
+# NB: if you update the ruby versions here, you also need to update
+# them in the Rakefile.
 rbenv:
 - 2.6
 - 2.7
 - 3.0
+- 3.1
 
 addons:
   apt:

data/CHANGELOG.md

@@ -1,3 +1,25 @@
+## [0.77.1](https://github.com/applandinc/appmap-ruby/compare/v0.77.0...v0.77.1) (2022-03-24)
+
+
+### Bug Fixes
+
+* Add 3.1 as a supported version ([453f6df](https://github.com/applandinc/appmap-ruby/commit/453f6dfc5de29303fc9cbcf60ce0c3499528711c))
+
+# [0.77.0](https://github.com/applandinc/appmap-ruby/compare/v0.76.0...v0.77.0) (2022-03-22)
+
+
+### Features
+
+* Add label job.perform ([fb5e220](https://github.com/applandinc/appmap-ruby/commit/fb5e220a1f4fd724d8d0178fd4282fed73ff9371))
+* Add labels for devise ([734ec61](https://github.com/applandinc/appmap-ruby/commit/734ec617aa81d756acf3cb392b5eaabcf9521934))
+
+# [0.76.0](https://github.com/applandinc/appmap-ruby/compare/v0.75.0...v0.76.0) (2022-03-19)
+
+
+### Features
+
+* Autoload hook handlers ([4cc0e70](https://github.com/applandinc/appmap-ruby/commit/4cc0e7003a8c37d3b6c8c8bbc68cffac0335b878))
+
 # [0.75.0](https://github.com/applandinc/appmap-ruby/compare/v0.74.0...v0.75.0) (2022-03-17)
 
 

data/Rakefile

@@ -13,7 +13,7 @@ Rake::ExtensionTask.new("appmap") do |ext|
   ext.lib_dir = "lib/appmap"
 end
 
-RUBY_VERSIONS=%w[2.6 2.7 3.0].select do |version|
+RUBY_VERSIONS=%w[2.6 2.7 3.0 3.1].select do |version|
   travis_ruby_version = ENV['TRAVIS_RUBY_VERSION']
   next true unless travis_ruby_version
 

data/appmap.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'reverse_markdown'
 
   spec.add_development_dependency 'bundler', '>= 1.16'
-  spec.add_development_dependency 'minitest', '= 5.14.4'
+  spec.add_development_dependency 'minitest', '~> 5.14'
   spec.add_development_dependency 'pry-byebug'
   spec.add_development_dependency 'rake', '>= 12.3.3'
   spec.add_development_dependency 'rdoc'

data/lib/appmap/config.rb

@@ -4,8 +4,7 @@ require 'pathname'
 require 'set'
 require 'yaml'
 require 'appmap/util'
-require 'appmap/handler/net_http'
-require 'appmap/handler/rails/template'
+require 'appmap/handler'
 require 'appmap/service/guesser'
 require 'appmap/swagger/configuration'
 require 'appmap/depends/configuration'
@@ -206,8 +205,8 @@ module AppMap
         }.compact
 
         handler_class = hook_decl['handler_class']
-        options[:handler_class] = Util.class_from_string(handler_class) if handler_class
-        
+        options[:handler_class] = Handler.find(handler_class) if handler_class
+
         package_hooks(methods, **options)
       end
 

data/lib/appmap/gem_hooks/activejob.yml

@@ -1,2 +1,6 @@
 - method: ActiveJob::Enqueuing#enqueue
   label: job.create
+- methods:
+  - ActiveJob::Execution#perform
+  - ActiveJob::Execution#perform_now
+  label: job.perform

data/lib/appmap/gem_hooks/devise.yml

@@ -0,0 +1,8 @@
+- method: Devise::TokenGenerator#generate
+  label: secret
+- method: Devise.friendly_token
+  label: secret
+- method: Devise.secure_compare
+  label: security.secure_compare
+- method: Devise::Strategies::DatabaseAuthenticatable#authenticate!
+  label: security.authentication

data/lib/appmap/handler.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require 'active_support/inflector/methods'
+
+module AppMap
+  # Specific hook handler classes and general related utilities.
+  module Handler
+    # Try to find handler module with a given name.
+    #
+    # If the module is not loaded, tries to require the appropriate file
+    # using the usual conventions, eg. `Acme::Handler::AppMap` will try
+    # to require `acme/handler/app_map`, then `acme/handler` and
+    # finally `acme`. Raises NameError if the module could not be loaded
+    # this way.
+    def self.find(name)
+      begin
+        return Object.const_get name
+      rescue NameError
+        try_load ActiveSupport::Inflector.underscore name
+      end
+      Object.const_get name
+    end
+
+    def self.try_load(fname)
+      fname = fname.sub %r{^app_map/}, 'appmap/'
+      fname = fname.split '/'
+      until fname.empty?
+        begin
+          require fname.join '/'
+          return
+        rescue LoadError
+          # pass
+        end
+        fname.pop
+      end
+    end
+  end
+end

data/lib/appmap/hook.rb

@@ -108,8 +108,11 @@ module AppMap
 
               warn "AppMap: Initiating hook for builtin #{class_name} #{method_name}" if LOG
 
-              base_cls = Util.class_from_string(class_name, must: false)
-              next unless base_cls
+              begin
+                base_cls = Object.const_get class_name
+              rescue NameError
+                next
+              end
 
               hook_method = lambda do |entry|
                 cls, method = entry

data/lib/appmap/util.rb

@@ -21,14 +21,6 @@ module AppMap
     WHITE   = "\e[37m"
 
     class << self
-      def class_from_string(fq_class, must: true)
-        fq_class.split('::').inject(Object) do |mod, class_name|
-          mod.const_get(class_name)
-        end
-      rescue NameError
-        raise if must
-      end
-
       def parse_function_name(name)
         package_tokens = name.split('/')
 

data/lib/appmap/version.rb

@@ -3,11 +3,11 @@
 module AppMap
   URL = 'https://github.com/applandinc/appmap-ruby'
 
-  VERSION = '0.75.0'
+  VERSION = '0.77.1'
 
   APPMAP_FORMAT_VERSION = '1.5.1'
 
-  SUPPORTED_RUBY_VERSIONS = %w[2.6 2.7 3.0].freeze
+  SUPPORTED_RUBY_VERSIONS = %w[2.6 2.7 3.0 3.1].freeze
 
   DEFAULT_APPMAP_DIR = 'tmp/appmap'.freeze
   DEFAULT_CONFIG_FILE_PATH = 'appmap.yml'.freeze

data/spec/hook_spec.rb

@@ -1,3 +1,4 @@
+# coding: utf-8
 # frozen_string_literal: true
 
 require 'rails_spec_helper'
@@ -1105,7 +1106,7 @@ describe 'AppMap class Hooking', docker: false do
       begin
         tz = ENV['TZ']
         ENV['TZ'] = 'UTC'
-        Timecop.freeze(Time.utc('2020-01-01')) do
+        Timecop.freeze(Time.utc(2020, 01, 01)) do
           expect(Time).to receive(:now).at_least(3).times.and_call_original
           expect(InstanceMethod.new.say_the_time).to be
         end

data/test/expectations/openssl_test_key_sign2-3.1.json

@@ -0,0 +1,52 @@
+[
+  {
+    "id": 1,
+    "event": "call",
+    "defined_class": "Example",
+    "method_id": "sign",
+    "path": "lib/openssl_key_sign.rb",
+    "lineno": 10,
+    "static": true,
+    "parameters": [
+
+    ],
+    "receiver": {
+      "class": "Module"
+    }
+  },
+  {
+    "id": 2,
+    "event": "call",
+    "defined_class": "OpenSSL::PKey::PKey",
+    "method_id": "sign",
+    "path": "OpenSSL::PKey::PKey#sign",
+    "static": false,
+    "parameters": [
+      {
+        "name": "arg",
+        "class": "Array",
+        "value": "[e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855, the document]",
+        "kind": "rest"
+      }
+    ],
+    "receiver": {
+      "class": "OpenSSL::PKey::RSA"
+    }
+  },
+  {
+    "id": 3,
+    "event": "return",
+    "parent_id": 2,
+    "return_value": {
+      "class": "String"
+    }
+  },
+  {
+    "id": 4,
+    "event": "return",
+    "parent_id": 1,
+    "return_value": {
+      "class": "String"
+    }
+  }
+]

data/test/openssl_test.rb

@@ -38,8 +38,14 @@ class OpenSSLTest < Minitest::Test
         event
       end
 
+      # Signature of OpenSSL::PKey::PKey.sign changed in 3.1
+      expected = if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.1')
+                   expectation('openssl_test_key_sign2-3.1.json').strip
+                 else
+                   expectation('openssl_test_key_sign2.json').strip
+                 end
       diff = Diffy::Diff.new(
-        expectation('openssl_test_key_sign2.json').strip,
+        expected,
         JSON.pretty_generate(sanitized_events).strip
       )
       assert_equal '', diff.to_s

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appmap
 version: !ruby/object:Gem::Version
-  version: 0.75.0
+  version: 0.77.1
 platform: ruby
 authors:
 - Kevin Gilpin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-03-17 00:00:00.000000000 Z
+date: 2022-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -84,16 +84,16 @@ dependencies:
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.14.4
+        version: '5.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.14.4
+        version: '5.14'
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
@@ -369,11 +369,13 @@ files:
 - lib/appmap/gem_hooks/activerecord.yml
 - lib/appmap/gem_hooks/activesupport.yml
 - lib/appmap/gem_hooks/cancancan.yml
+- lib/appmap/gem_hooks/devise.yml
 - lib/appmap/gem_hooks/rails.yml
 - lib/appmap/gem_hooks/railties.yml
 - lib/appmap/gem_hooks/resque.yml
 - lib/appmap/gem_hooks/sidekiq.yml
 - lib/appmap/gem_hooks/sprockets.yml
+- lib/appmap/handler.rb
 - lib/appmap/handler/function.rb
 - lib/appmap/handler/net_http.rb
 - lib/appmap/handler/rails/request_handler.rb
@@ -631,6 +633,7 @@ files:
 - test/bundle_vendor_test.rb
 - test/cucumber_test.rb
 - test/expectations/openssl_test_key_sign1.json
+- test/expectations/openssl_test_key_sign2-3.1.json
 - test/expectations/openssl_test_key_sign2.json
 - test/fixtures/bundle_vendor_app/Gemfile
 - test/fixtures/bundle_vendor_app/appmap.yml