RubyGems - appmap - Versions diffs - 0.34.5 → 0.37.0 - Mend

appmap 0.34.5 → 0.37.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (37) hide show

checksums.yaml +4 -4
data/.gitignore +2 -1
data/.rubocop.yml +3 -0
data/CHANGELOG.md +24 -0
data/README.md +11 -8
data/Rakefile +2 -1
data/appmap.gemspec +2 -1
data/appmap.yml +1 -7
data/lib/appmap.rb +2 -2
data/lib/appmap/class_map.rb +22 -9
data/lib/appmap/config.rb +55 -25
data/lib/appmap/event.rb +28 -10
data/lib/appmap/hook.rb +9 -8
data/lib/appmap/hook/method.rb +10 -6
data/lib/appmap/rails/request_handler.rb +88 -0
data/lib/appmap/rails/sql_handler.rb +10 -2
data/lib/appmap/railtie.rb +4 -6
data/lib/appmap/rspec.rb +11 -1
data/lib/appmap/trace.rb +9 -7
data/lib/appmap/version.rb +2 -2
data/spec/abstract_controller4_base_spec.rb +1 -1
data/spec/abstract_controller_base_spec.rb +6 -0
data/spec/class_map_spec.rb +36 -0
data/spec/fixtures/hook/exception_method.rb +44 -0
data/spec/hook_spec.rb +145 -2
data/test/cli_test.rb +0 -10
data/test/expectations/openssl_test_key_sign1.json +55 -0
data/test/expectations/openssl_test_key_sign2.json +58 -0
data/test/fixtures/gem_test/Gemfile +6 -0
data/test/fixtures/gem_test/appmap.yml +3 -0
data/test/fixtures/gem_test/test/to_param_test.rb +14 -0
data/test/gem_test.rb +34 -0
data/test/minitest_test.rb +2 -2
data/test/openssl_test.rb +10 -165
metadata +30 -10
data/.ruby-version +0 -1
data/lib/appmap/rails/action_handler.rb +0 -91

data/test/cli_test.rb CHANGED

@@ -56,12 +56,10 @@ class CLITest < Minitest::Test
     Class frequency:
     ----------------
     1	Main
-    1	IO
     Method frequency:
     ----------------
     1	Main.say_hello
-    1	IO#write
     OUTPUT
   end
@@ -82,20 +80,12 @@ class CLITest < Minitest::Test
         {
           "name": "Main",
           "count": 1
-        },
-        {
-          "name": "IO",
-          "count": 1
         }
       ],
       "method_frequency": [
         {
           "name": "Main.say_hello",
           "count": 1
-        },
-        {
-          "name": "IO#write",
-          "count": 1
         }
       ]
     }

data/test/expectations/openssl_test_key_sign1.json ADDED

@@ -0,0 +1,55 @@
+[
+  {
+    "name": "lib",
+    "type": "package",
+    "children": [
+      {
+        "name": "Example",
+        "type": "class",
+        "children": [
+          {
+            "name": "sign",
+            "type": "function",
+            "location": "lib/openssl_key_sign.rb:10",
+            "static": true,
+            "source": "  def Example.sign\n    key = OpenSSL::PKey::RSA.new 2048\n\n    document = 'the document'\n\n    digest = OpenSSL::Digest::SHA256.new\n    key.sign digest, document\n  end\n"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "name": "openssl",
+    "type": "package",
+    "children": [
+      {
+        "name": "OpenSSL",
+        "type": "class",
+        "children": [
+          {
+            "name": "PKey",
+            "type": "class",
+            "children": [
+              {
+                "name": "PKey",
+                "type": "class",
+                "children": [
+                  {
+                    "name": "sign",
+                    "type": "function",
+                    "location": "OpenSSL::PKey::PKey#sign",
+                    "static": false,
+                    "labels": [
+                      "security",
+                      "crypto"
+                    ]
+                  }
+                ]
+              }
+            ]
+          }
+        ]
+      }
+    ]
+  }
+]

data/test/expectations/openssl_test_key_sign2.json ADDED

@@ -0,0 +1,58 @@
+[
+  {
+    "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": "OpenSSL::Digest::SHA256",
+        "value": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
+        "kind": "req"
+      },
+      {
+        "name": "arg",
+        "class": "String",
+        "value": "the document",
+        "kind": "req"
+      }
+    ],
+    "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/fixtures/gem_test/Gemfile ADDED

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

data/test/fixtures/gem_test/appmap.yml ADDED

@@ -0,0 +1,3 @@
+name: gem_test
+packages:
+  - gem: activesupport

data/test/fixtures/gem_test/test/to_param_test.rb ADDED

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+require 'appmap/minitest'
+require 'minitest/autorun'
+require 'active_support'
+require 'active_support/core_ext'
+class ToParamTest < ::Minitest::Test
+  def test_to_param
+    # record use of a core extension
+    assert_equal 'my+id', 'my+id'.to_param
+  end
+end

data/test/gem_test.rb ADDED

@@ -0,0 +1,34 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+require 'test_helper'
+require 'English'
+class MinitestTest < Minitest::Test
+  def perform_gem_test(test_name)
+    Bundler.with_clean_env do
+      Dir.chdir 'test/fixtures/gem_test' do
+        FileUtils.rm_rf 'tmp'
+        system 'bundle config --local local.appmap ../../..'
+        system 'bundle'
+        system({ 'APPMAP' => 'true' }, %(bundle exec ruby -Ilib -Itest test/#{test_name}_test.rb))
+        yield
+      end
+    end
+  end
+  def test_record_gem
+    perform_gem_test 'to_param' do
+      appmap_file = 'tmp/appmap/minitest/To_param_to_param.appmap.json'
+      appmap = JSON.parse(File.read(appmap_file))
+      events = appmap['events']
+      assert_equal 2, events.size
+      assert_equal 'call', events.first['event']
+      assert_equal 'to_param', events.first['method_id']
+      assert_equal "#{Gem.loaded_specs['activesupport'].gem_dir}/lib/active_support/core_ext/object/to_query.rb", events.first['path']
+      assert_equal 'return', events.second['event']
+      assert_equal 1, events.second['parent_id']
+    end
+  end
+end

data/test/minitest_test.rb CHANGED

@@ -5,7 +5,7 @@ require 'test_helper'
 require 'English'
 class MinitestTest < Minitest::Test
-  def perform_test(test_name)
+  def perform_minitest_test(test_name)
     Bundler.with_clean_env do
       Dir.chdir 'test/fixtures/minitest_recorder' do
         FileUtils.rm_rf 'tmp'
@@ -19,7 +19,7 @@ class MinitestTest < Minitest::Test
   end
   def test_hello
-    perform_test 'hello' do
+    perform_minitest_test 'hello' do
       appmap_file = 'tmp/appmap/minitest/Hello_hello.appmap.json'
       assert File.file?(appmap_file), 'appmap output file does not exist'

data/test/openssl_test.rb CHANGED

@@ -11,13 +11,17 @@ class OpenSSLTest < Minitest::Test
         FileUtils.rm_rf 'tmp'
         system 'bundle config --local local.appmap ../../..'
         system 'bundle'
-        system({ 'APPMAP' => 'true', 'DEBUG' => 'true' }, %(bundle exec ruby lib/openssl_#{test_name}.rb))
+        system({ 'APPMAP' => 'true' }, %(bundle exec ruby lib/openssl_#{test_name}.rb))
         yield
       end
     end
   end
+  def expectation(name)
+    File.read File.join __dir__, 'expectations', name
+  end
   def test_key_sign
     perform_test 'key_sign' do
       appmap_file = 'appmap.json'
@@ -26,83 +30,7 @@ class OpenSSLTest < Minitest::Test
       appmap = JSON.parse(File.read(appmap_file))
       assert_equal AppMap::APPMAP_FORMAT_VERSION, appmap['version']
       assert_equal [ { 'recorder' => 'lib/openssl_key_sign.rb' } ], appmap['metadata']
-      assert_equal JSON.parse(<<~JSON), appmap['classMap']
-      [
-        {
-          "name": "lib",
-          "type": "package",
-          "children": [
-            {
-              "name": "Example",
-              "type": "class",
-              "children": [
-                {
-                  "name": "sign",
-                  "type": "function",
-                  "location": "lib/openssl_key_sign.rb:10",
-                  "static": true
-                }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "openssl",
-          "type": "package",
-          "children": [
-            {
-              "name": "OpenSSL",
-              "type": "class",
-              "children": [
-                {
-                  "name": "PKey",
-                  "type": "class",
-                  "children": [
-                    {
-                      "name": "PKey",
-                      "type": "class",
-                      "children": [
-                        {
-                          "name": "sign",
-                          "type": "function",
-                          "location": "OpenSSL::PKey::PKey#sign",
-                          "static": false,
-                          "labels": [
-                            "security",
-                            "crypto"
-                          ]
-                        }
-                      ]
-                    }
-                  ]
-                }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "io",
-          "type": "package",
-          "children": [
-            {
-              "name": "IO",
-              "type": "class",
-              "children": [
-                {
-                  "name": "write",
-                  "type": "function",
-                  "location": "IO#write",
-                  "static": false,
-                  "labels": [
-                    "io"
-                  ]
-                }
-              ]
-            }
-          ]
-        }
-      ]
-      JSON
+      assert_equal JSON.parse(expectation('openssl_test_key_sign1.json')), appmap['classMap']
       sanitized_events = appmap['events'].map(&:deep_symbolize_keys).map(&AppMap::Util.method(:sanitize_event)).map do |event|
         delete_value = ->(obj) { (obj || {}).delete(:value) }
         delete_value.call(event[:receiver])
@@ -110,93 +38,10 @@ class OpenSSLTest < Minitest::Test
         event
       end
-      diff = Diffy::Diff.new(<<~JSON.strip, JSON.pretty_generate(sanitized_events).strip)
-      [
-        {
-          "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": "OpenSSL::Digest::SHA256",
-              "value": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
-              "kind": "req"
-            },
-            {
-              "name": "arg",
-              "class": "String",
-              "value": "the document",
-              "kind": "req"
-            }
-          ],
-          "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"
-          }
-        },
-        {
-          "id": 5,
-          "event": "call",
-          "defined_class": "IO",
-          "method_id": "write",
-          "path": "IO#write",
-          "static": false,
-          "parameters": [
-            {
-              "name": "arg",
-              "class": "String",
-              "value": "Computed signature",
-              "kind": "rest"
-            }
-          ],
-          "receiver": {
-            "class": "IO"
-          }
-        },
-        {
-          "id": 6,
-          "event": "return",
-          "parent_id": 5,
-          "return_value": {
-            "class": "Integer"
-          }
-        }
-      ]
-      JSON
+      diff = Diffy::Diff.new(
+        expectation('openssl_test_key_sign2.json').strip,
+        JSON.pretty_generate(sanitized_events).strip
+      )
       assert_equal '', diff.to_s
     end
   end

metadata CHANGED

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appmap
 version: !ruby/object:Gem::Version
-  version: 0.34.5
+  version: 0.37.0
 platform: ruby
 authors:
 - Kevin Gilpin
-autorequire:
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-09-23 00:00:00.000000000 Z
+date: 2020-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: method_source
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: parser
   requirement: !ruby/object:Gem::Requirement
@@ -84,14 +98,14 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.16'
 - !ruby/object:Gem::Dependency
@@ -290,7 +304,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description:
+description:
 email:
 - kgilpin@gmail.com
 executables:
@@ -303,7 +317,6 @@ files:
 - ".gitignore"
 - ".rbenv-gemsets"
 - ".rubocop.yml"
-- ".ruby-version"
 - ".travis.yml"
 - CHANGELOG.md
 - Dockerfile.appmap
@@ -338,7 +351,7 @@ files:
 - lib/appmap/middleware/remote_recording.rb
 - lib/appmap/minitest.rb
 - lib/appmap/open.rb
-- lib/appmap/rails/action_handler.rb
+- lib/appmap/rails/request_handler.rb
 - lib/appmap/rails/sql_handler.rb
 - lib/appmap/railtie.rb
 - lib/appmap/record.rb
@@ -367,6 +380,7 @@ files:
 - package.json
 - spec/abstract_controller4_base_spec.rb
 - spec/abstract_controller_base_spec.rb
+- spec/class_map_spec.rb
 - spec/config_spec.rb
 - spec/fixtures/hook/attr_accessor.rb
 - spec/fixtures/hook/compare.rb
@@ -529,6 +543,8 @@ files:
 - spec/util_spec.rb
 - test/cli_test.rb
 - test/cucumber_test.rb
+- test/expectations/openssl_test_key_sign1.json
+- test/expectations/openssl_test_key_sign2.json
 - test/fixtures/cli_record_test/appmap.yml
 - test/fixtures/cli_record_test/lib/cli_record_test/main.rb
 - test/fixtures/cucumber4_recorder/Gemfile
@@ -545,6 +561,9 @@ files:
 - test/fixtures/cucumber_recorder/features/support/hooks.rb
 - test/fixtures/cucumber_recorder/features/support/steps.rb
 - test/fixtures/cucumber_recorder/lib/hello.rb
+- test/fixtures/gem_test/Gemfile
+- test/fixtures/gem_test/appmap.yml
+- test/fixtures/gem_test/test/to_param_test.rb
 - test/fixtures/minitest_recorder/Gemfile
 - test/fixtures/minitest_recorder/appmap.yml
 - test/fixtures/minitest_recorder/lib/hello.rb
@@ -562,6 +581,7 @@ files:
 - test/fixtures/rspec_recorder/spec/decorated_hello_spec.rb
 - test/fixtures/rspec_recorder/spec/labeled_hello_spec.rb
 - test/fixtures/rspec_recorder/spec/plain_hello_spec.rb
+- test/gem_test.rb
 - test/minitest_test.rb
 - test/openssl_test.rb
 - test/record_process_test.rb
@@ -571,7 +591,7 @@ homepage: https://github.com/applandinc/appmap-ruby
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -587,7 +607,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key:
+signing_key:
 specification_version: 4
 summary: Record the operation of a Ruby program, using the AppLand 'AppMap' format.
 test_files: []