pray-cli 1.15.0 → 1.17.0

data/lib/pray/torrent_manifest.rb

@@ -0,0 +1,78 @@
+# frozen_string_literal: true
+
+require "json"
+require "fileutils"
+
+module Pray
+  TORRENT_MANIFEST_SPEC = "pray-torrent-v1"
+  DEFAULT_TORRENT_PIECE_SIZE = 16 * 1024
+
+  module TorrentManifest
+    module_function
+
+    def path_for(artifact_path)
+      "#{artifact_path}.praytorrent.json"
+    end
+
+    def payload(name:, version:, artifact_path:, archive_bytes:, trackers: [])
+      {
+        "spec" => TORRENT_MANIFEST_SPEC,
+        "name" => name,
+        "version" => version,
+        "artifact_url" => artifact_path,
+        "artifact_hash" => Hashing.sha256_prefixed(archive_bytes),
+        "piece_size" => DEFAULT_TORRENT_PIECE_SIZE,
+        "length" => archive_bytes.bytesize,
+        "pieces" => piece_hashes(archive_bytes),
+        "sources" => [artifact_path],
+        "trackers" => Array(trackers)
+      }
+    end
+
+    def bytes(name:, version:, artifact_path:, archive_bytes:, trackers: [])
+      JSON.pretty_generate(
+        payload(
+          name: name,
+          version: version,
+          artifact_path: artifact_path,
+          archive_bytes: archive_bytes,
+          trackers: trackers
+        )
+      )
+    end
+
+    def write(root, name:, version:, artifact_path:, archive_bytes:, settings:)
+      return unless settings.allows_torrent?
+
+      path = File.join(root, path_for(artifact_path))
+      FileUtils.mkdir_p(File.dirname(path))
+      File.write(
+        path,
+        bytes(
+          name: name,
+          version: version,
+          artifact_path: artifact_path,
+          archive_bytes: archive_bytes,
+          trackers: settings.bootstrap_trackers
+        )
+      )
+    end
+
+    def piece_hashes(archive_bytes)
+      length = archive_bytes.bytesize
+      return [] if length.zero?
+
+      hashes = []
+      start = 0
+      while start < length
+        hashes << Hashing.sha256_prefixed(archive_bytes.byteslice(start, DEFAULT_TORRENT_PIECE_SIZE))
+        start += DEFAULT_TORRENT_PIECE_SIZE
+      end
+      hashes
+    end
+
+    def descriptor_present?(root, artifact_path, settings)
+      !settings.allows_torrent? || File.file?(File.join(root, path_for(artifact_path)))
+    end
+  end
+end

data/lib/pray/upstream_drift.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module Pray
+  module Upstream
+    module_function
+
+    def path_fork_drift_lines(project, previous, options)
+      user_config = Config.load_user_config
+      git_sources = GitSources.prepare_git_sources(
+        project.project_root,
+        project.manifest.sources,
+        previous,
+        refresh: options.refresh || options.refresh_source_revisions
+      )
+      sources = Resolve.source_map(project.manifest.sources)
+      lines = []
+      project.packages.each do |package|
+        next unless package.declaration.path
+        next unless package.upstream
+
+        upstream = package.upstream
+        resolved = resolve_named(
+          project.project_root, sources, git_sources, user_config, previous, options,
+          upstream.name, "= #{upstream.version}", upstream.source
+        )
+        upstream_content = content_file_bytes(resolved.root, resolved.spec)
+        local_content = local_content_for_refresh(package.root, package.spec)
+        if local_content.empty?
+          lines << "#{package.declaration.name} has no content files; run pray install to copy #{upstream.name} #{upstream.version}"
+          next
+        end
+
+        overlay_file_changes(local_content, upstream_content).each do |path, change|
+          lines << overlay_drift_line(
+            package.declaration.name, upstream.name, upstream.version, path, change
+          )
+        end
+      end
+      lines
+    end
+  end
+end

data/lib/pray/upstream_merge.rb

@@ -76,6 +76,31 @@ module Pray
 
       "= #{new_version}"
     end
+
+    def overlay_file_changes(local_content, upstream_content)
+      (local_content.keys + upstream_content.keys).uniq.sort.filter_map do |path|
+        local = local_content[path]
+        upstream = upstream_content[path]
+        if local && upstream && local != upstream
+          [path, :changed]
+        elsif local && upstream.nil?
+          [path, :local_only]
+        elsif local.nil? && upstream
+          [path, :missing]
+        end
+      end
+    end
+
+    def overlay_drift_line(fork, upstream_name, upstream_version, path, change)
+      case change
+      when :changed
+        "#{fork} #{path} differs from #{upstream_name} #{upstream_version}"
+      when :local_only
+        "#{fork} #{path} local"
+      else
+        "#{fork} #{path} missing from fork"
+      end
+    end
     private_class_method :merge_one_content_path, :merge_all_present
   end
 end

data/lib/pray/upstream_refresh.rb

@@ -27,6 +27,11 @@ module Pray
       new_upstream = package.upstream
       return false unless new_upstream && package.declaration.path
 
+      local_content = local_content_for_refresh(package.root, package.spec)
+      if local_content.empty?
+        return materialize_empty_path_fork(project, package, previous, sources, git_sources, user_config, options, new_upstream)
+      end
+
       old_upstream = previous&.package&.find { |entry| entry.name == package.declaration.name }&.upstream
       return false unless old_upstream
       return false if old_upstream.version == new_upstream.version && old_upstream.tree_hash == new_upstream.tree_hash
@@ -40,6 +45,27 @@ module Pray
       true
     end
 
+    def materialize_empty_path_fork(project, package, previous, sources, git_sources, user_config, options, new_upstream)
+      new_package = resolve_named(
+        project.project_root, sources, git_sources, user_config, previous, options,
+        new_upstream.name, "= #{new_upstream.version}", new_upstream.source
+      )
+      new_content = content_file_bytes(new_package.root, new_package.spec)
+      write_content_files(package.root, {}, new_content)
+      write_refreshed_spec(package, new_package, {}, {}, new_content)
+      true
+    end
+
+    def local_content_for_refresh(root, spec)
+      paths = content_paths(spec.files)
+      return {} if paths.empty?
+
+      missing = paths.count { |relative| !File.file?(File.join(root, relative)) }
+      return {} if missing == paths.length
+
+      content_file_bytes(root, spec)
+    end
+
     def resolve_upstream_pair(project, previous, sources, git_sources, user_config, options, old_upstream, new_upstream)
       old_package = resolve_named(
         project.project_root, sources, git_sources, user_config, previous, options,
@@ -80,7 +106,6 @@ module Pray
       updated = PackageSpecRender.fork_spec_after_refresh(
         package.spec,
         new_package.spec,
-        File.basename(spec_path),
         clean_replica?(old_content, local_content),
         merged.keys
       )
@@ -138,7 +163,8 @@ module Pray
         Transaction.write_file(File.join(root, relative), bytes)
       end
     end
-    private_class_method :apply_one_path_upstream, :resolve_upstream_pair, :merge_fork_content,
+    private_class_method :apply_one_path_upstream, :materialize_empty_path_fork, :local_content_for_refresh,
+      :resolve_upstream_pair, :merge_fork_content,
       :write_refreshed_spec, :resolve_named
   end
 end

data/lib/pray/verify.rb

@@ -83,10 +83,10 @@ module Pray
               message: "Package `#{package.declaration.name}` no longer matches the locked tree hash. Run `pray install` to re-resolve packages."
             )
           end
-          if locked.version != package.spec.version
+          if locked.version != package.spec.recorded_version
             report.findings << VerificationFinding.new(
               kind: "verify_error",
-              message: "Package `#{package.declaration.name}` resolved to version #{package.spec.version} but `Prayfile.lock` has #{locked.version}. Run `pray install` to refresh the lockfile."
+              message: "Package `#{package.declaration.name}` resolved to version #{package.spec.recorded_version} but `Prayfile.lock` has #{locked.version}. Run `pray install` to refresh the lockfile."
             )
           end
         else

data/lib/pray/verify_locked_dest.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+module Pray
+  module Verify
+    module_function
+
+    def inspect_locked_destinations(project_root, lockfile)
+      report = VerificationReport.new
+      lockfile.managed_span.group_by(&:target).each do |target_path, spans|
+        absolute_path = File.join(project_root, target_path)
+        unless File.exist?(absolute_path)
+          report.findings << VerificationFinding.new(
+            kind: "verify_error",
+            message: "Rendered file `#{target_path}` is missing. Run `pray install` to generate it."
+          )
+          next
+        end
+
+        text = RenderDest.decode_utf8(
+          RenderDest.read_regular_bytes(absolute_path, target_path),
+          target_path
+        )
+        markers = marker_positions(text.lines(chomp: true))
+        spans.each do |span|
+          marker = markers[span.id]
+          unless marker
+            report.findings << VerificationFinding.new(
+              kind: "removed_prayer",
+              message: "`#{target_path}` is missing managed marker `#{span.id}` for `#{span.package}::#{span.export}`. Run `pray install` to restore the managed span."
+            )
+            next
+          end
+          next if marker[2] == span.ideal_checksum
+
+          report.findings << VerificationFinding.new(
+            kind: "custom_implementation",
+            message: "`#{target_path}` marker `#{span.id}` (`#{span.package}::#{span.export}`) was edited. Restore the managed block or run `pray install` to regenerate it."
+          )
+        end
+        find_orphan_marker_findings(spans, markers, target_path).each do |finding|
+          report.findings << finding
+        end
+      end
+      report
+    end
+  end
+end

data/lib/pray/version.rb

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

data/lib/pray.rb

@@ -13,7 +13,13 @@ require_relative "pray/manifest"
 require_relative "pray/format_serialize"
 require_relative "pray/format_manifest"
 require_relative "pray/package_spec"
+require_relative "pray/package_spec_version"
+require_relative "pray/local_prayer"
 require_relative "pray/lockfile"
+require_relative "pray/distribution"
+require_relative "pray/torrent_manifest"
+require_relative "pray/serve_range"
+require_relative "pray/apply_report"
 require_relative "pray/config"
 require_relative "pray/dotenv"
 require_relative "pray/project_context"
@@ -21,16 +27,23 @@ require_relative "pray/environment"
 require_relative "pray/resolve_context"
 require_relative "pray/resolve_source"
 require_relative "pray/resolve_exports"
+require_relative "pray/dependency_graph"
+require_relative "pray/resolve_deps"
+require_relative "pray/resolve_tarball"
 require_relative "pray/invocation"
 require_relative "pray/git_refresh"
 require_relative "pray/resolve"
+require_relative "pray/resolve_local"
 require_relative "pray/upstream"
 require_relative "pray/upstream_merge"
 require_relative "pray/package_spec_render"
 require_relative "pray/upstream_refresh"
+require_relative "pray/upstream_drift"
 require_relative "pray/upstream_latest"
 require_relative "pray/compose_dest"
 require_relative "pray/render_patch"
+require_relative "pray/render_content"
+require_relative "pray/render_managed"
 require_relative "pray/render"
 require_relative "pray/render_dest"
 require_relative "pray/transaction"
@@ -38,6 +51,7 @@ require_relative "pray/render_layout"
 require_relative "pray/verify_position"
 require_relative "pray/verify_provisioned"
 require_relative "pray/verify"
+require_relative "pray/verify_locked_dest"
 require_relative "pray/resource_limits"
 require_relative "pray/http_body"
 require_relative "pray/registry_install"
@@ -61,6 +75,6 @@ class << Pray
     :parse_package_spec, :parse_lockfile, :read_lockfile, :serialize_lockfile, :lockfile_hash,
     :write_lockfile, :write_lockfile_if_changed, :lockfiles_equivalent?, :build_lockfile,
     :resolve_project, :render_project, :materialize_project,
-    :inspect_project, :verify_project, :drift_project,
+    :inspect_project, :inspect_locked_destinations, :verify_project, :drift_project,
     :default_manifest_path, :default_lockfile_path, :project_root_from_manifest
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pray-cli
 version: !ruby/object:Gem::Version
-  version: 1.15.0
+  version: 1.17.0
 platform: ruby
 authors:
 - Andrei Makarov
@@ -102,6 +102,7 @@ files:
 - bin/pray
 - lib/pray-cli.rb
 - lib/pray.rb
+- lib/pray/apply_report.rb
 - lib/pray/archive.rb
 - lib/pray/archive_unpack.rb
 - lib/pray/auth_client.rb
@@ -110,6 +111,8 @@ files:
 - lib/pray/cli/commands/auth.rb
 - lib/pray/cli/commands/distribution.rb
 - lib/pray/cli/commands/init.rb
+- lib/pray/cli/commands/init_prayer.rb
+- lib/pray/cli/commands/init_prayer_manifest.rb
 - lib/pray/cli/commands/meta.rb
 - lib/pray/cli/commands/packages.rb
 - lib/pray/cli/commands/trust.rb
@@ -125,7 +128,9 @@ files:
 - lib/pray/confess.rb
 - lib/pray/config.rb
 - lib/pray/constraint.rb
+- lib/pray/dependency_graph.rb
 - lib/pray/destination.rb
+- lib/pray/distribution.rb
 - lib/pray/dotenv.rb
 - lib/pray/environment.rb
 - lib/pray/error.rb
@@ -137,6 +142,7 @@ files:
 - lib/pray/http_body.rb
 - lib/pray/invocation.rb
 - lib/pray/literal.rb
+- lib/pray/local_prayer.rb
 - lib/pray/lockfile.rb
 - lib/pray/lockfile_serialize.rb
 - lib/pray/manifest.rb
@@ -149,6 +155,7 @@ files:
 - lib/pray/materialize.rb
 - lib/pray/package_spec.rb
 - lib/pray/package_spec_render.rb
+- lib/pray/package_spec_version.rb
 - lib/pray/path_safety.rb
 - lib/pray/plan.rb
 - lib/pray/project_context.rb
@@ -156,18 +163,24 @@ files:
 - lib/pray/registry.rb
 - lib/pray/registry_install.rb
 - lib/pray/registry_integrity.rb
+- lib/pray/registry_paths.rb
 - lib/pray/render.rb
 - lib/pray/render_content.rb
 - lib/pray/render_dest.rb
 - lib/pray/render_layout.rb
+- lib/pray/render_managed.rb
 - lib/pray/render_patch.rb
 - lib/pray/resolve.rb
 - lib/pray/resolve_context.rb
+- lib/pray/resolve_deps.rb
 - lib/pray/resolve_exports.rb
+- lib/pray/resolve_local.rb
 - lib/pray/resolve_source.rb
+- lib/pray/resolve_tarball.rb
 - lib/pray/resource_limits.rb
 - lib/pray/serve.rb
 - lib/pray/serve_federation.rb
+- lib/pray/serve_range.rb
 - lib/pray/session.rb
 - lib/pray/ssh_agent.rb
 - lib/pray/statement_surface.rb
@@ -175,6 +188,7 @@ files:
 - lib/pray/sync.rb
 - lib/pray/tar_validation.rb
 - lib/pray/terminal.rb
+- lib/pray/torrent_manifest.rb
 - lib/pray/transaction.rb
 - lib/pray/transaction/journal.rb
 - lib/pray/transaction/owner.rb
@@ -183,10 +197,12 @@ files:
 - lib/pray/trust_feed.rb
 - lib/pray/trust_ops.rb
 - lib/pray/upstream.rb
+- lib/pray/upstream_drift.rb
 - lib/pray/upstream_latest.rb
 - lib/pray/upstream_merge.rb
 - lib/pray/upstream_refresh.rb
 - lib/pray/verify.rb
+- lib/pray/verify_locked_dest.rb
 - lib/pray/verify_position.rb
 - lib/pray/verify_provisioned.rb
 - lib/pray/version.rb