appmap 0.60.0 → 0.61.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 832f968242440a6bac78181dbb49ca1b34d75c37074810df66c3d1b1d546c0cf
-  data.tar.gz: 26ffec9cffe15f63dc661563ec7bee9c8b4659a54c0a8888dd797b6253518954
+  metadata.gz: ff3bf2ebd7ec8fcc1a5af2e4e6dad9198f03aa002e5d9ec1c481989bae11fb4b
+  data.tar.gz: 0b601eb264047a0971ef17d086ea6335b2e657d198dbd8ec8892a8191d0ab373
 SHA512:
-  metadata.gz: '09eb7e68782f397a59a960ba617af180ee2d0746316db9b7d2c4cd011755e815205a5b484d0a90cd19224ab7f4be7231a96c664ea87e962c02372e155088cc82'
-  data.tar.gz: eea1765efb3ab76716d7c8c74f9f7b9d860923d815dab0bd003ecf8f07dc62ac6d3660e43ba0576b615bd6de094156e14e8a5be876dfe3851d4dc2c95cd82368
+  metadata.gz: 95d564c8858735cd87fe794657ab301fe38b96281f9947f7bc471d3a0bb9eb296b0eee309c234a2645f248aeec61bb73687378972cb5eb413ca628424787f167
+  data.tar.gz: 6adc060b2f2cb22f75ffb320d55f4a78a297e870b9f01b832aef366a5ecb95ff70e02ca6785644b353fbab1480418c18fddaef2242e9037aafd2d2e35b2d0d47

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# [0.61.0](https://github.com/applandinc/appmap-ruby/compare/v0.60.0...v0.61.0) (2021-07-14)
+
+
+### Features
+
+* check if rails is present in `appmap-agent-validate` ([b584c2d](https://github.com/applandinc/appmap-ruby/commit/b584c2d9bb37f166932c0b91eed4db94fbafa8a7))
+
 # [0.60.0](https://github.com/applandinc/appmap-ruby/compare/v0.59.2...v0.60.0) (2021-07-08)
 
 

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

@@ -24,7 +24,7 @@ module AppMap
                 agentVersion: AppMap::VERSION,
                 language: 'ruby',
                 remoteRecordingCapable: Gem.loaded_specs.has_key?('rails'),
-                integrationTests: Service::IntegrationTestPathFinder.count_paths > 0
+                integrationTests: Service::IntegrationTestPathFinder.new.count_paths > 0
               }
             }
           }

data/lib/appmap/service/integration_test_path_finder.rb

@@ -5,39 +5,43 @@ 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 initialize(base_path = '')
+        @base_path = base_path
+      end
 
-        def count_paths
-          find.flatten(2).length - 3
+      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
 
-        private
+      def count_paths
+        find.flatten(2).length - 3
+      end
 
-        def find_rspec_paths
-          find_non_empty_paths(%w[spec/controllers spec/requests spec/integration spec/api spec/features spec/system])
-        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_minitest_paths
+        top_level_paths = %w[test/controllers test/integration]
+        children_paths = Dir.glob('test/**/{controllers,integration}')
+        find_non_empty_paths((top_level_paths + children_paths).uniq).sort
+      end
 
-        def find_cucumber_paths
-          find_non_empty_paths(%w[features])
-        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
+      def find_non_empty_paths(paths)
+        paths.select { |path| Dir.exist?(@base_path + path) && !Dir.empty?(@base_path + path) }
       end
     end
   end

data/lib/appmap/service/test_command_provider.rb

@@ -69,7 +69,7 @@ module AppMap
         end
 
         def integration_test_paths
-          @paths ||= Service::IntegrationTestPathFinder.find
+          @paths ||= Service::IntegrationTestPathFinder.new.find
         end
       end
     end

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

@@ -19,6 +19,7 @@ module AppMap
 
         def valid?
           validate_ruby_version
+          validate_rails_presence
           validate_config_presence
           parse_config
           validate_config_load
@@ -66,6 +67,14 @@ module AppMap
           end
         end
 
+        def validate_rails_presence
+          unless Gem.loaded_specs.has_key?('rails')
+            @violations << Violation.error(
+              message: 'AppMap auto-configuration is currently not available for non Rails projects'
+            )
+          end
+        end
+
         def validate_ruby_version
           unless RUBY_VERSION =~ AppMap::SUPPORTED_RUBY_VERSIONS_REGEX
             @violations << Violation.error(

data/lib/appmap/version.rb

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

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
 
@@ -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/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,

data/test/agent_setup_validate_test.rb

@@ -1,4 +1,3 @@
-#!/usr/bin/env ruby
 # frozen_string_literal: true
 
 require 'test_helper'
@@ -11,13 +10,23 @@ class AgentSetupValidateTest < Minitest::Test
   def test_init_when_config_exists
     output = `./exe/appmap-agent-validate`
     assert_equal 0, $CHILD_STATUS.exitstatus
-    assert_equal JSON.pretty_generate([]), output.strip
+    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,
@@ -31,6 +40,10 @@ class AgentSetupValidateTest < Minitest::Test
     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,
@@ -46,6 +59,10 @@ class AgentSetupValidateTest < Minitest::Test
     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,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appmap
 version: !ruby/object:Gem::Version
-  version: 0.60.0
+  version: 0.61.0
 platform: ruby
 authors:
 - Kevin Gilpin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-07-08 00:00:00.000000000 Z
+date: 2021-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -565,6 +565,7 @@ 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