appmap 0.80.1 → 0.81.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de1e5a636c3d6e807f11c54a29563e338804f3d101dc4779229596455cd60682
-  data.tar.gz: cf2aba805fdb427da2a642826f490b0002eb1892dd57a07693b119582a8cd7e1
+  metadata.gz: 94d8d2495de74768697429a640c553549c029992969acfeb65c540f2471fbef3
+  data.tar.gz: bfbdf261991d859d31ec1f98c95ca9954e08bb1de0fe98ac2973a06c42a3dd18
 SHA512:
-  metadata.gz: 6056dda497e69c32a6e7550c76b4b4e40a5cd5405d7244748af4f5f34ed7d6790eafa206470ac8c9a98019fec802944b4cec0cc274451028cf2c5d6f405bd626
-  data.tar.gz: '039ef96a6ae64cf641e58fb364a2777a65dc507ded48027752ca766c65204659b844cb6408d17a077947968d1fbf006f7c9b29e2fdfe03fc392d90c4495361ff'
+  metadata.gz: 993e2ce2c51973a6469fd5f10c66c48c13200c4456f3230748e9d5ffd2b107962cdae7d0b286d59e4ee95aee98957dfa6cd062d0ac4ba5ab1923e99da233edf1
+  data.tar.gz: 512cb13c413d394d5237840f8dfec94a0d1d0720cb6c4e164d46e11949078b808b7c25220c3c0fc32a9be74ed4326726ef844588ea346a84242bdca1f87f3056

data/.travis.yml

@@ -4,9 +4,8 @@ cache:
 - bundle
 - yarn
 
-# NB: if you update the ruby versions here, you also need to update
-# them in the Rakefile.
 rbenv:
+- 2.5
 - 2.6
 - 2.7
 - 3.0

data/CHANGELOG.md

@@ -1,3 +1,26 @@
+## [0.81.1](https://github.com/applandinc/appmap-ruby/compare/v0.81.0...v0.81.1) (2022-04-27)
+
+
+### Bug Fixes
+
+* AppMap format version is 1.7.0 ([53b3f04](https://github.com/applandinc/appmap-ruby/commit/53b3f04dc4f4a7867f28f5b196b2fadbe7cb6eeb))
+* Avoid return within a block (Ruby 2.5) ([85094fd](https://github.com/applandinc/appmap-ruby/commit/85094fd760b3ea08d343960cf586f4cce210fb07))
+
+# [0.81.0](https://github.com/applandinc/appmap-ruby/compare/v0.80.2...v0.81.0) (2022-04-26)
+
+
+### Features
+
+* Add Ruby 2.5 to the version whitelist ([945f7da](https://github.com/applandinc/appmap-ruby/commit/945f7daaee9685a55f14e8714677661fa5cb4e82))
+
+## [0.80.2](https://github.com/applandinc/appmap-ruby/compare/v0.80.1...v0.80.2) (2022-04-26)
+
+
+### Bug Fixes
+
+* Ensure that request env key is a string ([721baef](https://github.com/applandinc/appmap-ruby/commit/721baefbb3ba083bf6c5a1b46e6ddffa51feebec))
+* Fix method_display_name ([b05c7fe](https://github.com/applandinc/appmap-ruby/commit/b05c7fe027a981214b224852dc54c5e467e1f116))
+
 ## [0.80.1](https://github.com/applandinc/appmap-ruby/compare/v0.80.0...v0.80.1) (2022-04-08)
 
 

data/lib/appmap/class_map.rb

@@ -78,7 +78,7 @@ module AppMap
         end
 
         collapse_package = lambda do |package|
-          return unless package.type == 'package'
+          next unless package.type == 'package'
 
           while package.children.length == 1 && package.children.all? { |child| child.type == 'package' }
             child = package.children[0]

data/lib/appmap/handler/rails/template.rb

@@ -147,7 +147,7 @@ module AppMap
               else
                 path_obj.inspect
               end
-            path = path[Dir.pwd.length + 1..] if path.index(Dir.pwd) == 0
+            path = path[Dir.pwd.length + 1..-1] if path.index(Dir.pwd) == 0
             path
           end
         end

data/lib/appmap/hook/method.rb

@@ -18,6 +18,8 @@ module AppMap
       method
     end
 
+    RUBY_MAJOR_VERSION, RUBY_MINOR_VERSION, _ = RUBY_VERSION.split('.').map(&:to_i)
+
     # Single hooked method.
     # Call #activate to override the original.
     class Method
@@ -51,18 +53,31 @@ module AppMap
         if hook_class == Kernel
           hook_class.define_method_with_arity(hook_method.name, hook_method.arity, hook_method_def)
         else
-          hook_class.ancestors.find { |cls| cls.method_defined?(hook_method.name, false) }.tap do |cls|
-            if cls
-              cls.define_method_with_arity(hook_method.name, hook_method.arity, hook_method_def)
-            else
-              warn "#{hook_method.name} not found on #{hook_class}"
-            end
+          cls = defining_class(hook_class)
+          if cls
+            cls.define_method_with_arity(hook_method.name, hook_method.arity, hook_method_def)
           end
         end
       end
 
       protected
 
+      def defining_class(hook_class)
+        cls = \
+          if RUBY_MAJOR_VERSION == 2 && RUBY_MINOR_VERSION <= 5
+            hook_class
+              .ancestors
+              .select { |cls| cls.method_defined?(hook_method.name) }
+              .find { |cls| cls.instance_method(hook_method.name).owner == cls }
+          else
+            hook_class.ancestors.find { |cls| cls.method_defined?(hook_method.name, false) }
+          end
+
+        return cls if cls
+
+        warn "#{hook_method.name} not found on #{hook_class}"
+      end
+
       def gettime
         Process.clock_gettime Process::CLOCK_MONOTONIC
       end
@@ -78,7 +93,7 @@ module AppMap
       def method_display_name
         return @method_display_name if @method_display_name
 
-        return @method_display_name = [defined_class, method_symbol, hook_method.name].join if defined_class
+        return @method_display_name = [defined_class, '#', hook_method.name].join if defined_class
 
         "#{hook_method.name} (class resolution deferred)"
       end

data/lib/appmap/hook.rb

@@ -116,7 +116,7 @@ module AppMap
 
               hook_method = lambda do |entry|
                 cls, method = entry
-                return false if config.never_hook?(cls, method)
+                next if config.never_hook?(cls, method)
 
                 hook.package.handler_class.new(hook.package, cls, method).activate
               end

data/lib/appmap/open.rb

@@ -38,7 +38,7 @@ module AppMap
       Thread.new do
         Rack::Handler::WEBrick.run(
           lambda do |env|
-            return [200, { 'Content-Type' => 'text/html' }, [page]]
+            [200, { 'Content-Type' => 'text/html' }, [page]]
           end,
           :Port => 0
         ) do |server|

data/lib/appmap/rspec.rb

@@ -78,7 +78,7 @@ module AppMap
         super
 
         webdriver_port = lambda do
-          return unless defined?(page) && page&.driver
+          next unless defined?(page) && page&.driver
 
           # This is the ugliest thing ever but I don't want to lose it.
           # All the WebDriver calls are getting app-mapped and it's really unclear

data/lib/appmap/swagger/markdown_descriptions.rb

@@ -15,8 +15,8 @@ module AppMap
 
       def perform
         to_markdown = lambda do |obj|
-          return obj.each(&to_markdown) if obj.is_a?(Array)
-          return unless obj.is_a?(Hash)
+          next obj.each(&to_markdown) if obj.is_a?(Array)
+          next unless obj.is_a?(Hash)
 
           description = obj['description']
           obj['description'] = converter.(description) if description

data/lib/appmap/swagger/stable.rb

@@ -10,8 +10,8 @@ module AppMap
       def perform
         clean_only = nil
         clean = lambda do |obj, properties = %w[description example]|
-          return obj.each(&clean_only.(properties)) if obj.is_a?(Array)
-          return unless obj.is_a?(Hash)
+          next obj.each(&clean_only.(properties)) if obj.is_a?(Array)
+          next unless obj.is_a?(Hash)
 
           properties.each { |property| obj.delete property }
 

data/lib/appmap/util.rb

@@ -122,7 +122,7 @@ module AppMap
         # Apparently, it's following the CGI spec in doing so.
         # https://datatracker.ietf.org/doc/html/rfc3875#section-4.1.18
         matching_headers = env
-          .select { |k,v| k.start_with? 'HTTP_' }
+          .select { |k,v| k.to_s.start_with? 'HTTP_' }
           .merge(
             'CONTENT_TYPE' => env['CONTENT_TYPE'],
             'CONTENT_LENGTH' => env['CONTENT_LENGTH'],

data/lib/appmap/version.rb

@@ -3,11 +3,11 @@
 module AppMap
   URL = 'https://github.com/applandinc/appmap-ruby'
 
-  VERSION = '0.80.1'
+  VERSION = '0.81.1'
 
-  APPMAP_FORMAT_VERSION = '1.5.1'
+  APPMAP_FORMAT_VERSION = '1.7.0'
 
-  SUPPORTED_RUBY_VERSIONS = %w[2.6 2.7 3.0 3.1].freeze
+  SUPPORTED_RUBY_VERSIONS = %w[2.5 2.6 2.7 3.0 3.1].freeze
 
   DEFAULT_APPMAP_DIR = 'tmp/appmap'.freeze
   DEFAULT_CONFIG_FILE_PATH = 'appmap.yml'.freeze

data/spec/depends/api_spec.rb

@@ -110,12 +110,14 @@ describe 'Depends API' do
 
     describe 'smoke test' do
       around do |test|
-        @minitest_test_command_method = AppMap.configuration.depends_config.minitest_test_command_method
-        AppMap.configuration.depends_config.minitest_test_command_method = 'AppMap::Depends::APISpec.minitest_test_command'
+        begin
+          @minitest_test_command_method = AppMap.configuration.depends_config.minitest_test_command_method
+          AppMap.configuration.depends_config.minitest_test_command_method = 'AppMap::Depends::APISpec.minitest_test_command'
 
-        test.call
-      ensure
-        AppMap.configuration.depends_config.minitest_test_command_method = @minitest_test_command
+          test.call
+        ensure
+          AppMap.configuration.depends_config.minitest_test_command_method = @minitest_test_command
+        end
       end
 
       it 'passes a smoke test' do
@@ -125,20 +127,22 @@ describe 'Depends API' do
 
     describe 'configuration settings' do
       it 'can all be modified' do
-        defaults = {}
-
-        %i[rspec minitest].each do |framework|
-          %i[environment_method select_tests_method test_command_method].each do |setting|
-            full_setting = [ framework, setting ].join('_').to_sym
-            defaults[full_setting] = AppMap.configuration.depends_config.send(full_setting)
-            AppMap.configuration.depends_config.send("#{full_setting}=", "AppMap::Depends::APISpec.#{full_setting}")
+        begin
+          defaults = {}
+
+          %i[rspec minitest].each do |framework|
+            %i[environment_method select_tests_method test_command_method].each do |setting|
+              full_setting = [ framework, setting ].join('_').to_sym
+              defaults[full_setting] = AppMap.configuration.depends_config.send(full_setting)
+              AppMap.configuration.depends_config.send("#{full_setting}=", "AppMap::Depends::APISpec.#{full_setting}")
+            end
           end
-        end
 
-        run_tests
-      ensure
-        defaults.keys.each do |setting|
-          AppMap.configuration.depends_config.send("#{setting}=", defaults[setting])
+          run_tests
+        ensure
+          defaults.keys.each do |setting|
+            AppMap.configuration.depends_config.send("#{setting}=", defaults[setting])
+          end
         end
       end
     end

data/spec/handler/eval_spec.rb

@@ -38,7 +38,7 @@ describe 'AppMap::Handler::Eval' do
   # a la Ruby 2.6.3 ruby-token.rb
   # token_c = eval("class #{token_n} < #{super_token}; end; #{token_n}")
   it 'can define a new class' do
-    num = (Random.random_number * 10_000).to_i
+    num = (Random.new.random_number * 10_000).to_i
     class_name = "Cls_#{num}"
     m = ClassMaker
     cls = nil

data/spec/hook_spec.rb

@@ -751,9 +751,11 @@ describe 'AppMap class Hooking' do
         :lineno: 9
     YAML
     test_hook_behavior 'spec/fixtures/hook/exception_method.rb', events_yaml do
-      ExceptionMethod.new.raise_exception
-    rescue
-      # don't let the exception fail the test
+      begin
+        ExceptionMethod.new.raise_exception
+      rescue
+        # don't let the exception fail the test
+      end
     end
   end
 
@@ -781,9 +783,11 @@ describe 'AppMap class Hooking' do
         :lineno: 59
     YAML
     test_hook_behavior 'spec/fixtures/hook/exception_method.rb', events_yaml do
-      ExceptionMethod.new.raise_illegal_utf8_message
-    rescue
-      # don't let the exception fail the test
+      begin
+        ExceptionMethod.new.raise_illegal_utf8_message
+      rescue
+        # don't let the exception fail the test
+      end
     end
   end
 

data/spec/rails_spec_helper.rb

@@ -18,7 +18,7 @@ class TestRailsApp
   attr_reader :fixture_dir
 
   def run_cmd(cmd, env = {})
-    run_process method(:system), cmd, env, exception: true
+    run_process method(:system), cmd, env
   end
 
   def spawn_cmd(cmd, env = {})
@@ -33,7 +33,7 @@ class TestRailsApp
 
   def database_name
     # This is used locally too, so make the name nice and unique.
-    @database_name ||= "appland-rails-test-#{Random.bytes(8).unpack1('h*')}"
+    @database_name ||= "appland-rails-test-#{Random.new.bytes(8).unpack1('h*')}"
   end
 
   def bundle

data/spec/remote_recording_spec.rb

@@ -18,10 +18,12 @@ describe 'remote recording', :order => :defined do
       uri = URI("http://localhost:#{@service_port}/health")
 
       100.times do
-        Net::HTTP.get(uri)
-        break
-      rescue Errno::ECONNREFUSED
-        sleep 0.1
+        begin
+          Net::HTTP.get(uri)
+          break
+        rescue Errno::ECONNREFUSED
+          sleep 0.1
+        end
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appmap
 version: !ruby/object:Gem::Version
-  version: 0.80.1
+  version: 0.81.1
 platform: ruby
 authors:
 - Kevin Gilpin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-04-08 00:00:00.000000000 Z
+date: 2022-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport