appmap 0.80.2 → 0.82.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52ebea9f89c7f412123ff2473f0ed62f46f2be4e69e98574d59c3eb91f8ef29b
-  data.tar.gz: 823073540b9979ede52b30c0e70398894b284bf51d10fcce786f082258d363c8
+  metadata.gz: 9823b1057cc7274ca130a8cfd86983fa837e340563024dce3363aa4f79b2ef88
+  data.tar.gz: fdf4e2dc117b62626e4a3b844505bc8d73119ca221159362a9ba822c5e64b56a
 SHA512:
-  metadata.gz: f837ad0b0ac7520c36c4ba2aa1c2d897235d316068461019a77a826dac5e8bf1401f44815d9cfb4fb47194c7b9090c70f3936073e1e99f0c7124fa9fe1d6baac
-  data.tar.gz: abb39a31ffd07bdccb0f5835cdd69bf5bacd5eb0844ea8836995017fe41716560243d1629bed2ed9fce046636586d35a17dc6abaaa5286d8532e41a3ad94f5ec
+  metadata.gz: e7b445107174000b6e01c04bc75ffcb5e46457f458949a354d6a455e721f21c5592279018f0eb3ba8bf4f3f476c47db9196d14bc6a8d629e5715b02c535f31c9
+  data.tar.gz: cdaa148278c0c6c3289e488332e280eac5b786728bd27f514a2f5e38bc01b2eaeb19f837cf74f251987402e10fc083de77c170abf5360145fef3d6c23d0955a7

data/.travis.yml

@@ -4,9 +4,8 @@ cache:
 - bundle
 - yarn
 
-# NB: if you update the ruby versions here, you also need to update
-# them in the Rakefile.
 rbenv:
+- 2.5
 - 2.6
 - 2.7
 - 3.0

data/CHANGELOG.md

@@ -1,3 +1,30 @@
+# [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)
+
+
+### Features
+
+* Add Ruby 2.5 to the version whitelist ([945f7da](https://github.com/applandinc/appmap-ruby/commit/945f7daaee9685a55f14e8714677661fa5cb4e82))
+
 ## [0.80.2](https://github.com/applandinc/appmap-ruby/compare/v0.80.1...v0.80.2) (2022-04-26)
 
 

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/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,11 +3,11 @@
 module AppMap
   URL = 'https://github.com/applandinc/appmap-ruby'
 
-  VERSION = '0.80.2'
+  VERSION = '0.82.0'
 
-  APPMAP_FORMAT_VERSION = '1.5.1'
+  APPMAP_FORMAT_VERSION = '1.7.0'
 
-  SUPPORTED_RUBY_VERSIONS = %w[2.6 2.7 3.0 3.1].freeze
+  SUPPORTED_RUBY_VERSIONS = %w[2.5 2.6 2.7 3.0 3.1].freeze
 
   DEFAULT_APPMAP_DIR = 'tmp/appmap'.freeze
   DEFAULT_CONFIG_FILE_PATH = 'appmap.yml'.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/handler/eval_spec.rb

@@ -38,7 +38,7 @@ describe 'AppMap::Handler::Eval' do
   # a la Ruby 2.6.3 ruby-token.rb
   # token_c = eval("class #{token_n} < #{super_token}; end; #{token_n}")
   it 'can define a new class' do
-    num = (Random.random_number * 10_000).to_i
+    num = (Random.new.random_number * 10_000).to_i
     class_name = "Cls_#{num}"
     m = ClassMaker
     cls = nil

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/rails_spec_helper.rb

@@ -18,7 +18,7 @@ class TestRailsApp
   attr_reader :fixture_dir
 
   def run_cmd(cmd, env = {})
-    run_process method(:system), cmd, env, exception: true
+    run_process method(:system), cmd, env
   end
 
   def spawn_cmd(cmd, env = {})
@@ -33,7 +33,7 @@ class TestRailsApp
 
   def database_name
     # This is used locally too, so make the name nice and unique.
-    @database_name ||= "appland-rails-test-#{Random.bytes(8).unpack1('h*')}"
+    @database_name ||= "appland-rails-test-#{Random.new.bytes(8).unpack1('h*')}"
   end
 
   def bundle

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.80.2
+  version: 0.82.0
 platform: ruby
 authors:
 - Kevin Gilpin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-04-26 00:00:00.000000000 Z
+date: 2022-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -435,6 +435,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