pray-cli 1.26.0 → 1.26.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '087854aaa5f5bfead826eaa843615d2a52ba5f52236cc953b55d715c66c6f84b'
-  data.tar.gz: 2600fce7bf405cdcc5f9ef78da7e7026dd408f0babd026ecbf869dc09da2de6f
+  metadata.gz: 2c518cdb4d98021a08d150ad7c0c20463d885b09c9f69b022f2fa596d9597269
+  data.tar.gz: 8e46339135b9a8cb554eb4b8d9f60510baa5eab1b1b730bbda70efdd227289f3
 SHA512:
-  metadata.gz: 1242427bff2198aafc4c74e2c6977128150dde7ba0d7fadecf9d92df8bcaf68662028f45e11419faf8e3a25b9b3c9c959034190dff054cb264c93b303ee1fe3a
-  data.tar.gz: 8d4b9ebc38d9fef0360ec9173b7e53ff92baff22f146e349f6ab049b48b1d0668883bfa0acb6bd3c8a8fd42993e91d06bc96b310b58df09d83dcfa0c377899f8
+  metadata.gz: 1b619b7f79ee252328c885ac0664270d29f00f81a720102a26f8a1af8d78c57e7f9245f6eb09e724a3ba1f19d482001c59a8153d0f2da534d64fe64cdc5cc314
+  data.tar.gz: bd6f8f108e1e8cab3e48060c09dff86b8dfc55cc5edaaed320fcb6d347f2b9ea90e208ceb5c2757136084b7da815f34b491ef7fffec3f78d7b70abfb530819d3

data/CHANGELOG.md

@@ -2,6 +2,19 @@
 
 ## Unreleased
 
+## 1.26.3 (2026-11-12)
+
+- Allow `pray install` to refresh the lock when a managed span already matches the fresh render but the lock ideal is stale. Keep failing when the on-disk body matches neither, and name move-aside recovery instead of a force flag.
+
+## 1.26.2 (2026-11-06)
+
+- Reduce wall and CPU time for package resolve, tree hashing, and related install work without changing install results.
+
+## 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/hashing.rb

@@ -24,6 +24,8 @@ module Pray
     end
 
     def normalize_line_endings(text)
+      return text unless text.include?("\r")
+
       text.gsub("\r\n", "\n").tr("\r", "\n")
     end
 

data/lib/pray/package_spec.rb

@@ -54,27 +54,6 @@ module Pray
         copy.dependencies = dependencies.sort_by { |dependency| [dependency.name, dependency.constraint, dependency.optional] }
       end
     end
-
-    def tree_hash_for_root(root)
-      validate_relative_paths!
-      file_bytes = {}
-      files.each do |file|
-        path = File.join(root, file)
-        raise Error.integrity("package file missing: #{file}") unless File.exist?(path)
-        raise Error.integrity("package file is a directory: #{file}") if File.directory?(path)
-
-        file_bytes[file] = File.binread(path)
-      end
-      self.class.tree_hash_from_file_bytes(file_bytes)
-    end
-
-    def self.tree_hash_from_file_bytes(file_bytes)
-      entries = file_bytes.map { |path, bytes| [path, Hashing.sha256_prefixed(bytes)] }.sort_by(&:first)
-      serialized = entries.map do |path, hash|
-        "file\0regular\0#{path}\0#{hash}\n"
-      end.join
-      Hashing.sha256_prefixed(serialized)
-    end
   end
 
   module PackageSpecParser

data/lib/pray/package_spec_tree_hash.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require "digest"
+
+module Pray
+  class PackageSpec
+    def tree_hash_for_root(root)
+      validate_relative_paths!
+      file_bytes = {}
+      files.each do |file|
+        path = File.join(root, file)
+        raise Error.integrity("package file missing: #{file}") unless File.exist?(path)
+        raise Error.integrity("package file is a directory: #{file}") if File.directory?(path)
+
+        file_bytes[file] = File.binread(path)
+      end
+      self.class.tree_hash_from_file_bytes(file_bytes)
+    end
+
+    def self.tree_hash_from_file_bytes(file_bytes)
+      # Stream the same bytes the prior string builder emitted so the digest stays identical.
+      digest = Digest::SHA256.new
+      file_bytes.keys.sort.each do |path|
+        bytes = file_bytes.fetch(path)
+        digest << "file\0regular\0"
+        digest << path
+        digest << "\0"
+        digest << "sha256:"
+        digest << Digest::SHA256.hexdigest(bytes)
+        digest << "\n"
+      end
+      Hashing.prefixed_hex_digest(digest.digest)
+    end
+  end
+end

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)
@@ -27,6 +31,9 @@ module Pray
     end
 
     def reject_managed_span_conflicts!(project, rendered, previous_lockfile)
+      fresh_ideals = rendered.each_with_object({}) do |target, ideals|
+        target.managed_spans.each { |span| ideals[span.id] = span.ideal_checksum }
+      end
       active_by_target = rendered.to_h do |target|
         [target.path, target.managed_spans.to_h { |span| [span.id, true] }]
       end
@@ -43,11 +50,16 @@ module Pray
         bodies = RenderPatch.managed_bodies(RenderPatch.split_segments(content))
         spans.each do |span|
           next unless active[span.id] && bodies.key?(span.id)
-          next if Hashing.checksum_managed_span_content(bodies[span.id]) == span.ideal_checksum
+
+          checksum = Hashing.checksum_managed_span_content(bodies[span.id])
+          next if checksum == span.ideal_checksum
+          next if checksum == fresh_ideals[span.id]
 
           raise Error.render(
-            "conflict: managed span `#{span.id}` in `#{target_path}` was edited " \
-            "(`#{span.package}::#{span.export}`)"
+            "conflict: managed span `#{span.id}` in `#{target_path}` differs from lock and from " \
+            "fresh render (`#{span.package}::#{span.export}`).\n" \
+            "Move the destination aside and rerun `pray install`, or restore the managed block " \
+            "to the locked bytes."
           )
         end
       end

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(
@@ -276,18 +277,17 @@ module Pray
     end
 
     def find_prayspec_file(root)
-      files = []
+      found = nil
       Dir.each_child(root) do |entry|
         next unless File.extname(entry) == ".prayspec"
 
         path = File.join(root, entry)
-        files << path if File.file?(path)
-      end
-      case files.length
-      when 1 then files.first
-      when 0 then raise Error.resolution("no prayspec file found in #{root.inspect}")
-      else raise Error.resolution("multiple prayspec files found in #{root.inspect}")
+        next unless File.file?(path)
+        raise Error.resolution("multiple prayspec files found in #{root.inspect}") if found
+
+        found = path
       end
+      found || raise(Error.resolution("no prayspec file found in #{root.inspect}"))
     end
 
     def source_map(sources)

data/lib/pray/resolve_deps.rb

@@ -5,14 +5,35 @@ module Pray
     module_function
 
     def reject_dependency_cycles(packages)
+      return if packages.all? { |package| package.spec.dependencies.all?(&:optional) }
+
       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)
+      return if packages.all? { |package| package.spec.dependencies.none?(&:optional) }
+
+      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.3"
+  GENERATED_BY = "pray 1.26.3"
 end

data/lib/pray.rb

@@ -18,6 +18,7 @@ require_relative "pray/format_manifest"
 require_relative "pray/package_relation"
 require_relative "pray/package_spec"
 require_relative "pray/package_spec_paths"
+require_relative "pray/package_spec_tree_hash"
 require_relative "pray/package_spec_version"
 require_relative "pray/local_prayer"
 require_relative "pray/lockfile"

data/pray-cli.gemspec

@@ -44,5 +44,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "rspec", "~> 3.13"
   spec.add_development_dependency "polyrun", "~> 2.2"
-  spec.add_development_dependency "rbs", "~> 3.9"
+  spec.add_development_dependency "rbs", "~> 4.0"
 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.3
 platform: ruby
 authors:
 - Andrei Makarov
@@ -77,14 +77,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '4.0'
 description: 'Ruby Prayfile CLI and library: resolve, lock, render, verify, and publish
   inference input packages. Consumes path, git, and registry distribution points.'
 email:
@@ -166,6 +166,7 @@ files:
 - lib/pray/package_spec.rb
 - lib/pray/package_spec_paths.rb
 - lib/pray/package_spec_render.rb
+- lib/pray/package_spec_tree_hash.rb
 - lib/pray/package_spec_version.rb
 - lib/pray/path_safety.rb
 - lib/pray/plan.rb
@@ -251,7 +252,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: []