appmap 0.81.0 → 0.83.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86f2c44b83fd3ecc97b23cbffb41f1c735eb41b9ed6e134518ecfc3093e5585a
-  data.tar.gz: 3e5d84855cbcfdc93d3dee64719f63650f7f46932e60e81b93f24050c43b9965
+  metadata.gz: 447831123769ff227fed969398dbaad500f5c002e976414ed3cc10e914d2b76e
+  data.tar.gz: 47bdb94fbe52785cc7f68fbdfc20d9d50e96a33173dba68e52ab58334eaa5d84
 SHA512:
-  metadata.gz: 63aa95863c061a8c8185efb02cb10a410b0399a9bde445be8911bed7a0d4a7b10c36c9143d3f77647004610bedc072dca1b14f953c82bfd86ee863883a5dbae6
-  data.tar.gz: 1ca89bb45ed6bb7c6f917d297d2b15d341a9349e1694b38be94251bad090170b84a5c5390fcc9760bdd160fa6c9f660942cf7203d8064dc90f83e10a0dcfa3f9
+  metadata.gz: 790f9967ee6d587acc2c21e594b3147487b798c5d0f83ff52495af3d51b7be80796ba4e68c379055e2accb151a067965a9c8925a38432151b8bb74c5361f6f7a
+  data.tar.gz: ac70307f9221d105c86cc5919e31d3eb4d23f4a91b8c04578ba6d3b8425628d2cd89f90af706f607cce9ae4c5f3eabc4a3237d9a47456f13244b0800e72c4078

data/CHANGELOG.md

@@ -1,3 +1,31 @@
+# [0.83.0](https://github.com/applandinc/appmap-ruby/compare/v0.82.0...v0.83.0) (2022-04-29)
+
+
+### Features
+
+* #before_setup is lang.eval.safe and deserialize.safe ([cf03641](https://github.com/applandinc/appmap-ruby/commit/cf03641dacc1c50aa8ec9803e27936df06acf592))
+* pandoc-ruby is system.exec.safe ([2b3ec8e](https://github.com/applandinc/appmap-ruby/commit/2b3ec8ecc762b1209dc070bc5dc4ec5f33d7eec9))
+
+# [0.82.0](https://github.com/applandinc/appmap-ruby/compare/v0.81.1...v0.82.0) (2022-04-27)
+
+
+### Bug Fixes
+
+* Guess 'app' as the source path ([090f9f3](https://github.com/applandinc/appmap-ruby/commit/090f9f39616accd3bc1e9d3cc5f7991232fe5663))
+
+
+### Features
+
+* install command emits language, appmap_dir ([f780095](https://github.com/applandinc/appmap-ruby/commit/f780095269352e30637de3300dd76b2d6c051022))
+
+## [0.81.1](https://github.com/applandinc/appmap-ruby/compare/v0.81.0...v0.81.1) (2022-04-27)
+
+
+### Bug Fixes
+
+* AppMap format version is 1.7.0 ([53b3f04](https://github.com/applandinc/appmap-ruby/commit/53b3f04dc4f4a7867f28f5b196b2fadbe7cb6eeb))
+* Avoid return within a block (Ruby 2.5) ([85094fd](https://github.com/applandinc/appmap-ruby/commit/85094fd760b3ea08d343960cf586f4cce210fb07))
+
 # [0.81.0](https://github.com/applandinc/appmap-ruby/compare/v0.80.2...v0.81.0) (2022-04-26)
 
 

data/lib/appmap/builtin_hooks/ruby.yml

@@ -19,17 +19,6 @@
   require_name: ruby
   label: lang.eval
   handler_class: AppMap::Handler::Eval
-# TODO: eval does not happen in the right context, and therefore any new constants
-# which are defined are placed on the wrong module/class.
-#  - Binding#eval
-#  - BasicObject#instance_eval
-# These methods cannot be hooked as far as I can tell.
-# Why? When calling one of these functions, the context at the point of
-# definition is used. It's not possible to bind class_eval to a new context.
-#  - Module#class_eval
-#  - Module#module_eval
-#  require_name: ruby
-#  label: lang.eval
 - methods:
   - IO#popen
   - Kernel#exec

data/lib/appmap/command/agent_setup/init.rb

@@ -13,7 +13,9 @@ module AppMap
         def perform
           config = {
             'name' => Service::Guesser.guess_name,
-            'packages' => Service::Guesser.guess_paths.map { |path| { 'path' => path } }
+            'packages' => Service::Guesser.guess_paths.map { |path| { 'path' => path } },
+            'language' => 'ruby',
+            'appmap_dir' => 'tmp/appmap'
           }
 
           result = {

data/lib/appmap/gem_hooks/actionpack.yml

@@ -49,3 +49,7 @@
   label: mvc.render
   handler_class: AppMap::Handler::Rails::RenderHandler
   require_name: action_controller
+- method: ActionDispatch::Integration::Runner#before_setup
+  labels:
+  - deserialize.safe
+  - lang.eval.safe

data/lib/appmap/gem_hooks/pandoc-ruby.yml

@@ -0,0 +1,3 @@
+- method: PandocRuby#convert
+  labels:
+  - system.exec.safe

data/lib/appmap/hook.rb

@@ -116,7 +116,7 @@ module AppMap
 
               hook_method = lambda do |entry|
                 cls, method = entry
-                return false if config.never_hook?(cls, method)
+                next if config.never_hook?(cls, method)
 
                 hook.package.handler_class.new(hook.package, cls, method).activate
               end

data/lib/appmap/open.rb

@@ -38,7 +38,7 @@ module AppMap
       Thread.new do
         Rack::Handler::WEBrick.run(
           lambda do |env|
-            return [200, { 'Content-Type' => 'text/html' }, [page]]
+            [200, { 'Content-Type' => 'text/html' }, [page]]
           end,
           :Port => 0
         ) do |server|

data/lib/appmap/service/config_analyzer.rb

@@ -23,6 +23,11 @@ module AppMap
         config_validator.valid?
       end
 
+      def errors
+        valid?
+        config_validator.violations.map(&:message)
+      end
+
       private
 
       def config_validator

data/lib/appmap/service/guesser.rb

@@ -3,10 +3,11 @@
 module AppMap
   module Service
     class Guesser
-      POSSIBLE_PATHS = %w[app/controllers app/models lib]
+      POSSIBLE_PATHS = %w[app lib]
       class << self
         def guess_name
           return Pathname.new(`git rev-parse --show-toplevel`.strip).basename.to_s if File.directory?('.git')
+
           Dir.pwd.split('/').last
         end
 

data/lib/appmap/service/validator/config_validator.rb

@@ -19,6 +19,7 @@ module AppMap
         end
 
         def valid?
+          @violations = []
           validate_ruby_version
           validate_rails_presence
           validate_config_presence

data/lib/appmap/version.rb

@@ -3,9 +3,9 @@
 module AppMap
   URL = 'https://github.com/applandinc/appmap-ruby'
 
-  VERSION = '0.81.0'
+  VERSION = '0.83.0'
 
-  APPMAP_FORMAT_VERSION = '1.5.1'
+  APPMAP_FORMAT_VERSION = '1.7.0'
 
   SUPPORTED_RUBY_VERSIONS = %w[2.5 2.6 2.7 3.0 3.1].freeze
 

data/spec/depends/api_spec.rb

@@ -110,12 +110,14 @@ describe 'Depends API' do
 
     describe 'smoke test' do
       around do |test|
-        @minitest_test_command_method = AppMap.configuration.depends_config.minitest_test_command_method
-        AppMap.configuration.depends_config.minitest_test_command_method = 'AppMap::Depends::APISpec.minitest_test_command'
+        begin
+          @minitest_test_command_method = AppMap.configuration.depends_config.minitest_test_command_method
+          AppMap.configuration.depends_config.minitest_test_command_method = 'AppMap::Depends::APISpec.minitest_test_command'
 
-        test.call
-      ensure
-        AppMap.configuration.depends_config.minitest_test_command_method = @minitest_test_command
+          test.call
+        ensure
+          AppMap.configuration.depends_config.minitest_test_command_method = @minitest_test_command
+        end
       end
 
       it 'passes a smoke test' do
@@ -125,20 +127,22 @@ describe 'Depends API' do
 
     describe 'configuration settings' do
       it 'can all be modified' do
-        defaults = {}
-
-        %i[rspec minitest].each do |framework|
-          %i[environment_method select_tests_method test_command_method].each do |setting|
-            full_setting = [ framework, setting ].join('_').to_sym
-            defaults[full_setting] = AppMap.configuration.depends_config.send(full_setting)
-            AppMap.configuration.depends_config.send("#{full_setting}=", "AppMap::Depends::APISpec.#{full_setting}")
+        begin
+          defaults = {}
+
+          %i[rspec minitest].each do |framework|
+            %i[environment_method select_tests_method test_command_method].each do |setting|
+              full_setting = [ framework, setting ].join('_').to_sym
+              defaults[full_setting] = AppMap.configuration.depends_config.send(full_setting)
+              AppMap.configuration.depends_config.send("#{full_setting}=", "AppMap::Depends::APISpec.#{full_setting}")
+            end
           end
-        end
 
-        run_tests
-      ensure
-        defaults.keys.each do |setting|
-          AppMap.configuration.depends_config.send("#{setting}=", defaults[setting])
+          run_tests
+        ensure
+          defaults.keys.each do |setting|
+            AppMap.configuration.depends_config.send("#{setting}=", defaults[setting])
+          end
         end
       end
     end

data/spec/fixtures/config/maximal_config.yml

@@ -0,0 +1,14 @@
+name: appmap
+packages:
+  - path: app/models
+    exclude: app/models/helpers
+  - gem: rack
+  - gem: activesupport
+    shallow: false
+functions:
+  - methods:
+    - OpenSSL::X509::Request#sign
+    - OpenSSL::X509::Request#verify
+    label: crypto.x509
+language: ruby
+appmap_dir: tmp/appmap

data/spec/fixtures/config/valid_config.yml

@@ -1,3 +1,3 @@
 name: appmap
 packages:
-  - path: app/models
+  - path: app/models

data/spec/hook_spec.rb

@@ -751,9 +751,11 @@ describe 'AppMap class Hooking' do
         :lineno: 9
     YAML
     test_hook_behavior 'spec/fixtures/hook/exception_method.rb', events_yaml do
-      ExceptionMethod.new.raise_exception
-    rescue
-      # don't let the exception fail the test
+      begin
+        ExceptionMethod.new.raise_exception
+      rescue
+        # don't let the exception fail the test
+      end
     end
   end
 
@@ -781,9 +783,11 @@ describe 'AppMap class Hooking' do
         :lineno: 59
     YAML
     test_hook_behavior 'spec/fixtures/hook/exception_method.rb', events_yaml do
-      ExceptionMethod.new.raise_illegal_utf8_message
-    rescue
-      # don't let the exception fail the test
+      begin
+        ExceptionMethod.new.raise_illegal_utf8_message
+      rescue
+        # don't let the exception fail the test
+      end
     end
   end
 

data/spec/remote_recording_spec.rb

@@ -18,10 +18,12 @@ describe 'remote recording', :order => :defined do
       uri = URI("http://localhost:#{@service_port}/health")
 
       100.times do
-        Net::HTTP.get(uri)
-        break
-      rescue Errno::ECONNREFUSED
-        sleep 0.1
+        begin
+          Net::HTTP.get(uri)
+          break
+        rescue Errno::ECONNREFUSED
+          sleep 0.1
+        end
       end
     end
 

data/spec/service/config_analyzer_spec.rb

@@ -37,10 +37,8 @@ describe AppMap::Service::ConfigAnalyzer do
       end
     end
 
-    describe '.is_valid?' do
-      it 'returns true' do
-        expect(subject.valid?).to be_falsey
-      end
+    it 'is valid' do
+      expect(subject.errors).to eq(['AppMap auto-configuration is currently not available for non Rails projects'])
     end
 
     describe '.is_present?' do
@@ -50,6 +48,14 @@ describe AppMap::Service::ConfigAnalyzer do
     end
   end
 
+  context 'with maximal valid config' do
+    let(:config_file) { 'spec/fixtures/config/maximal_config.yml'}
+
+    it 'is valid' do
+      expect(subject.errors).to eq(['AppMap auto-configuration is currently not available for non Rails projects'])
+    end
+  end
+
   context 'with invalid YAML config' do
     let(:config_file) { 'spec/fixtures/config/invalid_yaml_config.yml'}
 

data/test/agent_setup_init_test.rb

@@ -9,6 +9,8 @@ class AgentSetupInitTest < Minitest::Test
 name: appmap-ruby
 packages:
 - path: lib
+language: ruby
+appmap_dir: tmp/appmap
 )
 
   def test_init_when_config_exists

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appmap
 version: !ruby/object:Gem::Version
-  version: 0.81.0
+  version: 0.83.0
 platform: ruby
 authors:
 - Kevin Gilpin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-04-26 00:00:00.000000000 Z
+date: 2022-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -385,6 +385,7 @@ files:
 - lib/appmap/gem_hooks/activesupport.yml
 - lib/appmap/gem_hooks/cancancan.yml
 - lib/appmap/gem_hooks/devise.yml
+- lib/appmap/gem_hooks/pandoc-ruby.yml
 - lib/appmap/gem_hooks/rails.yml
 - lib/appmap/gem_hooks/railties.yml
 - lib/appmap/gem_hooks/resque.yml
@@ -435,6 +436,7 @@ files:
 - spec/fixtures/config/incomplete_config.yml
 - spec/fixtures/config/invalid_config.yml
 - spec/fixtures/config/invalid_yaml_config.yml
+- spec/fixtures/config/maximal_config.yml
 - spec/fixtures/config/missing_path_or_gem.yml
 - spec/fixtures/config/valid_config.yml
 - spec/fixtures/database.yml