appmap 0.67.0 → 0.67.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4209d3f9422b61ba07ca1776597eac220374e8308a303cdf001604c90903dd31
-  data.tar.gz: 55a755af5bd85255ce882633d3089a0ca308d137b15945e0a1fff4d5479c4994
+  metadata.gz: 66a5dd9600679b05f4789e2531ca6151bc46fa5e95a7458d401f67b3b94861e7
+  data.tar.gz: 89380ec4d7ebfabe615a187a1d0a10ad107d06df4e5bc50c987b62a3f27c4edf
 SHA512:
-  metadata.gz: 4a7ce04424eac8292b0457c99bc3b6f699c0e80a6222450e52f37071e078c2c574c33e8a89249c584412c50da5b26d07f98864f50ecc13e0318da6272fafb879
-  data.tar.gz: 6c8ba9b9a67f09ce662d1bdf0569238537087709cff6f9be2562d50fe06d8ca4199268a2bc3c0d9136dd8a6ab6ff0e66f0d85683b4d3c15e95ba5e10dbcdeb71
+  metadata.gz: 89b13f75e8fbe46e5ddf9a5ec817eaebfd0356d124f2a117e74c24a44d07a8d89f9b0e5afcacbe9ea1277f34979955f30d441c5325ce8aa954bfeda08ce2f03f
+  data.tar.gz: 27c0ba4946df49d998aa6cfa5cfae8cbcc10bed6ec0590ac06c106e99d828f03bfb675b4a67317b1abd1b87ba1c0016699f44470585c0954d431198ee34b6b44

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [0.67.1](https://github.com/applandinc/appmap-ruby/compare/v0.67.0...v0.67.1) (2021-11-02)
+
+
+### Bug Fixes
+
+* Don't try to index AppMaps when inspecting ([ca18861](https://github.com/applandinc/appmap-ruby/commit/ca188619bd7085caa75a06eeeb5d5a92213251ac))
+
 # [0.67.0](https://github.com/applandinc/appmap-ruby/compare/v0.66.2...v0.67.0) (2021-10-21)
 
 

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

@@ -10,7 +10,14 @@ module AppMap
 
       class Validate < ValidateStruct
         def perform
-          puts JSON.pretty_generate(config_validator.valid? ? [] : config_validator.violations.map(&:to_h))
+          schema_path = File.expand_path('../../../../../config-schema.yml', __FILE__)
+          schema = YAML.safe_load(File.read(schema_path))
+          result = {
+            version: 2,
+            errors: config_validator.valid? ? [] : config_validator.violations.map(&:to_h),
+            schema: schema
+          }
+          puts JSON.pretty_generate(result)
         end
 
         private

data/lib/appmap/command/inspect.rb

@@ -13,7 +13,6 @@ module AppMap
 
       def inspect(arguments)
         detect_nodejs
-        index_appmaps
 
         arguments.unshift 'inspect'
         arguments.unshift APPMAP_JS

data/lib/appmap/version.rb

@@ -3,7 +3,7 @@
 module AppMap
   URL = 'https://github.com/applandinc/appmap-ruby'
 
-  VERSION = '0.67.0'
+  VERSION = '0.67.1'
 
   APPMAP_FORMAT_VERSION = '1.5.1'
 

data/spec/depends/api_spec.rb

@@ -104,7 +104,7 @@ describe 'Depends API' do
   describe '.run_tests' do
     def run_tests
       Dir.chdir 'spec/fixtures/depends' do
-        api.run_tests([ 'spec/actual_rspec_test.rb', 'test/actual_minitest_test.rb' ], appmap_dir: Pathname.new(DEPENDS_TEST_DIR).expand_path.to_s)
+        api.run_tests([ 'spec/actual_rspec_test.rb', 'test/actual_minitest_test.rb' ], appmap_dir: Pathname.new('.').expand_path.to_s)
       end
     end
 

data/spec/rails_spec_helper.rb

@@ -5,9 +5,14 @@ require 'active_support'
 require 'active_support/core_ext'
 require 'open3'
 
+# docker compose v2 replaced the --filter flag with --status
+PS_CMD=`docker-compose --version` =~ /version v2/ ?
+         "docker-compose ps -q --status running" :
+         "docker-compose ps -q --filter health=healthy"
+
 def wait_for_container(app_name)
   start_time = Time.now
-  until `docker-compose ps -q --filter health=healthy #{app_name}`.strip != ''
+  until `#{PS_CMD} #{app_name}`.strip != ''
     elapsed = Time.now - start_time
     raise "Timeout waiting for container #{app_name} to be ready" if elapsed > 10
 

data/test/agent_setup_validate_test.rb

@@ -2,28 +2,40 @@
 
 require 'test_helper'
 
+schema_path = File.expand_path('../../config-schema.yml', __FILE__)
+CONFIG_SCHEMA = YAML.safe_load(File.read(schema_path))
 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'
   MISSING_PATH_OR_GEM_CONFIG_FILENAME = 'spec/fixtures/config/missing_path_or_gem.yml'
 
+  def check_output(output, expected_errors)
+    expected = JSON.pretty_generate(
+      {
+        version: 2,
+        errors: expected_errors,
+        schema: CONFIG_SCHEMA
+      }
+    )
+    assert_equal(expected, output.strip)
+  end
+    
   def test_init_when_config_exists
     output = `./exe/appmap-agent-validate`
     assert_equal 0, $CHILD_STATUS.exitstatus
-    expected = JSON.pretty_generate([
+    check_output(output, [
       {
         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([
+    check_output(output, [
       {
         level: :error,
         message: 'AppMap auto-configuration is currently not available for non Rails projects'
@@ -34,13 +46,12 @@ class AgentSetupValidateTest < Minitest::Test
         message: "AppMap configuration #{NON_EXISTING_CONFIG_FILENAME} 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([
+    check_output(output, [
       {
         level: :error,
         message: 'AppMap auto-configuration is currently not available for non Rails projects'
@@ -53,13 +64,12 @@ class AgentSetupValidateTest < Minitest::Test
           '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([
+    check_output(output, [
       {
         level: :error,
         message: 'AppMap auto-configuration is currently not available for non Rails projects'
@@ -71,13 +81,12 @@ class AgentSetupValidateTest < Minitest::Test
         detailed_message: "no implicit conversion of String into Integer"
       }
     ])
-    assert_equal expected, output.strip
   end
 
   def test_init_with_missing_package_key
     output = `./exe/appmap-agent-validate -c #{MISSING_PATH_OR_GEM_CONFIG_FILENAME}`
     assert_equal 0, $CHILD_STATUS.exitstatus
-    expected = JSON.pretty_generate([
+    check_output(output, [
       {
         level: :error,
         message: 'AppMap auto-configuration is currently not available for non Rails projects'
@@ -89,6 +98,5 @@ class AgentSetupValidateTest < Minitest::Test
         detailed_message: "AppMap config 'package' element should specify 'gem' or 'path'"
       }
     ])
-    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.67.0
+  version: 0.67.1
 platform: ruby
 authors:
 - Kevin Gilpin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-10-21 00:00:00.000000000 Z
+date: 2021-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport