flutter 0.2.6 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2470e3d751dcee88e34d5954533cd0e27eabed7bc2da3f125e44455491e024ee
-  data.tar.gz: 27c405a255544315c4e27792351cefcbacab177308793973396be672f94ad007
+  metadata.gz: 892688c26b88bc96c4c37c4ea72d7ef54342dc242c7741a0241250a96e4d484e
+  data.tar.gz: 4700cb7256bf15cc3b1238607eb37c37b96d93828413ed793733bf3374b39730
 SHA512:
-  metadata.gz: d5b4d52b2afc31b98c1103a11bdc95cf53ac932ce7498f8488f6dc352f04cf1396bc4fb00a13d735fd719651a7b6728b1f03ec7dc0ca6465b4404ba0ef4e8376
-  data.tar.gz: 3857beb1103a0d64d7a31d3de1c1b1c5da7ff7a3c5d71d84b43d9d422d94a0a81a1f0a0eb3bf359ef6786803d097ed4da9575f592739328487b9acbc480db12f
+  metadata.gz: 8c8f5fbb1e054bbb041002c25b9ff4545b83938320be7af311df4cabda4829c105778153e95b6a9ced5861602a24ad7266f2d7900abcd813a471ba70128238f0
+  data.tar.gz: 13c7c7818265fcfa0b4738bd51e179ab787dc242dbb6213234a635472a996b10db7c983188f837ee4ce76675d17a9036592eee5a14b7c7ff629ead075f4004e6

data/CHANGELOG.md

@@ -5,6 +5,13 @@ 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.3.0 - 2022-10-16
+### Changed
+- Switch from `pry` to `method_source` as the actual dependency for inspecting method sources for generating signatures
+
+### Fixed
+- Ensure partial test runs don't clobber source mappings for previously run test cases
+
 ## 0.2.6 - 2022-10-14
 ### Added
 - Backward compatibilty hack for default values in `dry-configurable < 0.13`

data/lib/flutter/minitest.rb

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

data/lib/flutter/parser.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
+require "method_source"
 require "parser/current"
-require "pry"
 require "digest/sha1"
 require "set"
 

data/lib/flutter/persistence.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "deep_merge"
 require "fileutils"
 require "set"
 module Flutter
@@ -122,8 +123,8 @@ module Flutter
 
       # (see AbstractStorage#update_source_mapping!)
       def update_source_mapping!(mapping, hints)
-        source_mapping.merge!(mapping)
-        source_hints.merge!(hints)
+        source_mapping.deep_merge!(mapping)
+        source_hints.deep_merge!(hints)
       end
 
       # (see AbstractStorage#clear!)
@@ -197,8 +198,8 @@ module Flutter
         @state.transaction do
           @state[:source_mapping] ||= {}
           @state[:source_hints] ||= {}
-          @state[:source_mapping].merge!(mapping)
-          @state[:source_hints].merge!(hints)
+          @state[:source_mapping].deep_merge!(mapping)
+          @state[:source_hints].deep_merge!(hints)
         end
       end
 

data/lib/flutter/rspec.rb

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

data/lib/flutter/tracker.rb

@@ -33,6 +33,7 @@ module Flutter
       @method_prefixes = {}
       @tracked_files = {}
       @source_hints = @storage.source_hints
+      @tracker_pwd = Dir.pwd
     end
 
     # Starts tracking calls made by +test+
@@ -73,12 +74,14 @@ module Flutter
       @test_source_mapping.fetch(test_location_rel) do
         @test_source_mapping[test_location_rel] = {}
       end[test] = Digest::SHA1.hexdigest(test_source)
-      return false unless
-        @test_mapping.key?(test) && @test_source_mapping[test_location_rel][test] == @source_mapping.dig(
-          test_location_rel, test
-        )
+      test_seen = @test_mapping.key?(test)
+
+      test_source_unchanged = @test_source_mapping[test_location_rel][test] == @source_mapping.dig(
+        test_location_rel, test
+      )
+      return unless test_seen && test_source_unchanged
 
-      sources = @test_mapping[test]
+      sources = @test_mapping[test] || {}
       sources.map do |file, methods|
         @current_source_mapping[file] ||= Flutter::Parser.new(file, @source_hints[file]).signatures
         methods.map do |method|
@@ -119,18 +122,18 @@ module Flutter
 
       if tracked?(tracepoint.path, tracepoint.callee_id)
         rel_path = relative_path(tracepoint.path)
-        class_name, seperator = method_prefix(tracepoint.defined_class).values_at(:class, :seperator)
+        class_name, separator = method_prefix(tracepoint.defined_class).values_at(:class, :separator)
         @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 } << (
-          class_name ? "#{class_name}#{seperator}#{tracepoint.callee_id}" : tracepoint.callee_id
+          class_name ? "#{class_name}#{separator}#{tracepoint.callee_id}" : tracepoint.callee_id
         )
       end
     end
 
     def relative_path(file)
-      @path_mapping[file] ||= Pathname.new(file).relative_path_from(Dir.pwd).to_s
+      @path_mapping[file] ||= Pathname.new(file).relative_path_from(@tracker_pwd).to_s
     end
 
     ##
@@ -140,7 +143,7 @@ module Flutter
     # @return [Hash<Symbol, String>]
     #
     def method_prefix(tracepoint_class)
-      return { class: nil, seperator: nil } unless tracepoint_class
+      return { class: nil, separator: 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)
@@ -149,7 +152,7 @@ module Flutter
           { class: tracepoint_class.to_s.sub(/#<Class:(.*?)(\(.*?\))?>/, '\1'), separator: "::" }
         end
       else
-        { class: tracepoint_class.name, seperator: ":" }
+        { class: tracepoint_class.name, separator: ":" }
       end
     end
 
@@ -169,9 +172,9 @@ module Flutter
     end
 
     ##
-    # Generates a mapping of
+    # Generates a mapping of source files to method=>signatures
     #
-    # @return [Hash<String, Hash<String, Hash<String, String>>>]
+    # @return [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, @source_hints[file] || []).signatures }]

data/lib/flutter/version.rb

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

metadata

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