varar-rspec 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a79154b49d4b13d706d22d242f4edd456c061de513d13681be93f6fbfad21ed
-  data.tar.gz: 7ec9debe89392c639140b059d2885f477f281d61d7b99174f57a4e4f0592c39a
+  metadata.gz: dd1931c8d54abf4bdaae28a8e8f136e3d6991b03ba6cf1a22cc49d5f658c8bfe
+  data.tar.gz: 0dd3622959aa6b187cc593223850229ab598fd0870c24f943f87e4779b8d31c8
 SHA512:
-  metadata.gz: 66206a596b79c0d267618fdd8c157a3be5eb272405e1ecae5d254e70c4fcf689b5b07a21510ce79ce5efdb50d97ccb77615ab70ecc875b4f5ebfc7c7e6f8e216
-  data.tar.gz: a9e7a899eadfddfb6eebb7c0f7a88e527557dea82b093f3cf043863d3503c09e5c0e5b9c421c000fa264b25ab88dd32345b5e2cea8279e38d062c9aa85cdb01a
+  metadata.gz: cc553518b90a17dc6bd813462ccdea3bd1a4f004b1dc0cd6ec1de78c4879522eb3e6c55c73964f4cbbfed577dd8c7cedda22b12955756a9f60b2dcb3362674ef
+  data.tar.gz: 5a38ebeb4b9cfb4c78bf3ebd54327875f509ca74dc0de2926f8f1ae45daf59f98365b61d8389d8348817193c4bea8fca014e5e1ab0df91bd937fc86f13a472a5

data/lib/varar/rspec.rb

@@ -12,7 +12,7 @@ module Varar
   #   require "varar/rspec"
   #   Varar::RSpec.generate
   module RSpec
-    VERSION = '0.8.0'
+    VERSION = '0.8.1'
 
     module_function
 
@@ -36,21 +36,52 @@ module Varar
       # everything.
       Core::Drifts.prune_baselines(store, oaths.map { |p| Runner.rel_posix(p, root) }, update: update)
 
+      workspace = project_workspace(oaths, root)
+
       oaths.each do |oath_path|
-        define_group(oath_path, root, loaded, store, update, results)
+        define_group(oath_path, root, loaded, store, update, results, workspace)
+      end
+    end
+
+    # Whether a section is a standalone example depends on whether another oath
+    # references it, which is whole-project knowledge (ADR 0016). Built from the
+    # config globs — the full set, for the same reason baseline pruning is.
+    # The sources of every oath this plan's steps were spliced in from (ADR
+    # 0016). Their hashes go in the run record, so a consumer can tell a stale
+    # failure from a live one.
+    def referenced_sources(plan, workspace)
+      plan.examples.flat_map { |ex| ex.steps.map(&:doc_path) }.compact.uniq.each_with_object({}) do |path, out|
+        doc = workspace.docs[path]
+        out[path] = doc.source if doc
+      end
+    end
+
+    def project_workspace(oaths, root)
+      docs = oaths.filter_map do |path|
+        Core::Parse.parse(Runner.rel_posix(path, root), File.read(path, encoding: 'UTF-8'))
+      rescue SystemCallError
+        nil
       end
+      Core::Reference.build_workspace(docs)
     end
 
-    def define_group(oath_path, root, loaded, store, update, results)
+    def define_group(oath_path, root, loaded, store, update, results, workspace)
       rel = Runner.rel_posix(oath_path, root)
       source = File.read(oath_path, encoding: 'UTF-8')
-      plan = Runner.plan_oath(File.basename(oath_path), source, loaded.registry)
+      # `rel`, not the basename: doc.path is an oath's identity in every port,
+      # so a relative reference resolves alike and two same-named oaths in
+      # different directories stay distinct (ADR 0016).
+      plan = Runner.plan_oath(rel, source, loaded.registry, workspace)
+      referenced = referenced_sources(plan, workspace)
       pairs = Runner.examples_with_runs(plan, loaded.create_context, Runner::RecordingReporter.new)
       drifts = Core::Drifts.reconcile_drift(store, rel, source, plan.doc, plan, update: update)
 
       ::RSpec.describe(rel) do
         pairs.each do |example, run|
-          lines = example.steps.map { |s| s.match_span.start_line }.uniq
+          # Lines in THIS oath: a step a reference block spliced in from
+          # another oath (ADR 0016) contributes none, since its line is not in
+          # this file.
+          lines = example.steps.reject(&:doc_path).map { |s| s.match_span.start_line }.uniq
           # A var diff surfaces as a failure carrying the span-anchored render;
           # any other exception propagates. RSpec reports both as failures.
           it(example.name) do
@@ -61,14 +92,14 @@ module Varar
             results.record(rel, source, Core::ExampleResult.new(
                                           name: example.name, status: 'failed', lines: lines,
                                           failure: Core::Failures.to_failure(e, rel, lines.first || 0)
-                                        ))
+                                        ), referenced)
             raise Runner.render_failure(e, source, rel) if RSpec.var_diff_error?(e)
 
             raise
           else
             results.record(rel, source, Core::ExampleResult.new(
                                           name: example.name, status: 'passed', lines: lines, failure: nil
-                                        ))
+                                        ), referenced)
           end
         end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: varar-rspec
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Aslak Hellesøy
@@ -29,14 +29,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.8.1
 description: 'RSpec adapter: one selectable example per Markdown example, with a drift
   gate.'
 email: