pray-cli 1.16.0 → 1.18.0

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/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module Pray
-  VERSION = "1.16.0"
-  GENERATED_BY = "pray 1.16.0"
+  VERSION = "1.18.0"
+  GENERATED_BY = "pray 1.18.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"
@@ -27,13 +33,17 @@ 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"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pray-cli
 version: !ruby/object:Gem::Version
-  version: 1.16.0
+  version: 1.18.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
@@ -127,17 +130,23 @@ files:
 - 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
 - lib/pray/format_manifest.rb
 - lib/pray/format_serialize.rb
+- lib/pray/git_cache.rb
+- lib/pray/git_clone.rb
+- lib/pray/git_materialize.rb
 - lib/pray/git_refresh.rb
+- lib/pray/git_run.rb
 - lib/pray/git_sources.rb
 - lib/pray/hashing.rb
 - 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
@@ -150,11 +159,13 @@ 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
 - lib/pray/publish.rb
 - lib/pray/registry.rb
+- lib/pray/registry_http_cache.rb
 - lib/pray/registry_install.rb
 - lib/pray/registry_integrity.rb
 - lib/pray/registry_paths.rb
@@ -162,16 +173,19 @@ files:
 - 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
@@ -179,6 +193,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
@@ -187,6 +202,7 @@ 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