appmap 0.57.1 → 0.58.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e1ad8b152e2dbb26fd8b62042a4908f09c46b5dea88a9e05dc2a431b0fd2674
-  data.tar.gz: 9fa1719c374839b8a7827265771d0db2e25e11a27860240bd17b5155ea7029ed
+  metadata.gz: ca5a16a5edc35706d33aa6ec21e45b5641aa9342b6fc5ab03ada141556c2b859
+  data.tar.gz: 7a4b5b6ff0c504814b7eccebba46a739cc4e00fcf6eb1e5492ef7f52d2f887d6
 SHA512:
-  metadata.gz: e38b17165142f6e5c574ee0cfda832baf2f27ac0c66b90e979a88c5280f66b659e53e3f919a24eb72cd132be6ec321a01708fa73f4c9d54bdaedacc137202895
-  data.tar.gz: 7d873528d6c51980d88816f74981da0d427697b4f720dfae9b34cd2ff616fd309935487c3187b603d44e2fa74930bbc90a5441f68c7f045829ffee6269cf7ebe
+  metadata.gz: 5267e3ba0827671d825ca0bb0323965ae0d8b5c0ac772f95721227af2b66a3a2d2843f7813a4f1faff997e49cd83dc4b7d78a57cb3b4852cfd6fbe63290aa223
+  data.tar.gz: cdb60a38a5d9c836a159c9473a7bf42e06589926ec7011b5978add71dca14ef6fd8acc807d7ef745e3d17ab908e38eca49bfbb3094c5b48a97d4084d9a2f34d8

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# [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/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/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,54 @@
+# 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: "APPMAP=true bundle exec rspec #{integration_test_paths[:rspec].join(' ')}"
+            }
+          end
+
+          if TestFrameworkDetector.minitest_present? && !integration_test_paths[:minitest].empty?
+            commands << {
+              framework: :minitest,
+              command: minitest_command
+            }
+          end
+
+          if TestFrameworkDetector.cucumber_present? && !integration_test_paths[:cucumber].empty?
+            commands << {
+              framework: :cucumber,
+              command: 'APPMAP=true bundle exec cucumber'
+            }
+          end
+
+          commands
+        end
+
+        private
+
+        def minitest_command
+          if Gem.loaded_specs.has_key?('rails')
+            "APPMAP=true bundle exec rails test #{integration_test_paths[:minitest].join(' ')}"
+          else
+            subcommands = integration_test_paths[:minitest].map { |path| "APPMAP=true bundle exec ruby #{path}" }
+            subcommands.join(' && ')
+          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/version.rb

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

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/test/agent_setup_status_test.rb

@@ -4,24 +4,62 @@
 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
+    def test_status
+      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: 'APPMAP=true bundle exec rspec spec/controllers'
+          },
+          {
+            framework: :minitest,
+            command: 'APPMAP=true bundle exec ruby test/controllers && APPMAP=true bundle exec ruby test/integration'
+          },
+          {
+            framework: :cucumber,
+            command: 'APPMAP=true bundle exec cucumber'
+          }
+        ],
+        properties: {
+          config: {
+            app: nil,
+            present: true,
+            valid: true
+          },
+          project: {
+            agentVersion: AppMap::VERSION,
+            language: 'ruby',
+            remoteRecordingCapable: false,
+            integrationTests: true
+          }
+        }
+      }
+      assert_equal JSON.pretty_generate(expected), output.strip
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appmap
 version: !ruby/object:Gem::Version
-  version: 0.57.1
+  version: 0.58.0
 platform: ruby
 authors:
 - Kevin Gilpin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-07-02 00:00:00.000000000 Z
+date: 2021-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -356,6 +356,9 @@ 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/swagger.rb
 - lib/appmap/swagger/configuration.rb
 - lib/appmap/swagger/markdown_descriptions.rb
@@ -543,6 +546,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