pray-cli 1.22.0 → 1.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98ff5ea4c8847034ac02621b75593119ad7b5810fdde65e25998f0702b326a4a
-  data.tar.gz: a6f9245375fad4ae3b49eeb71e97cb51ccd4554dcd0e98e7acf64cc8b1d1864c
+  metadata.gz: 9fa10db14b7b45fdd5152a06e02fdf4312ca40fa575529ecd7448722caea437c
+  data.tar.gz: f53a2e0ca8b6d8a5d97a8a45903953a9b20c900864a354b8ea494e986eb9d815
 SHA512:
-  metadata.gz: a7cf4893383addd2ad24b02f36be80543e4fac33ef93b0f606de2ee4370b4be8998b361ed9739d43424aa872e9c1748009fd04f176aa28a64e2cddda15249b3b
-  data.tar.gz: f4c71dccd6a7f7faf2e4a266893ff693ffdd10827061c85213c87dacd167fc0482d7fac32e67db6ed868809d6a02dff1c9f4fc8b4275d8f74c511be394bb782e
+  metadata.gz: 21c44b12b0e8bf97d429491f4c32969a6700857c28b2b4b0981312dab4032279f7e52b4a4bd050984578469287554497e0ccff96a36ff6a3f99e69b97bbe1790
+  data.tar.gz: 11b795d9454a35f763cab755f82747c4470303912ef4269dd399d0b89266ad6833cf2246462b39113acfaccc494b904eba026d0e3813709a5e62735fcb74617e

data/CHANGELOG.md

@@ -2,6 +2,16 @@
 
 ## Unreleased
 
+## 1.23.0 (2026-10-26)
+
+- Leave package catalog JSON bytes alone when publish reports a version unchanged. A load and rewrite round trip no longer strips trailing newlines or reorders keys such as `artifact_hash` relative to `yanked`.
+- Refuse private, parent-relative, and symbolic-link paths from distribution readers. Reject symbolic-link source files and package paths.
+- Treat `~> 1.4` as allowing later 1.x releases and keep `~> 1.4.0` within the 1.4 patch line.
+- Render every legacy target output and enforce `max_bytes`.
+- Refuse two packages or exports that claim the same provisioned destination, and name both owners in the error.
+- Emit valid TOML and JSON escapes for lock and manifest values containing control characters.
+- Reduce repeated parser and render scans.
+
 ## 1.22.0 (2026-10-22)
 
 - Keep and create catalog `derived_metadata` on publish. Unchanged republishes and version appends no longer strip historical summaries, topics, or embeddings.

data/lib/pray/constraint.rb

@@ -74,7 +74,7 @@ module Pray
       lower = numbers.join(".")
       upper = case parts.length
       when 1 then "#{numbers[0] + 1}.0.0"
-      when 2 then "#{numbers[0]}.#{numbers[1] + 1}.0"
+      when 2 then "#{numbers[0] + 1}.0.0"
       else "#{numbers[0]}.#{numbers[1] + 1}.0"
       end
       ">= #{lower}, < #{upper}"

data/lib/pray/destination.rb

@@ -41,9 +41,15 @@ module Pray
       target
     end
 
-    def upsert_package(manifest, package)
-      existing = manifest.packages.find { |candidate| candidate.name == package.name }
+    def upsert_package(manifest, package, package_indices = nil)
+      existing_index = package_indices&.[](package.name)
+      existing = if existing_index
+        manifest.packages[existing_index]
+      elsif package_indices.nil?
+        manifest.packages.find { |candidate| candidate.name == package.name }
+      end
       unless existing
+        package_indices[package.name] = manifest.packages.length if package_indices
         manifest.packages << package
         return
       end
@@ -93,9 +99,15 @@ module Pray
       end
     end
 
-    def upsert_local(manifest, local)
-      existing = manifest.local.find { |candidate| candidate.path == local.path }
+    def upsert_local(manifest, local, local_indices = nil)
+      existing_index = local_indices&.[](local.path)
+      existing = if existing_index
+        manifest.local[existing_index]
+      elsif local_indices.nil?
+        manifest.local.find { |candidate| candidate.path == local.path }
+      end
       unless existing
+        local_indices[local.path] = manifest.local.length if local_indices
         manifest.local << local
         return
       end
@@ -108,17 +120,25 @@ module Pray
       existing.file ||= local.file
     end
 
-    def bind_package_entry(target, package_name)
+    def bind_package_entry(target, package_name, package_names = nil)
       entry = DestinationEntry.package(package_name)
-      return if target.entries.any? { |candidate| candidate.kind == "package" && candidate.name == package_name }
+      exists = package_names ? package_names.key?(package_name) : target.entries.any? do |candidate|
+        candidate.kind == "package" && candidate.name == package_name
+      end
+      return if exists
 
       target.entries << entry
+      package_names[package_name] = true if package_names
     end
 
-    def bind_local_entry(target, path)
-      return if target.entries.any? { |candidate| candidate.kind == "local" && candidate.path == path }
+    def bind_local_entry(target, path, local_paths = nil)
+      exists = local_paths ? local_paths.key?(path) : target.entries.any? do |candidate|
+        candidate.kind == "local" && candidate.path == path
+      end
+      return if exists
 
       target.entries << DestinationEntry.local(path)
+      local_paths[path] = true if local_paths
     end
 
     def role_for_destination(mode)

data/lib/pray/literal.rb

@@ -81,7 +81,7 @@ module Pray
         when "]", "}", ")"
           depth -= 1
         else
-          return index if depth.zero? && input[index..].start_with?(token)
+          return index if depth.zero? && input[index, token.length] == token
         end
         index += 1
       end
@@ -151,6 +151,7 @@ module Pray
     end
 
     def strip_line_comment(line)
+      return line unless line.include?("#")
       quote = nil
       escaped = false
       line.each_char.with_index do |character, index|
@@ -190,7 +191,7 @@ module Pray
         end
       end
 
-      def peek = remaining[0]
+      def peek = @input[@cursor]
 
       def next_character
         character = peek
@@ -370,9 +371,7 @@ module Pray
         LiteralValue.new(kind: :string, value: @input[start...@cursor])
       end
 
-      def identifier_start?(character)
-        character && (character.match?(/[[:alpha:]]/) || character == "_")
-      end
+      def identifier_start?(character) = character && (character.match?(/[[:alpha:]]/) || character == "_")
 
       def identifier_continue?(character)
         character.match?(%r{[[:alnum:]_\-.\\/]})

data/lib/pray/lockfile_serialize.rb

@@ -144,7 +144,12 @@ module Pray
     end
 
     def format_string(value)
-      escaped = value.gsub("\\", "\\\\").gsub("\"", "\\\"")
+      escapes = {8 => "\\b", 9 => "\\t", 10 => "\\n", 12 => "\\f", 13 => "\\r", 34 => "\\\"", 92 => "\\\\"}
+      escaped = value.each_codepoint.map do |codepoint|
+        escapes.fetch(codepoint) do
+          (codepoint < 32 || codepoint == 127) ? format("\\u%04X", codepoint) : codepoint.chr(Encoding::UTF_8)
+        end
+      end.join
       "\"#{escaped}\""
     end
 

data/lib/pray/manifest_json.rb

@@ -1,11 +1,13 @@
 # frozen_string_literal: true
 
+require "json"
+
 module Pray
   module ManifestJson
     module_function
 
     def encode_compact(manifest)
-      encode_object(manifest_fields(manifest))
+      JSON.generate(manifest_fields(manifest))
     end
 
     def manifest_fields(manifest)
@@ -109,31 +111,5 @@ module Pray
         "header" => render.header
       }
     end
-
-    def encode_object(hash)
-      entries = hash.map { |key, value| "#{encode_string(key)}:#{encode_value(value)}" }
-      "{#{entries.join(",")}}"
-    end
-
-    def encode_array(array)
-      "[#{array.map { |value| encode_value(value) }.join(",")}]"
-    end
-
-    def encode_value(value)
-      case value
-      when Hash then encode_object(value)
-      when Array then encode_array(value)
-      when String then encode_string(value)
-      when TrueClass, FalseClass then value.to_s
-      when NilClass then "null"
-      when Integer then value.to_s
-      else
-        raise Error.manifest("unsupported JSON value: #{value.inspect}")
-      end
-    end
-
-    def encode_string(text)
-      "\"#{text.gsub("\\", "\\\\").gsub("\"", "\\\"").gsub("\n", "\\n").gsub("\r", "\\r").gsub("\t", "\\t")}\""
-    end
   end
 end

data/lib/pray/manifest_parser.rb

@@ -12,6 +12,10 @@ module Pray
         @cursor = 0
         @group_stack = []
         @surface = StatementSurface::Reader.new
+        @package_indices = {}
+        @local_indices = {}
+        @target_package_names = {}
+        @target_local_paths = {}
       end
 
       def parse_root
@@ -59,7 +63,7 @@ module Pray
         when /\Aagent (.+)\z/
           apply_agent_package(manifest, Regexp.last_match(1))
         when /\Apackage (.+)\z/
-          Destination.upsert_package(manifest, parse_package_with_groups(Regexp.last_match(1)))
+          upsert_package(manifest, parse_package_with_groups(Regexp.last_match(1)))
         when /\A(?:pray|use|include) (.+)\z/
           apply_pray_statement(manifest, Regexp.last_match(1), nil)
         when /\Alocal (.+)\z/
@@ -113,13 +117,13 @@ module Pray
 
       def apply_agent_package(manifest, rest)
         manifest.note_deprecated_keyword("agent")
-        Destination.upsert_package(manifest, parse_package_with_groups(rest))
+        upsert_package(manifest, parse_package_with_groups(rest))
       end
 
       def apply_unbound_local(manifest, rest)
         local = parse_local_decl(rest)
         local.bound = false
-        Destination.upsert_local(manifest, local)
+        upsert_local(manifest, local)
       end
 
       def parse_package_with_groups(rest)
@@ -128,6 +132,24 @@ module Pray
         package
       end
 
+      def upsert_package(manifest, package)
+        Destination.upsert_package(manifest, package, @package_indices)
+      end
+
+      def upsert_local(manifest, local)
+        Destination.upsert_local(manifest, local, @local_indices)
+      end
+
+      def bind_package_entry(target, name)
+        names = (@target_package_names[target.object_id] ||= {})
+        Destination.bind_package_entry(target, name, names)
+      end
+
+      def bind_local_entry(target, path)
+        paths = (@target_local_paths[target.object_id] ||= {})
+        Destination.bind_local_entry(target, path, paths)
+      end
+
       def next_statement
         pending = @surface.next
         return pending if pending

data/lib/pray/manifest_parser_blocks.rb

@@ -33,9 +33,9 @@ module Pray
           return if statement == "end"
           if (match = statement.match(/\Aagent (.+)\z/))
             manifest.note_deprecated_keyword("agent")
-            Destination.upsert_package(manifest, parse_package_with_groups(match[1]))
+            upsert_package(manifest, parse_package_with_groups(match[1]))
           elsif (match = statement.match(/\A(?:package|pray|use|include) (.+)\z/))
-            Destination.upsert_package(manifest, parse_package_with_groups(match[1]))
+            upsert_package(manifest, parse_package_with_groups(match[1]))
           elsif /\Agroup (.+)\z/.match?(statement)
             raise Error.parse("manifest", "nested group blocks are not supported")
           else
@@ -95,8 +95,8 @@ module Pray
       def bind_compose_local(manifest, index, rest)
         local = parse_local_decl(rest)
         local.bound = true
-        Destination.bind_local_entry(manifest.targets[index], local.path)
-        Destination.upsert_local(manifest, local)
+        bind_local_entry(manifest.targets[index], local.path)
+        upsert_local(manifest, local)
       end
 
       def parse_file_block(manifest, rest)
@@ -154,7 +154,7 @@ module Pray
         package.file = file_path
         package.bound = true
         package.roles << "file" unless package.roles.include?("file")
-        Destination.upsert_package(manifest, package)
+        upsert_package(manifest, package)
       end
 
       def apply_pray_statement(manifest, rest, destination_index)
@@ -196,9 +196,9 @@ module Pray
           package.bound = true
           role = Destination.role_for_destination(mode)
           package.roles << role if role && !package.roles.include?(role)
-          Destination.bind_package_entry(manifest.targets[destination_index], package.name)
+          bind_package_entry(manifest.targets[destination_index], package.name)
         end
-        Destination.upsert_package(manifest, package)
+        upsert_package(manifest, package)
       end
 
       def parse_target_block(manifest, target_index)

data/lib/pray/publish.rb

@@ -34,7 +34,7 @@ module Pray
         stored_artifact = stored_package_artifact(root, artifact_path, package, existing, distribution)
         if stored_artifact && stored_publish_matches?(stored_artifact, package, existing)
           package_names << package.declaration.name
-          write_registry_package_metadata(metadata_path, metadata)
+          # Intent: unchanged packages keep on-disk catalog bytes (newline, key order).
           report_unchanged(package, dest_name, target)
           stats[:unchanged] += 1
           next

data/lib/pray/render.rb

@@ -4,6 +4,7 @@ require "fileutils"
 require "pathname"
 require_relative "render_content"
 require_relative "render_managed"
+require_relative "render_project"
 
 module Pray
   RenderedTarget = Struct.new(:path, :content, :managed_spans) do
@@ -15,16 +16,6 @@ module Pray
   module Render
     module_function
 
-    def render_project(project)
-      rendered = []
-      project.manifest.targets.each do |target|
-        output = target.outputs.first
-        next unless output
-        rendered << render_target(project, target, output)
-      end
-      rendered
-    end
-
     def write_rendered_targets(project, rendered, previous_lockfile = nil)
       Transaction.run(project.project_root) { RenderDest.write_rendered_targets(project, rendered, previous_lockfile) }
     end
@@ -56,7 +47,18 @@ module Pray
           end
         end
       end
-      planned.sort_by(&:path).uniq(&:path)
+      planned.sort_by! { |file| [file.path, file.package, file.export] }
+      planned.each_cons(2) do |left, right|
+        next unless left.path == right.path
+        next if left.package == right.package && left.export == right.export
+
+        raise Error.render(
+          "provisioned destination `#{left.path}` has multiple owners: " \
+          "package `#{left.package}` export `#{left.export}` and " \
+          "package `#{right.package}` export `#{right.export}`"
+        )
+      end
+      planned.uniq(&:path)
     end
 
     PlannedProvisionedFile = Struct.new(:path, :source, :package, :export, keyword_init: true)
@@ -74,12 +76,23 @@ module Pray
       append_header(builder, project, target, output)
       symbols = project.manifest.symbols || {}
       managed_spans = []
+      locals_by_path = project.local_files.to_h { |local| [local.manifest_path, local] }
+      packages_by_name = project.packages.to_h { |package| [package.declaration.name, package] }
 
       (target.entries || []).each do |entry|
         if entry.kind == "local"
-          append_scoped_local(builder, managed_spans, project, target, output, entry.path, symbols)
+          local = locals_by_path[entry.path]
+          append_managed_local(builder, managed_spans, local, target, output, symbols) if local
         else
-          append_scoped_package(builder, managed_spans, project, target, output, entry.name, symbols)
+          package = packages_by_name[entry.name]
+          next unless package
+          next unless Environment.package_matches_environment?(package.declaration.groups, project.environment)
+
+          package.selected_exports.each do |export|
+            next unless should_inline_export?(package, export)
+
+            append_managed_export(builder, managed_spans, package, export, target, output, symbols)
+          end
         end
       end
 
@@ -133,25 +146,6 @@ module Pray
       builder.append_empty_line
     end
 
-    def append_scoped_local(builder, managed_spans, project, target, output, path, symbols)
-      local = project.local_files.find { |candidate| candidate.manifest_path == path }
-      return unless local
-
-      append_managed_local(builder, managed_spans, local, target, output, symbols)
-    end
-
-    def append_scoped_package(builder, managed_spans, project, target, output, package_name, symbols)
-      package = project.packages.find { |candidate| candidate.declaration.name == package_name }
-      return unless package
-      return unless Environment.package_matches_environment?(package.declaration.groups, project.environment)
-
-      package.selected_exports.each do |export|
-        next unless should_inline_export?(package, export)
-
-        append_managed_export(builder, managed_spans, package, export, target, output, symbols)
-      end
-    end
-
     def should_inline_export?(package, export_name)
       export = package.spec.exports[export_name]
       export.nil? || %w[fragment file].include?(export.kind)

data/lib/pray/render_content.rb

@@ -3,16 +3,16 @@
 module Pray
   module Render
     class ContentBuilder
+      attr_reader :next_line_number
+
       def initialize
         @content = +""
-      end
-
-      def next_line_number
-        @content.count("\n") + 1
+        @next_line_number = 1
       end
 
       def append_line(line)
         @content << line << "\n"
+        @next_line_number += 1
       end
 
       def append_empty_line

data/lib/pray/render_project.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Pray
+  module Render
+    module_function
+
+    def render_project(project)
+      project.manifest.targets.flat_map do |target|
+        target.outputs.map do |output|
+          rendered = render_target(project, target, output)
+          if target.max_bytes && rendered.content.bytesize > target.max_bytes
+            raise Error.render(
+              "target `#{target.name}` output `#{output}` is #{rendered.content.bytesize} bytes; " \
+              "max_bytes is #{target.max_bytes}"
+            )
+          end
+          rendered
+        end
+      end
+    end
+  end
+end

data/lib/pray/resolve.rb

@@ -154,8 +154,8 @@ module Pray
         project_root, sources, git_sources, user_config, declaration, lockfile, options
       )
       spec_path = find_prayspec_file(root)
-      spec_text = File.read(spec_path)
-      spec = Pray.parse_package_spec(spec_text).canonicalized
+      spec_text = SourcePath.read(root, File.basename(spec_path), "package specification").force_encoding(Encoding::UTF_8)
+      spec = Pray.parse_package_spec(spec_text)
       if spec.name != declaration.name
         raise Error.resolution(
           "package path #{root.inspect} declares #{spec.name.inspect}, expected #{declaration.name.inspect}"
@@ -195,9 +195,11 @@ module Pray
       offline = options.offline
       preferred_version = options.preferred_lock_version(lockfile, declaration.name)
       if (local_path = user_config.local.package[declaration.name])
-        return [File.expand_path(local_path, project_root), nil]
+        return [SourcePath.declared_directory(project_root, local_path, "package directory"), nil]
+      end
+      if declaration.path
+        return [SourcePath.declared_directory(project_root, declaration.path, "package directory"), nil]
       end
-      return [File.expand_path(declaration.path, project_root), nil] if declaration.path
       return [ResolveTarball.package_root(project_root, declaration.tarball, offline: offline), nil] if declaration.tarball
       source_name = ResolveSource.implied_source_name(declaration, sources)
       if source_name
@@ -220,7 +222,8 @@ module Pray
         case source.kind
         when "path"
           directory = LocalPrayer.path_source_package_directory(source_name, declaration.name)
-          return [File.join(project_root, source.url, directory), nil]
+          relative = File.join(source.url, directory)
+          return [SourcePath.declared_directory(project_root, relative, "package directory"), nil]
         when "registry", "static index"
           resolved = Registry.resolve_registry_package_root(
             project_root,
@@ -264,7 +267,8 @@ module Pray
 
       raise Error.unsupported("remote sources are not implemented yet") if declaration.git || declaration.oci
 
-      [File.join(project_root, declaration.name.tr("/", "-")), nil]
+      slug = declaration.name.tr("/", "-")
+      [SourcePath.declared_directory(project_root, slug, "package directory"), nil]
     end
 
     def resolve_package_root(project_root, sources, git_sources, user_config, declaration, lockfile = nil)
@@ -272,9 +276,12 @@ module Pray
     end
 
     def find_prayspec_file(root)
-      files = Dir.children(root).filter_map do |entry|
+      files = []
+      Dir.each_child(root) do |entry|
+        next unless File.extname(entry) == ".prayspec"
+
         path = File.join(root, entry)
-        (File.file?(path) && File.extname(entry) == ".prayspec") ? path : nil
+        files << path if File.file?(path)
       end
       case files.length
       when 1 then files.first
@@ -296,15 +303,7 @@ module Pray
     end
 
     def load_package_file_bytes(root, spec)
-      file_bytes = {}
-      spec.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
-      file_bytes
+      spec.files.to_h { |file| [file, SourcePath.read(root, file, "package file")] }
     end
 
     def build_skill_file_index(spec)
@@ -331,12 +330,7 @@ module Pray
     end
 
     def skill_relative_file(file, skill_prefix)
-      return nil unless file.start_with?(skill_prefix)
-
-      relative = file.delete_prefix(skill_prefix).delete_prefix("/")
-      return nil if relative.empty? || file == skill_prefix
-
-      relative
+      file.delete_prefix("#{skill_prefix.delete_suffix("/")}/") if file.start_with?("#{skill_prefix.delete_suffix("/")}/")
     end
   end
 end

data/lib/pray/resolve_local.rb

@@ -11,6 +11,7 @@ module Pray
 
     def resolve_local_file(project_root, declaration)
       path = File.join(project_root, declaration.path)
+      SourcePath.reject_symlinks!(project_root, declaration.path, "local source")
       unless File.exist?(path)
         if declaration.optional
           return ResolvedLocalFile.new(

data/lib/pray/serve.rb

@@ -118,7 +118,7 @@ module Pray
         return html_response("<h1>Pray distribution</h1>")
       end
 
-      file_path = PathSafety.join_under_root(root, path.delete_prefix("/"))
+      file_path = public_distribution_path(root, path)
       return not_found unless file_path
       return not_found unless File.file?(file_path)
       return payload_too_large if File.size(file_path) > ResourceLimits::MAX_HTTP_RESPONSE_BYTES
@@ -129,6 +129,20 @@ module Pray
       ranged_response(status, content_type, ranged_body, content_range)
     end
 
+    def public_distribution_path(root, request_path)
+      relative = PathSafety.sanitize_relative_path(request_path)
+      exact = %w[v1/index.json v1/distribution.json v1/trust.json]
+      return nil unless exact.include?(relative) || relative.start_with?("v1/packages/", "v1/artifacts/")
+
+      file_path = PathSafety.join_under_root(root, relative)
+      return nil unless file_path
+
+      SourcePath.reject_symlinks!(root, relative, "distribution file")
+      file_path
+    rescue Error
+      nil
+    end
+
     def content_type_for(path)
       case File.extname(path)
       when ".json" then "application/json"

data/lib/pray/serve_federation.rb

@@ -51,6 +51,7 @@ module Pray
 
     def package_response(root, path)
       name = path.delete_prefix("/v1/sync/package/")
+      PathSafety.validate_registry_cache_identity!(name, "metadata")
       metadata_path = Publish.registry_metadata_path(root, name)
       return Serve.not_found unless File.file?(metadata_path)
 
@@ -61,6 +62,8 @@ module Pray
         "versions" => metadata.versions.map { |version| transport_version(version) }
       }
       Serve.ok_response("application/json", JSON.pretty_generate(body))
+    rescue Error
+      Serve.not_found
     end
 
     def append_confession(root, body)

data/lib/pray/source_path.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require "pathname"
+
+module Pray
+  module SourcePath
+    module_function
+
+    def declared_directory(root, relative, label)
+      reject_symlinks!(root, relative, label)
+      File.expand_path(relative, root)
+    end
+
+    def reject_symlinks!(root, relative, label)
+      current = Pathname(relative).absolute? ? File::SEPARATOR : root
+      status = nil
+      Pathname(relative).each_filename do |component|
+        current = File.join(current, component)
+        status = File.lstat(current)
+        raise Error.integrity("#{label} uses a symbolic link: #{relative}") if status.symlink?
+      rescue Errno::ENOENT
+        return nil
+      end
+      status
+    end
+
+    def read(root, relative, label)
+      status = reject_symlinks!(root, relative, label)
+      raise Error.integrity("#{label} missing: #{relative}") unless status
+      raise Error.integrity("#{label} is a directory: #{relative}") if status.directory?
+
+      File.binread(File.join(root, relative))
+    end
+  end
+end

data/lib/pray/statement_surface.rb

@@ -7,6 +7,7 @@ module Pray
     def expand_statement_surface(statement)
       trimmed = statement.strip
       return [] if trimmed.empty?
+      return [normalize_keyword_call(trimmed)] unless trimmed.include?(";") || trimmed.include?("{")
 
       Literal.split_top_level(trimmed, ";").flat_map { |segment| expand_one_surface(segment) }
     end
@@ -15,7 +16,7 @@ module Pray
       trimmed = statement.strip
       return [] if trimmed.empty?
 
-      braced = expand_brace_block(trimmed)
+      braced = expand_brace_block(trimmed) if trimmed.include?("{")
       return braced if braced
 
       [normalize_keyword_call(trimmed)]
@@ -71,6 +72,7 @@ module Pray
     def normalize_keyword_call(statement)
       spaced = normalize_spaced_block_opener(statement)
       return spaced if spaced
+      return statement unless statement.include?("(")
 
       keyword = leading_identifier(statement)
       return statement unless keyword

data/lib/pray/trust.rb

@@ -110,10 +110,11 @@ module Pray
     end
 
     def prepare_source_host_keys(sources)
-      policy = load_policy_or_default
-      sources.each_with_object({}) do |source, host_keys|
-        next unless source.kind == "pray_ssh"
+      ssh_sources = sources.select { |source| source.kind == "pray_ssh" }
+      return {} if ssh_sources.empty?
 
+      policy = load_policy_or_default
+      ssh_sources.each_with_object({}) do |source, host_keys|
         rule = best_rule(policy, source.url)
         fingerprint = rule.allowed_host_keys.first
         host_keys[source.name] = fingerprint if fingerprint

data/lib/pray/version.rb

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

data/lib/pray.rb

@@ -26,6 +26,7 @@ require_relative "pray/dotenv"
 require_relative "pray/project_context"
 require_relative "pray/environment"
 require_relative "pray/resolve_context"
+require_relative "pray/source_path"
 require_relative "pray/resolve_source"
 require_relative "pray/resolve_exports"
 require_relative "pray/dependency_graph"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pray-cli
 version: !ruby/object:Gem::Version
-  version: 1.22.0
+  version: 1.23.0
 platform: ruby
 authors:
 - Andrei Makarov
@@ -182,6 +182,7 @@ files:
 - lib/pray/render_layout.rb
 - lib/pray/render_managed.rb
 - lib/pray/render_patch.rb
+- lib/pray/render_project.rb
 - lib/pray/resolve.rb
 - lib/pray/resolve_context.rb
 - lib/pray/resolve_deps.rb
@@ -194,6 +195,7 @@ files:
 - lib/pray/serve_federation.rb
 - lib/pray/serve_range.rb
 - lib/pray/session.rb
+- lib/pray/source_path.rb
 - lib/pray/ssh_agent.rb
 - lib/pray/statement_surface.rb
 - lib/pray/substitute.rb