appmap 0.25.0 → 0.28.0

data/test/rspec_test.rb

@@ -9,6 +9,7 @@ class RSpecTest < Minitest::Test
     Bundler.with_clean_env do
       Dir.chdir 'test/fixtures/rspec_recorder' do
         FileUtils.rm_rf 'tmp'
+        system 'bundle config --local local.appmap ../../..'
         system 'bundle'
         system({ 'APPMAP' => 'true' }, %(bundle exec rspec spec/#{test_name}.rb))
 
@@ -48,6 +49,10 @@ class RSpecTest < Minitest::Test
       assert_equal({ name: 'appmap', url: AppMap::URL, version: AppMap::VERSION }.stringify_keys, metadata['client'])
       assert_includes metadata.keys, 'recorder'
       assert_equal({ name: 'rspec' }.stringify_keys, metadata['recorder'])
+
+      assert_includes metadata.keys, 'frameworks'
+      rspec = metadata['frameworks'].select {|f| f['name'] == 'rspec'}
+      assert_equal 1, rspec.count
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appmap
 version: !ruby/object:Gem::Version
-  version: 0.25.0
+  version: 0.28.0
 platform: ruby
 authors:
 - Kevin Gilpin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-13 00:00:00.000000000 Z
+date: 2020-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -269,15 +269,17 @@ files:
 - lib/appmap/class_map.rb
 - lib/appmap/command/record.rb
 - lib/appmap/command/stats.rb
-- lib/appmap/command/upload.rb
+- lib/appmap/cucumber.rb
 - lib/appmap/event.rb
 - lib/appmap/hook.rb
+- lib/appmap/metadata.rb
 - lib/appmap/middleware/remote_recording.rb
 - lib/appmap/rails/action_handler.rb
 - lib/appmap/rails/sql_handler.rb
 - lib/appmap/railtie.rb
 - lib/appmap/rspec.rb
 - lib/appmap/trace.rb
+- lib/appmap/util.rb
 - lib/appmap/version.rb
 - lore/pages/2019-05-21-install-and-record/index.pug
 - lore/pages/2019-05-21-install-and-record/install_example_appmap.png
@@ -437,6 +439,10 @@ files:
 - spec/fixtures/rails_users_app/db/migrate/20190728211408_create_users.rb
 - spec/fixtures/rails_users_app/db/schema.rb
 - spec/fixtures/rails_users_app/docker-compose.yml
+- spec/fixtures/rails_users_app/features/api_users.feature
+- spec/fixtures/rails_users_app/features/support/env.rb
+- spec/fixtures/rails_users_app/features/support/hooks.rb
+- spec/fixtures/rails_users_app/features/support/steps.rb
 - spec/fixtures/rails_users_app/lib/tasks/.keep
 - spec/fixtures/rails_users_app/log/.keep
 - spec/fixtures/rails_users_app/public/robots.txt
@@ -453,9 +459,26 @@ files:
 - spec/remote_recording_spec.rb
 - spec/rspec_feature_metadata_spec.rb
 - spec/spec_helper.rb
+- spec/util_spec.rb
 - test/cli_test.rb
+- test/cucumber_test.rb
 - test/fixtures/cli_record_test/appmap.yml
 - test/fixtures/cli_record_test/lib/cli_record_test/main.rb
+- test/fixtures/cucumber4_recorder/Gemfile
+- test/fixtures/cucumber4_recorder/appmap.yml
+- test/fixtures/cucumber4_recorder/features/say_hello.feature
+- test/fixtures/cucumber4_recorder/features/support/env.rb
+- test/fixtures/cucumber4_recorder/features/support/hooks.rb
+- test/fixtures/cucumber4_recorder/features/support/steps.rb
+- test/fixtures/cucumber4_recorder/lib/hello.rb
+- test/fixtures/cucumber_recorder/.bundle/config
+- test/fixtures/cucumber_recorder/Gemfile
+- test/fixtures/cucumber_recorder/appmap.yml
+- test/fixtures/cucumber_recorder/features/say_hello.feature
+- test/fixtures/cucumber_recorder/features/support/env.rb
+- test/fixtures/cucumber_recorder/features/support/hooks.rb
+- test/fixtures/cucumber_recorder/features/support/steps.rb
+- test/fixtures/cucumber_recorder/lib/hello.rb
 - test/fixtures/rspec_recorder/Gemfile
 - test/fixtures/rspec_recorder/appmap.yml
 - test/fixtures/rspec_recorder/lib/hello.rb

data/lib/appmap/command/upload.rb

@@ -1,101 +0,0 @@
-# frozen_string_literal: true
-
-require 'json'
-require 'faraday'
-
-module AppMap
-  module Command
-    UploadResponse = Struct.new(:batch_id, :scenario_uuid)
-
-    UploadStruct = Struct.new(:data, :url, :user, :org)
-    class Upload < UploadStruct
-      MAX_DEPTH = 12
-
-      attr_accessor :batch_id
-
-      def initialize(data, url, user, org)
-        super
-
-        # TODO: Make this an option
-        @max_depth = MAX_DEPTH
-      end
-
-      def perform
-        appmap = data.clone
-
-        events = data.delete('events')
-        class_map = data.delete('classMap') || []
-
-        unless events.blank?
-          pruned_events = []
-          stack = []
-          events.each do |evt|
-            if evt['event'] == 'call'
-              stack << evt
-              stack_depth = stack.length
-            else
-              stack_depth = stack.length
-              stack.pop
-            end
-
-            prune = stack_depth > @max_depth
-
-            pruned_events << evt unless prune
-          end
-
-          warn "Pruned events to #{pruned_events.length}" if events.length > pruned_events.length
-
-          appmap[:events] = pruned_events
-          appmap[:classMap] = prune(class_map, events: pruned_events)
-        else
-          appmap[:events] = []
-          appmap[:classMap] = prune(class_map)
-        end
-
-        upload_file = { user: user, org: org, data: appmap }.compact
-
-        conn = Faraday.new(url: url)
-        response = conn.post do |req|
-          req.url '/api/scenarios'
-          req.headers['Content-Type'] = 'application/json'
-          req.headers[AppMap::BATCH_HEADER_NAME] = @batch_id if @batch_id
-          req.body = JSON.generate(upload_file)
-        end
-
-        unless response.body.blank?
-          message = begin
-                      JSON.parse(response.body)
-                    rescue JSON::ParserError => e
-                      warn "Response is not valid JSON (#{e.message})"
-                      nil
-                    end
-        end
-
-        unless response.success?
-          error = [ 'Upload failed' ]
-          error << ": #{message}" if message
-          raise error.join
-        end
-
-        batch_id = @batch_id || response.headers[AppMap::BATCH_HEADER_NAME]
-
-        uuid = message['uuid']
-        UploadResponse.new(batch_id, uuid)
-      end
-
-      protected
-
-      def debug?
-        ENV['DEBUG'] == 'true' || ENV['GLI_DEBUG'] == 'true'
-      end
-
-      def prune(class_map, events: nil)
-        require 'appmap/algorithm/prune_class_map'
-        Algorithm::PruneClassMap.new(class_map).tap do |alg|
-          alg.events = events if events
-          alg.logger = ->(msg) { warn msg } if debug?
-        end.perform
-      end
-    end
-  end
-end