pray-cli 1.26.0 → 1.26.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '087854aaa5f5bfead826eaa843615d2a52ba5f52236cc953b55d715c66c6f84b'
-  data.tar.gz: 2600fce7bf405cdcc5f9ef78da7e7026dd408f0babd026ecbf869dc09da2de6f
+  metadata.gz: 7a2524f61bfecb06bcdcf1656ed618e104d854a2d0386c791c3bf3989b9894d1
+  data.tar.gz: d20780c7dd5cb5a9f14448fcb793e2bb42007ec8c29db9a390fbe3d4c9dd27b5
 SHA512:
-  metadata.gz: 1242427bff2198aafc4c74e2c6977128150dde7ba0d7fadecf9d92df8bcaf68662028f45e11419faf8e3a25b9b3c9c959034190dff054cb264c93b303ee1fe3a
-  data.tar.gz: 8d4b9ebc38d9fef0360ec9173b7e53ff92baff22f146e349f6ab049b48b1d0668883bfa0acb6bd3c8a8fd42993e91d06bc96b310b58df09d83dcfa0c377899f8
+  metadata.gz: 3f721c1a473ce6e07b726c6be47f6b98da4dcd83a6f6da6e3afcf6f80d18d50a7f47ed1b42f3bdde9b4922e16c05784ef5c32f69e1255cb7ae521f7f6ade8dbe
+  data.tar.gz: aeeaaade1743bf0b15511ec45704692fed58ed65b2f2f4ccca6d848481b23bd958bee3e433bb944632828ed029391f638c1ffaf31699bb73251763e8654f0c9b

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## Unreleased
 
+## 1.26.1 (2026-11-02)
+
+- Show optional package referrals separately in `pray explain`, exclude them from dependency cycles and trees, and validate their constraints when another declaration selects the target.
+- Keep drift, render checks, planning, and writes consistent for managed files that contain local content.
+
 ## 1.26.0 (2026-10-30)
 
 - Add validated `related` references to prayspec parsing, rendering, and `pray explain`.

data/lib/pray/cli/commands/packages.rb

@@ -84,7 +84,12 @@ module Pray
       end
       lines << "source: #{package_source_summary(package)}"
       lines << "exports: #{format_list(package.selected_exports)}"
-      lines << "dependencies: #{format_list(package.spec.dependencies.map(&:name))}"
+      required_dependencies = package.spec.dependencies.reject(&:optional).map(&:name)
+      optional_referrals = package.spec.dependencies.select(&:optional).map do |dependency|
+        "#{dependency.name} (#{dependency.constraint})"
+      end
+      lines << "dependencies: #{format_list(required_dependencies)}"
+      lines << "optional referrals: #{format_list(optional_referrals)}"
       lines << "related prayers: #{format_list(package.spec.related)}"
       lines << "tree hash: #{package.tree_hash}"
       lines << "artifact hash: #{package.artifact_hash}"

data/lib/pray/cli/helpers.rb

@@ -152,7 +152,7 @@ module Pray
       lines << "#{indent}#{package.declaration.name} #{package.spec.recorded_version}"
       return unless ancestry.add?(package.declaration.name)
 
-      package.spec.dependencies.each do |dependency|
+      package.spec.dependencies.reject(&:optional).each do |dependency|
         resolved = package_map[dependency.name]
         if resolved
           if ancestry.include?(resolved.declaration.name)

data/lib/pray/render_dest.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "fileutils"
-require "pathname"
 
 module Pray
   module RenderDest
@@ -157,7 +156,7 @@ module Pray
       unless kind == :regular
         raise Error.render("refusing to write `#{display}`; destination is not a regular file")
       end
-      RenderPatch.patch_rendered_content(decode_utf8(read_regular_bytes(path, display), display), fresh, retired)
+      RenderReconcile.reconcile_content(decode_utf8(read_regular_bytes(path, display), display), fresh, retired)
     end
 
     def write_rendered_content(path, display, fresh, retired = {})
@@ -165,7 +164,7 @@ module Pray
 
       open_regular(path, display, File::RDWR) do |file|
         existing = decode_utf8(read_destination_bytes(file, display), display)
-        content = RenderPatch.patch_rendered_content(existing, fresh, retired)
+        content = RenderReconcile.reconcile_content(existing, fresh, retired)
         return if Transaction.replace(path, existing.b, content.b)
 
         file.rewind

data/lib/pray/render_reconcile.rb

@@ -4,6 +4,10 @@ module Pray
   module RenderReconcile
     module_function
 
+    def reconcile_content(existing, fresh, retired = {})
+      RenderPatch.patch_rendered_content(existing, fresh, retired)
+    end
+
     def current?(path, display, fresh, retired = {})
       kind = RenderDest.destination_kind(path)
       return false if kind == :missing
@@ -13,7 +17,7 @@ module Pray
         raise Error.render("refusing to read `#{display}`; destination is not a regular file")
       end
       existing = RenderDest.decode_utf8(RenderDest.read_regular_bytes(path, display), display)
-      existing == RenderPatch.patch_rendered_content(existing, fresh, retired)
+      existing == reconcile_content(existing, fresh, retired)
     end
 
     def retired_span_checksums(previous_lockfile, target)

data/lib/pray/resolve.rb

@@ -100,6 +100,7 @@ module Pray
       raise Error.resolution(local_errors.join("\n")) unless local_errors.empty?
 
       ResolveDeps.reject_dependency_cycles(packages)
+      ResolveDeps.validate_optional_referrals(packages)
       source_revisions = git_sources.revisions
 
       ResolvedProject.new(

data/lib/pray/resolve_deps.rb

@@ -7,12 +7,29 @@ module Pray
     def reject_dependency_cycles(packages)
       edges = {}
       packages.each do |package|
-        edges[package.declaration.name] = package.spec.dependencies.map(&:name)
+        edges[package.declaration.name] = package.spec.dependencies.reject(&:optional).map(&:name)
       end
       cycle = DependencyGraph.find_dependency_cycle(edges)
       return unless cycle
 
       raise Error.resolution("dependency cycle detected: #{cycle.join(" -> ")}")
     end
+
+    def validate_optional_referrals(packages)
+      packages_by_name = packages.to_h { |package| [package.declaration.name, package] }
+      packages.each do |package|
+        package.spec.dependencies.select(&:optional).each do |dependency|
+          target = packages_by_name[dependency.name]
+          next unless target
+
+          target.spec.satisfy_constraint!(dependency.constraint)
+        rescue Error
+          raise Error.resolution(
+            "optional referral #{package.declaration.name} -> #{dependency.name} requires " \
+              "#{dependency.constraint}, but selected version is #{target.spec.recorded_version}"
+          )
+        end
+      end
+    end
   end
 end

data/lib/pray/verify.rb

@@ -36,11 +36,16 @@ module Pray
 
     def drift_project(project, lockfile)
       report, rendered_targets, fresh_targets = collect_verification_report(project, lockfile)
-      fresh_targets.each do |path, fresh_content|
-        normalized_fresh = Hashing.normalize_line_endings(fresh_content)
+      fresh_targets.each do |path, fresh_target|
         on_disk = rendered_targets[path]
-        on_disk = Hashing.normalize_line_endings(on_disk) if on_disk
-        unless on_disk == normalized_fresh
+        retired = RenderReconcile.retired_span_checksums(lockfile, fresh_target)
+        expected = if on_disk
+          RenderReconcile.reconcile_content(on_disk, fresh_target.content, retired)
+        else
+          fresh_target.content
+        end
+        normalized_on_disk = Hashing.normalize_line_endings(on_disk) if on_disk
+        unless normalized_on_disk == Hashing.normalize_line_endings(expected)
           report.findings << VerificationFinding.new(
             kind: "renderer_drift",
             message: "#{path} differs from fresh render"
@@ -64,7 +69,7 @@ module Pray
     def collect_verification_report(project, lockfile)
       report = VerificationReport.new
       rendered_targets = {}
-      fresh_targets = Render.render_project(project).to_h { |target| [target.path, target.content] }
+      fresh_targets = Render.render_project(project).to_h { |target| [target.path, target] }
 
       if project.manifest_hash != lockfile.manifest_hash
         report.findings << VerificationFinding.new(
@@ -104,6 +109,7 @@ module Pray
       end
 
       target_spans = lockfile.managed_span.group_by(&:target)
+      fresh_targets.each_key { |target_path| target_spans[target_path] ||= [] }
       target_spans.each do |target_path, spans|
         absolute_path = File.join(project.project_root, target_path)
         unless File.exist?(absolute_path)
@@ -135,7 +141,7 @@ module Pray
             end
           end
         end
-        fresh_lines = fresh_targets[target_path]&.lines(chomp: true)
+        fresh_lines = fresh_targets[target_path]&.content&.lines(chomp: true)
         summary = VerifyPosition.summarize_position_drift(
           target_path,
           spans,

data/lib/pray/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module Pray
-  VERSION = "1.26.0"
-  GENERATED_BY = "pray 1.26.0"
+  VERSION = "1.26.1"
+  GENERATED_BY = "pray 1.26.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pray-cli
 version: !ruby/object:Gem::Version
-  version: 1.26.0
+  version: 1.26.1
 platform: ruby
 authors:
 - Andrei Makarov
@@ -251,7 +251,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.20
 specification_version: 4
 summary: Package manager for the language placed before inference (Prayfile)
 test_files: []