pray-cli 1.12.0 → 1.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68bb4b372a260d62b3cfce3bdc74811b85c2cff0446adf0bd551065b0214fbb1
-  data.tar.gz: 3bfc7db4cd0b6227a554199f6c8cbf8fd2e4c1e2715be48f7d102903e7a26bb2
+  metadata.gz: 58da4ada7990f04bc2acf64b33bca633828a586f0918e1e3ff00cc50ddaeb7c5
+  data.tar.gz: ffc0855f9f9dc6466fe1260905b23d9ab74a5d96905562f8307f472dde851849
 SHA512:
-  metadata.gz: '095670c5e563280d0610d1eefa2ef2a825e2676aaff537c54eda62ad97ee11a631dc5328648614bfdd69b6dca744c7377fea9fef3b5cc0c4d3341ad511adb4be'
-  data.tar.gz: a820d50b02742e1b8a7c79fe9075f48e6ae7c90f3551dba8e8fbb37c7ed28d2e7089ac9fe81b82c2db7e8bf7d20f926840084d841e30bb3d2a733efa68e2892f
+  metadata.gz: 20cab97de54d753c4f7191f6a68469bbc7f4801e16999e7ca8ee13c0e1c5c27e53b8e0c436695a6f457cb169e7f4389d41407f9e56752cf7fed33c329b5fa94b
+  data.tar.gz: 109496e4410f4bc43f63af51a73ec3439f87348a5c1e94dbed712799416d8e47286360f97bb50e37aaad096f8c0957fc3e2a9a26840167fefe7ea1d6dbb66abd

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+## 1.12.1 (2026-09-08)
+
+- Refresh a locked git catalog during `pray install` when a newly declared package is missing from the pinned revision, and name that revision with `pray update` if it is still missing.
+
 ## 1.12.0 (2026-09-07)
 
 - Speed up planning for large package trees and reuse the resolved lock during installation.

data/lib/pray/git_refresh.rb

@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+module Pray
+  module GitRefresh
+    module_function
+
+    def resolution_may_benefit_from_git_source_refresh?(error)
+      error.category == :resolution && catalog_miss_message?(error.message)
+    end
+
+    def catalog_miss_message?(message)
+      message.include?("no registry version") ||
+        message.include?("not found in distribution") ||
+        message.include?("not found in git source") ||
+        message.include?("v1/packages/")
+    end
+
+    def annotate_missing_git_catalog(error, package_name:, source_name:, revision:)
+      return error unless error.category == :resolution
+      return error if revision.to_s.empty?
+      return error unless catalog_miss_message?(error.message)
+      return error if error.message.include?("not found in git source")
+
+      Error.resolution(
+        "package #{package_name} was not found in git source #{source_name} at revision #{revision}. " \
+        "Run `pray update` to advance the source pin."
+      )
+    end
+
+    def annotate_failed_refresh(lockfile_path, error)
+      return error unless error.category == :resolution
+      return error unless catalog_miss_message?(error.message)
+
+      pins = locked_git_revision_guidance(lockfile_path)
+      return error if pins.nil?
+
+      package = package_name_from_catalog_miss(error.message) || "the declared package"
+      Error.resolution(
+        "package #{package} was not found in locked git source (#{pins}). " \
+        "Run `pray update` to advance the source pin."
+      )
+    end
+
+    def locked_git_revision_guidance(lockfile_path)
+      return unless File.exist?(lockfile_path)
+
+      lockfile = LockfileIO.read_lockfile(lockfile_path)
+      pins = lockfile.source.filter_map do |source|
+        next unless source.kind == "git" && source.revision
+
+        "#{source.name} at #{source.revision}"
+      end
+      pins.empty? ? nil : pins.join(", ")
+    rescue Error
+      nil
+    end
+
+    def package_name_from_catalog_miss(message)
+      rest = message.delete_prefix("package ")
+      return if rest == message
+
+      ending = rest.index(" was not found") || rest.index(" not found")
+      return unless ending
+
+      name = rest[0, ending].strip
+      name.empty? ? nil : name
+    end
+  end
+end

data/lib/pray/invocation.rb

@@ -49,10 +49,14 @@ module Pray
       if allow_git_refresh_fallback &&
           !options.offline &&
           !options.refresh &&
-          Resolve.resolution_may_benefit_from_git_source_refresh?(error)
+          GitRefresh.resolution_may_benefit_from_git_source_refresh?(error)
         refreshed = options.dup
         refreshed.refresh = true
-        resolve_current_project(refreshed)
+        begin
+          resolve_current_project(refreshed)
+        rescue Error => retry_error
+          raise GitRefresh.annotate_failed_refresh(lockfile_path, retry_error)
+        end
       else
         raise
       end

data/lib/pray/materialize.rb

@@ -34,10 +34,17 @@ module Pray
         if allow_git_refresh_fallback &&
             !offline &&
             !refresh &&
-            Resolve.resolution_may_benefit_from_git_source_refresh?(error)
+            GitRefresh.resolution_may_benefit_from_git_source_refresh?(error)
           refreshed = options.dup
           refreshed.refresh = true
-          Resolve.resolve_project_in_context(manifest_path, project_root, refreshed)
+          begin
+            Resolve.resolve_project_in_context(manifest_path, project_root, refreshed)
+          rescue Error => retry_error
+            raise GitRefresh.annotate_failed_refresh(
+              default_lockfile_path(project_root),
+              retry_error
+            )
+          end
         else
           raise
         end

data/lib/pray/resolve.rb

@@ -127,14 +127,21 @@ module Pray
           !refresh &&
           resolution_may_benefit_from_git_source_refresh?(error)
         refreshed = ResolveOptions.new(offline: offline, refresh: true, environment: environment)
-        resolve_project_with_options(manifest_path, refreshed)
+        begin
+          resolve_project_with_options(manifest_path, refreshed)
+        rescue Error => retry_error
+          raise GitRefresh.annotate_failed_refresh(
+            File.join(File.dirname(File.expand_path(manifest_path)), "Prayfile.lock"),
+            retry_error
+          )
+        end
       else
         raise
       end
     end
 
     def resolution_may_benefit_from_git_source_refresh?(error)
-      error.category == :resolution && error.message.include?("no registry version")
+      GitRefresh.resolution_may_benefit_from_git_source_refresh?(error)
     end
 
     def missing_local_embed_guidance(path)
@@ -228,14 +235,23 @@ module Pray
           clone_url = source.url.delete_prefix("git+")
           distribution_root = GitSources.resolve_distribution_root(checkout.cache_directory, checkout.subdir)
           source_key = checkout.revision.to_s.empty? ? clone_url : "#{clone_url}@#{checkout.revision}"
-          resolved = Registry.resolve_local_registry_package_root(
-            project_root,
-            source_key,
-            distribution_root,
-            declaration,
-            preferred_version: lockfile_preferred_version(lockfile, declaration.name),
-            offline: offline
-          )
+          resolved = begin
+            Registry.resolve_local_registry_package_root(
+              project_root,
+              source_key,
+              distribution_root,
+              declaration,
+              preferred_version: lockfile_preferred_version(lockfile, declaration.name),
+              offline: offline
+            )
+          rescue Error => error
+            raise GitRefresh.annotate_missing_git_catalog(
+              error,
+              package_name: declaration.name,
+              source_name: source.name,
+              revision: checkout.revision
+            )
+          end
           return [resolved.root, resolved.registry_latest_version]
         else
           raise Error.unsupported("source kind #{source.kind} not implemented yet")

data/lib/pray/version.rb

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

data/lib/pray.rb

@@ -22,6 +22,7 @@ require_relative "pray/resolve_context"
 require_relative "pray/resolve_source"
 require_relative "pray/resolve_exports"
 require_relative "pray/invocation"
+require_relative "pray/git_refresh"
 require_relative "pray/resolve"
 require_relative "pray/compose_dest"
 require_relative "pray/render_patch"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pray-cli
 version: !ruby/object:Gem::Version
-  version: 1.12.0
+  version: 1.12.1
 platform: ruby
 authors:
 - Andrei Makarov
@@ -130,6 +130,7 @@ files:
 - lib/pray/error.rb
 - lib/pray/format_manifest.rb
 - lib/pray/format_serialize.rb
+- lib/pray/git_refresh.rb
 - lib/pray/git_sources.rb
 - lib/pray/hashing.rb
 - lib/pray/http_body.rb