pray-cli 1.20.0 → 1.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4eb951f0ca0abc5ac0aa68ab27e63e4f778c92453fddb9a7cca0115dac1526d9
-  data.tar.gz: 28ba1073042c0c2a77138e35a9ae80688cb1a6075dd16cba5ee1b9aef2c9c3af
+  metadata.gz: cdfebfb1eb131a2329908805545aff6330a96381e7790251da11a615cb30174d
+  data.tar.gz: 10dd49010364b5525e230ec4b567c9fe0fe036ed61e26397db2f6ab8370134cd
 SHA512:
-  metadata.gz: 260a99edc903d99d235b2d9dd40904490fbcc392d67a07a4323d43b1359fead4428976745e438e17767948a1494262daa97b87650965ffc22366267c8faf5226
-  data.tar.gz: f031ff7ebaeceee86829abac7e2f99f060be902ebc586c00e5ad67135d25958248ac7c4fd5425a12068b67d1a01ebd747cacf53501f2c81cc68f3bdcbcfd838d
+  metadata.gz: 6a25b584cc6561c2454642f23e2e6a7245966e928d10c5c7ff903cdab564e82c0ec0b985918fdc0c5586451b6dce770b4cbb9e330e2a78476fb904fa6bf4e9fe
+  data.tar.gz: a53cce034d8cca01ab38119f982515b715c72b70675e9d97999d00cbaa43bf5e804eb205a48fb64846d1b1069fc44d28f535ae9d34be75e945eadbc4426944ab

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # CHANGELOG
 
+## 1.21.0 (2026-10-21)
+
+- Read package catalogs whose `published_at` is an RFC 3339 string or JSON null.
+- Keep prayer sources under `prayers/<name>/`, beside `prayers/v1/` when this project publishes. `prayers/v1/packages/` is catalog metadata. A root `packages/` folder is not a pray source convention.
+- Prevent commands from changing the calling repository when a Git hook passes repository variables such as `GIT_DIR` or `GIT_WORK_TREE`. Explicit Git configuration, including CI credentials and URL rewrites, still applies.
+- Refuse a damaged Git cache that resolves to a parent repository before changing its remote.
+
 ## 1.20.0 (2026-09-18)
 
 - Fetch a locked git catalog revision during `pray install` when the local cache does not have that commit yet. `pray install --offline` still refuses a missing commit.

data/lib/pray/cli/help.rb

@@ -207,11 +207,19 @@ module Pray
           The default directory is prayers/. Use --path to choose another.
           Declares pray "<source>/<name>" once, such as pray "local/project", inside compose when a compose block exists.
           The default name is project. The name v1 is reserved for the distribution layout.
+          Named prayers may sit beside prayers/v1/. Keep sources under prayers/<name>/.
           Without a Prayfile, writes a versioned package spec in the current directory.
           Add spec.version before pray package or pray publish.
           A compose file such as .agents/project.md remains a shortcut for one local file.
         TEXT
-        "repo" => "scaffold a distribution root\n\nUsage: pray repo init",
+        "repo" => <<~TEXT.strip,
+          scaffold a distribution root
+
+          Usage: pray repo init
+
+          Writes prayers/v1/. Git install discovers that catalog. Named prayers may sit beside v1/.
+          Keep sources under prayers/<name>/.
+        TEXT
         "manifest" => "print canonical Prayfile JSON\n\nUsage: pray manifest",
         "package" => "build a distributable prayer archive\n\nUsage: pray package",
         "version" => <<~TEXT.strip,

data/lib/pray/git_materialize.rb

@@ -82,7 +82,7 @@ module Pray
     end
 
     def unpack_archive_prefix(git_dir, dest, revision, prefix)
-      env = ENV.to_h.merge("GIT_TERMINAL_PROMPT" => "0")
+      env = GitRun.git_env("GIT_TERMINAL_PROMPT" => "0")
       stdout, _stderr, status = Open3.capture3(
         env,
         "git",

data/lib/pray/git_run.rb

@@ -5,8 +5,37 @@ require_relative "error"
 
 module Pray
   module GitRun
+    # Mirrors git's own sanitize_repo_env: `git rev-parse --local-env-vars` minus
+    # GIT_CONFIG_PARAMETERS and GIT_CONFIG_COUNT. Git exports these to hooks, so
+    # pray started from a hook would otherwise run every cache command against the
+    # host repository. The two config variables pass through, as they do when git
+    # enters a submodule, because callers such as CI jobs use them to hand git
+    # credentials or URL rewrites, and they cannot select a repository.
+    REPOSITORY_LOCAL_VARIABLES = %w[
+      GIT_ALTERNATE_OBJECT_DIRECTORIES
+      GIT_CONFIG
+      GIT_OBJECT_DIRECTORY
+      GIT_DIR
+      GIT_WORK_TREE
+      GIT_IMPLICIT_WORK_TREE
+      GIT_GRAFT_FILE
+      GIT_INDEX_FILE
+      GIT_NO_REPLACE_OBJECTS
+      GIT_REPLACE_REF_BASE
+      GIT_PREFIX
+      GIT_SHALLOW_FILE
+      GIT_COMMON_DIR
+    ].freeze
+
     module_function
 
+    # Process.spawn merges this hash into the inherited environment, so a nil
+    # value is what removes a variable. Credential, SSH, proxy and global config
+    # variables still pass through.
+    def git_env(extra = {})
+      REPOSITORY_LOCAL_VARIABLES.to_h { |name| [name, nil] }.merge(extra)
+    end
+
     def run_git(cwd, *arguments)
       output, status = capture_git(cwd, *arguments)
       return if status.success?
@@ -20,7 +49,7 @@ module Pray
     end
 
     def capture_git(cwd, *arguments)
-      env = ENV.to_h.merge("GIT_TERMINAL_PROMPT" => "0")
+      env = git_env("GIT_TERMINAL_PROMPT" => "0")
       Open3.capture2e(
         env,
         "git",

data/lib/pray/git_store.rb

@@ -73,6 +73,7 @@ module Pray
     end
 
     def ensure_git_remote_origin(repository, clone_url)
+      require_own_git_dir(repository)
       if GitRun.try_run_git(repository, "remote", "get-url", "origin")
         GitRun.run_git(repository, "remote", "set-url", "origin", clone_url)
       else
@@ -80,6 +81,29 @@ module Pray
       end
     end
 
+    # Git searches parent directories when `repository` is not a valid git
+    # directory, so a damaged cache inside another checkout would otherwise
+    # rewrite that checkout's origin.
+    def require_own_git_dir(repository)
+      output, status = GitRun.capture_git(repository, "rev-parse", "--absolute-git-dir")
+      resolved = status.success? ? output.strip : ""
+      own = [repository, File.join(repository, ".git")].any? do |candidate|
+        real_path(candidate) && real_path(candidate) == real_path(resolved)
+      end
+      return if own
+
+      raise Error.resolution(
+        "git cache #{repository} is not a usable git repository (git resolved #{resolved.inspect}). " \
+        "Remove it and run the command again."
+      )
+    end
+
+    def real_path(path)
+      File.realpath(path)
+    rescue SystemCallError
+      nil
+    end
+
     def fetch_origin_tip(db, clone_url)
       ensure_git_remote_origin(db, clone_url)
       unless GitRun.try_run_git(db, "fetch", "--depth", "1", "--filter=blob:none", "origin")

data/lib/pray/registry.rb

@@ -165,9 +165,9 @@ module Pray
 
     def publish_timestamp_from_value(value)
       timestamp = case value
+      when nil then return nil
       when Integer then value
-      when String
-        value.match?(/\A\d+\z/) ? value.to_i : Time.iso8601(value).to_i
+      when String then value.match?(/\A\d+\z/) ? value.to_i : Time.iso8601(value).to_i
       end
       unless timestamp&.between?(0, 253_402_300_799)
         raise Error.integrity("registry published_at must be whole UTC Unix seconds")

data/lib/pray/trust_ops.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "json"
+require_relative "git_run"
 
 module Pray
   module Trust
@@ -189,7 +190,7 @@ module Pray
 
     def git_format(repository, format)
       output = IO.popen(
-        ["git", "-C", repository, "log", "-1", "--format=#{format}"],
+        [GitRun.git_env, "git", "-C", repository, "log", "-1", "--format=#{format}"],
         err: File::NULL, &:read
       )
       return "" unless $?.success?

data/lib/pray/version.rb

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

metadata

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