appmap 0.37.2 → 0.41.0

data/spec/record_sql_rails_pg_spec.rb

@@ -5,7 +5,7 @@ describe 'SQL events' do
     around(:each) do |example|
       FileUtils.rm_rf tmpdir
       FileUtils.mkdir_p tmpdir
-      cmd = "docker-compose run --rm -e ORM_MODULE=#{orm_module} -e APPMAP=true -v #{File.absolute_path tmpdir}:/app/tmp app ./bin/rspec spec/controllers/users_controller_api_spec.rb:#{test_line_number}"
+      cmd = "docker-compose run --rm -e ORM_MODULE=#{orm_module} -e RAILS_ENV=test -e APPMAP=true -v #{File.absolute_path tmpdir}:/app/tmp app ./bin/rspec spec/controllers/users_controller_api_spec.rb:#{test_line_number}"
       run_cmd cmd, chdir: fixture_dir
 
       example.run

data/spec/rspec_feature_metadata_spec.rb

@@ -7,7 +7,7 @@ describe 'RSpec feature and feature group metadata' do
     around(:each) do |example|
       FileUtils.rm_rf tmpdir
       FileUtils.mkdir_p tmpdir
-      cmd = "docker-compose run --rm -e APPMAP=true -v #{File.absolute_path(tmpdir).shellescape}:/app/tmp app ./bin/rspec spec/models/user_spec.rb"
+      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

data/spec/spec_helper.rb

@@ -3,6 +3,7 @@ require 'net/http'
 require 'json'
 require 'yaml'
 require 'English'
+require 'byebug'
 require 'webdrivers/chromedriver'
 
 # Disable default initialization of AppMap

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appmap
 version: !ruby/object:Gem::Version
-  version: 0.37.2
+  version: 0.41.0
 platform: ruby
 authors:
 - Kevin Gilpin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-11-19 00:00:00.000000000 Z
+date: 2021-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -319,6 +319,7 @@ files:
 - ".rubocop.yml"
 - ".travis.yml"
 - CHANGELOG.md
+- CONTRIBUTING.md
 - Dockerfile.appmap
 - Gemfile
 - LICENSE.txt
@@ -378,7 +379,6 @@ files:
 - lore/public/stylesheets/style.css
 - package-lock.json
 - package.json
-- spec/abstract_controller4_base_spec.rb
 - spec/abstract_controller_base_spec.rb
 - spec/class_map_spec.rb
 - spec/config_spec.rb
@@ -386,7 +386,9 @@ files:
 - spec/fixtures/hook/compare.rb
 - spec/fixtures/hook/constructor.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/singleton_method.rb
 - spec/fixtures/rack_users_app/.dockerignore
 - spec/fixtures/rack_users_app/.gitignore
@@ -396,70 +398,6 @@ files:
 - spec/fixtures/rack_users_app/config.ru
 - spec/fixtures/rack_users_app/docker-compose.yml
 - spec/fixtures/rack_users_app/lib/app.rb
-- spec/fixtures/rails4_users_app/.gitignore
-- spec/fixtures/rails4_users_app/.rbenv-gemsets
-- spec/fixtures/rails4_users_app/.ruby-version
-- spec/fixtures/rails4_users_app/Dockerfile
-- spec/fixtures/rails4_users_app/Dockerfile.pg
-- spec/fixtures/rails4_users_app/Gemfile
-- spec/fixtures/rails4_users_app/README.rdoc
-- spec/fixtures/rails4_users_app/Rakefile
-- spec/fixtures/rails4_users_app/app/assets/images/.keep
-- spec/fixtures/rails4_users_app/app/assets/javascripts/application.js
-- spec/fixtures/rails4_users_app/app/assets/stylesheets/application.css
-- spec/fixtures/rails4_users_app/app/controllers/api/users_controller.rb
-- spec/fixtures/rails4_users_app/app/controllers/application_controller.rb
-- spec/fixtures/rails4_users_app/app/controllers/concerns/.keep
-- spec/fixtures/rails4_users_app/app/controllers/health_controller.rb
-- spec/fixtures/rails4_users_app/app/controllers/users_controller.rb
-- spec/fixtures/rails4_users_app/app/helpers/application_helper.rb
-- spec/fixtures/rails4_users_app/app/mailers/.keep
-- spec/fixtures/rails4_users_app/app/models/.keep
-- spec/fixtures/rails4_users_app/app/models/concerns/.keep
-- spec/fixtures/rails4_users_app/app/models/user.rb
-- spec/fixtures/rails4_users_app/app/views/layouts/application.html.haml
-- spec/fixtures/rails4_users_app/app/views/users/index.html.haml
-- spec/fixtures/rails4_users_app/appmap.yml
-- spec/fixtures/rails4_users_app/bin/rails
-- spec/fixtures/rails4_users_app/bin/setup
-- spec/fixtures/rails4_users_app/bin/spring
-- spec/fixtures/rails4_users_app/config.ru
-- spec/fixtures/rails4_users_app/config/application.rb
-- spec/fixtures/rails4_users_app/config/boot.rb
-- spec/fixtures/rails4_users_app/config/database.yml
-- spec/fixtures/rails4_users_app/config/environment.rb
-- spec/fixtures/rails4_users_app/config/environments/development.rb
-- spec/fixtures/rails4_users_app/config/environments/production.rb
-- spec/fixtures/rails4_users_app/config/environments/test.rb
-- spec/fixtures/rails4_users_app/config/initializers/assets.rb
-- spec/fixtures/rails4_users_app/config/initializers/backtrace_silencers.rb
-- spec/fixtures/rails4_users_app/config/initializers/cookies_serializer.rb
-- spec/fixtures/rails4_users_app/config/initializers/filter_parameter_logging.rb
-- spec/fixtures/rails4_users_app/config/initializers/inflections.rb
-- spec/fixtures/rails4_users_app/config/initializers/mime_types.rb
-- spec/fixtures/rails4_users_app/config/initializers/session_store.rb
-- spec/fixtures/rails4_users_app/config/initializers/to_time_preserves_timezone.rb
-- spec/fixtures/rails4_users_app/config/initializers/wrap_parameters.rb
-- spec/fixtures/rails4_users_app/config/locales/en.yml
-- spec/fixtures/rails4_users_app/config/routes.rb
-- spec/fixtures/rails4_users_app/config/secrets.yml
-- spec/fixtures/rails4_users_app/create_app
-- spec/fixtures/rails4_users_app/db/migrate/20191127112304_create_users.rb
-- spec/fixtures/rails4_users_app/db/schema.rb
-- spec/fixtures/rails4_users_app/db/seeds.rb
-- spec/fixtures/rails4_users_app/docker-compose.yml
-- spec/fixtures/rails4_users_app/lib/assets/.keep
-- spec/fixtures/rails4_users_app/lib/tasks/.keep
-- spec/fixtures/rails4_users_app/log/.keep
-- spec/fixtures/rails4_users_app/public/404.html
-- spec/fixtures/rails4_users_app/public/422.html
-- spec/fixtures/rails4_users_app/public/500.html
-- spec/fixtures/rails4_users_app/public/favicon.ico
-- spec/fixtures/rails4_users_app/public/robots.txt
-- spec/fixtures/rails4_users_app/spec/controllers/users_controller_api_spec.rb
-- spec/fixtures/rails4_users_app/spec/rails_helper.rb
-- spec/fixtures/rails4_users_app/spec/spec_helper.rb
-- spec/fixtures/rails4_users_app/test/fixtures/users.yml
 - spec/fixtures/rails5_users_app/.dockerignore
 - spec/fixtures/rails5_users_app/.gitignore
 - spec/fixtures/rails5_users_app/.rspec
@@ -527,6 +465,7 @@ files:
 - spec/fixtures/rails5_users_app/log/.keep
 - spec/fixtures/rails5_users_app/public/robots.txt
 - spec/fixtures/rails5_users_app/spec/controllers/users_controller_api_spec.rb
+- spec/fixtures/rails5_users_app/spec/controllers/users_controller_spec.rb
 - spec/fixtures/rails5_users_app/spec/models/user_spec.rb
 - spec/fixtures/rails5_users_app/spec/rails_helper.rb
 - spec/fixtures/rails5_users_app/spec/spec_helper.rb
@@ -598,6 +537,7 @@ files:
 - spec/fixtures/rails6_users_app/log/.keep
 - spec/fixtures/rails6_users_app/public/robots.txt
 - spec/fixtures/rails6_users_app/spec/controllers/users_controller_api_spec.rb
+- spec/fixtures/rails6_users_app/spec/controllers/users_controller_spec.rb
 - 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
@@ -606,7 +546,6 @@ files:
 - spec/open_spec.rb
 - spec/rails_spec_helper.rb
 - spec/railtie_spec.rb
-- spec/record_sql_rails4_pg_spec.rb
 - spec/record_sql_rails_pg_spec.rb
 - spec/remote_recording_spec.rb
 - spec/rspec_feature_metadata_spec.rb

data/spec/abstract_controller4_base_spec.rb

@@ -1,66 +0,0 @@
-require 'rails_spec_helper'
-
-describe 'AbstractControllerBase' do
-  include_context 'Rails app pg database', 'spec/fixtures/rails4_users_app' do
-    around(:each) do |example|
-      FileUtils.rm_rf tmpdir
-      FileUtils.mkdir_p tmpdir
-      cmd = "docker-compose run --rm -e APPMAP=true -v #{File.absolute_path tmpdir}:/app/tmp app ./bin/rspec spec/controllers/users_controller_api_spec.rb:8"
-      run_cmd cmd, chdir: fixture_dir
-
-      example.run
-    end
-
-    let(:tmpdir) { 'tmp/spec/AbstractControllerBase' }
-    let(:appmap_json) { File.join(tmpdir, 'appmap/rspec/Api_UsersController_POST_api_users_with_required_parameters_creates_a_user.appmap.json') }
-
-    describe 'testing with rspec' do
-      it 'Message fields 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(<<-MESSAGE.strip)
-  message:
-  - name: login
-    class: String
-    value: alice
-    object_id:
-        MESSAGE
-
-        expect(appmap).to include(<<-MESSAGE.strip)
-  - name: password
-    class: String
-    value: "[FILTERED]"
-    object_id:
-       MESSAGE
-
-        expect(appmap).to include(<<-SERVER_REQUEST.strip)
-  http_server_request:
-    request_method: POST
-    path_info: "/api/users"
-        SERVER_REQUEST
-      end
-      it 'Properly captures method parameters in the appmap' do
-        expect(File).to exist(appmap_json)
-        appmap = JSON.parse(File.read(appmap_json)).to_yaml
-
-        expect(appmap).to match(<<-CREATE_CALL.strip)
-  event: call
-  thread_id: .*
-  defined_class: Api::UsersController
-  method_id: build_user
-  path: app/controllers/api/users_controller.rb
-  lineno: 23
-  static: false
-  parameters:
-  - name: params
-    class: Hash
-    object_id: .*
-    value: '{"login"=>"alice"}'
-    kind: req
-  receiver:
-        CREATE_CALL
-      end
-    end
-  end
-end

data/spec/fixtures/rails4_users_app/.gitignore

@@ -1,13 +0,0 @@
-# See https://help.github.com/articles/ignoring-files for more about ignoring files.
-#
-# If you find yourself ignoring temporary files generated by your text editor
-# or operating system, you probably want to add a global ignore instead:
-#   git config --global core.excludesfile '~/.gitignore_global'
-
-# Ignore bundler config.
-/.bundle
-
-# Ignore all logfiles and tempfiles.
-/log/*
-!/log/.keep
-/tmp

data/spec/fixtures/rails4_users_app/.rbenv-gemsets

@@ -1,2 +0,0 @@
-rails4_users_app
-

data/spec/fixtures/rails4_users_app/.ruby-version

@@ -1 +0,0 @@
-2.5.1

data/spec/fixtures/rails4_users_app/Dockerfile

@@ -1,30 +0,0 @@
-ARG GEM_VERSION
-ARG RUBY_VERSION
-
-FROM appmap:${GEM_VERSION} as appmap
-
-FROM ruby:${RUBY_VERSION}
-RUN apt-get update && apt-get install -y vim less
-RUN apt-get install -y postgresql-client
-
-RUN mkdir /app
-WORKDIR /app
-
-RUN gem install -v '~> 1.17' -N bundler
- 
-COPY Gemfile .
-
-RUN bundle
-RUN bundle binstubs --force \
-    bundler rake rspec-core
-
-COPY . .
-
-COPY --from=appmap /pkg/appmap.gem /tmp/
-RUN gem install /tmp/appmap.gem && \
-    bundle update --local appmap && \
-    bundle binstubs appmap --force
-
-EXPOSE 3000
-
-HEALTHCHECK --interval=1s --retries=10 CMD curl --fail http://localhost:3000/health || exit 1

data/spec/fixtures/rails4_users_app/Dockerfile.pg

@@ -1,3 +0,0 @@
-FROM postgres:9.6
-
-HEALTHCHECK --interval=1s --retries=10 CMD psql -U postgres -c "select 1" || exit 1

data/spec/fixtures/rails4_users_app/Gemfile

@@ -1,77 +0,0 @@
-source 'https://rubygems.org'
-git_source(:github) { |name| "https://github.com/#{name}.git" }
-
-# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '4.2.11'
-gem 'haml-rails'
-
-# Use postgresql as the database for Active Record
-gem 'pg', '~> 0.15'
-# Use SCSS for stylesheets
-gem 'sass-rails', '~> 5.0'
-# Use Uglifier as compressor for JavaScript assets
-# gem 'uglifier', '>= 1.3.0'
-# Use CoffeeScript for .coffee assets and views
-# gem 'coffee-rails', '~> 4.1.0'
-# See https://github.com/rails/execjs#readme for more supported runtimes
-# gem 'therubyracer', platforms: :ruby
-
-# Use jquery as the JavaScript library
-# gem 'jquery-rails'
-# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
-gem 'turbolinks'
-# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
-gem 'jbuilder', '~> 2.0'
-# bundle exec rake doc:rails generates the API under doc/api.
-gem 'sdoc', '~> 0.4.0', group: :doc
-
-# Use ActiveModel has_secure_password
-gem 'bcrypt', '~> 3.1.7'
-
-# Use Unicorn as the app server
-# gem 'unicorn'
-
-# Use Capistrano for deployment
-# gem 'capistrano-rails', group: :development
-
-appmap_path = \
-  # Support debugging inside the container with volume-mounted source
-  if File.directory?('/src/appmap-ruby')
-    '/src/appmap-ruby'
-  elsif File.exist?('../../../appmap.gemspec')
-    '../../..'
-  end
-
-if appmap_path
-  # Set the branch parameter, so that 'bundle config local.appmap' will work
-  appmap_branch = Dir.chdir appmap_path do
-    `git rev-parse --abbrev-ref HEAD`.strip
-  end
-end
-
-appmap_options = \
-  if appmap_path && appmap_branch
-    { git: appmap_path, branch: appmap_branch }
-  elsif appmap_path
-    { path: appmap_path }
-  else
-    {}
-  end.merge(require: %w[appmap appmap/railtie])
-
-gem 'appmap', appmap_options
-
-group :development, :test do
-  gem 'rspec-rails'
-  gem 'database_cleaner'
-  
-  gem 'pry-byebug'
-end
-
-group :development do
-  # Access an IRB console on exception pages or by using <%= console %> in views
-  gem 'web-console', '~> 2.0'
-
-  # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
-  gem 'spring'
-end
-

data/spec/fixtures/rails4_users_app/README.rdoc

@@ -1,28 +0,0 @@
-== README
-
-This README would normally document whatever steps are necessary to get the
-application up and running.
-
-Things you may want to cover:
-
-* Ruby version
-
-* System dependencies
-
-* Configuration
-
-* Database creation
-
-* Database initialization
-
-* How to run the test suite
-
-* Services (job queues, cache servers, search engines, etc.)
-
-* Deployment instructions
-
-* ...
-
-
-Please feel free to use a different markup language if you do not plan to run
-<tt>rake doc:app</tt>.

data/spec/fixtures/rails4_users_app/Rakefile

@@ -1,6 +0,0 @@
-# Add your own tasks in files placed in lib/tasks ending in .rake,
-# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
-
-require File.expand_path('../config/application', __FILE__)
-
-Rails.application.load_tasks

data/spec/fixtures/rails4_users_app/app/assets/javascripts/application.js

@@ -1,16 +0,0 @@
-// This is a manifest file that'll be compiled into application.js, which will include all the files
-// listed below.
-//
-// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
-// or any plugin's vendor/assets/javascripts directory can be referenced here using a relative path.
-//
-// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// compiled file.
-//
-// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
-// about supported directives.
-//
-//= require jquery
-//= require jquery_ujs
-//= require turbolinks
-//= require_tree .

data/spec/fixtures/rails4_users_app/app/assets/stylesheets/application.css

@@ -1,15 +0,0 @@
-/*
- * This is a manifest file that'll be compiled into application.css, which will include all the files
- * listed below.
- *
- * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
- * or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path.
- *
- * You're free to add application-wide styles to this file and they'll appear at the bottom of the
- * compiled file so the styles you add here take precedence over styles defined in any styles
- * defined in the other CSS/SCSS files in this directory. It is generally better to create a new
- * file per style scope.
- *
- *= require_tree .
- *= require_self
- */

data/spec/fixtures/rails4_users_app/app/controllers/api/users_controller.rb

@@ -1,27 +0,0 @@
-module Api
-  class UsersController < ApplicationController
-    def index
-      @users = User.all
-      render json: @users
-    end
-
-    def create
-      @user = build_user(params.slice(:login).to_unsafe_h)
-      unless @user.valid?
-        error = {
-          code: 'invalid',
-          target: 'User',
-          message: @user.errors.full_messages.join(', '),
-          details: @user.errors.map { |k, v| { code: 'invalid', target: k, message: Array(v).join(', ') } }
-        }
-        return render json: error, status: :unprocessable_entity
-      end
-      @user.save
-      render json: @user, status: :created
-    end
-
-    def build_user(params)
-      User.new(params)
-    end
-  end
-end