pray-cli 1.9.2 → 1.11.0

data/lib/pray/render_patch.rb

@@ -0,0 +1,107 @@
+# frozen_string_literal: true
+
+module Pray
+  module RenderPatch
+    module_function
+
+    def patch_rendered_content(existing, fresh)
+      existing_segments = split_segments(existing)
+      fresh_segments = split_segments(fresh)
+      fresh_managed = fresh_segments.filter_map do |segment|
+        [segment[:id], segment[:body]] if segment[:kind] == :managed
+      end.to_h
+      overlap = existing_segments.any? do |segment|
+        segment[:kind] == :managed && fresh_managed.key?(segment[:id])
+      end
+      return fresh unless overlap
+
+      used = {}
+      output = existing_segments.map do |segment|
+        next segment[:text] if segment[:kind] == :text
+
+        used[segment[:id]] = true
+        managed_segment(segment[:id], fresh_managed.fetch(segment[:id], segment[:body]))
+      end.join
+      fresh_segments.each do |segment|
+        next unless segment[:kind] == :managed
+        next if used[segment[:id]]
+
+        output << managed_segment(segment[:id], segment[:body])
+      end
+      output.end_with?("\n") ? output : "#{output}\n"
+    end
+
+    def relocate_managed_spans(content, spans)
+      positions = marker_positions(lines_of(content))
+      spans.map do |span|
+        position = positions[span.id]
+        next span unless position
+
+        span.dup.tap do |relocated|
+          relocated.open_line = position[0]
+          relocated.close_line = position[1]
+        end
+      end
+    end
+
+    def split_segments(content)
+      lines = lines_of(content)
+      segments = []
+      text = +""
+      index = 0
+      while index < lines.length
+        identifier = marker_id(lines[index])
+        close = find_closing_marker(lines, index + 1, identifier) if identifier
+        if identifier && close
+          segments << {kind: :text, text: text} unless text.empty?
+          text = +""
+          body_lines = lines[(index + 1)...close]
+          body = body_lines.empty? ? "" : "#{body_lines.join("\n")}\n"
+          segments << {kind: :managed, id: identifier, body: body}
+          index = close + 1
+        else
+          text << "#{lines[index]}\n"
+          index += 1
+        end
+      end
+      segments << {kind: :text, text: text} unless text.empty?
+      segments
+    end
+
+    def lines_of(content)
+      content.lines(chomp: true)
+    end
+
+    def find_closing_marker(lines, start, identifier)
+      (start...lines.length).find { |index| marker_id(lines[index]) == identifier }
+    end
+
+    def marker_positions(lines)
+      positions = {}
+      active = nil
+      lines.each_with_index do |line, index|
+        identifier = marker_id(line)
+        next unless identifier&.match?(/\A[a-z0-9]+\z/)
+
+        if active.nil?
+          active = [identifier, index + 1]
+        elsif active[0] == identifier
+          positions[identifier] = [active[1], index + 1]
+          active = nil
+        end
+      end
+      positions
+    end
+
+    def marker_id(line)
+      match = line.strip.match(/\A<!-- pray:(.+) -->\z/)
+      identifier = match && match[1]
+      identifier unless identifier == "0 ignore-comments"
+    end
+
+    def managed_segment(identifier, body)
+      content = body.empty? ? "" : "#{body.sub(/\n+\z/, "")}\n"
+      "<!-- pray:#{identifier} -->\n#{content}<!-- pray:#{identifier} -->\n"
+    end
+  end
+end

data/lib/pray/resolve.rb

@@ -87,6 +87,7 @@ module Pray
         errors << "#{declaration.name}: #{error.message}"
       end
       raise Error.resolution(errors.join("\n")) unless errors.empty?
+      PackageSpec.warn_resolved_deprecations(packages)
 
       local_files = []
       local_errors = []
@@ -298,40 +299,11 @@ module Pray
     end
 
     def select_exports(declaration, spec)
-      unless declaration.exports.empty?
-        declaration.exports.each do |export|
-          unless spec.exports.key?(export)
-            raise Error.resolution("package #{declaration.name} does not export #{export}")
-          end
-        end
-        return declaration.exports
-      end
-
-      roles = declaration.roles || []
-      return spec.exports.keys.sort if roles.empty? && declaration.file.nil?
-
-      effective_roles = roles.dup
-      effective_roles << "file" if declaration.file && !effective_roles.include?("file")
+      ResolveExports.select_exports(declaration, spec)
+    end
 
-      selected = []
-      effective_roles.each do |role|
-        compatible = spec.exports.filter_map do |name, export|
-          name if Destination.export_kind_matches_role?(export.kind, role)
-        end
-        case compatible.length
-        when 1
-          selected << compatible.first unless selected.include?(compatible.first)
-        when 0
-          raise Error.resolution(
-            "package #{declaration.name} has no export compatible with #{role}"
-          )
-        else
-          raise Error.resolution(
-            "package #{declaration.name} has multiple exports compatible with #{role}; set export: \"name\""
-          )
-        end
-      end
-      selected
+    def load_export_bodies(file_bytes, spec, selected_exports)
+      ResolveExports.load_export_bodies(file_bytes, spec, selected_exports)
     end
 
     def load_package_file_bytes(root, spec)
@@ -346,21 +318,6 @@ module Pray
       file_bytes
     end
 
-    def load_export_bodies(file_bytes, spec, selected_exports)
-      export_bodies = {}
-      selected_exports.each do |export_name|
-        entry = spec.exports[export_name]
-        raise Error.resolution("package #{spec.name} is missing export #{export_name}") unless entry
-        next unless entry.kind == "fragment"
-
-        bytes = file_bytes[entry.path]
-        raise Error.integrity("package file missing for export #{export_name}: #{entry.path}") unless bytes
-
-        export_bodies[export_name] = Hashing.normalize_line_endings(bytes.force_encoding(Encoding::UTF_8))
-      end
-      export_bodies
-    end
-
     def build_skill_file_index(spec)
       index = {}
       spec.exports.each do |export_name, export|

data/lib/pray/resolve_exports.rb

@@ -0,0 +1,79 @@
+# frozen_string_literal: true
+
+module Pray
+  module ResolveExports
+    module_function
+
+    def select_exports(declaration, spec)
+      unless declaration.exports.empty?
+        declaration.exports.each do |export|
+          unless spec.exports.key?(export)
+            raise Error.resolution("package #{declaration.name} does not export #{export}")
+          end
+        end
+        return declaration.exports
+      end
+
+      roles = declaration.roles || []
+      return spec.exports.keys.sort if roles.empty? && declaration.file.nil?
+
+      effective_roles = roles.dup
+      effective_roles << "file" if declaration.file && !effective_roles.include?("file")
+
+      selected = []
+      effective_roles.each do |role|
+        compatible = if role == "fragment"
+          fragment_role_exports(spec)
+        else
+          spec.exports.filter_map do |name, export|
+            name if Destination.export_kind_matches_role?(export.kind, role)
+          end
+        end
+        case compatible.length
+        when 1
+          selected << compatible.first unless selected.include?(compatible.first)
+        when 0
+          raise Error.resolution(
+            "package #{declaration.name} has no export compatible with #{role}"
+          )
+        else
+          raise Error.resolution(
+            "package #{declaration.name} has multiple exports compatible with #{role}; set export: \"name\""
+          )
+        end
+      end
+      selected
+    end
+
+    def load_export_bodies(file_bytes, spec, selected_exports)
+      export_bodies = {}
+      selected_exports.each do |export_name|
+        entry = spec.exports[export_name]
+        raise Error.resolution("package #{spec.name} is missing export #{export_name}") unless entry
+        next unless %w[fragment file].include?(entry.kind)
+
+        bytes = file_bytes[entry.path]
+        unless bytes
+          raise Error.integrity("package file missing for export #{export_name}: #{entry.path}")
+        end
+
+        text = bytes.dup.force_encoding(Encoding::UTF_8)
+        unless text.valid_encoding?
+          if entry.kind == "fragment"
+            raise Error.integrity("package file is not valid utf-8 for export #{export_name}")
+          end
+          next
+        end
+        export_bodies[export_name] = Hashing.normalize_line_endings(text)
+      end
+      export_bodies
+    end
+
+    def fragment_role_exports(spec)
+      fragments = spec.exports.filter_map { |name, export| name if export.kind == "fragment" }
+      return fragments unless fragments.empty?
+
+      spec.exports.filter_map { |name, export| name if export.kind == "file" }
+    end
+  end
+end

data/lib/pray/tar_validation.rb

@@ -102,7 +102,10 @@ module Pray
     end
 
     def verify_checksum!(header)
-      stored = parse_octal(header.byteslice(148, 6), "checksum")
+      # The checksum field is eight bytes. Writers fill it differently: six octal
+      # digits then NUL and space, seven digits then NUL, or space padding. Read the
+      # whole field and let parse_octal strip the terminator.
+      stored = parse_octal(header.byteslice(148, 8), "checksum")
       sum = 0
       header.bytes.each_with_index do |byte, index|
         sum += (index >= 148 && index < 156) ? 32 : byte

data/lib/pray/verify.rb

@@ -165,6 +165,8 @@ module Pray
         )
       end
 
+      VerifyProvisioned.push_findings(project, report)
+
       [report, rendered_targets, fresh_targets]
     end
 

data/lib/pray/verify_provisioned.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+module Pray
+  module VerifyProvisioned
+    module_function
+
+    def push_findings(project, report)
+      push_exclusive_file_export_findings(project, report)
+      Render.planned_provisioned_files(project).each do |file|
+        path_text = file.path.to_s.tr("\\", "/")
+        absolute = File.join(project.project_root, file.path)
+        if File.symlink?(absolute)
+          report.findings << VerificationFinding.new(
+            kind: "verify_error",
+            message: "Provisioned file `#{path_text}` is a symbolic link. Remove the link or choose another destination."
+          )
+          next
+        end
+        unless File.file?(absolute)
+          report.findings << VerificationFinding.new(
+            kind: "verify_error",
+            message: "Provisioned file `#{path_text}` from `#{file.package}` is missing. Run `pray install` to materialize it."
+          )
+          next
+        end
+        destination_bytes = File.binread(absolute)
+        expected_bytes = Render.expected_provisioned_bytes(file.source, project.manifest.symbols || {})
+        next if Hashing.sha256_prefixed(destination_bytes) == Hashing.sha256_prefixed(expected_bytes.b)
+
+        report.findings << VerificationFinding.new(
+          kind: "package_integrity",
+          message: "Provisioned file `#{path_text}` no longer matches package `#{file.package}`. Run `pray install` to restore it."
+        )
+      end
+    end
+
+    def push_exclusive_file_export_findings(project, report)
+      project.packages.each do |package|
+        destination = package.declaration.file
+        next unless destination
+
+        has_file_export = package.selected_exports.any? do |name|
+          export = package.spec.exports[name]
+          export && export.kind == "file"
+        end
+        next if has_file_export
+
+        report.findings << VerificationFinding.new(
+          kind: "verify_error",
+          message: "Package `#{package.declaration.name}` declares file: \"#{destination}\" but has no selected file export."
+        )
+      end
+    end
+  end
+end

data/lib/pray/version.rb

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

data/lib/pray.rb

@@ -20,10 +20,16 @@ require_relative "pray/project_context"
 require_relative "pray/environment"
 require_relative "pray/resolve_context"
 require_relative "pray/resolve_source"
+require_relative "pray/resolve_exports"
 require_relative "pray/invocation"
 require_relative "pray/resolve"
+require_relative "pray/compose_dest"
+require_relative "pray/render_patch"
 require_relative "pray/render"
+require_relative "pray/render_dest"
+require_relative "pray/render_layout"
 require_relative "pray/verify_position"
+require_relative "pray/verify_provisioned"
 require_relative "pray/verify"
 require_relative "pray/resource_limits"
 require_relative "pray/http_body"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pray-cli
 version: !ruby/object:Gem::Version
-  version: 1.9.2
+  version: 1.11.0
 platform: ruby
 authors:
 - Andrei Makarov
@@ -99,6 +99,7 @@ files:
 - lib/pray/archive.rb
 - lib/pray/archive_unpack.rb
 - lib/pray/auth_client.rb
+- lib/pray/cache_clean.rb
 - lib/pray/cli.rb
 - lib/pray/cli/commands/auth.rb
 - lib/pray/cli/commands/distribution.rb
@@ -113,6 +114,7 @@ files:
 - lib/pray/cli/parse_auth.rb
 - lib/pray/cli/parse_trust.rb
 - lib/pray/cli/suggest.rb
+- lib/pray/compose_dest.rb
 - lib/pray/confess.rb
 - lib/pray/config.rb
 - lib/pray/constraint.rb
@@ -146,8 +148,13 @@ files:
 - lib/pray/registry_install.rb
 - lib/pray/registry_integrity.rb
 - lib/pray/render.rb
+- lib/pray/render_content.rb
+- lib/pray/render_dest.rb
+- lib/pray/render_layout.rb
+- lib/pray/render_patch.rb
 - lib/pray/resolve.rb
 - lib/pray/resolve_context.rb
+- lib/pray/resolve_exports.rb
 - lib/pray/resolve_source.rb
 - lib/pray/resource_limits.rb
 - lib/pray/serve.rb
@@ -164,6 +171,7 @@ files:
 - lib/pray/trust_ops.rb
 - lib/pray/verify.rb
 - lib/pray/verify_position.rb
+- lib/pray/verify_provisioned.rb
 - lib/pray/version.rb
 - pray-cli.gemspec
 homepage: https://pray.kisko.dev