appmap 0.57.1 → 0.60.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e1ad8b152e2dbb26fd8b62042a4908f09c46b5dea88a9e05dc2a431b0fd2674
-  data.tar.gz: 9fa1719c374839b8a7827265771d0db2e25e11a27860240bd17b5155ea7029ed
+  metadata.gz: 832f968242440a6bac78181dbb49ca1b34d75c37074810df66c3d1b1d546c0cf
+  data.tar.gz: 26ffec9cffe15f63dc661563ec7bee9c8b4659a54c0a8888dd797b6253518954
 SHA512:
-  metadata.gz: e38b17165142f6e5c574ee0cfda832baf2f27ac0c66b90e979a88c5280f66b659e53e3f919a24eb72cd132be6ec321a01708fa73f4c9d54bdaedacc137202895
-  data.tar.gz: 7d873528d6c51980d88816f74981da0d427697b4f720dfae9b34cd2ff616fd309935487c3187b603d44e2fa74930bbc90a5441f68c7f045829ffee6269cf7ebe
+  metadata.gz: '09eb7e68782f397a59a960ba617af180ee2d0746316db9b7d2c4cd011755e815205a5b484d0a90cd19224ab7f4be7231a96c664ea87e962c02372e155088cc82'
+  data.tar.gz: eea1765efb3ab76716d7c8c74f9f7b9d860923d815dab0bd003ecf8f07dc62ac6d3660e43ba0576b615bd6de094156e14e8a5be876dfe3851d4dc2c95cd82368

data/CHANGELOG.md

@@ -1,3 +1,39 @@
+# [0.60.0](https://github.com/applandinc/appmap-ruby/compare/v0.59.2...v0.60.0) (2021-07-08)
+
+
+### Features
+
+* add agent-setup-validate command ([d9b3bc1](https://github.com/applandinc/appmap-ruby/commit/d9b3bc15e01bf89994aa67b0256dd69b9983be76))
+* validate ruby version (+ better config loading validation) ([1756e6c](https://github.com/applandinc/appmap-ruby/commit/1756e6c30b5c44a033c23eb47c27c56732d12470))
+
+## [0.59.2](https://github.com/applandinc/appmap-ruby/compare/v0.59.1...v0.59.2) (2021-07-08)
+
+
+### Bug Fixes
+
+* Remove improper reliance on Rails 'try' ([c6b5b16](https://github.com/applandinc/appmap-ruby/commit/c6b5b16a6963988e20bab5f88b99401e25691f3c))
+
+## [0.59.1](https://github.com/applandinc/appmap-ruby/compare/v0.59.0...v0.59.1) (2021-07-08)
+
+
+### Bug Fixes
+
+* Events may be constructed in stages ([b0b23f5](https://github.com/applandinc/appmap-ruby/commit/b0b23f59a84158b8162424b84430894fe4278324))
+
+# [0.59.0](https://github.com/applandinc/appmap-ruby/compare/v0.58.0...v0.59.0) (2021-07-07)
+
+
+### Features
+
+* define commands as objects ([1b43203](https://github.com/applandinc/appmap-ruby/commit/1b432039040277e1b5349cc2f75aa436238ea873))
+
+# [0.58.0](https://github.com/applandinc/appmap-ruby/compare/v0.57.1...v0.58.0) (2021-07-06)
+
+
+### Features
+
+* Add `test_commands` sections to `appmap-agent-status` executable ([4cd8fe5](https://github.com/applandinc/appmap-ruby/commit/4cd8fe58acb4af72b7818db96de9e479562b9ea0))
+
 ## [0.57.1](https://github.com/applandinc/appmap-ruby/compare/v0.57.0...v0.57.1) (2021-07-02)
 
 

data/config-schema.yml

@@ -0,0 +1,57 @@
+type: object
+additionalProperties: false
+required:
+  - name
+properties:
+  name:
+    type: string
+  packages:
+    type: array
+    items:
+      anyOf:
+        - type: object
+          additionalProperties: false
+          required:
+            - path
+          properties:
+            path:
+              type: string
+            shallow:
+              type: boolean
+            exclude:
+              type: array
+              items:
+                type: string
+        - type: object
+          additionalProperties: false
+          required:
+            - gem
+          properties:
+            gem:
+              type: string
+            shallow:
+              type: boolean
+            exclude:
+              type: array
+              items:
+                type: string
+  exclude:
+    type: array
+    items:
+      type: string
+  functions:
+    type: array
+    items:
+      type: object
+      additionalProperties: false
+      properties:
+        package:
+          type: string
+        class:
+          type: string
+        function:
+          type: string
+        labels:
+          type: array
+          items:
+            type: string

data/exe/appmap-agent-validate

@@ -0,0 +1,19 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require 'optparse'
+require 'appmap'
+require 'appmap/command/agent_setup/validate'
+
+@options = { config_file: AppMap::DEFAULT_CONFIG_FILE_PATH }
+
+OptionParser.new do |parser|
+  parser.banner = 'Usage: appmap-agent-validate [options]'
+
+  description = "AppMap configuration file path (default: #{AppMap::DEFAULT_CONFIG_FILE_PATH})"
+  parser.on('-c', '--config=FILEPATH', description) do |filepath|
+    @options[:config_file] = filepath
+  end
+end.parse!
+
+AppMap::Command::AgentSetup::Validate.new(@options[:config_file]).perform

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

@@ -2,6 +2,8 @@
 
 require 'json'
 require 'appmap/service/config_analyzer'
+require 'appmap/service/integration_test_path_finder'
+require 'appmap/service/test_command_provider'
 
 module AppMap
   module Command
@@ -11,22 +13,23 @@ module AppMap
       class Status < StatusStruct
         def perform
           status = {
-            :properties => {
-              :config => {
-                :app => config_analyzer.app_name,
-                :present => config_analyzer.present?,
-                :valid => config_analyzer.valid?
+            test_commands: Service::TestCommandProvider.all,
+            properties: {
+              config: {
+                app: config_analyzer.app_name,
+                present: config_analyzer.present?,
+                valid: config_analyzer.valid?
               },
-              :project => {
-                :agentVersion => AppMap::VERSION,
-                :language => 'ruby',
-                :remoteRecordingCapable => Gem.loaded_specs.has_key?('rails'),
-                :integrationTests => false #TODO
+              project: {
+                agentVersion: AppMap::VERSION,
+                language: 'ruby',
+                remoteRecordingCapable: Gem.loaded_specs.has_key?('rails'),
+                integrationTests: Service::IntegrationTestPathFinder.count_paths > 0
               }
             }
           }
 
-          puts status.to_json
+          puts JSON.pretty_generate(status)
         end
 
         private

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

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require 'json'
+require 'appmap/service/validator/config_validator'
+
+module AppMap
+  module Command
+    module AgentSetup
+      ValidateStruct = Struct.new(:config_file)
+
+      class Validate < ValidateStruct
+        def perform
+          puts JSON.pretty_generate(config_validator.valid? ? [] : config_validator.violations.map(&:to_h))
+        end
+
+        private
+
+        def config_validator
+          @validator ||= Service::Validator::ConfigValidator.new(config_file)
+        end
+      end
+    end
+  end
+end

data/lib/appmap/event.rb

@@ -119,6 +119,14 @@ module AppMap
           end
         end
       end
+      
+      # An event may be partially constructed, and then completed at a later time. When the event
+      # is only partially constructed, it's not ready for serialization to the AppMap file. 
+      # 
+      # @return false until the event is fully constructed and available.
+      def ready?
+        true
+      end
 
       protected
 
@@ -240,7 +248,7 @@ module AppMap
               next_exception = exception
               exceptions = []
               while next_exception
-                exception_backtrace = next_exception.backtrace_locations.try(:[], 0)
+                exception_backtrace = AppMap::Util.try(next_exception.backtrace_locations, :[], 0)
                 exceptions << {
                   class: best_class_name(next_exception),
                   message: display_string(next_exception.message),

data/lib/appmap/handler/rails/template.rb

@@ -71,11 +71,16 @@ module AppMap
           attr_reader :render_instance
           # Path to the view template.
           attr_accessor :path
-  
+          # Indicates when the event is fully constructed.
+          attr_accessor :ready
+
+          alias ready? ready
+ 
           def initialize(render_instance)
             super :call
   
             AppMap::Event::MethodEvent.build_from_invocation(:call, event: self)
+            @ready = false
             @render_instance = render_instance
           end
   
@@ -95,8 +100,7 @@ module AppMap
                 object_id: render_instance.__id__,
                 value: AppMap::Event::MethodEvent.display_string(render_instance)
               }
-              h.compact
-            end
+            end.compact
           end
         end
  
@@ -158,7 +162,8 @@ module AppMap
             end
   
             def handle_return(call_event_id, elapsed, return_value, exception)
-              Array(Thread.current[TEMPLATE_RENDERER]).pop
+              template_call = Array(Thread.current[TEMPLATE_RENDERER]).pop
+              template_call.ready = true
 
               AppMap::Event::MethodReturnIgnoreValue.build_from_invocation(call_event_id, elapsed: elapsed)
             end

data/lib/appmap/service/config_analyzer.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'appmap/service/validator/config_validator'
+
 module AppMap
   module Service
     class ConfigAnalyzer
@@ -7,11 +9,10 @@ module AppMap
 
       def initialize(config_file)
         @config_file = config_file
-        @config = load_config
       end
 
       def app_name
-        @config.to_h[:name] if present?
+        config_validator.config.to_h['name'] if present?
       end
 
       def present?
@@ -19,16 +20,14 @@ module AppMap
       end
 
       def valid?
-        present? && @config.to_h.key?(:name) && @config.to_h.key?(:packages)
+        config_validator.valid?
       end
 
       private
 
-      def load_config
-        AppMap::Config.load_from_file @config_file if present?
-      rescue
-        nil
+      def config_validator
+        @validator ||= AppMap::Service::Validator::ConfigValidator.new(@config_file)
       end
     end
   end
-end
+end

data/lib/appmap/service/integration_test_path_finder.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require 'appmap/service/test_framework_detector'
+
+module AppMap
+  module Service
+    class IntegrationTestPathFinder
+      class << self
+        def find
+          @paths ||= begin
+            paths = { rspec: [], minitest: [], cucumber: [] }
+            paths[:rspec] = find_rspec_paths if TestFrameworkDetector.rspec_present?
+            paths[:minitest] = find_minitest_paths if TestFrameworkDetector.minitest_present?
+            paths[:cucumber] = find_cucumber_paths if TestFrameworkDetector.cucumber_present?
+            paths
+          end
+        end
+
+        def count_paths
+          find.flatten(2).length - 3
+        end
+
+        private
+
+        def find_rspec_paths
+          find_non_empty_paths(%w[spec/controllers spec/requests spec/integration spec/api spec/features spec/system])
+        end
+
+
+        def find_minitest_paths
+          find_non_empty_paths(%w[test/controllers test/integration])
+        end
+
+        def find_cucumber_paths
+          find_non_empty_paths(%w[features])
+        end
+
+        def find_non_empty_paths(paths)
+          paths.select { |path| Dir.exist?(path) && !Dir.empty?(path) }
+        end
+      end
+    end
+  end
+end

data/lib/appmap/service/test_command_provider.rb

@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+require 'appmap/service/test_framework_detector'
+require 'appmap/service/integration_test_path_finder'
+
+module AppMap
+  module Service
+    class TestCommandProvider
+      class << self
+        def all
+          commands = []
+
+          if TestFrameworkDetector.rspec_present? && !integration_test_paths[:rspec].empty?
+            commands << {
+              framework: :rspec,
+              command: {
+                program: 'bundle',
+                args: %w[exec rspec] + integration_test_paths[:rspec].map { |path| "./#{path}" },
+                environment: {
+                  APPMAP: 'true'
+                }
+              }
+            }
+          end
+
+          if TestFrameworkDetector.minitest_present? && !integration_test_paths[:minitest].empty?
+            commands += minitest_commands
+          end
+          if TestFrameworkDetector.cucumber_present? && !integration_test_paths[:cucumber].empty?
+            commands << {
+              framework: :cucumber,
+              command: {
+                program: 'bundle',
+                args: %w[exec cucumber],
+                environment: { APPMAP: 'true' }
+              }
+            }
+          end
+
+          commands
+        end
+
+        private
+
+        def minitest_commands
+          if Gem.loaded_specs.has_key?('rails')
+            [
+              {
+                framework: :minitest,
+                command: {
+                  program: 'bundle',
+                  args: %w[exec rails test] + integration_test_paths[:minitest].map { |path| "./#{path}" },
+                  environment: { APPMAP: 'true' }
+                }
+              }
+            ]
+          else
+            integration_test_paths[:minitest].map do |path|
+              {
+                framework: :minitest,
+                command: {
+                  program: 'bundle',
+                  args: ['exec', 'ruby', "./#{path}"],
+                  environment: { APPMAP: 'true' }
+                }
+              }
+            end
+          end
+        end
+
+        def integration_test_paths
+          @paths ||= Service::IntegrationTestPathFinder.find
+        end
+      end
+    end
+  end
+end

data/lib/appmap/service/test_framework_detector.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module AppMap
+  module Service
+    class TestFrameworkDetector
+      class << self
+        def rspec_present?
+          Gem.loaded_specs.has_key?('rspec-core')
+        end
+
+        def minitest_present?
+          Gem.loaded_specs.has_key?('minitest')
+        end
+
+        def cucumber_present?
+          Gem.loaded_specs.has_key?('cucumber')
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,80 @@
+# frozen_string_literal: true
+
+require 'appmap/service/validator/violation'
+
+module AppMap
+  module Service
+    module Validator
+      class ConfigValidator
+        attr_reader :violations
+
+        def initialize(config_file)
+          @config_file = config_file
+          @violations = []
+        end
+
+        def config
+          parse_config
+        end
+
+        def valid?
+          validate_ruby_version
+          validate_config_presence
+          parse_config
+          validate_config_load
+          @violations.empty?
+        end
+
+        private
+
+        def present?
+          File.exist?(@config_file)
+        end
+
+        def parse_config
+          return unless present?
+
+          @config_data ||= YAML.load_file(@config_file)
+        rescue Psych::SyntaxError => e
+          @violations << Violation.error(
+            filename: @config_file,
+            message: 'AppMap configuration is not valid YAML',
+            detailed_message: e.message
+          )
+          nil
+        end
+
+        def validate_config_load
+          return unless @config_data
+
+          AppMap::Config.load(@config_data)
+        rescue StandardError => e
+          @violations << Violation.error(
+            filename: @config_file,
+            message: 'AppMap configuration could not be loaded',
+            detailed_message: e.message
+          )
+          nil
+        end
+
+        def validate_config_presence
+          unless present?
+            @violations << Violation.error(
+              filename: @config_file,
+              message: 'AppMap configuration file does not exist'
+            )
+          end
+        end
+
+        def validate_ruby_version
+          unless RUBY_VERSION =~ AppMap::SUPPORTED_RUBY_VERSIONS_REGEX
+            @violations << Violation.error(
+              message: "AppMap does not support Ruby #{RUBY_VERSION}. " \
+                "Supported versions are: #{AppMap::SUPPORTED_RUBY_VERSIONS.join(', ')}."
+              )
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+module AppMap
+  module Service
+    module Validator
+      class Violation
+        attr_reader :level, :setting, :filename, :message, :detailed_message, :help_urls
+
+        class << self
+          def error(message:, setting: nil, filename: nil, detailed_message: nil, help_urls: nil)
+            self.new(
+              level: :error,
+              message: message,
+              setting: setting,
+              filename: filename,
+              detailed_message: detailed_message,
+              help_urls: help_urls
+            )
+          end
+
+          def warning(message:, setting: nil, filename: nil, detailed_message: nil, help_urls: nil)
+            self.new(
+              level: :warning,
+              message: message,
+              setting: setting,
+              filename: filename,
+              detailed_message: detailed_message,
+              help_urls: help_urls
+            )
+          end
+        end
+
+        def initialize(level:, message:, setting:, filename:, detailed_message:, help_urls:)
+          @level = level
+          @setting = setting
+          @filename = filename
+          @message = message
+          @detailed_message = detailed_message
+          @help_urls = help_urls
+        end
+
+        def to_h
+          instance_variables.each_with_object({}) do |var, hash|
+            hash[var.to_s.delete("@")] = self.instance_variable_get(var)
+          end.compact
+        end
+      end
+    end
+  end
+end

data/lib/appmap/trace.rb

@@ -143,12 +143,12 @@ module AppMap
 
     # Whether there is an event available for processing.
     def event?
-      !@events.empty?
+      !@events.empty? && @events.first.ready?
     end
 
     # Gets the next available event, if any.
     def next_event
-      @events.shift
+      @events.shift if event?
     end
   end
 end

data/lib/appmap/util.rb

@@ -183,6 +183,15 @@ module AppMap
         false
       end
 
+      # https://github.com/rails/rails/blob/8cd143900978902ed9bbba10b34099a3140de5c6/activesupport/lib/active_support/core_ext/object/try.rb
+      def try(obj, *methods)
+        return nil if methods.empty?
+
+        return nil unless obj.respond_to?(methods.first)
+
+        obj.public_send(*methods)
+      end
+
       def startup_message(msg)
         if defined?(::Rails) && defined?(::Rails.logger) && ::Rails.logger
           ::Rails.logger.info msg

data/lib/appmap/version.rb

@@ -3,10 +3,13 @@
 module AppMap
   URL = 'https://github.com/applandinc/appmap-ruby'
 
-  VERSION = '0.57.1'
+  VERSION = '0.60.0'
 
   APPMAP_FORMAT_VERSION = '1.5.1'
 
+  SUPPORTED_RUBY_VERSIONS_REGEX = /^2\.[567]\./.freeze
+  SUPPORTED_RUBY_VERSIONS = %w[2.5 2.6 2.7].freeze
+
   DEFAULT_APPMAP_DIR = 'tmp/appmap'.freeze
   DEFAULT_CONFIG_FILE_PATH = 'appmap.yml'.freeze
 end

data/spec/fixtures/config/invalid_config.yml

@@ -1,2 +1,2 @@
-name: -123- %
-packages: ~{}~ ''
+name: name
+packages: [1,2,3]

data/spec/fixtures/config/invalid_yaml_config.yml

@@ -0,0 +1,3 @@
+name:
+-
+packages: "[]" asd

data/spec/fixtures/rails6_users_app/test/controllers/functional_calc_test.rb

@@ -0,0 +1,10 @@
+# minitest_calc_test_unit_format_spec.rb
+
+require "minitest/autorun"
+
+class FunctionalCalcTest < Minitest::Test
+  def test_add
+    puts 'functional'
+    assert_equal 2 + 2, 4
+  end
+end

data/spec/fixtures/rails6_users_app/test/integration/integration_calc_test.rb

@@ -0,0 +1,12 @@
+# minitest_calc_test_unit_format_spec.rb
+
+require "minitest/autorun"
+
+class IntegrationCalcTest < Minitest::Test
+  class CalcTest < Minitest::Test
+    def test_add
+      puts 'integration'
+      assert_equal 2 + 2, 4
+    end
+  end
+end

data/spec/service/config_analyzer_spec.rb

@@ -51,7 +51,7 @@ describe AppMap::Service::ConfigAnalyzer do
   end
 
   context 'with invalid YAML config' do
-    let(:config_file) { 'spec/fixtures/config/invalid_config.yml'}
+    let(:config_file) { 'spec/fixtures/config/invalid_yaml_config.yml'}
 
     describe '.app_name' do
       it 'returns app name value from config' do

data/spec/service/validator/violation_spec.rb

@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require 'appmap/service/validator/violation'
+
+describe AppMap::Service::Validator::Violation do
+  describe '.error' do
+    let(:message) { 'error' }
+
+    context 'with default parameters' do
+      subject { described_class.error(message: :message) }
+
+      it 'builds an error' do
+        expect(subject.level).to be :error
+        expect(subject.message).to be :message
+      end
+    end
+
+    context 'with default parameters' do
+      subject do
+        described_class.error(
+          message: :message,
+          setting: :setting,
+          filename: :filename,
+          detailed_message: :detailed_message,
+          help_urls: :help_urls
+        )
+      end
+
+      let(:filename) { 'filename' }
+      let(:setting) { 'setting' }
+      let(:detailed_message) { 'details' }
+      let(:help_urls) { %w[123 456] }
+
+      it 'builds an error' do
+        expect(subject.level).to be :error
+        expect(subject.message).to be :message
+        expect(subject.setting).to be :setting
+        expect(subject.detailed_message).to be :detailed_message
+        expect(subject.help_urls).to be :help_urls
+      end
+    end
+
+    describe '.warning' do
+      let(:message) { 'warning' }
+
+      context 'with default parameters' do
+        subject { described_class.warning(message: :message) }
+
+        it 'builds an error' do
+          expect(subject.level).to be :warning
+          expect(subject.message).to be :message
+        end
+      end
+    end
+
+    describe '#to_hash' do
+      subject { described_class.warning(message: :message) }
+
+      let(:message) { 'warning' }
+
+      it 'returns correct hash' do
+        expect(subject.to_h['level']).to be :warning
+        expect(subject.to_h['message']).to be :message
+      end
+    end
+  end
+end

data/test/agent_setup_status_test.rb

@@ -4,24 +4,78 @@
 require 'test_helper'
 
 class AgentSetupInitTest < Minitest::Test
-  def test_status
+  def test_status_gem
     output = `./exe/appmap-agent-status`
     assert_equal 0, $CHILD_STATUS.exitstatus
     expected = {
-      :properties => {
-        :config => {
-          :app => 'AppMap Rubygem',
-          :present => true,
-          :valid => true
+      test_commands: [],
+      properties: {
+        config: {
+          app: 'AppMap Rubygem',
+          present: true,
+          valid: true
         },
-        :project => {
-          :agentVersion => AppMap::VERSION,
-          :language => 'ruby',
-          :remoteRecordingCapable => false,
-          :integrationTests => false
+        project: {
+          agentVersion: AppMap::VERSION,
+          language: 'ruby',
+          remoteRecordingCapable: false,
+          integrationTests: false
         }
       }
-    }.to_json
-    assert_equal expected, output.strip
+    }
+    assert_equal JSON.pretty_generate(expected), output.strip
+  end
+
+  def test_status_rails_app
+    output = `cd spec/fixtures/rails6_users_app && bundle exec ../../../exe/appmap-agent-status`
+    assert_equal 0, $CHILD_STATUS.exitstatus
+    expected = {
+      test_commands: [
+        {
+          framework: :rspec,
+          command: {
+            program: 'bundle',
+            args: %w[exec rspec ./spec/controllers],
+            environment: {
+              APPMAP: 'true'
+            }
+          }
+        },
+        {
+          framework: :minitest,
+          command: {
+            program: 'bundle',
+            args: %w[exec ruby ./test/controllers],
+            environment: {
+              APPMAP: 'true'
+            }
+          }
+        },
+        {
+          framework: :minitest,
+          command: {
+            program: 'bundle',
+            args: %w[exec ruby ./test/integration],
+            environment: {
+              APPMAP: 'true'
+            }
+          }
+        }
+      ],
+      properties: {
+        config: {
+          app: 'rails6_users_app',
+          present: true,
+          valid: false
+        },
+        project: {
+          agentVersion: AppMap::VERSION,
+          language: 'ruby',
+          remoteRecordingCapable: false,
+          integrationTests: true
+        }
+      }
+    }
+    assert_equal JSON.pretty_generate(expected), output.strip
   end
 end

data/test/agent_setup_validate_test.rb

@@ -0,0 +1,58 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require 'test_helper'
+
+class AgentSetupValidateTest < Minitest::Test
+  NON_EXISTING_CONFIG_FILENAME = '123.yml'
+  INVALID_YAML_CONFIG_FILENAME = 'spec/fixtures/config/invalid_yaml_config.yml'
+  INVALID_CONFIG_FILENAME = 'spec/fixtures/config/invalid_config.yml'
+
+  def test_init_when_config_exists
+    output = `./exe/appmap-agent-validate`
+    assert_equal 0, $CHILD_STATUS.exitstatus
+    assert_equal JSON.pretty_generate([]), output.strip
+  end
+
+  def test_init_with_non_existing_config_file
+    output = `./exe/appmap-agent-validate -c #{NON_EXISTING_CONFIG_FILENAME}`
+    assert_equal 0, $CHILD_STATUS.exitstatus
+    expected = JSON.pretty_generate([
+      {
+        level: :error,
+        filename: NON_EXISTING_CONFIG_FILENAME,
+        message: 'AppMap configuration file does not exist'
+      }
+    ])
+    assert_equal expected, output.strip
+  end
+
+  def test_init_with_invalid_YAML
+    output = `./exe/appmap-agent-validate -c #{INVALID_YAML_CONFIG_FILENAME}`
+    assert_equal 0, $CHILD_STATUS.exitstatus
+    expected = JSON.pretty_generate([
+      {
+        level: :error,
+        filename: INVALID_YAML_CONFIG_FILENAME,
+        message: 'AppMap configuration is not valid YAML',
+        detailed_message: "(#{INVALID_YAML_CONFIG_FILENAME}): " \
+          'did not find expected key while parsing a block mapping at line 1 column 1'
+      }
+    ])
+    assert_equal expected, output.strip
+  end
+
+  def test_init_with_invalid_data_config
+    output = `./exe/appmap-agent-validate -c #{INVALID_CONFIG_FILENAME}`
+    assert_equal 0, $CHILD_STATUS.exitstatus
+    expected = JSON.pretty_generate([
+      {
+        level: :error,
+        filename: INVALID_CONFIG_FILENAME,
+        message: 'AppMap configuration could not be loaded',
+        detailed_message: "no implicit conversion of String into Integer"
+      }
+    ])
+    assert_equal expected, output.strip
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appmap
 version: !ruby/object:Gem::Version
-  version: 0.57.1
+  version: 0.60.0
 platform: ruby
 authors:
 - Kevin Gilpin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-07-02 00:00:00.000000000 Z
+date: 2021-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -296,6 +296,7 @@ email:
 executables:
 - appmap-agent-init
 - appmap-agent-status
+- appmap-agent-validate
 - appmap-inspect
 extensions:
 - ext/appmap/extconf.rb
@@ -317,6 +318,7 @@ files:
 - Rakefile
 - appmap.gemspec
 - appmap.yml
+- config-schema.yml
 - examples/install.rb
 - examples/mock_webapp/Gemfile
 - examples/mock_webapp/appmap.yml
@@ -326,6 +328,7 @@ files:
 - examples/mock_webapp/lib/mock_webapp/user.rb
 - exe/appmap-agent-init
 - exe/appmap-agent-status
+- exe/appmap-agent-validate
 - exe/appmap-inspect
 - ext/appmap/appmap.c
 - ext/appmap/extconf.rb
@@ -334,6 +337,7 @@ files:
 - lib/appmap/class_map.rb
 - lib/appmap/command/agent_setup/init.rb
 - lib/appmap/command/agent_setup/status.rb
+- lib/appmap/command/agent_setup/validate.rb
 - lib/appmap/command/inspect.rb
 - lib/appmap/command_error.rb
 - lib/appmap/config.rb
@@ -356,6 +360,11 @@ files:
 - lib/appmap/rspec.rb
 - lib/appmap/service/config_analyzer.rb
 - lib/appmap/service/guesser.rb
+- lib/appmap/service/integration_test_path_finder.rb
+- lib/appmap/service/test_command_provider.rb
+- lib/appmap/service/test_framework_detector.rb
+- lib/appmap/service/validator/config_validator.rb
+- lib/appmap/service/validator/violation.rb
 - lib/appmap/swagger.rb
 - lib/appmap/swagger/configuration.rb
 - lib/appmap/swagger/markdown_descriptions.rb
@@ -370,6 +379,7 @@ files:
 - spec/config_spec.rb
 - spec/fixtures/config/incomplete_config.yml
 - spec/fixtures/config/invalid_config.yml
+- spec/fixtures/config/invalid_yaml_config.yml
 - spec/fixtures/config/valid_config.yml
 - spec/fixtures/hook/.gitignore
 - spec/fixtures/hook/app/controllers/api/api_keys_controller.rb
@@ -543,6 +553,8 @@ files:
 - spec/fixtures/rails6_users_app/spec/models/user_spec.rb
 - spec/fixtures/rails6_users_app/spec/rails_helper.rb
 - spec/fixtures/rails6_users_app/spec/spec_helper.rb
+- spec/fixtures/rails6_users_app/test/controllers/functional_calc_test.rb
+- spec/fixtures/rails6_users_app/test/integration/integration_calc_test.rb
 - spec/fixtures/rails6_users_app/users_app/.gitignore
 - spec/hook_spec.rb
 - spec/open_spec.rb
@@ -553,11 +565,13 @@ files:
 - spec/record_sql_rails_pg_spec.rb
 - spec/remote_recording_spec.rb
 - spec/service/config_analyzer_spec.rb
+- spec/service/validator/violation_spec.rb
 - spec/spec_helper.rb
 - spec/swagger/swagger_spec.rb
 - spec/util_spec.rb
 - test/agent_setup_init_test.rb
 - test/agent_setup_status_test.rb
+- test/agent_setup_validate_test.rb
 - test/bundle_vendor_test.rb
 - test/cucumber_test.rb
 - test/expectations/openssl_test_key_sign1.json