appmap 0.21.0 → 0.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f6f185625c62dee8266aaca7dc13d15994bf1ebe947569e134da574a0a557a0
-  data.tar.gz: 46c6c133477606f5ba908b710fa69fd44063b91b4e966e8d1d36fb5eb8b4aa6b
+  metadata.gz: 7e4bb797e4a52228da17a1d2bea86cc7b39c0e77f868794282a4a506bc118c1b
+  data.tar.gz: 17c42a6dbab64ded9e0c0735df3e1a6b4ffb871f5368c134038fa4574f18a140
 SHA512:
-  metadata.gz: 82ed069dbe728941c732d1b9c9e5681a6d31544df703a859e4e3a8c75fe0fde906036bfaaabebac5ad2f2cab5df1176e2233f16e975ab39f2eca1bac592fd3f0
-  data.tar.gz: 77d93bb43e7efdc5cd81570422af35aac203e84438eea375eb18f07d5ed3e0a76ad7383ba808daa1cc8ac0e7f5a1a224c3857131aef7fbe5a64c323fefacdab7
+  metadata.gz: ce536f9473bc5c13127c7f9e327e011123a0b56291197c1c3f91db68c7ec2fa64438382cc08f002e2634cf7a1877b630f43849989197ca0285da72e79a93767d
+  data.tar.gz: 5a457dbc9afa127d6ca284bf47ee549b3e7a0cb579e1edf2313783ced314e87134ac9a2c4b06e1035402e5619876d7d990b0f65268e12a991480641b5574bc0e

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# v0.22.0
+
+* **RSpec** recorder generates an "inventory" (AppMap with classMap, without events) named `Inventory.appmap.json`.
+* **appmap inspect** generates an inventory AppMap which includes `version`, `metadata`, and `classMap`. Previously, the file output by this command was the class map represented as an array.
+
 # v0.21.0
 
 * Scenario data includes `recorder` and `client` info, describing how the data was recorded.

data/exe/appmap

@@ -48,8 +48,8 @@ module AppMap
 
       c.action do
         require 'appmap/command/inspect'
-        features = AppMap::Command::Inspect.new(@config).perform
-        @output_file.write JSON.pretty_generate(features)
+        appmap = AppMap::Command::Inspect.new(@config).perform
+        @output_file.write JSON.pretty_generate(appmap)
       end
     end
 

data/lib/appmap/command/inspect.rb

@@ -4,7 +4,10 @@ module AppMap
 
     class Inspect < InspectStruct
       def perform
-        AppMap.inspect(config)
+        require 'appmap/command/record'
+
+        features = AppMap.inspect(config)
+        { version: AppMap::APPMAP_FORMAT_VERSION, metadata: AppMap::Command::Record.detect_metadata, classMap: features }
       end
     end
   end

data/lib/appmap/command/upload.rb

@@ -21,11 +21,10 @@ module AppMap
       def perform
         appmap = data.clone
 
-        # If it's a list, upload it as a classMap
-        if data.is_a?(Hash)
-          events = data.delete('events') || []
-          class_map = data.delete('classMap') || []
+        events = data.delete('events')
+        class_map = data.delete('classMap') || []
 
+        unless events.blank?
           pruned_events = []
           stack = []
           events.each do |evt|
@@ -44,14 +43,11 @@ module AppMap
 
           warn "Pruned events to #{pruned_events.length}" if events.length > pruned_events.length
 
-          events = pruned_events
-
-          class_map = prune(class_map, events: events)
-          appmap[:classMap] = class_map
-          appmap[:events] = events
+          appmap[:events] = pruned_events
+          appmap[:classMap] = prune(class_map, events: pruned_events)
         else
-          class_map = prune(data)
-          appmap = { "version": AppMap::APPMAP_FORMAT_VERSION, "classMap": class_map, "events": [] }
+          appmap[:events] = []
+          appmap[:classMap] = prune(class_map)
         end
 
         upload_file = { user: user, org: org, data: appmap }.compact

data/lib/appmap/rspec.rb

@@ -29,7 +29,7 @@ module AppMap
         FileUtils.mkdir_p APPMAP_OUTPUT_DIR
       end
 
-      def save(example_name, events, feature_name: nil, feature_group_name: nil, labels: nil)
+      def save(example_name, events: nil, feature_name: nil, feature_group_name: nil, labels: nil)
         require 'appmap/command/record'
         metadata = AppMap::Command::Record.detect_metadata.tap do |m|
           m[:name] = example_name
@@ -52,7 +52,7 @@ module AppMap
           classMap: features,
           metadata: metadata,
           events: events
-        }
+        }.compact
         fname = sanitize_filename(example_name)
         File.write(File.join(APPMAP_OUTPUT_DIR, "#{fname}.appmap.json"), JSON.generate(appmap))
       end
@@ -198,6 +198,12 @@ module AppMap
           tp.defined_class.to_s == 'RSpec::Core::Example'
       end
 
+      def generate_inventory
+        Recorder.new.tap do |recorder|
+          recorder.setup
+        end.save 'Inventory', labels: %w[inventory]
+      end
+
       def generate_appmaps_from_specs
         recorder = Recorder.new
         recorder.setup
@@ -312,7 +318,7 @@ module AppMap
               feature_name = normalize.call(feature_name) if feature_name
 
               recorder.save full_description,
-                            events,
+                            events: events,
                             feature_name: feature_name,
                             feature_group_name: feature_group,
                             labels: labels.blank? ? nil : labels
@@ -320,8 +326,17 @@ module AppMap
           end
         end
       end
-    end
 
-    generate_appmaps_from_specs if ENV['APPMAP'] == 'true'
+      def enabled?
+        ENV['APPMAP'] == 'true'
+      end
+
+      def run
+        generate_inventory
+        generate_appmaps_from_specs
+      end
+    end
   end
 end
+
+AppMap::RSpec.run if AppMap::RSpec.enabled?

data/lib/appmap/version.rb

@@ -3,7 +3,7 @@
 module AppMap
   URL = 'https://github.com/applandinc/appmap-ruby'
 
-  VERSION = '0.21.0'
+  VERSION = '0.22.0'
 
   APPMAP_FORMAT_VERSION = '1.2'
 end

data/test/cli_test.rb

@@ -33,7 +33,16 @@ class CLITest < Minitest::Test
 
     assert_equal 0, $CHILD_STATUS.exitstatus
     assert !output.blank?, 'Output should exist in stdout'
-    JSON.parse(output)
+  end
+
+  def test_inspect_fields
+    output = `./exe/appmap inspect -o -`
+
+    output = JSON.parse(output)
+    assert_includes output.keys, 'version'
+    assert_includes output.keys, 'classMap'
+    assert_includes output.keys, 'metadata'
+    assert !output.keys.include?('events')
   end
 
   def test_record

data/test/rspec_test.rb

@@ -17,6 +17,21 @@ class RSpecTest < Minitest::Test
     end
   end
 
+  def test_inventory
+    perform_test 'plain_hello_spec' do
+      appmap_file = 'tmp/appmap/rspec/Inventory.appmap.json'
+
+      assert File.file?(appmap_file), 'appmap output file does not exist'
+      appmap = JSON.parse(File.read(appmap_file))
+      assert_equal AppMap::APPMAP_FORMAT_VERSION, appmap['version']
+      assert_includes appmap.keys, 'metadata'
+      metadata = appmap['metadata']
+      assert_equal 'Inventory', metadata['name']
+      assert_includes metadata.keys, 'labels'
+      assert_equal metadata['labels'], %w[inventory]
+    end
+  end
+
   def test_record_decorated_rspec
     perform_test 'decorated_hello_spec' do
       appmap_file = 'tmp/appmap/rspec/Hello_says_hello.appmap.json'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appmap
 version: !ruby/object:Gem::Version
-  version: 0.21.0
+  version: 0.22.0
 platform: ruby
 authors:
 - Kevin Gilpin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-12 00:00:00.000000000 Z
+date: 2019-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport