flutter 0.2.4 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0137e88be0b2d6f99518bde9e33497eb948d824778661410538a72b0bf852c97
-  data.tar.gz: 2842efb0848b384af7b2f23fa12c0974c229c72bc43d02b54e8866c85a4124f7
+  metadata.gz: 2470e3d751dcee88e34d5954533cd0e27eabed7bc2da3f125e44455491e024ee
+  data.tar.gz: 27c405a255544315c4e27792351cefcbacab177308793973396be672f94ad007
 SHA512:
-  metadata.gz: 2ac30e5299a8127650b95b7178b38a3d7b949c5d1c65674163d9c89c2e18f676b47acb4a3a20887b3ce9d13cf108f5365b81a95a917bd7e0eba339c9f6c3fddd
-  data.tar.gz: a3b8bfeab3a7681616e7aac4af9d086d60b3a0b783beaf50e15499e3e7575876a2eb68ae89c31d6a3c4b3ce98d4b0c3f0dfdce536cdf49da5e45ebbafafc1133
+  metadata.gz: d5b4d52b2afc31b98c1103a11bdc95cf53ac932ce7498f8488f6dc352f04cf1396bc4fb00a13d735fd719651a7b6728b1f03ec7dc0ca6465b4404ba0ef4e8376
+  data.tar.gz: 3857beb1103a0d64d7a31d3de1c1b1c5da7ff7a3c5d71d84b43d9d422d94a0a81a1f0a0eb3bf359ef6786803d097ed4da9575f592739328487b9acbc480db12f

data/CHANGELOG.md

@@ -5,6 +5,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## Unreleased
+## 0.2.6 - 2022-10-14
+### Added
+- Backward compatibilty hack for default values in `dry-configurable < 0.13`
+
+## 0.2.5 - 2022-10-13
+### Added
+- Explicit dependency on `pry` for reflecting sources of methods
+- Use source hints from coverage to include dynamically added classes in signature generation
+
 ## 0.2.4 - 2022-10-04
 ### Changed
 - Relax version requirement for dry-configurable

data/README.md

@@ -3,7 +3,7 @@
 [![CI](https://github.com/indydevs/flutter/actions/workflows/main.yml/badge.svg?branch=main)](https://github.com/indydevs/flutter/actions/workflows/main.yml)
 [![codecov](https://codecov.io/github/indydevs/flutter/branch/main/graph/badge.svg?token=XANF37D9C1)](https://codecov.io/github/indydevs/flutter)
 [![Gem](https://img.shields.io/gem/v/flutter)](https://rubygems.org/gems/flutter)
-[![Docs](http://img.shields.io/badge/yard-docs-blue.svg)](https://flutter.indydevs.org)
+[![Docs](https://img.shields.io/badge/yard-docs-blue.svg)](https://flutter.indydevs.org)
 
 ```
  __   __

data/lib/flutter/config.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "dry/configurable"
+require "dry/configurable/version"
 require_relative "persistence"
 
 module Flutter
@@ -11,12 +12,26 @@ module Flutter
       def included(other)
         other.extend(Dry::Configurable)
         other.class_eval do
-          setting(:enabled, default: false, reader: true)
-          setting(:sources, default: Set.new(["#{Dir.pwd}/*"]))
-          setting(:exclusions, default: Set.new(["./vendor/*"]))
-          setting(:storage_class, default: Flutter::Persistence::Marshal)
-          setting(:storage_options, default: { path: "./.flutter" })
-          setting(:reset_storage, default: false)
+          # dry-configurable versions < 0.13 expect default values
+          # as the second parameter, whereas newer versions have started
+          # deprecating passing the default value as a non keyword argument.
+          if Dry::Configurable::VERSION >= "0.13"
+            setting(:enabled, default: false, reader: true)
+            setting(:sources, default: Set.new(["#{Dir.pwd}/*"]))
+            setting(:exclusions, default: Set.new(["./vendor/*"]))
+            setting(:storage_class, default: Flutter::Persistence::Marshal)
+            setting(:storage_options, default: { path: "./.flutter" })
+            setting(:reset_storage, default: false)
+          else
+            # :nocov:
+            setting(:enabled, false, reader: true)
+            setting(:sources, Set.new(["#{Dir.pwd}/*"]))
+            setting(:exclusions, Set.new(["./vendor/*"]))
+            setting(:storage_class, Flutter::Persistence::Marshal)
+            setting(:storage_options, { path: "./.flutter" })
+            setting(:reset_storage, false)
+            # :nocov:
+          end
         end
       end
     end

data/lib/flutter/minitest.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "pry"
 require_relative "tracker"
 
 begin

data/lib/flutter/parser.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "parser/current"
+require "pry"
 require "digest/sha1"
 require "set"
 
@@ -13,9 +14,9 @@ module Flutter
       attr_reader :method_cache
     end
 
-    def initialize(file)
+    def initialize(file, hints = [])
       @signatures = {}
-      @targets = Set.new
+      @targets = Set.new(hints)
       if File.exist?(file)
         code = File.open(file, "r").read
         @file = File.absolute_path(file)
@@ -70,6 +71,8 @@ module Flutter
           hash = source_hash(instance.instance_method(method))
           ["#{container}:#{method}", hash] if hash
         end.compact.to_h)
+      rescue NameError
+        next
       rescue
         warn("Failed to parse #{@file}")
         break

data/lib/flutter/persistence.rb

@@ -30,11 +30,17 @@ module Flutter
       end
 
       # Mapping of +source file -> callable_id -> signature+
-      # @return [Hash<String, Hash<String, String>>] mapping
+      # @return [Hash<String, Hash<String, String>>]
       def source_mapping
         raise NotImplementedError
       end
 
+      # Mapping of +source file -> class or module
+      # @return [Hash<String, Set<String>]
+      def source_hints
+        raise NotImplementedError
+      end
+
       ##
       # Update {#test_mapping}
       #
@@ -47,7 +53,8 @@ module Flutter
       # Update {#source_mapping}
       #
       # @param [Hash<String, Hash<String, String>>] mapping
-      def update_source_mapping!(mapping)
+      # @param [Hash<String, Hash<String, String>>] hints
+      def update_source_mapping!(mapping, hints)
         raise NotImplementedError
       end
 
@@ -103,14 +110,20 @@ module Flutter
         @state.fetch(:source_mapping) { @state[:source_mapping] = {} }
       end
 
+      # (see AbstractStorage#source_hints)
+      def source_hints
+        @state.fetch(:source_hints) { @state[:source_hints] = {} }
+      end
+
       # (see AbstractStorage#update_test_mapping!)
       def update_test_mapping!(mapping)
         test_mapping.merge!(mapping)
       end
 
       # (see AbstractStorage#update_source_mapping!)
-      def update_source_mapping!(mapping)
+      def update_source_mapping!(mapping, hints)
         source_mapping.merge!(mapping)
+        source_hints.merge!(hints)
       end
 
       # (see AbstractStorage#clear!)
@@ -153,14 +166,21 @@ module Flutter
       # (see AbstractStorage#test_mapping)
       def test_mapping
         @state.transaction do
-          return @state[:test_mapping]
+          return @state[:test_mapping] || {}
         end
       end
 
       # (see AbstractStorage#source_mapping)
       def source_mapping
         @state.transaction do
-          return @state[:source_mapping]
+          return @state[:source_mapping] || {}
+        end
+      end
+
+      # (see AbstractStorage#source_hints)
+      def source_hints
+        @state.transaction do
+          return @state[:source_hints] || {}
         end
       end
 
@@ -173,10 +193,12 @@ module Flutter
       end
 
       # (see AbstractStorage#update_source_mapping!)
-      def update_source_mapping!(mapping)
+      def update_source_mapping!(mapping, hints)
         @state.transaction do
           @state[:source_mapping] ||= {}
+          @state[:source_hints] ||= {}
           @state[:source_mapping].merge!(mapping)
+          @state[:source_hints].merge!(hints)
         end
       end
 

data/lib/flutter/rspec.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "pry"
 require_relative "tracker"
 
 module Flutter

data/lib/flutter/tracker.rb

@@ -4,7 +4,6 @@ require "deep_merge"
 require "set"
 require_relative "persistence"
 require_relative "parser"
-require "pry"
 
 module Flutter
   # @attr [Hash<String, Hash<String, Set<String>>>] test_mapping Mapping of tests to
@@ -33,6 +32,7 @@ module Flutter
       @path_mapping = {}
       @method_prefixes = {}
       @tracked_files = {}
+      @source_hints = @storage.source_hints
     end
 
     # Starts tracking calls made by +test+
@@ -80,7 +80,7 @@ module Flutter
 
       sources = @test_mapping[test]
       sources.map do |file, methods|
-        @current_source_mapping[file] ||= Flutter::Parser.new(file).signatures
+        @current_source_mapping[file] ||= Flutter::Parser.new(file, @source_hints[file]).signatures
         methods.map do |method|
           @source_mapping.dig(file, method) == @current_source_mapping.dig(file, method)
         end.all?
@@ -93,7 +93,7 @@ module Flutter
     # @return [void]
     def persist!
       @storage.update_test_mapping!(@test_mapping)
-      @storage.update_source_mapping!(generate_source_mapping)
+      @storage.update_source_mapping!(generate_source_mapping, @source_hints)
       @storage.persist!
     end
 
@@ -119,11 +119,12 @@ module Flutter
 
       if tracked?(tracepoint.path, tracepoint.callee_id)
         rel_path = relative_path(tracepoint.path)
-        prefix = method_prefix(tracepoint.defined_class)
+        class_name, seperator = method_prefix(tracepoint.defined_class).values_at(:class, :seperator)
+        @source_hints.fetch(rel_path) { @source_hints[rel_path] = Set.new } << class_name if class_name
         @test_mapping.fetch(test) do
           @test_mapping[test] = {}
         end.fetch(rel_path) { @test_mapping[test][rel_path] = Set.new } << (
-          prefix ? "#{prefix}#{tracepoint.callee_id}" : tracepoint.callee_id
+          class_name ? "#{class_name}#{seperator}#{tracepoint.callee_id}" : tracepoint.callee_id
         )
       end
     end
@@ -133,22 +134,22 @@ module Flutter
     end
 
     ##
-    # Returns a prefix based on Tracepoint.defined_class
+    # Returns a (class name, separator) prefix based on Tracepoint.defined_class
     #
     # @param [Class] tracepoint_class
-    # @return [String]
+    # @return [Hash<Symbol, String>]
     #
     def method_prefix(tracepoint_class)
-      return unless tracepoint_class
+      return { class: nil, seperator: nil } unless tracepoint_class
 
       @method_prefixes[tracepoint_class] ||= if tracepoint_class.to_s.start_with?("#<Class")
         if tracepoint_class.superclass.name && tracepoint_class.to_s.include?(tracepoint_class.superclass.name)
-          "#{tracepoint_class.superclass.name}::"
+          { class: tracepoint_class.superclass.name, separator: "::" }
         else
-          tracepoint_class.to_s.sub(/#<Class:(.*?)(\(.*?\))?>/, '\1::')
+          { class: tracepoint_class.to_s.sub(/#<Class:(.*?)(\(.*?\))?>/, '\1'), separator: "::" }
         end
       else
-        "#{tracepoint_class.name}:"
+        { class: tracepoint_class.name, seperator: ":" }
       end
     end
 
@@ -173,7 +174,7 @@ module Flutter
     # @return [Hash<String, Hash<String, Hash<String, String>>>]
     def generate_source_mapping
       @test_mapping.map { |_k, v| v.keys }.flatten.uniq.map do |file|
-        [file, @current_source_mapping.fetch(file) { Flutter::Parser.new(file).signatures }]
+        [file, @current_source_mapping.fetch(file) { Flutter::Parser.new(file, @source_hints[file] || []).signatures }]
       end.to_h.deep_merge(@test_source_mapping)
     end
   end

data/lib/flutter/version.rb

@@ -3,5 +3,5 @@
 # :nocov:
 
 module Flutter
-  VERSION = "0.2.4"
+  VERSION = "0.2.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flutter
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.6
 platform: ruby
 authors:
 - Ali-Akber Saifee
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-04 00:00:00.000000000 Z
+date: 2022-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deep_merge
@@ -53,6 +53,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.13'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.13'
 description: "Plug in for RSpec & Minitest test suites\n  to run only the tests that
   exercise the code that has changed\n  "
 email: