appmap 0.72.0 → 0.72.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (14) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +9 -0
  3. data/ext/appmap/extconf.rb +1 -1
  4. data/lib/appmap/builtin_hooks/json.yml +2 -2
  5. data/lib/appmap/builtin_hooks/marshal.yml +3 -7
  6. data/lib/appmap/builtin_hooks/psych.yml +16 -0
  7. data/lib/appmap/gem_hooks/activerecord.yml +2 -0
  8. data/lib/appmap/gem_hooks/rails.yml +2 -0
  9. data/lib/appmap/gem_hooks/railties.yml +2 -0
  10. data/lib/appmap/gem_hooks/sprockets.yml +2 -0
  11. data/lib/appmap/hook/method.rb +6 -1
  12. data/lib/appmap/version.rb +1 -1
  13. metadata +6 -3
  14. data/lib/appmap/builtin_hooks/yaml.yml +0 -23
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 3dffdfecec5017edcd8c551226e5915348ef7db45a3ab82e1ccc1ace4879d712
4
- data.tar.gz: 462c0d8e46b2a7c278e95e526ff8b1de7fa4d966e38c481cf69c5e3d1d97817e
3
+ metadata.gz: d0dac1cd2861b93a4ec1865d66c561b11bb325263e4f2918192a455158c62429
4
+ data.tar.gz: 6565fc39df7835aa009fdba68890bb8879f771092b32c2c53f8140d3c2d69196
5
5
  SHA512:
6
- metadata.gz: fc3e0a0c0488be776f924a457e04afd1ea9048ee43fd9bbcd557f79fd45212e2036ac38e2df021dcfa3c4a7c47f5401ae8e983dae236bd6de13481df103f552f
7
- data.tar.gz: e369f73989da51222f65a50697c2fdcae367db5a0742d5b9e9a77dab321bfe2b74e09d49eb1d56359cc6b6ac64817e73ef55f0dfdfae63ff2c7e5dbf9c6f9a87
6
+ metadata.gz: 93ec8a28c7b4c6573b2be71c5a35fa41e6a3a4af560bc0f3e24d9bf22e43906916c9ecce04f1d0c2e4ee0feef3514dddc48a836df1d1f489180483c032a19261
7
+ data.tar.gz: 646801d2effd4ca81ded335a12295b86c12d60575096b6fa50375947682ea567f53bd54949525d1cf5c29bf36ba9c15e97d33dc3b207c65b5d262010e9cb4b8b
data/CHANGELOG.md CHANGED
@@ -1,3 +1,12 @@
1
+ ## [0.72.1](https://github.com/applandinc/appmap-ruby/compare/v0.72.0...v0.72.1) (2022-01-31)
2
+
3
+
4
+ ### Bug Fixes
5
+
6
+ * Check that Procs respond to #ruby2_keywords ([12863dc](https://github.com/applandinc/appmap-ruby/commit/12863dc229f91fd813430db716856f111007f1c2)), closes [#ruby2](https://github.com/applandinc/appmap-ruby/issues/ruby2) [#ruby2](https://github.com/applandinc/appmap-ruby/issues/ruby2)
7
+ * Don't stomp on $CFLAGS ([c0b44df](https://github.com/applandinc/appmap-ruby/commit/c0b44df2d85d97b7b379d6f030df54a77a88291b))
8
+ * Update labels for deserialization ([4f51825](https://github.com/applandinc/appmap-ruby/commit/4f5182526d74fb3491c700bca16e203a010bb111))
9
+
1
10
  # [0.72.0](https://github.com/applandinc/appmap-ruby/compare/v0.71.0...v0.72.0) (2022-01-24)
2
11
 
3
12
 
data/ext/appmap/extconf.rb CHANGED
@@ -1,7 +1,7 @@
1
1
  require "mkmf"
2
2
 
3
3
 
4
- $CFLAGS='-Werror'
4
+ $CFLAGS='-Werror ' + $CFLAGS
5
5
 
6
6
  # Per https://bugs.ruby-lang.org/issues/17865,
7
7
  # compound-token-split-by-macro was added in clang 12 and broke
data/lib/appmap/builtin_hooks/json.yml CHANGED
@@ -1,8 +1,8 @@
1
1
  - method: JSON::Ext::Parser#parse
2
2
  labels:
3
3
  - format.json.parse
4
- - deserialize
4
+ - deserialize.safe
5
5
  - method: JSON::Ext::Generator::State#generate
6
- label:
6
+ labels:
7
7
  - format.json.generate
8
8
  - serialize
data/lib/appmap/builtin_hooks/marshal.yml CHANGED
@@ -2,11 +2,7 @@
2
2
  - Marshal#load
3
3
  - Marshal#restore
4
4
  require_name: ruby
5
- label:
6
- - deserialize
7
- - deserialize.unsafe
8
- - methods:
9
- - Marshal#dump
5
+ label: deserialize.unsafe
6
+ - method: Marshal#dump
10
7
  require_name: ruby
11
- label:
12
- - deserialize
8
+ label: serialize
data/lib/appmap/builtin_hooks/psych.yml ADDED
@@ -0,0 +1,16 @@
1
+ - methods:
2
+ - Psych#parse
3
+ - Psych#parse_stream
4
+ label: format.yaml.parse
5
+ - methods:
6
+ - Psych#load
7
+ - Psych#load_stream
8
+ label: deserialize.unsafe
9
+ - method: Psych#safe_load
10
+ label: deserialize.safe
11
+ - methods:
12
+ - Psych#dump
13
+ - Psych#dump_stream
14
+ labels:
15
+ - format.yaml.generate
16
+ - serialize
data/lib/appmap/gem_hooks/activerecord.yml CHANGED
@@ -1,2 +1,4 @@
1
1
  - method: ActiveRecord::Relation#records
2
2
  label: dao.materialize
3
+ - method: ActiveRecord::FixtureSet::File#raw_rows
4
+ # label: deserialize.safe
data/lib/appmap/gem_hooks/rails.yml ADDED
@@ -0,0 +1,2 @@
1
+ - method: Rails::Application#config_for
2
+ # label: deserialize.safe
data/lib/appmap/gem_hooks/railties.yml ADDED
@@ -0,0 +1,2 @@
1
+ - method: Rails::Application::Configuration#database_configuration
2
+ # label: deserialize.safe
data/lib/appmap/gem_hooks/sprockets.yml ADDED
@@ -0,0 +1,2 @@
1
+ - method: Sprockets::EncodingUtils#unmarshaled_deflated
2
+ label: deserialize.safe
data/lib/appmap/hook/method.rb CHANGED
@@ -1,6 +1,11 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module AppMap
4
+ NEW_RUBY = Util.ruby_minor_version >= 2.7
5
+ if NEW_RUBY && !Proc.instance_methods.include?(:ruby2_keywords)
6
+ warn "Ruby is #{RUBY_VERSION}, but Procs don't respond to #ruby2_keywords"
7
+ end
8
+
4
9
  class Hook
5
10
  class Method
6
11
  attr_reader :hook_package, :hook_class, :hook_method
@@ -56,7 +61,7 @@ module AppMap
56
61
 
57
62
  call_instance_method = -> {
58
63
  # https://github.com/applandinc/appmap-ruby/issues/153
59
- if Util.ruby_minor_version >= 2.7 && is_array_containing_empty_hash.(args) && hook_method.arity == 1
64
+ if NEW_RUBY && is_array_containing_empty_hash.(args) && hook_method.arity == 1
60
65
  instance_method.call({}, &block)
61
66
  else
62
67
  instance_method.call(*args, &block)
data/lib/appmap/version.rb CHANGED
@@ -3,7 +3,7 @@
3
3
  module AppMap
4
4
  URL = 'https://github.com/applandinc/appmap-ruby'
5
5
 
6
- VERSION = '0.72.0'
6
+ VERSION = '0.72.1'
7
7
 
8
8
  APPMAP_FORMAT_VERSION = '1.5.1'
9
9
 
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: appmap
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.72.0
4
+ version: 0.72.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Kevin Gilpin
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2022-01-24 00:00:00.000000000 Z
11
+ date: 2022-01-31 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activesupport
@@ -3410,7 +3410,7 @@ files:
3410
3410
  - lib/appmap/builtin_hooks/marshal.yml
3411
3411
  - lib/appmap/builtin_hooks/net/http.yml
3412
3412
  - lib/appmap/builtin_hooks/openssl.yml
3413
- - lib/appmap/builtin_hooks/yaml.yml
3413
+ - lib/appmap/builtin_hooks/psych.yml
3414
3414
  - lib/appmap/class_map.rb
3415
3415
  - lib/appmap/command/agent_setup/init.rb
3416
3416
  - lib/appmap/command/agent_setup/status.rb
@@ -3436,8 +3436,11 @@ files:
3436
3436
  - lib/appmap/gem_hooks/activerecord.yml
3437
3437
  - lib/appmap/gem_hooks/activesupport.yml
3438
3438
  - lib/appmap/gem_hooks/cancancan.yml
3439
+ - lib/appmap/gem_hooks/rails.yml
3440
+ - lib/appmap/gem_hooks/railties.yml
3439
3441
  - lib/appmap/gem_hooks/resque.yml
3440
3442
  - lib/appmap/gem_hooks/sidekiq.yml
3443
+ - lib/appmap/gem_hooks/sprockets.yml
3441
3444
  - lib/appmap/handler/function.rb
3442
3445
  - lib/appmap/handler/net_http.rb
3443
3446
  - lib/appmap/handler/rails/request_handler.rb
data/lib/appmap/builtin_hooks/yaml.yml DELETED
@@ -1,23 +0,0 @@
1
- - methods:
2
- - Psych#load
3
- - Psych#unsafe_load
4
- - Psych#load_file
5
- - Psych#unsafe_load_file
6
- - Psych#load_stream
7
- - Psych#parse
8
- - Psych#parse_stream
9
- label:
10
- - format.yaml.parse
11
- - deserialize
12
- - deserialize.unsafe
13
- - methods:
14
- - Psych#safe_load
15
- label:
16
- - format.yaml.parse
17
- - deserialize
18
- - methods:
19
- - Psych#dump
20
- - Psych#dump_stream
21
- label:
22
- - format.yaml.generate
23
- - serialize