appmap 0.64.0 → 0.65.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0df13ca1b5fd3d0dbba13b97bdb28e5fd3e37a62763282769d370fd1c7f3d9bc
-  data.tar.gz: d2cf8db5e9fdbd0c9802a514d9a35f19caa305fad9eeb7ecef42fb6d195a8735
+  metadata.gz: 9ff92977defe997917c8b7c2d9d5974d5e743c02b637bcfffa5548e087d4644f
+  data.tar.gz: 4889a8d717b0167737719acc75c12f5709404b6445b6dd633523cd76e4992a96
 SHA512:
-  metadata.gz: 327795a4c2903e30f487ec12c3e989a79d42f9c3b9d4dcd1ef3d5e863cbdefecc189f157a61cd3652c985f92a39d94f915eeee52db5d41ed6ac1f9fa8befc0cf
-  data.tar.gz: cc3a9a103df311b1060050207557bd76f898314295562d6913279924ad13983fcb720bacefd553857b551e07f4ec0b308334ae944adafd72ba624487d61b5031
+  metadata.gz: 4a78ced9dc2d5c0e80fe0f68d01508cff0af59bfc65f9a747ec5f981d7bd5a7523a59230427ddf465b39db1768f2443c856a93c852ddb444bc80eec4a539f460
+  data.tar.gz: 21a54adacd2b5b27a5f2a6143db0c0684716a9d1db6add75d4e05fdd73054bb9576fc2bac3ce68067230d1fb04caf177c8e4366e05a061301bd1a9dd84214bf5

data/.travis.yml

@@ -1,9 +1,9 @@
 language: ruby
 
 rbenv:
-- 2.5
 - 2.6
 - 2.7
+- 3.0
 
 addons:
   apt:

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+# [0.65.0](https://github.com/applandinc/appmap-ruby/compare/v0.64.0...v0.65.0) (2021-09-14)
+
+
+### Bug Fixes
+
+* Require fileutils as needed ([790c3a8](https://github.com/applandinc/appmap-ruby/commit/790c3a88b0e69581e0e4f73b7a92f46448b3cdd8))
+
+
+### Features
+
+* Add support for Ruby 3.0, and drop Ruby 2.5 ([eba14e1](https://github.com/applandinc/appmap-ruby/commit/eba14e1669bdf50dc51ce8623c5d586edfdb1a2f))
+
 # [0.64.0](https://github.com/applandinc/appmap-ruby/compare/v0.63.0...v0.64.0) (2021-08-24)
 
 

data/README.md

@@ -117,11 +117,11 @@ root@6fab5f89125f:/src/app# bundle
 ```
 
 At this point, the bundle is built with the `appmap` gem located  in `/src/appmap`, which is volume-mounted from the host.
-So you can edit the fixture code and the appmap code and run test commands such as `rspec` and `cucumber` in the container.
+So you can edit the fixture code and the appmap code and run test commands such as `rspec` in the container.
 For example:
 
 ```sh-session
-root@6fab5f89125f:/src/app# bundle exec rspec
+root@6fab5f89125f:/src/app# APPMAP=true bundle exec rspec
 Configuring AppMap from path appmap.yml
 ....
 

data/Rakefile

@@ -28,7 +28,7 @@ namespace 'gem' do
   end
 end
 
-RUBY_VERSIONS=%w[2.5 2.6 2.7].select do |version|
+RUBY_VERSIONS=%w[2.6 2.7 3.0].select do |version|
   travis_ruby_version = ENV['TRAVIS_RUBY_VERSION']
   next true unless travis_ruby_version
 

data/lib/appmap/command/agent_setup/init.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'json'
+require 'yaml'
 require 'appmap/service/guesser'
 
 module AppMap

data/lib/appmap/config.rb

@@ -254,7 +254,7 @@ module AppMap
       functions.each do |func|
         package_options = {}
         package_options[:labels] = func.labels if func.labels
-        @hooked_methods[func.cls] << TargetMethods.new(func.function_names, Package.build_from_path(func.package, package_options))
+        @hooked_methods[func.cls] << TargetMethods.new(func.function_names, Package.build_from_path(func.package, **package_options))
       end
 
       @hooked_methods.each_value do |hooks|
@@ -367,7 +367,7 @@ module AppMap
           config_params[:depends_config] = depends_config
         end
 
-        Config.new name, config_params
+        Config.new name, **config_params
       end
     end
 

data/lib/appmap/cucumber.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'appmap/util'
+require 'fileutils'
 
 module AppMap
   module Cucumber

data/lib/appmap/depends/util.rb

@@ -1,3 +1,5 @@
+require 'fileutils'
+
 module AppMap
   module Depends
     module Util

data/lib/appmap/minitest.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'appmap/util'
+require 'fileutils'
 require 'active_support'
 require 'active_support/core_ext'
 

data/lib/appmap/rspec.rb

@@ -2,6 +2,7 @@
 
 require 'appmap/util'
 require 'set'
+require 'fileutils'
 
 module AppMap
   # Integration of AppMap with RSpec. When enabled with APPMAP=true, the AppMap tracer will

data/lib/appmap/service/validator/config_validator.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'appmap/service/validator/violation'
+require 'yaml'
 
 module AppMap
   module Service
@@ -76,7 +77,10 @@ module AppMap
         end
 
         def validate_ruby_version
-          unless RUBY_VERSION =~ AppMap::SUPPORTED_RUBY_VERSIONS_REGEX
+          major, minor, _ = RUBY_VERSION.split('.')
+          version = [ major, minor ].join('.')
+
+          unless AppMap::SUPPORTED_RUBY_VERSIONS.member?(version)
             @violations << Violation.error(
               message: "AppMap does not support Ruby #{RUBY_VERSION}. " \
                 "Supported versions are: #{AppMap::SUPPORTED_RUBY_VERSIONS.join(', ')}."

data/lib/appmap/swagger/rake_tasks.rb

@@ -1,5 +1,6 @@
 require 'rake'
 require 'yaml'
+require 'fileutils'
 require 'appmap/node_cli'
 require 'appmap/swagger/markdown_descriptions'
 require 'appmap/swagger/stable'

data/lib/appmap/util.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'bundler'
+require 'fileutils'
 
 module AppMap
   module Util
@@ -130,7 +131,6 @@ module AppMap
 
       # Atomically writes AppMap data to +filename+.
       def write_appmap(filename, appmap)
-        require 'fileutils'
         require 'tmpdir'
 
         # This is what Ruby Tempfile does; but we don't want the file to be unlinked.

data/lib/appmap/version.rb

@@ -3,12 +3,11 @@
 module AppMap
   URL = 'https://github.com/applandinc/appmap-ruby'
 
-  VERSION = '0.64.0'
+  VERSION = '0.65.0'
 
   APPMAP_FORMAT_VERSION = '1.5.1'
 
-  SUPPORTED_RUBY_VERSIONS_REGEX = /^2\.[567]\./.freeze
-  SUPPORTED_RUBY_VERSIONS = %w[2.5 2.6 2.7].freeze
+  SUPPORTED_RUBY_VERSIONS = %w[2.6 2.7 3.0].freeze
 
   DEFAULT_APPMAP_DIR = 'tmp/appmap'.freeze
   DEFAULT_CONFIG_FILE_PATH = 'appmap.yml'.freeze

data/spec/depends/api_spec.rb

@@ -55,7 +55,7 @@ describe 'Depends API' do
   describe '.inspect_test_files' do
     it 'reports metadata, added, removed, changed, failed' do
       test_report = api.inspect_test_files(appmap_dir: DEPENDS_TEST_DIR, test_file_patterns: %w[spec/fixtures/depends/spec/*_spec.rb])
-      expect(test_report.metadata_files).to eq(%w[spec/fixtures/depends/user_page_scenario/metadata.json spec/fixtures/depends/revoke_api_key/metadata.json])
+      expect(test_report.metadata_files.sort).to eq(%w[spec/fixtures/depends/revoke_api_key/metadata.json spec/fixtures/depends/user_page_scenario/metadata.json])
       expect(test_report.added).to be_empty
       expect(test_report.removed).to be_empty
       expect(test_report.changed).to be_empty

data/spec/fixtures/rails6_users_app/Gemfile

@@ -7,7 +7,7 @@ gem 'haml-rails'
 
 gem 'activerecord', require: false
 gem 'pg'
-gem 'sequel', '= 5.20.0', require: false
+gem 'sequel', '>= 5.43.0', require: false
 gem 'sequel-rails', require: false
 gem 'sequel_secure_password', require: false
 

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

@@ -15,7 +15,7 @@ services:
       dockerfile: Dockerfile
     image: rails6-app:${RUBY_VERSION}
     command:
-      [ "./bin/rails", "server", "-b", "0.0.0.0", "webrick" ]
+      [ "./bin/rails", "server", "-b", "0.0.0.0", "-u", "webrick" ]
     environment:
       RAILS_ENV:
       ORM_MODULE:

data/spec/hook_spec.rb

@@ -987,10 +987,12 @@ describe 'AppMap class Hooking', docker: false do
   end
 
   describe 'kwargs handling' do
-    # https://github.com/applandinc/appmap-ruby/issues/153
-    it 'empty hash for **kwrest can be proxied as a regular function argument', github_issue: 153 do
-      invoke_test_file 'spec/fixtures/hook/kwargs.rb' do
-        expect(Kwargs.has_kwrest_calls_no_kwargs(nil, {})).to eq({})
+    if ruby_2?
+      # https://github.com/applandinc/appmap-ruby/issues/153
+      it 'empty hash for **kwrest can be proxied as a regular function argument', github_issue: 153 do
+        invoke_test_file 'spec/fixtures/hook/kwargs.rb' do
+          expect(Kwargs.has_kwrest_calls_no_kwargs(nil, {})).to eq({})
+        end
       end
     end
   end

data/spec/rails_recording_spec.rb

@@ -1,7 +1,10 @@
 require 'rails_spec_helper'
 
+# Rails5 doesn't work with Ruby 3.x
+RailsVersions = ruby_2? ? [ 5, 6 ] : [ 6 ]
+
 describe 'Rails' do
-  %w[5 6].each do |rails_major_version| # rubocop:disable Metrics/BlockLength
+  RailsVersions.each do |rails_major_version| # rubocop:disable Metrics/BlockLength
     context "#{rails_major_version}" do
       include_context 'Rails app pg database', "spec/fixtures/rails#{rails_major_version}_users_app" unless use_existing_data?
       include_context 'rails integration test setup'
@@ -239,7 +242,7 @@ describe 'Rails' do
   end
 
   describe 'with default appmap.yml' do
-    include_context 'Rails app pg database', "spec/fixtures/rails5_users_app" unless use_existing_data?
+    include_context 'Rails app pg database', "spec/fixtures/rails6_users_app" unless use_existing_data?
     include_context 'rails integration test setup'
 
     def run_spec(spec_name)

data/spec/railtie_spec.rb

@@ -1,7 +1,7 @@
 require 'rails_spec_helper'
 
 describe 'AppMap tracer via Railtie' do
-  include_context 'Rails app pg database', 'spec/fixtures/rails5_users_app' do 
+  include_context 'Rails app pg database', 'spec/fixtures/rails6_users_app' do 
     let(:env) { {} }
 
     let(:cmd) { %(docker-compose run --rm -e RAILS_ENV=development -e APPMAP app ./bin/rails r "puts AppMap.instance_variable_get('@configuration').nil?") }
@@ -10,13 +10,13 @@ describe 'AppMap tracer via Railtie' do
       Open3.capture3(env, cmd, chdir: fixture_dir).tap do |result|
         unless result[2] == 0
           warn <<~STDERR
-            Failed to run rails5_users_app container
+            Failed to run rails6_users_app container
             <<< Output:
             #{result[0]}
             #{result[1]}
             >>> End of output
           STDERR
-          raise 'Failed to run rails5_users_app container'
+          raise 'Failed to run rails6_users_app container'
         end
       end
     end

data/spec/record_sql_rails_pg_spec.rb

@@ -1,7 +1,7 @@
 require 'rails_spec_helper'
 
 describe 'SQL events' do
-  include_context 'Rails app pg database', 'spec/fixtures/rails5_users_app' do
+  include_context 'Rails app pg database', 'spec/fixtures/rails6_users_app' do
     around(:each) do |example|
       FileUtils.rm_rf tmpdir
       FileUtils.mkdir_p tmpdir

data/spec/remote_recording_spec.rb

@@ -3,9 +3,9 @@ require 'net/http'
 require 'socket'
 
 describe 'remote recording', :order => :defined do
-  include_context 'Rails app pg database', 'spec/fixtures/rails5_users_app' do
+  include_context 'Rails app pg database', 'spec/fixtures/rails6_users_app' do
     before(:all) do
-      fixture_dir = 'spec/fixtures/rails5_users_app'
+      fixture_dir = 'spec/fixtures/rails6_users_app'
       start_cmd = 'docker-compose up -d app'
       run_cmd({ 'ORM_MODULE' => 'sequel', 'APPMAP' => 'true' }, start_cmd, chdir: fixture_dir)
       Dir.chdir fixture_dir do
@@ -44,7 +44,7 @@ describe 'remote recording', :order => :defined do
     end
 
     after(:all) do
-      fixture_dir = 'spec/fixtures/rails5_users_app'
+      fixture_dir = 'spec/fixtures/rails6_users_app'
       run_cmd 'docker-compose rm -fs app', chdir: fixture_dir
     end
 

data/spec/spec_helper.rb

@@ -21,6 +21,10 @@ def use_existing_data?
   ENV['USE_EXISTING_DATA'] == 'true'
 end
 
+def ruby_2?
+  RUBY_VERSION.split('.')[0].to_i == 2
+end
+
 shared_context 'collect events' do
   def collect_events(tracer)
     [].tap do |events|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appmap
 version: !ruby/object:Gem::Version
-  version: 0.64.0
+  version: 0.65.0
 platform: ruby
 authors:
 - Kevin Gilpin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-08-24 00:00:00.000000000 Z
+date: 2021-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport