appmap 0.59.2 → 0.62.0

data/spec/fixtures/rails5_users_app/create_app

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -e
+set -ex
 
 # Just checking for a healthy container isn't enough, apparently. If
 # we don't wait here, sometimes the database is inaccessible.
@@ -27,7 +27,7 @@ set -e
 psql -h pg -U postgres -c "create database app_development"
 psql -h pg -U postgres -c "create database app_test"
 
-RAILS_ENV=development ./bin/rake db:migrate
-RAILS_ENV=test ./bin/rake db:migrate
+env RAILS_ENV=development bundle exec rake -t db:migrate
+env RAILS_ENV=test bundle exec rake -t db:migrate
 
 echo "INSERT INTO users ( login ) VALUES ( 'admin' )  " | psql -h pg -U postgres app_development

data/spec/fixtures/rails6_users_app/create_app

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -e
+set -ex
 
 # Just checking for a healthy container isn't enough, apparently. If
 # we don't wait here, sometimes the database is inaccessible.
@@ -27,7 +27,7 @@ set -e
 psql -h pg -U postgres -c "create database app_development"
 psql -h pg -U postgres -c "create database app_test"
 
-RAILS_ENV=development ./bin/rake db:migrate
-RAILS_ENV=test ./bin/rake db:migrate
+env RAILS_ENV=development bundle exec rake -t db:migrate
+env RAILS_ENV=test bundle exec rake -t db:migrate
 
 echo "INSERT INTO users ( login ) VALUES ( 'admin' )  " | psql -h pg -U postgres app_development

data/spec/fixtures/rails6_users_app/lib/tasks/appmap.rake

@@ -3,11 +3,21 @@
 namespace :appmap do
   def swagger_tasks
     require 'appmap/swagger'
-
     AppMap::Swagger::RakeTasks.define_tasks
   end
 
+  def depends_tasks
+    require 'appmap/depends'
+    AppMap::Depends::RakeTasks.define_tasks
+  end
+
   if %w[test development].member?(Rails.env)
     swagger_tasks
+    depends_tasks
   end
 end
+
+if %w[test development].member?(Rails.env)
+  desc 'Bring AppMaps up to date with local file modifications, and updated derived data such as Swagger files'
+  task :appmap => [ :'appmap:depends:update' ]
+end

data/spec/service/config_analyzer_spec.rb

@@ -28,7 +28,7 @@ describe AppMap::Service::ConfigAnalyzer do
     end
   end
 
-  context 'with valid config' do
+  context 'with valid but non rails config' do
     let(:config_file) { 'spec/fixtures/config/valid_config.yml'}
 
     describe '.app_name' do
@@ -39,7 +39,7 @@ describe AppMap::Service::ConfigAnalyzer do
 
     describe '.is_valid?' do
       it 'returns true' do
-        expect(subject.valid?).to be_truthy
+        expect(subject.valid?).to be_falsey
       end
     end
 
@@ -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
@@ -83,7 +83,7 @@ describe AppMap::Service::ConfigAnalyzer do
 
     describe '.is_valid?' do
       it 'guesses paths and returns true ' do
-        expect(subject.valid?).to be_truthy
+        expect(subject.valid?).to be_falsey
       end
     end
 

data/spec/service/integration_test_path_finder_spec.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require 'appmap/service/integration_test_path_finder'
+
+describe AppMap::Service::IntegrationTestPathFinder do
+  subject { described_class.new('./spec/fixtures/rails6_users_app/') }
+
+  describe '.count' do
+    it 'counts existing paths' do
+      expect(subject.count_paths).to be(3)
+    end
+  end
+
+  describe '.find' do
+    it 'finds paths' do
+      expect(subject.find).to eq({
+        rspec: %w[spec/controllers],
+        minitest: %w[test/controllers test/integration],
+        cucumber: []
+      })
+    end
+  end
+end

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

@@ -13,7 +13,7 @@ class AgentSetupInitTest < Minitest::Test
         config: {
           app: 'AppMap Rubygem',
           present: true,
-          valid: true
+          valid: false
         },
         project: {
           agentVersion: AppMap::VERSION,
@@ -37,7 +37,8 @@ class AgentSetupInitTest < Minitest::Test
             program: 'bundle',
             args: %w[exec rspec ./spec/controllers],
             environment: {
-              APPMAP: 'true'
+              APPMAP: 'true',
+              DISABLE_SPRING: 'true'
             }
           }
         },
@@ -47,7 +48,8 @@ class AgentSetupInitTest < Minitest::Test
             program: 'bundle',
             args: %w[exec ruby ./test/controllers],
             environment: {
-              APPMAP: 'true'
+              APPMAP: 'true',
+              DISABLE_SPRING: 'true'
             }
           }
         },
@@ -57,14 +59,15 @@ class AgentSetupInitTest < Minitest::Test
             program: 'bundle',
             args: %w[exec ruby ./test/integration],
             environment: {
-              APPMAP: 'true'
+              APPMAP: 'true',
+              DISABLE_SPRING: 'true'
             }
           }
         }
       ],
       properties: {
         config: {
-          app: nil,
+          app: 'rails6_users_app',
           present: true,
           valid: false
         },

data/test/agent_setup_validate_test.rb

@@ -0,0 +1,75 @@
+# 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
+    expected = JSON.pretty_generate([
+      {
+        level: :error,
+        message: 'AppMap auto-configuration is currently not available for non Rails projects'
+      }
+    ])
+    assert_equal expected, 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,
+        message: 'AppMap auto-configuration is currently not available for non Rails projects'
+      },
+      {
+        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,
+        message: 'AppMap auto-configuration is currently not available for non Rails projects'
+      },
+      {
+        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,
+        message: 'AppMap auto-configuration is currently not available for non Rails projects'
+      },
+      {
+        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

data/test/test_helper.rb

@@ -3,3 +3,6 @@ require 'appmap'
 
 require 'minitest/autorun'
 require 'diffy'
+require 'active_support'
+require 'active_support/core_ext'
+require 'json'

data/yarn.lock

@@ -2,14 +2,15 @@
 # yarn lockfile v1
 
 
-"@appland/cli@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@appland/cli/-/cli-1.1.0.tgz#db2e207cc10f0fac7ae435128390c3656b430a74"
-  integrity sha512-zhxi2Yk6ssueMYMkZk509VR4oJb7+zoskQNoBiqIXYeZs0geBj/kJPQTIjIcIxk1gBoq0JhXWEd7mEUGVWfFfA==
+"@appland/cli@^1.3.2":
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/@appland/cli/-/cli-1.3.2.tgz#84c8b995c9dc103b7a45680c20196db0abbda48b"
+  integrity sha512-j2lMuz1ydNDVPmHr3oXBrcsl3vFAFziZiRwArLMRCcfLVsNkSdFN7IdwVF939Xi+M0cYb5VYx0RSR6iZomC4dQ==
   dependencies:
-    "@appland/models" "1.0.6"
+    "@appland/models" "1.3.0"
     async "^3.2.0"
     chokidar "^3.5.1"
+    cli-progress "^3.9.0"
     console-table-printer "^2.9.0"
     crypto-js "^4.0.0"
     diff "^5.0.0"
@@ -19,10 +20,10 @@
     semver "^7.3.5"
     yargs "^17.0.1"
 
-"@appland/models@1.0.6":
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/@appland/models/-/models-1.0.6.tgz#a3ce8a0063125b9bed8cb71e396067e2853151c9"
-  integrity sha512-54FvtaoZyJOIzeS8SxY1UXkYfDa/gGwZcynEWT+KLT9hkAjGsr9pIhgJCvZ1EJpUmiXYoH6sxYl8SvGlNuG5Xw==
+"@appland/models@1.3.0":
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/@appland/models/-/models-1.3.0.tgz#8da9cb5d0e5e89bd3ad5e354c914da133edc8307"
+  integrity sha512-Oax4/6vJMHyh75CWZdbL3Zxojf3sLKY50tiPMWKqwqDqlP2BgjdOvCFfw5rMMeOW2afs+yptBBPeDPuiS1Kb7w==
   dependencies:
     "@rollup/plugin-alias" "^3.1.2"
     cross-env "^7.0.3"
@@ -113,6 +114,14 @@ chokidar@^3.5.1:
   optionalDependencies:
     fsevents "~2.3.2"
 
+cli-progress@^3.9.0:
+  version "3.9.0"
+  resolved "https://registry.yarnpkg.com/cli-progress/-/cli-progress-3.9.0.tgz#25db83447deb812e62d05bac1af9aec5387ef3d4"
+  integrity sha512-g7rLWfhAo/7pF+a/STFH/xPyosaL1zgADhI0OM83hl3c7S43iGvJWEAV2QuDOnQ8i6EMBj/u4+NTd0d5L+4JfA==
+  dependencies:
+    colors "^1.1.2"
+    string-width "^4.2.0"
+
 cliui@^7.0.2:
   version "7.0.4"
   resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f"
@@ -134,6 +143,11 @@ color-name@~1.1.4:
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
+colors@^1.1.2:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
+  integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
+
 concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appmap
 version: !ruby/object:Gem::Version
-  version: 0.59.2
+  version: 0.62.0
 platform: ruby
 authors:
 - Kevin Gilpin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-07-08 00:00:00.000000000 Z
+date: 2021-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -296,6 +296,8 @@ email:
 executables:
 - appmap-agent-init
 - appmap-agent-status
+- appmap-agent-validate
+- appmap-index
 - appmap-inspect
 extensions:
 - ext/appmap/extconf.rb
@@ -307,6 +309,7 @@ files:
 - ".releaserc.yml"
 - ".rubocop.yml"
 - ".travis.yml"
+- ARCHITECTURE.md
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Dockerfile.appmap
@@ -327,6 +330,8 @@ files:
 - examples/mock_webapp/lib/mock_webapp/user.rb
 - exe/appmap-agent-init
 - exe/appmap-agent-status
+- exe/appmap-agent-validate
+- exe/appmap-index
 - exe/appmap-inspect
 - ext/appmap/appmap.c
 - ext/appmap/extconf.rb
@@ -335,10 +340,20 @@ 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/index.rb
 - lib/appmap/command/inspect.rb
 - lib/appmap/command_error.rb
 - lib/appmap/config.rb
 - lib/appmap/cucumber.rb
+- lib/appmap/depends.rb
+- lib/appmap/depends/api.rb
+- lib/appmap/depends/configuration.rb
+- lib/appmap/depends/node_cli.rb
+- lib/appmap/depends/rake_tasks.rb
+- lib/appmap/depends/test_file_inspector.rb
+- lib/appmap/depends/test_runner.rb
+- lib/appmap/depends/util.rb
 - lib/appmap/event.rb
 - lib/appmap/handler/function.rb
 - lib/appmap/handler/net_http.rb
@@ -360,6 +375,8 @@ files:
 - 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
@@ -372,9 +389,25 @@ files:
 - release.sh
 - spec/class_map_spec.rb
 - spec/config_spec.rb
+- spec/depends/api_spec.rb
+- spec/depends/spec_helper.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/depends/.gitignore
+- spec/fixtures/depends/app/controllers/api/api_keys_controller.rb
+- spec/fixtures/depends/app/controllers/organizations_controller.rb
+- spec/fixtures/depends/app/models/api_key.rb
+- spec/fixtures/depends/app/models/configuration.rb
+- spec/fixtures/depends/app/models/show.rb
+- spec/fixtures/depends/app/models/user.rb
+- spec/fixtures/depends/revoke_api_key.appmap.json
+- spec/fixtures/depends/spec/actual_rspec_test.rb
+- spec/fixtures/depends/spec/api_spec.rb
+- spec/fixtures/depends/spec/user_spec.rb
+- spec/fixtures/depends/test/actual_minitest_test.rb
+- spec/fixtures/depends/user_page_scenario.appmap.json
 - spec/fixtures/hook/.gitignore
 - spec/fixtures/hook/app/controllers/api/api_keys_controller.rb
 - spec/fixtures/hook/app/controllers/organizations_controller.rb
@@ -559,11 +592,14 @@ files:
 - spec/record_sql_rails_pg_spec.rb
 - spec/remote_recording_spec.rb
 - spec/service/config_analyzer_spec.rb
+- spec/service/integration_test_path_finder_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