appmap 0.58.0 → 0.59.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca5a16a5edc35706d33aa6ec21e45b5641aa9342b6fc5ab03ada141556c2b859
-  data.tar.gz: 7a4b5b6ff0c504814b7eccebba46a739cc4e00fcf6eb1e5492ef7f52d2f887d6
+  metadata.gz: b0592a1e7b252df037c7e06986095c4e7f5feba8011a317e54edda181c53aed7
+  data.tar.gz: 44d0c65506400e36016dd140e7f4a109f6495dd2ae6bdd893e038bd8c1504d95
 SHA512:
-  metadata.gz: 5267e3ba0827671d825ca0bb0323965ae0d8b5c0ac772f95721227af2b66a3a2d2843f7813a4f1faff997e49cd83dc4b7d78a57cb3b4852cfd6fbe63290aa223
-  data.tar.gz: cdb60a38a5d9c836a159c9473a7bf42e06589926ec7011b5978add71dca14ef6fd8acc807d7ef745e3d17ab908e38eca49bfbb3094c5b48a97d4084d9a2f34d8
+  metadata.gz: cc7057bf09581066d6ef84f2f73b17ea9a3088ec6e19dfd90f2983a15706f98de6ca1e20ccfc949aad334ccfa7f0346474bd53899eefb9a44d871618c7c17995
+  data.tar.gz: 4c86d5a8782501a8924f286e41334b79473d87990e7a731ee7832288ae81ad4db112d6826313dfae99cb1a5b418e77fbea63a3a2888ec9d09fffbbd98d0c7e80

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# [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)
 
 

data/lib/appmap/service/test_command_provider.rb

@@ -13,21 +13,27 @@ module AppMap
           if TestFrameworkDetector.rspec_present? && !integration_test_paths[:rspec].empty?
             commands << {
               framework: :rspec,
-              command: "APPMAP=true bundle exec rspec #{integration_test_paths[:rspec].join(' ')}"
+              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 << {
-              framework: :minitest,
-              command: minitest_command
-            }
+            commands += minitest_commands
           end
-
           if TestFrameworkDetector.cucumber_present? && !integration_test_paths[:cucumber].empty?
             commands << {
               framework: :cucumber,
-              command: 'APPMAP=true bundle exec cucumber'
+              command: {
+                program: 'bundle',
+                args: %w[exec cucumber],
+                environment: { APPMAP: 'true' }
+              }
             }
           end
 
@@ -36,12 +42,29 @@ module AppMap
 
         private
 
-        def minitest_command
+        def minitest_commands
           if Gem.loaded_specs.has_key?('rails')
-            "APPMAP=true bundle exec rails test #{integration_test_paths[:minitest].join(' ')}"
+            [
+              {
+                framework: :minitest,
+                command: {
+                  program: 'bundle',
+                  args: %w[exec rails test] + integration_test_paths[:minitest].map { |path| "./#{path}" },
+                  environment: { APPMAP: 'true' }
+                }
+              }
+            ]
           else
-            subcommands = integration_test_paths[:minitest].map { |path| "APPMAP=true bundle exec ruby #{path}" }
-            subcommands.join(' && ')
+            integration_test_paths[:minitest].map do |path|
+              {
+                framework: :minitest,
+                command: {
+                  program: 'bundle',
+                  args: ['exec', 'ruby', "./#{path}"],
+                  environment: { APPMAP: 'true' }
+                }
+              }
+            end
           end
         end
 

data/lib/appmap/version.rb

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

data/test/agent_setup_status_test.rb

@@ -27,39 +27,55 @@ class AgentSetupInitTest < Minitest::Test
   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'
+    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'
+            }
           }
-        ],
-        properties: {
-          config: {
-            app: nil,
-            present: true,
-            valid: true
-          },
-          project: {
-            agentVersion: AppMap::VERSION,
-            language: 'ruby',
-            remoteRecordingCapable: false,
-            integrationTests: true
+        },
+        {
+          framework: :minitest,
+          command: {
+            program: 'bundle',
+            args: %w[exec ruby ./test/integration],
+            environment: {
+              APPMAP: 'true'
+            }
           }
         }
+      ],
+      properties: {
+        config: {
+          app: nil,
+          present: true,
+          valid: false
+        },
+        project: {
+          agentVersion: AppMap::VERSION,
+          language: 'ruby',
+          remoteRecordingCapable: false,
+          integrationTests: true
+        }
       }
-      assert_equal JSON.pretty_generate(expected), output.strip
-    end
+    }
+    assert_equal JSON.pretty_generate(expected), output.strip
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appmap
 version: !ruby/object:Gem::Version
-  version: 0.58.0
+  version: 0.59.0
 platform: ruby
 authors:
 - Kevin Gilpin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-07-06 00:00:00.000000000 Z
+date: 2021-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport