appmap 0.77.4 → 0.80.0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appmap
 version: !ruby/object:Gem::Version
-  version: 0.77.4
+  version: 0.80.0
 platform: ruby
 authors:
 - Kevin Gilpin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-04-04 00:00:00.000000000 Z
+date: 2022-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.14'
+        version: '5.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.14'
+        version: '5.15'
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
@@ -276,6 +276,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: random-port
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.1
 - !ruby/object:Gem::Dependency
   name: webrick
   requirement: !ruby/object:Gem::Requirement
@@ -312,7 +326,7 @@ files:
 - ARCHITECTURE.md
 - CHANGELOG.md
 - CONTRIBUTING.md
-- Dockerfile.appmap
+- Dockerfile.pg
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -321,6 +335,7 @@ files:
 - appmap.gemspec
 - appmap.yml
 - config-schema.yml
+- docker-compose.yml
 - examples/install.rb
 - examples/mock_webapp/Gemfile
 - examples/mock_webapp/appmap.yml
@@ -376,8 +391,10 @@ files:
 - lib/appmap/gem_hooks/sidekiq.yml
 - lib/appmap/gem_hooks/sprockets.yml
 - lib/appmap/handler.rb
+- lib/appmap/handler/eval.rb
 - lib/appmap/handler/function.rb
 - lib/appmap/handler/net_http.rb
+- lib/appmap/handler/rails/render_handler.rb
 - lib/appmap/handler/rails/request_handler.rb
 - lib/appmap/handler/rails/sql_handler.rb
 - lib/appmap/handler/rails/template.rb
@@ -420,6 +437,7 @@ files:
 - spec/fixtures/config/invalid_yaml_config.yml
 - spec/fixtures/config/missing_path_or_gem.yml
 - spec/fixtures/config/valid_config.yml
+- spec/fixtures/database.yml
 - spec/fixtures/depends/.gitignore
 - spec/fixtures/depends/app/controllers/api/api_keys_controller.rb
 - spec/fixtures/depends/app/controllers/organizations_controller.rb
@@ -462,18 +480,14 @@ files:
 - spec/fixtures/hook/user_page_scenario.appmap.json
 - spec/fixtures/rack_users_app/.dockerignore
 - spec/fixtures/rack_users_app/.gitignore
-- spec/fixtures/rack_users_app/Dockerfile
 - spec/fixtures/rack_users_app/Gemfile
 - spec/fixtures/rack_users_app/appmap.yml
 - 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/rails5_users_app/.dockerignore
 - spec/fixtures/rails5_users_app/.gitignore
 - spec/fixtures/rails5_users_app/.rspec
 - spec/fixtures/rails5_users_app/.ruby-version
-- spec/fixtures/rails5_users_app/Dockerfile
-- spec/fixtures/rails5_users_app/Dockerfile.pg
 - spec/fixtures/rails5_users_app/Gemfile
 - spec/fixtures/rails5_users_app/Rakefile
 - spec/fixtures/rails5_users_app/app/controllers/api/users_controller.rb
@@ -522,10 +536,8 @@ files:
 - spec/fixtures/rails5_users_app/config/initializers/wrap_parameters.rb
 - spec/fixtures/rails5_users_app/config/locales/en.yml
 - spec/fixtures/rails5_users_app/config/routes.rb
-- spec/fixtures/rails5_users_app/create_app
 - spec/fixtures/rails5_users_app/db/migrate/20190728211408_create_users.rb
 - spec/fixtures/rails5_users_app/db/schema.rb
-- spec/fixtures/rails5_users_app/docker-compose.yml
 - spec/fixtures/rails5_users_app/features/api_users.feature
 - spec/fixtures/rails5_users_app/features/support/env.rb
 - spec/fixtures/rails5_users_app/features/support/hooks.rb
@@ -542,9 +554,6 @@ files:
 - spec/fixtures/rails6_users_app/.dockerignore
 - spec/fixtures/rails6_users_app/.gitignore
 - spec/fixtures/rails6_users_app/.rspec
-- spec/fixtures/rails6_users_app/.ruby-version
-- spec/fixtures/rails6_users_app/Dockerfile
-- spec/fixtures/rails6_users_app/Dockerfile.pg
 - spec/fixtures/rails6_users_app/Gemfile
 - spec/fixtures/rails6_users_app/Rakefile
 - spec/fixtures/rails6_users_app/app/controllers/api/users_controller.rb
@@ -593,10 +602,8 @@ files:
 - spec/fixtures/rails6_users_app/config/initializers/wrap_parameters.rb
 - spec/fixtures/rails6_users_app/config/locales/en.yml
 - spec/fixtures/rails6_users_app/config/routes.rb
-- spec/fixtures/rails6_users_app/create_app
 - spec/fixtures/rails6_users_app/db/migrate/20190728211408_create_users.rb
 - spec/fixtures/rails6_users_app/db/schema.rb
-- spec/fixtures/rails6_users_app/docker-compose.yml
 - spec/fixtures/rails6_users_app/features/api_users.feature
 - spec/fixtures/rails6_users_app/features/support/env.rb
 - spec/fixtures/rails6_users_app/features/support/hooks.rb
@@ -619,9 +626,6 @@ files:
 - spec/fixtures/rails7_users_app/.gitattributes
 - spec/fixtures/rails7_users_app/.gitignore
 - spec/fixtures/rails7_users_app/.rspec
-- spec/fixtures/rails7_users_app/.ruby-version
-- spec/fixtures/rails7_users_app/Dockerfile
-- spec/fixtures/rails7_users_app/Dockerfile.pg
 - spec/fixtures/rails7_users_app/Gemfile
 - spec/fixtures/rails7_users_app/README.md
 - spec/fixtures/rails7_users_app/Rakefile
@@ -672,12 +676,10 @@ files:
 - spec/fixtures/rails7_users_app/config/puma.rb
 - spec/fixtures/rails7_users_app/config/routes.rb
 - spec/fixtures/rails7_users_app/config/storage.yml
-- spec/fixtures/rails7_users_app/create_app
 - spec/fixtures/rails7_users_app/db/migrate/20220328093141_create_instances.rb
 - spec/fixtures/rails7_users_app/db/migrate/20220328093154_create_instructors.rb
 - spec/fixtures/rails7_users_app/db/schema.rb
 - spec/fixtures/rails7_users_app/db/seeds.rb
-- spec/fixtures/rails7_users_app/docker-compose.yml
 - spec/fixtures/rails7_users_app/lib/assets/.keep
 - spec/fixtures/rails7_users_app/lib/tasks/.keep
 - spec/fixtures/rails7_users_app/log/.keep
@@ -703,6 +705,7 @@ files:
 - spec/fixtures/rails7_users_app/test/models/instructor_test.rb
 - spec/fixtures/rails7_users_app/test/system/.keep
 - spec/fixtures/rails7_users_app/test/test_helper.rb
+- spec/handler/eval_spec.rb
 - spec/hook_spec.rb
 - spec/open_spec.rb
 - spec/rails_recording_spec.rb

data/Dockerfile.appmap

@@ -1,5 +0,0 @@
-FROM alpine
-ARG GEM_VERSION
-
-RUN mkdir /pkg
-COPY pkg/appmap-${GEM_VERSION}.gem /pkg/appmap.gem

data/spec/fixtures/rack_users_app/Dockerfile

@@ -1,32 +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 mkdir /app
-WORKDIR /app
-
-RUN gem install -N bundler
-
-COPY Gemfile .
-
-RUN bundle
-RUN bundle binstubs rack
-
-COPY . .
-
-COPY --from=appmap /pkg/appmap.gem /tmp/
-RUN gem install /tmp/appmap.gem && \
-    bundle update --local appmap && \
-    bundle binstubs appmap --force
-
-EXPOSE 9292
-
-ENV GLI_DEBUG=true
-
-ENTRYPOINT [ "./bin/appmap", "record", "-o", "tmp/appmap.json" ]
-
-HEALTHCHECK --interval=1s --retries=10 CMD curl --fail http://localhost:9292/health || exit 1

data/spec/fixtures/rack_users_app/docker-compose.yml

@@ -1,9 +0,0 @@
-version: "3"
-services:
-  app:
-    build:
-      context: .
-      dockerfile: Dockerfile
-    image: rack-users-app:${RUBY_VERSION}
-    ports:
-      - "9292"

data/spec/fixtures/rails5_users_app/Dockerfile

@@ -1,29 +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 -N bundler
-
-COPY Gemfile .
-
-RUN bundle
-RUN bundle binstubs bundler rspec-core --force
-
-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/rails5_users_app/config/database.yml

@@ -1,18 +0,0 @@
-default: &default
-  host: <%= ENV['PGHOST'] || 'pg' %>
-  port: <%= ENV['PGPORT'] || 5432 %>
-  user: postgres
-  adapter: postgresql
-  encoding: unicode
-  # For details on connection pooling, see Rails configuration guide
-  # http://guides.rubyonrails.org/configuring.html#database-pooling
-  pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
-
-development:
-  <<: *default
-  database: app_development
-test:
-  <<: *default
-  database: app_test
-production:
-  <<: *default

data/spec/fixtures/rails5_users_app/create_app

@@ -1,33 +0,0 @@
-#!/usr/bin/env bash
-set -ex
-
-# Just checking for a healthy container isn't enough, apparently. If
-# we don't wait here, sometimes the database is inaccessible.
-for i in {1..10}; do
-  psql -h pg -U postgres postgres -c 'select 1' >/dev/null 2>&1 && break
-  printf ' .'
-  sleep 1
-done
-echo
-out="$(psql -h pg -U postgres postgres -c 'select 1' 2>&1)"
-if [[ $? != 0 ]]; then
-   echo "Postgres didn't start in time:"
-   echo "$out"
-   exit 1
-fi
-
-# Required for migrations
-export ORM_MODULE=sequel
-
-set +e
-psql -h pg -U postgres -c "drop database if exists app_development"
-psql -h pg -U postgres -c "drop database if exists app_test"
-set -e
-
-psql -h pg -U postgres -c "create database app_development"
-psql -h pg -U postgres -c "create database app_test"
-
-env RAILS_ENV=development bundle exec rake -t db:migrate
-env RAILS_ENV=test bundle exec rake -t db:migrate
-
-echo "INSERT INTO users ( login ) VALUES ( 'admin' )  " | psql -h pg -U postgres app_development

data/spec/fixtures/rails5_users_app/docker-compose.yml

@@ -1,31 +0,0 @@
-version: "3"
-services:
-  pg:
-    build:
-      context: .
-      dockerfile: Dockerfile.pg
-    ports:
-      - "5432"
-    environment:
-      POSTGRES_HOST_AUTH_METHOD: trust
-
-  app:
-    build:
-      context: .
-      dockerfile: Dockerfile
-    image: rails5-app:${RUBY_VERSION}
-    command:
-      [ "./bin/rails", "server", "-b", "0.0.0.0", "webrick" ]
-    environment:
-      RAILS_ENV:
-      ORM_MODULE:
-      PGHOST: pg
-      PGPORT: '5432'
-      DATABASE_URL: postgres://postgres@pg
-      APPMAP:
-    volumes:
-    - .:/src/app
-    ports:
-    - "3000"
-    links:
-    - pg:pg

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

@@ -1 +0,0 @@
-2.6.2

data/spec/fixtures/rails6_users_app/Dockerfile

@@ -1,44 +0,0 @@
-ARG GEM_VERSION
-ARG RUBY_VERSION
-
-FROM appmap:${GEM_VERSION} as appmap
-FROM ruby:${RUBY_VERSION}
-
-SHELL ["/bin/bash", "-c"]
-
-RUN apt-get update && apt-get install -y vim less
-RUN apt-get install -y postgresql-client
-
-RUN curl -fsSL https://fnm.vercel.app/install | bash \
-    && source /root/.bashrc \
-    && fnm install --lts \
-    && echo 'fnm default $(fnm current)' >> ~/.bashrc \
-    && ln -s $(which node) /usr/local/bin/ \
-    && ln -s $(which npx) /usr/local/bin/ \
-    && npm install -g yarn \
-    && ln -s $(which yarn) /usr/local/bin/
-
-RUN mkdir /app
-WORKDIR /app
-
-RUN gem install -N bundler
-
-COPY package.json .
-
-RUN yarn install
-
-COPY Gemfile .
-
-RUN bundle
-RUN bundle binstubs bundler rspec-core --force
-
-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/rails6_users_app/Dockerfile.pg

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

data/spec/fixtures/rails6_users_app/config/database.yml

@@ -1,18 +0,0 @@
-default: &default
-  host: <%= ENV['PGHOST'] || 'pg' %>
-  port: <%= ENV['PGPORT'] || 5432 %>
-  user: postgres
-  adapter: postgresql
-  encoding: unicode
-  # For details on connection pooling, see Rails configuration guide
-  # http://guides.rubyonrails.org/configuring.html#database-pooling
-  pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
-
-development:
-  <<: *default
-  database: app_development
-test:
-  <<: *default
-  database: app_test
-production:
-  <<: *default

data/spec/fixtures/rails6_users_app/create_app

@@ -1,33 +0,0 @@
-#!/usr/bin/env bash
-set -ex
-
-# Just checking for a healthy container isn't enough, apparently. If
-# we don't wait here, sometimes the database is inaccessible.
-for i in {1..10}; do
-  psql -h pg -U postgres postgres -c 'select 1' >/dev/null 2>&1 && break
-  printf ' .'
-  sleep 1
-done
-echo
-out="$(psql -h pg -U postgres postgres -c 'select 1' 2>&1)"
-if [[ $? != 0 ]]; then
-   echo "Postgres didn't start in time:"
-   echo "$out"
-   exit 1
-fi
-
-# Required for migrations
-export ORM_MODULE=sequel
-
-set +e
-psql -h pg -U postgres -c "drop database if exists app_development"
-psql -h pg -U postgres -c "drop database if exists app_test"
-set -e
-
-psql -h pg -U postgres -c "create database app_development"
-psql -h pg -U postgres -c "create database app_test"
-
-env RAILS_ENV=development bundle exec rake -t db:migrate
-env RAILS_ENV=test bundle exec rake -t db:migrate
-
-echo "INSERT INTO users ( login ) VALUES ( 'admin' )  " | psql -h pg -U postgres app_development

data/spec/fixtures/rails6_users_app/docker-compose.yml

@@ -1,31 +0,0 @@
-version: "3"
-services:
-  pg:
-    build:
-      context: .
-      dockerfile: Dockerfile.pg
-    ports:
-      - "5432"
-    environment:
-      POSTGRES_HOST_AUTH_METHOD: trust
-
-  app:
-    build:
-      context: .
-      dockerfile: Dockerfile
-    image: rails6-app:${RUBY_VERSION}
-    command:
-      [ "./bin/rails", "server", "-b", "0.0.0.0", "-u", "webrick" ]
-    environment:
-      RAILS_ENV:
-      ORM_MODULE:
-      PGHOST: pg
-      PGPORT: '5432'
-      DATABASE_URL: postgres://postgres@pg
-      APPMAP:
-    volumes:
-    - .:/src/app
-    ports:
-    - "3000"
-    links:
-    - pg:pg

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

@@ -1 +0,0 @@
-ruby-3.1.0

data/spec/fixtures/rails7_users_app/Dockerfile

@@ -1,30 +0,0 @@
-ARG GEM_VERSION
-ARG RUBY_VERSION
-
-FROM appmap:${GEM_VERSION} as appmap
-FROM ruby:${RUBY_VERSION}
-
-SHELL ["/bin/bash", "-c"]
-
-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 -N bundler
-
-COPY Gemfile .
-
-RUN bundle
-
-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/rails7_users_app/Dockerfile.pg

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

data/spec/fixtures/rails7_users_app/config/database.yml

@@ -1,86 +0,0 @@
-# PostgreSQL. Versions 9.3 and up are supported.
-#
-# Install the pg driver:
-#   gem install pg
-# On macOS with Homebrew:
-#   gem install pg -- --with-pg-config=/usr/local/bin/pg_config
-# On macOS with MacPorts:
-#   gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config
-# On Windows:
-#   gem install pg
-#       Choose the win32 build.
-#       Install PostgreSQL and put its /bin directory on your path.
-#
-# Configure Using Gemfile
-# gem "pg"
-#
-default: &default
-  adapter: postgresql
-  encoding: unicode
-  # For details on connection pooling, see Rails configuration guide
-  # https://guides.rubyonrails.org/configuring.html#database-pooling
-  pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
-
-development:
-  <<: *default
-  database: app_development
-
-  # The specified database role being used to connect to postgres.
-  # To create additional roles in postgres see `$ createuser --help`.
-  # When left blank, postgres will use the default role. This is
-  # the same name as the operating system user running Rails.
-  #username: app
-
-  # The password associated with the postgres role (username).
-  #password:
-
-  # Connect on a TCP socket. Omitted by default since the client uses a
-  # domain socket that doesn't need configuration. Windows does not have
-  # domain sockets, so uncomment these lines.
-  #host: localhost
-
-  # The TCP port the server listens on. Defaults to 5432.
-  # If your server runs on a different port number, change accordingly.
-  #port: 5432
-
-  # Schema search path. The server defaults to $user,public
-  #schema_search_path: myapp,sharedapp,public
-
-  # Minimum log levels, in increasing order:
-  #   debug5, debug4, debug3, debug2, debug1,
-  #   log, notice, warning, error, fatal, and panic
-  # Defaults to warning.
-  #min_messages: notice
-
-# Warning: The database defined as "test" will be erased and
-# re-generated from your development database when you run "rake".
-# Do not set this db to the same as development or production.
-test:
-  <<: *default
-  database: app_test
-
-# As with config/credentials.yml, you never want to store sensitive information,
-# like your database password, in your source code. If your source code is
-# ever seen by anyone, they now have access to your database.
-#
-# Instead, provide the password or a full connection URL as an environment
-# variable when you boot the app. For example:
-#
-#   DATABASE_URL="postgres://myuser:mypass@localhost/somedatabase"
-#
-# If the connection URL is provided in the special DATABASE_URL environment
-# variable, Rails will automatically merge its configuration values on top of
-# the values provided in this file. Alternatively, you can specify a connection
-# URL environment variable explicitly:
-#
-#   production:
-#     url: <%= ENV["MY_APP_DATABASE_URL"] %>
-#
-# Read https://guides.rubyonrails.org/configuring.html#configuring-a-database
-# for a full overview on how database connection configuration can be specified.
-#
-production:
-  <<: *default
-  database: app_production
-  username: app
-  password: <%= ENV["APP_DATABASE_PASSWORD"] %>

data/spec/fixtures/rails7_users_app/create_app

@@ -1,31 +0,0 @@
-#!/usr/bin/env bash
-set -ex
-
-# Just checking for a healthy container isn't enough, apparently. If
-# we don't wait here, sometimes the database is inaccessible.
-for i in {1..10}; do
-  psql -h pg -U postgres postgres -c 'select 1' >/dev/null 2>&1 && break
-  printf ' .'
-  sleep 1
-done
-echo
-out="$(psql -h pg -U postgres postgres -c 'select 1' 2>&1)"
-if [[ $? != 0 ]]; then
-   echo "Postgres didn't start in time:"
-   echo "$out"
-   exit 1
-fi
-
-# Required for migrations
-export ORM_MODULE=sequel
-
-set +e
-psql -h pg -U postgres -c "drop database if exists app_development"
-psql -h pg -U postgres -c "drop database if exists app_test"
-set -e
-
-psql -h pg -U postgres -c "create database app_development"
-psql -h pg -U postgres -c "create database app_test"
-
-env RAILS_ENV=development bundle exec rake -t db:migrate
-env RAILS_ENV=test bundle exec rake -t db:migrate

data/spec/fixtures/rails7_users_app/docker-compose.yml

@@ -1,31 +0,0 @@
-version: "3"
-services:
-  pg:
-    build:
-      context: .
-      dockerfile: Dockerfile.pg
-    ports:
-      - "5432"
-    environment:
-      POSTGRES_HOST_AUTH_METHOD: trust
-
-  app:
-    build:
-      context: .
-      dockerfile: Dockerfile
-    image: rails7-app:${RUBY_VERSION}
-    command:
-      [ "./bin/rails", "server", "-b", "0.0.0.0", "-u", "webrick" ]
-    environment:
-      RAILS_ENV:
-      ORM_MODULE:
-      PGHOST: pg
-      PGPORT: '5432'
-      DATABASE_URL: postgres://postgres@pg
-      APPMAP:
-    volumes:
-    - .:/src/app
-    ports:
-    - "3000"
-    links:
-    - pg:pg