appmap 0.81.1 → 0.83.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94d8d2495de74768697429a640c553549c029992969acfeb65c540f2471fbef3
-  data.tar.gz: bfbdf261991d859d31ec1f98c95ca9954e08bb1de0fe98ac2973a06c42a3dd18
+  metadata.gz: 14e329b0f8ab9095d4c90804976dfd50aa1dd5a9a16edae5e617eae656cd28d8
+  data.tar.gz: e1d95435d0c77329270f645f7e4230676b46711cbb4ecec4611d4cc9e00a3581
 SHA512:
-  metadata.gz: 993e2ce2c51973a6469fd5f10c66c48c13200c4456f3230748e9d5ffd2b107962cdae7d0b286d59e4ee95aee98957dfa6cd062d0ac4ba5ab1923e99da233edf1
-  data.tar.gz: 512cb13c413d394d5237840f8dfec94a0d1d0720cb6c4e164d46e11949078b808b7c25220c3c0fc32a9be74ed4326726ef844588ea346a84242bdca1f87f3056
+  metadata.gz: 7446aee80e06c3796c6d68e2e157baf644995d83e50279930946a0e5a2124ab2daf12eba19a7853cbb53cdc909e96d95f4c7587273a0a36595be3d3df03e2526
+  data.tar.gz: 3840c616f9bc8829688a91cd3ac5c3e7e15bbc5e17418220681102b07dbad36702e1aa45305bb73e55cf13166ca3f7bc08a7dac9e051225ff42955c200af7a8a

data/CHANGELOG.md

@@ -1,3 +1,30 @@
+## [0.83.1](https://github.com/applandinc/appmap-ruby/compare/v0.83.0...v0.83.1) (2022-05-05)
+
+
+### Bug Fixes
+
+* Allow appmap_dir, language and additional properties ([a3bb87c](https://github.com/applandinc/appmap-ruby/commit/a3bb87cb4a87d00a7196f21c45dfcaaf6502e014))
+
+# [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)
 
 

data/config-schema.yml

@@ -1,10 +1,14 @@
 type: object
-additionalProperties: false
+additionalProperties: true
 required:
   - name
 properties:
   name:
     type: string
+  language:
+    type: string
+  appmap_dir:
+    type: string
   packages:
     type: array
     items:

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/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,7 +3,7 @@
 module AppMap
   URL = 'https://github.com/applandinc/appmap-ruby'
 
-  VERSION = '0.81.1'
+  VERSION = '0.83.1'
 
   APPMAP_FORMAT_VERSION = '1.7.0'
 

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/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.1
+  version: 0.83.1
 platform: ruby
 authors:
 - Kevin Gilpin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-04-27 00:00:00.000000000 Z
+date: 2022-05-05 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