appmap 0.41.1 → 0.44.0

data/test/fixtures/rspec_recorder/spec/plain_hello_spec.rb

@@ -2,7 +2,7 @@ require 'rspec'
 require 'appmap/rspec'
 require 'hello'
 
-describe Hello, appmap: true do
+describe Hello do
   it 'says hello' do
     expect(Hello.new.say_hello).to eq('Hello!')
   end

data/test/gem_test.rb

@@ -26,7 +26,7 @@ class MinitestTest < Minitest::Test
       assert_equal 2, events.size
       assert_equal 'call', events.first['event']
       assert_equal 'default_parser', events.first['method_id']
-      assert_equal "#{Gem.loaded_specs['parser'].gem_dir}/lib/parser/base.rb", events.first['path']
+      assert_match /\lib\/parser\/base\.rb$/, events.first['path']
       assert_equal 'return', events.second['event']
       assert_equal 1, events.second['parent_id']
     end

data/test/minitest_test.rb

@@ -30,9 +30,8 @@ class MinitestTest < Minitest::Test
       assert_equal 'minitest_recorder', metadata['app']
       assert_equal 'minitest', metadata['recorder']['name']
       assert_equal 'ruby', metadata['language']['name']
-      assert_equal 'Hello', metadata['feature_group']
-      assert_equal 'hello', metadata['feature']
       assert_equal 'Hello hello', metadata['name']
+      assert_equal 'test/hello_test.rb:9', metadata['source_location']
     end
   end
 end

data/test/rspec_test.rb

@@ -18,21 +18,6 @@ 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'
@@ -42,9 +27,8 @@ class RSpecTest < Minitest::Test
       assert_equal AppMap::APPMAP_FORMAT_VERSION, appmap['version']
       assert_includes appmap.keys, 'metadata'
       metadata = appmap['metadata']
-      assert_equal 'Saying hello', metadata['feature_group']
-      assert_equal 'Speak hello', metadata['feature']
       assert_equal 'Hello says hello', metadata['name']
+      assert_equal 'spec/decorated_hello_spec.rb', metadata['source_location']
       assert_includes metadata.keys, 'client'
       assert_equal({ name: 'appmap', url: AppMap::URL, version: AppMap::VERSION }.stringify_keys, metadata['client'])
       assert_includes metadata.keys, 'recorder'
@@ -63,8 +47,6 @@ class RSpecTest < Minitest::Test
       appmap = JSON.parse(File.read(appmap_file))
       assert_includes appmap.keys, 'metadata'
       metadata = appmap['metadata']
-      assert_equal 'Hello', metadata['feature_group']
-      assert_equal 'Hello', metadata['feature']
       assert_equal 'Hello says hello', metadata['name']
     end
   end
@@ -76,7 +58,6 @@ class RSpecTest < Minitest::Test
       appmap = JSON.parse(File.read(appmap_file))
       assert_includes appmap.keys, 'metadata'
       metadata = appmap['metadata']
-      assert_equal %w[hello speak], metadata['labels'].sort
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appmap
 version: !ruby/object:Gem::Version
-  version: 0.41.1
+  version: 0.44.0
 platform: ruby
 authors:
 - Kevin Gilpin
 autorequire:
-bindir: exe
+bindir: bin
 cert_chain: []
-date: 2021-02-10 00:00:00.000000000 Z
+date: 2021-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -307,8 +307,7 @@ dependencies:
 description:
 email:
 - kgilpin@gmail.com
-executables:
-- appmap
+executables: []
 extensions:
 - ext/appmap/extconf.rb
 extra_rdoc_files: []
@@ -334,7 +333,6 @@ files:
 - examples/mock_webapp/lib/mock_webapp/controller.rb
 - examples/mock_webapp/lib/mock_webapp/request.rb
 - examples/mock_webapp/lib/mock_webapp/user.rb
-- exe/appmap
 - ext/appmap/appmap.c
 - ext/appmap/extconf.rb
 - lib/appmap.rb
@@ -379,16 +377,19 @@ files:
 - lore/public/stylesheets/style.css
 - package-lock.json
 - package.json
+- patch
 - spec/abstract_controller_base_spec.rb
 - spec/class_map_spec.rb
 - spec/config_spec.rb
 - spec/fixtures/hook/attr_accessor.rb
 - spec/fixtures/hook/compare.rb
 - spec/fixtures/hook/constructor.rb
+- spec/fixtures/hook/custom_instance_method.rb
 - spec/fixtures/hook/exception_method.rb
 - spec/fixtures/hook/exclude.rb
 - spec/fixtures/hook/instance_method.rb
 - spec/fixtures/hook/labels.rb
+- spec/fixtures/hook/method_named_call.rb
 - spec/fixtures/hook/singleton_method.rb
 - spec/fixtures/rack_users_app/.dockerignore
 - spec/fixtures/rack_users_app/.gitignore
@@ -548,10 +549,8 @@ files:
 - spec/railtie_spec.rb
 - spec/record_sql_rails_pg_spec.rb
 - 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/expectations/openssl_test_key_sign1.json
 - test/expectations/openssl_test_key_sign2.json

data/exe/appmap

@@ -1,154 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-require 'gli'
-
-ENV['APPMAP_INITIALIZE'] = 'false'
-
-require 'appmap'
-require 'appmap/version'
-
-# AppMap CLI.
-module AppMap
-  class App
-    extend GLI::App
-
-    program_desc 'AppMap client'
-
-    version AppMap::VERSION
-
-    subcommand_option_handling :normal
-    arguments :strict
-    preserve_argv true
-
-    class << self
-      protected
-
-      def default_appmap_file
-        ENV['APPMAP_FILE'] || 'appmap.json'
-      end
-
-      def output_file_flag(c, default_value: nil)
-        c.desc 'Name of the output file'
-        c.long_desc <<~DESC
-        Use a single dash '-' for stdout.
-        DESC
-        c.default_value default_value if default_value
-        c.arg_name 'filename'
-        c.flag %i[o output]
-      end
-    end
-
-    desc 'AppMap configuration file name'
-    default_value ENV['APPMAP_CONFIG'] || 'appmap.yml'
-    arg_name 'filename'
-    flag %i[c config]
-
-    desc 'Record the execution of a program and generate an AppMap.'
-    arg_name 'program'
-    command :record do |c|
-      output_file_flag(c, default_value: default_appmap_file)
-
-      c.action do |_, _, args|
-        # My subcommand name
-        ARGV.shift
-
-        # Consume the :output option, if provided
-        if %w[-o --output].find { |arg_name| ARGV[0] == arg_name.to_s }
-          ARGV.shift
-          ARGV.shift
-        end
-
-        # Name of the program to execute. GLI will ensure that it's present.
-        program = args.shift or help_now!("'program' argument is required")
-
-        # Also pop the program name from ARGV, because the command will use raw ARGV
-        # to load the extra arguments into this Ruby process.
-        ARGV.shift
-
-        require 'appmap/command/record'
-        AppMap::Command::Record.new(@config, program).perform do |version, metadata, class_map, events|
-          @output_file.write JSON.generate(version: version,
-                                           metadata: metadata,
-                                           classMap: class_map,
-                                           events: events)
-        end
-      end
-    end
-
-    desc 'Calculate and print statistics of scenario files.'
-    arg_name 'filename'
-    command :stats do |c|
-      output_file_flag(c, default_value: '-')
-
-      c.desc 'Display format for the result (text | json)'
-      c.default_value 'text'
-      c.flag %i[f format]
-
-      c.desc 'Maximum number of lines to display for each stat'
-      c.flag %i[l limit]
-
-      c.action do |_, options, args|
-        require 'appmap/command/stats'
-
-        limit = options[:limit].to_i if options[:limit]
-
-        # Name of the file to analyze. GLI will ensure that it's present.
-        filenames = args
-        help_now!("'filename' argument is required") if filenames.empty?
-
-        require 'appmap/algorithm/stats'
-        result = filenames.inject(::AppMap::Algorithm::Stats::Result.new([], [])) do |stats_result, filename|
-          appmap = begin
-            JSON.parse(File.read(filename))
-          rescue JSON::ParserError
-            STDERR.puts "#{filename} is not valid JSON : #{$!}"
-            nil
-          end
-          stats_result.tap do
-            if appmap
-              limit = options[:limit].to_i if options[:limit]
-              stats_for_file = AppMap::Command::Stats.new(appmap).perform(limit: limit)
-              stats_result.merge!(stats_for_file)
-            end
-          end
-        end
-
-        result.sort!
-        result.limit!(limit) if limit
-
-        display = case options[:format]
-        when 'json'
-          JSON.pretty_generate(result.as_json)
-        else
-          result.as_text
-        end
-        @output_file.write display
-      end
-    end
-
-    pre do |global, _, options, _|
-      @config = interpret_config_option(global[:config])
-      @output_file = interpret_output_file_option(options[:output])
-
-      true
-    end
-
-    class << self
-      protected
-
-      def interpret_config_option(fname)
-        AppMap.initialize fname
-      end
-
-      def interpret_output_file_option(file_name)
-        Hash.new { |_, fname| -> { File.new(fname, 'w') } }.tap do |open_output_file|
-          open_output_file[nil] = -> { nil }
-          open_output_file['-'] = -> { $stdout }
-        end[file_name].call
-      end
-    end
-  end
-end
-
-exit AppMap::App.run(ARGV)

data/spec/rspec_feature_metadata_spec.rb

@@ -1,31 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_spec_helper'
-
-describe 'RSpec feature and feature group metadata' do
-  include_examples 'Rails app pg database', 'spec/fixtures/rails5_users_app' do
-    around(:each) do |example|
-      FileUtils.rm_rf tmpdir
-      FileUtils.mkdir_p tmpdir
-      cmd = "docker-compose run --rm -e RAILS_ENV=test -e APPMAP=true -v #{File.absolute_path(tmpdir).shellescape}:/app/tmp app ./bin/rspec spec/models/user_spec.rb"
-      run_cmd cmd, chdir: fixture_dir
-
-      example.run
-    end
-
-    let(:tmpdir) { 'tmp/spec/RSpec feature and feature group metadata' }
-    let(:appmap_json) { File.join(tmpdir, %(appmap/rspec/User_creation_creates_charles.appmap.json)) }
-
-    describe do
-      it 'are recorded in the appmap' do
-        expect(File).to exist(appmap_json)
-        appmap = JSON.parse(File.read(appmap_json)).to_yaml
-
-        expect(appmap).to include(<<-METADATA.strip)
-  feature: Create a user
-  feature_group: User
-        METADATA
-      end
-    end
-  end
-end

data/test/cli_test.rb

@@ -1,116 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-require 'test_helper'
-require 'English'
-
-class CLITest < Minitest::Test
-  OUTPUT_FILENAME = File.expand_path('../tmp/appmap.json', __dir__)
-  STATS_OUTPUT_FILENAME = File.expand_path('../tmp/stats.txt', __dir__)
-
-  def setup
-    FileUtils.rm_f OUTPUT_FILENAME
-    FileUtils.rm_f STATS_OUTPUT_FILENAME
-  end
-
-  def test_record
-    output = Dir.chdir 'test/fixtures/cli_record_test' do
-      `#{File.expand_path '../exe/appmap', __dir__} record -o #{OUTPUT_FILENAME} ./lib/cli_record_test/main.rb`.strip
-    end
-
-    assert_equal 0, $CHILD_STATUS.exitstatus
-    assert File.file?(OUTPUT_FILENAME), "#{OUTPUT_FILENAME} does not exist"
-    assert_equal 'Hello', output
-    output = JSON.parse(File.read(OUTPUT_FILENAME))
-    assert output['classMap'], 'Output should contain classMap'
-    assert output['events'], 'Output should contain events'
-  end
-
-  def test_stats_to_file
-    Dir.chdir 'test/fixtures/cli_record_test' do
-      `#{File.expand_path '../exe/appmap', __dir__} record -o #{OUTPUT_FILENAME} ./lib/cli_record_test/main.rb`.strip
-    end
-    assert_equal 0, $CHILD_STATUS.exitstatus
-
-    output = Dir.chdir 'test/fixtures/cli_record_test' do
-      `#{File.expand_path '../exe/appmap', __dir__} stats -o #{STATS_OUTPUT_FILENAME} #{OUTPUT_FILENAME}`.strip
-    end
-    assert_equal 0, $CHILD_STATUS.exitstatus
-    assert_equal '', output
-    assert File.file?(OUTPUT_FILENAME), "#{OUTPUT_FILENAME} does not exist"
-  end
-
-
-  def test_stats_text
-    Dir.chdir 'test/fixtures/cli_record_test' do
-      `#{File.expand_path '../exe/appmap', __dir__} record -o #{OUTPUT_FILENAME} ./lib/cli_record_test/main.rb`.strip
-    end
-    assert_equal 0, $CHILD_STATUS.exitstatus
-
-    output = Dir.chdir 'test/fixtures/cli_record_test' do
-      `#{File.expand_path '../exe/appmap', __dir__} stats -o - #{OUTPUT_FILENAME}`.strip
-    end
-
-    assert_equal 0, $CHILD_STATUS.exitstatus
-    assert_equal <<~OUTPUT.strip, output.strip
-    Class frequency:
-    ----------------
-    1	Main
-
-    Method frequency:
-    ----------------
-    1	Main.say_hello
-    OUTPUT
-  end
-
-  def test_stats_json
-    Dir.chdir 'test/fixtures/cli_record_test' do
-      `#{File.expand_path '../exe/appmap', __dir__} record -o #{OUTPUT_FILENAME} ./lib/cli_record_test/main.rb`.strip
-    end
-    assert_equal 0, $CHILD_STATUS.exitstatus
-
-    output = Dir.chdir 'test/fixtures/cli_record_test' do
-      `#{File.expand_path '../exe/appmap', __dir__} stats -f json -o - #{OUTPUT_FILENAME}`.strip
-    end
-
-    assert_equal 0, $CHILD_STATUS.exitstatus
-    assert_equal <<~OUTPUT.strip, output.strip
-    {
-      "class_frequency": [
-        {
-          "name": "Main",
-          "count": 1
-        }
-      ],
-      "method_frequency": [
-        {
-          "name": "Main.say_hello",
-          "count": 1
-        }
-      ]
-    }
-    OUTPUT
-  end
-
-  def test_record_to_default_location
-    Dir.chdir 'test/fixtures/cli_record_test' do
-      system({ 'APPMAP_FILE' => OUTPUT_FILENAME }, "#{File.expand_path '../exe/appmap', __dir__} record ./lib/cli_record_test/main.rb")
-    end
-
-    assert_equal 0, $CHILD_STATUS.exitstatus
-    assert File.file?(OUTPUT_FILENAME), 'appmap.json does not exist'
-  end
-
-  def test_record_to_stdout
-    output = Dir.chdir 'test/fixtures/cli_record_test' do
-      `#{File.expand_path '../exe/appmap', __dir__} record -o - ./lib/cli_record_test/main.rb`
-    end
-
-    assert_equal 0, $CHILD_STATUS.exitstatus
-    # Event path
-    assert_includes output, %("path":"lib/cli_record_test/main.rb")
-    # Function location
-    assert_includes output, %("location":"lib/cli_record_test/main.rb:3")
-    assert !File.file?(OUTPUT_FILENAME), "#{OUTPUT_FILENAME} should not exist"
-  end
-end