appmap 0.76.0 → 0.77.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15371b6980bcc95640c4d579c323da11db85509c0f50110c318da0d9cc04f189
-  data.tar.gz: 03a4e889edcfaf15629a7e9662f230df18b3b1123c86ce463edf4ba03c9e7280
+  metadata.gz: c287b504d552b0f627f6343e61f42835b144d12f3dea4e9f8a6e33bd72dbc581
+  data.tar.gz: b00990f93c7961487a0c4ea6bc1f0828c3efa391578100de41600cc72ee1727d
 SHA512:
-  metadata.gz: a1bc1b230b3e946400acbc3d1bc8ee87508973ce594ca488c17f2d39d1280346959e2c5acb5c9d3f6cd62627b61764f5cd0d96ef60639c645337df2ac850409b
-  data.tar.gz: e0bb0223a99795cedc38470d49dae428a720f0638674dc4e04b26d15aa085286d51c42aacc1ee490ff713122711728af9df1064adcb66a6dff7ccb89292b72a5
+  metadata.gz: 0245f3bb4e483b6fba7326d759af828022e4339e05a293144e628c7fae558d744b105a0d3be8f44caa106f9b7b056fb3886176f3cdd513fe400c18126c4b7488
+  data.tar.gz: 84cf727259f8ec5bad21b9d2ce799bc0753aeaeca0047fcf4296a0e5782d392a28340d44af0c08ab5d6a44fddb7baea4ea784ddd65e942329f159cf9eb4eac5b

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.2](https://github.com/applandinc/appmap-ruby/compare/v0.77.1...v0.77.2) (2022-03-25)
+
+
+### Bug Fixes
+
+* Pass the proper openapi-template arg ([05cbfde](https://github.com/applandinc/appmap-ruby/commit/05cbfdebdf80e3df2105a943ad892d5a7df614d7))
+
+## [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)
 
 

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

@@ -20,9 +20,14 @@ module AppMap
           appmap_js = AppMap::NodeCLI.new(verbose: Rake.verbose == true)
 
           FileUtils.mkdir_p configuration.swagger_config.output_dir
+          swagger_template = Tempfile.new('swagger_template')
+
+          swagger_template.write(configuration.swagger_config.template.to_yaml)
+          swagger_template.close
 
           cmd = %w[swagger]
-  
+          cmd << '--openapi-template' << swagger_template.path
+
           swagger_raw, = appmap_js.command(cmd)
 
           gen_swagger = YAML.load(swagger_raw)

data/lib/appmap/version.rb

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

@@ -33,8 +33,8 @@ describe 'rake appmap:swagger' do
     expect(swagger).to eq(YAML.load(<<~YAML
       :openapi: 3.0.1
       :info:
-        :title: My project
-        :version: v1
+        :title: Usersapp API
+        :version: 1.1.0
       :paths:
         :/api/users:
           :get:

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.76.0
+  version: 0.77.2
 platform: ruby
 authors:
 - Kevin Gilpin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-03-19 00:00:00.000000000 Z
+date: 2022-03-25 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,6 +369,7 @@ 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
@@ -632,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