appmap 0.39.0 → 0.39.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f48fa55666d8310e8a24c268a7b72c1748c22fe0aa9b884000b1e83a703dbac
-  data.tar.gz: 5d82f1809e549bc71659048a9dce037eafe6e261c63c09d127bbd6b1f43d5b3c
+  metadata.gz: 384456ad51727b3c819e8307de92b2785da152a46c5fa60d0a4e6ff690dbb596
+  data.tar.gz: e0d5a984bc74ee91b0f9428d83cbaac70c387b442cc55666f36b75907080e620
 SHA512:
-  metadata.gz: 5077fd340fac2478af5361e518c777b8ef76ffeb358aee18f6f507a6314b687ea02a40721b32fe0d2886d279e76ed3d249f9ebfd7b850fb05a1d5d2168b62c6c
-  data.tar.gz: 97b2c5306bd7b07d9f853b883d1ece37f6160683ae0eec5c5d6afe9e6909311468fb2def4e2f70c439ad18a56f9262e77569c7385b2d34dca28e02119302b57d
+  metadata.gz: 2f0670d632a370241168ad76ad30dd663568556ea3e524c48aafdbf86ae9d0c8e8f76f48a1c34a7a830457cff66c4417bbf19acb7ac952daeaaec65121e7a0d5
+  data.tar.gz: 3f1bec26161a40c75487e7f98f039df0c135f7de77ee089d72dde29c1a5d5fd19b43661c6aff3c3de58e945b87d330b96a66738a95a208ec7a4e75db1bd85363

data/.travis.yml

@@ -16,22 +16,8 @@ before_script:
   
 jobs:
   include:
-  - stage: minitest
+  - stage: test
     script:
     - mkdir tmp
-    - bundle exec rake minitest
-    
-  - stage: base
-    script:
-    - bundle exec rake build:base:2.5
-  - stage: base
-    script:
-    - bundle exec rake build:base:2.6
-      
-  - stage: spec
-    script:
-    - bundle exec rake spec:2.5
-  - stage: spec
-    script:
-    - bundle exec rake spec:2.6
+    - bundle exec rake test
     

data/CHANGELOG.md

@@ -1,9 +1,12 @@
-# v0.39.0
+# v0.39.1
+* Support Ruby 2.7.
+* Remove support for Rails 4.
+* Stop recommending `-t appmap` argument for `rspec`.
 
+# v0.39.0
 * Recognize and record `normalized_path_info` in Rails applications, per 1.4 AppMap format version.
 
 # v0.38.1
-
 * Package configuration can be `shallow`, in case which only the initial entry into the package is recorded.
 
 # v0.37.2

data/README.md

@@ -39,6 +39,13 @@ by the [AppLand CLI](https://github.com/applandinc/appland-cli/releases).
 Then, on the [AppLand website](https://app.land), you can
 visualize the design of your code and share links with collaborators.
 
+### Supported versions
+
+* Ruby 2.5, 2.6, 2.7
+* Rails 5, 6
+
+Support for new versions is added frequently, please check back regularly for updates.
+
 # Installation
 
 Add `gem 'appmap'` to your Gemfile just as you would any other dependency.
@@ -128,7 +135,7 @@ require File.expand_path("../../config/environment", __FILE__)
 3) Run the tests with the environment variable `APPMAP=true`:
 
 ```sh-session
-$ APPMAP=true bundle exec rspec -t appmap
+$ APPMAP=true bundle exec rspec
 ```
 
 Each RSpec test will output an AppMap file into the directory `tmp/appmap/rspec`. For example:

data/Rakefile

@@ -18,12 +18,12 @@ namespace 'gem' do
   require 'bundler/gem_tasks'
 end
 
-RUBY_VERSIONS=%w[2.5 2.6]
-FIXTURE_APPS=%w[rack_users_app rails6_users_app rails5_users_app rails4_users_app]
+RUBY_VERSIONS=%w[2.5 2.6 2.7]
+FIXTURE_APPS=%w[rack_users_app rails6_users_app rails5_users_app]
 
 def run_cmd(*cmd)
   $stderr.puts "Running: #{cmd}"
-  out,s = Open3.capture2e(*cmd)
+  out, s = Open3.capture2e(*cmd)
   unless s.success?
     $stderr.puts <<-END
       Command failed:

data/lib/appmap/hook.rb

@@ -6,6 +6,9 @@ module AppMap
   class Hook
     LOG = (ENV['APPMAP_DEBUG'] == 'true' || ENV['DEBUG'] == 'true')
 
+    OBJECT_INSTANCE_METHODS = %i[! != !~ <=> == === =~ __id__ __send__ class clone define_singleton_method display dup enum_for eql? equal? extend freeze frozen? hash inspect instance_eval instance_exec instance_of? instance_variable_defined? instance_variable_get instance_variable_set instance_variables is_a? itself kind_of? method methods nil? object_id private_methods protected_methods public_method public_methods public_send remove_instance_variable respond_to? send singleton_class singleton_method singleton_methods taint tainted? tap then to_enum to_s to_h to_a trust untaint untrust untrusted? yield_self].freeze
+    OBJECT_STATIC_METHODS = %i[! != !~ < <= <=> == === =~ > >= __id__ __send__ alias_method allocate ancestors attr attr_accessor attr_reader attr_writer autoload autoload? class class_eval class_exec class_variable_defined? class_variable_get class_variable_set class_variables clone const_defined? const_get const_missing const_set constants define_method define_singleton_method deprecate_constant display dup enum_for eql? equal? extend freeze frozen? hash include include? included_modules inspect instance_eval instance_exec instance_method instance_methods instance_of? instance_variable_defined? instance_variable_get instance_variable_set instance_variables is_a? itself kind_of? method method_defined? methods module_eval module_exec name new nil? object_id prepend private_class_method private_constant private_instance_methods private_method_defined? private_methods protected_instance_methods protected_method_defined? protected_methods public_class_method public_constant public_instance_method public_instance_methods public_method public_method_defined? public_methods public_send remove_class_variable remove_instance_variable remove_method respond_to? send singleton_class singleton_class? singleton_method singleton_methods superclass taint tainted? tap then to_enum to_s trust undef_method untaint untrust untrusted? yield_self].freeze
+
     @unbound_method_arity = ::UnboundMethod.instance_method(:arity)
     @method_arity = ::Method.instance_method(:arity)
 
@@ -42,12 +45,17 @@ module AppMap
       tp = TracePoint.new(:end) do |trace_point|
         cls = trace_point.self
 
-        instance_methods = cls.public_instance_methods(false)
-        class_methods = cls.singleton_class.public_instance_methods(false) - instance_methods
+        instance_methods = cls.public_instance_methods(false) - OBJECT_INSTANCE_METHODS
+        class_methods = cls.singleton_class.public_instance_methods(false) - instance_methods - OBJECT_STATIC_METHODS
 
         hook = lambda do |hook_cls|
           lambda do |method_id|
-            method = hook_cls.public_instance_method(method_id)
+            method = begin
+              hook_cls.public_instance_method(method_id)
+            rescue NameError
+              warn "AppMap: Method #{hook_cls} #{method.name} is not accessible" if LOG
+              return
+            end
 
             warn "AppMap: Examining #{hook_cls} #{method.name}" if LOG
 

data/lib/appmap/version.rb

@@ -3,7 +3,7 @@
 module AppMap
   URL = 'https://github.com/applandinc/appmap-ruby'
 
-  VERSION = '0.39.0'
+  VERSION = '0.39.1'
 
   APPMAP_FORMAT_VERSION = '1.4'
 end

data/spec/hook_spec.rb

@@ -517,24 +517,6 @@ describe 'AppMap class Hooking', docker: false do
       events_yaml = <<~YAML
       ---
       - :id: 1
-        :event: :call
-        :defined_class: NoToSMethod
-        :method_id: respond_to?
-        :path: spec/fixtures/hook/exception_method.rb
-        :lineno: 24
-        :static: false
-        :parameters:
-        - :name: :args
-          :class: Array
-          :value: "[:to_s]"
-          :kind: :rest
-        :receiver:
-          :class: Class
-          :value: NoToSMethod
-      - :id: 2
-        :event: :return
-        :parent_id: 1
-      - :id: 3
         :event: :call
         :defined_class: NoToSMethod
         :method_id: say_hello
@@ -545,9 +527,9 @@ describe 'AppMap class Hooking', docker: false do
         :receiver:
           :class: Class
           :value: NoToSMethod
-      - :id: 4
+      - :id: 2
         :event: :return
-        :parent_id: 3
+        :parent_id: 1
         :return_value:
           :class: String
           :value: hello
@@ -565,24 +547,6 @@ describe 'AppMap class Hooking', docker: false do
       events_yaml = <<~YAML
       ---
       - :id: 1
-        :event: :call
-        :defined_class: NoToSMethod
-        :method_id: respond_to?
-        :path: spec/fixtures/hook/exception_method.rb
-        :lineno: 24
-        :static: false
-        :parameters:
-        - :name: :args
-          :class: Array
-          :value: "[:to_s]"
-          :kind: :rest
-        :receiver:
-          :class: Class
-          :value: "*Error inspecting variable*"
-      - :id: 2
-        :event: :return
-        :parent_id: 1
-      - :id: 3
         :event: :call
         :defined_class: InspectRaises
         :method_id: say_hello
@@ -593,9 +557,9 @@ describe 'AppMap class Hooking', docker: false do
         :receiver:
           :class: Class
           :value: "*Error inspecting variable*"
-      - :id: 4
+      - :id: 2
         :event: :return
-        :parent_id: 3
+        :parent_id: 1
         :return_value:
           :class: String
           :value: hello

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appmap
 version: !ruby/object:Gem::Version
-  version: 0.39.0
+  version: 0.39.1
 platform: ruby
 authors:
 - Kevin Gilpin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-01-15 00:00:00.000000000 Z
+date: 2021-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -378,7 +378,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
@@ -396,70 +395,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
@@ -608,7 +543,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
-