appmap 0.72.0 → 0.72.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3dffdfecec5017edcd8c551226e5915348ef7db45a3ab82e1ccc1ace4879d712
-  data.tar.gz: 462c0d8e46b2a7c278e95e526ff8b1de7fa4d966e38c481cf69c5e3d1d97817e
+  metadata.gz: d0dac1cd2861b93a4ec1865d66c561b11bb325263e4f2918192a455158c62429
+  data.tar.gz: 6565fc39df7835aa009fdba68890bb8879f771092b32c2c53f8140d3c2d69196
 SHA512:
-  metadata.gz: fc3e0a0c0488be776f924a457e04afd1ea9048ee43fd9bbcd557f79fd45212e2036ac38e2df021dcfa3c4a7c47f5401ae8e983dae236bd6de13481df103f552f
-  data.tar.gz: e369f73989da51222f65a50697c2fdcae367db5a0742d5b9e9a77dab321bfe2b74e09d49eb1d56359cc6b6ac64817e73ef55f0dfdfae63ff2c7e5dbf9c6f9a87
+  metadata.gz: 93ec8a28c7b4c6573b2be71c5a35fa41e6a3a4af560bc0f3e24d9bf22e43906916c9ecce04f1d0c2e4ee0feef3514dddc48a836df1d1f489180483c032a19261
+  data.tar.gz: 646801d2effd4ca81ded335a12295b86c12d60575096b6fa50375947682ea567f53bd54949525d1cf5c29bf36ba9c15e97d33dc3b207c65b5d262010e9cb4b8b

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## [0.72.1](https://github.com/applandinc/appmap-ruby/compare/v0.72.0...v0.72.1) (2022-01-31)
+
+
+### Bug Fixes
+
+* 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)
+* Don't stomp on $CFLAGS ([c0b44df](https://github.com/applandinc/appmap-ruby/commit/c0b44df2d85d97b7b379d6f030df54a77a88291b))
+* Update labels for deserialization ([4f51825](https://github.com/applandinc/appmap-ruby/commit/4f5182526d74fb3491c700bca16e203a010bb111))
+
 # [0.72.0](https://github.com/applandinc/appmap-ruby/compare/v0.71.0...v0.72.0) (2022-01-24)
 
 

data/ext/appmap/extconf.rb

@@ -1,7 +1,7 @@
 require "mkmf"
 
 
-$CFLAGS='-Werror'
+$CFLAGS='-Werror ' + $CFLAGS
 
 # Per https://bugs.ruby-lang.org/issues/17865,
 # compound-token-split-by-macro was added in clang 12 and broke

data/lib/appmap/builtin_hooks/json.yml

@@ -1,8 +1,8 @@
 - method: JSON::Ext::Parser#parse
   labels:
     - format.json.parse
-    - deserialize
+    - deserialize.safe
 - method: JSON::Ext::Generator::State#generate
-  label:
+  labels:
     - format.json.generate
     - serialize

data/lib/appmap/builtin_hooks/marshal.yml

@@ -2,11 +2,7 @@
   - Marshal#load
   - Marshal#restore
   require_name: ruby
-  label:
-    - deserialize
-    - deserialize.unsafe
-- methods:
-  - Marshal#dump
+  label: deserialize.unsafe
+- method: Marshal#dump
   require_name: ruby
-  label:
-    - deserialize
+  label: serialize

data/lib/appmap/builtin_hooks/psych.yml

@@ -0,0 +1,16 @@
+- methods:
+  - Psych#parse
+  - Psych#parse_stream
+  label: format.yaml.parse
+- methods:
+  - Psych#load
+  - Psych#load_stream
+  label: deserialize.unsafe
+- method: Psych#safe_load
+  label: deserialize.safe
+- methods:
+  - Psych#dump
+  - Psych#dump_stream
+  labels:
+    - format.yaml.generate
+    - serialize

data/lib/appmap/gem_hooks/activerecord.yml

@@ -1,2 +1,4 @@
 - method: ActiveRecord::Relation#records
   label: dao.materialize
+- method: ActiveRecord::FixtureSet::File#raw_rows
+#  label: deserialize.safe

data/lib/appmap/gem_hooks/rails.yml

@@ -0,0 +1,2 @@
+- method: Rails::Application#config_for
+#  label: deserialize.safe

data/lib/appmap/gem_hooks/railties.yml

@@ -0,0 +1,2 @@
+- method: Rails::Application::Configuration#database_configuration
+#  label: deserialize.safe

data/lib/appmap/gem_hooks/sprockets.yml

@@ -0,0 +1,2 @@
+- method: Sprockets::EncodingUtils#unmarshaled_deflated
+  label: deserialize.safe

data/lib/appmap/hook/method.rb

@@ -1,6 +1,11 @@
 # frozen_string_literal: true
 
 module AppMap
+  NEW_RUBY = Util.ruby_minor_version >= 2.7
+  if NEW_RUBY && !Proc.instance_methods.include?(:ruby2_keywords)
+    warn "Ruby is #{RUBY_VERSION}, but Procs don't respond to #ruby2_keywords"
+  end
+
   class Hook
     class Method
       attr_reader :hook_package, :hook_class, :hook_method
@@ -56,7 +61,7 @@ module AppMap
 
           call_instance_method = -> {
             # https://github.com/applandinc/appmap-ruby/issues/153
-            if Util.ruby_minor_version >= 2.7 && is_array_containing_empty_hash.(args) && hook_method.arity == 1
+            if NEW_RUBY && is_array_containing_empty_hash.(args) && hook_method.arity == 1
               instance_method.call({}, &block)
             else
               instance_method.call(*args, &block)

data/lib/appmap/version.rb

@@ -3,7 +3,7 @@
 module AppMap
   URL = 'https://github.com/applandinc/appmap-ruby'
 
-  VERSION = '0.72.0'
+  VERSION = '0.72.1'
 
   APPMAP_FORMAT_VERSION = '1.5.1'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appmap
 version: !ruby/object:Gem::Version
-  version: 0.72.0
+  version: 0.72.1
 platform: ruby
 authors:
 - Kevin Gilpin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-01-24 00:00:00.000000000 Z
+date: 2022-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -3410,7 +3410,7 @@ files:
 - lib/appmap/builtin_hooks/marshal.yml
 - lib/appmap/builtin_hooks/net/http.yml
 - lib/appmap/builtin_hooks/openssl.yml
-- lib/appmap/builtin_hooks/yaml.yml
+- lib/appmap/builtin_hooks/psych.yml
 - lib/appmap/class_map.rb
 - lib/appmap/command/agent_setup/init.rb
 - lib/appmap/command/agent_setup/status.rb
@@ -3436,8 +3436,11 @@ files:
 - lib/appmap/gem_hooks/activerecord.yml
 - lib/appmap/gem_hooks/activesupport.yml
 - lib/appmap/gem_hooks/cancancan.yml
+- lib/appmap/gem_hooks/rails.yml
+- lib/appmap/gem_hooks/railties.yml
 - lib/appmap/gem_hooks/resque.yml
 - lib/appmap/gem_hooks/sidekiq.yml
+- lib/appmap/gem_hooks/sprockets.yml
 - lib/appmap/handler/function.rb
 - lib/appmap/handler/net_http.rb
 - lib/appmap/handler/rails/request_handler.rb

data/lib/appmap/builtin_hooks/yaml.yml

@@ -1,23 +0,0 @@
-- methods:
-  - Psych#load
-  - Psych#unsafe_load
-  - Psych#load_file
-  - Psych#unsafe_load_file
-  - Psych#load_stream
-  - Psych#parse
-  - Psych#parse_stream
-  label:
-    - format.yaml.parse
-    - deserialize
-    - deserialize.unsafe
-- methods:
-  - Psych#safe_load
-  label:
-    - format.yaml.parse
-    - deserialize
-- methods:
-  - Psych#dump
-  - Psych#dump_stream
-  label:
-    - format.yaml.generate
-    - serialize