pray-cli 1.21.0 → 1.23.0

data/lib/pray/upstream_plan.rb

@@ -0,0 +1,84 @@
+# frozen_string_literal: true
+
+module Pray
+  module Upstream
+    PathUpstreamConflict = Struct.new(
+      :package_name,
+      :upstream_name,
+      :old_version,
+      :new_version,
+      :paths,
+      keyword_init: true
+    )
+
+    module_function
+
+    def plan_path_upstream_conflicts(project, previous, selected, 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,
+        offline: options.offline
+      )
+      sources = Resolve.source_map(project.manifest.sources)
+      conflicts = []
+      project.packages.each do |package|
+        next if selected && package.declaration.name != selected
+
+        conflict = plan_one_path_upstream_conflict(
+          project, package, previous, sources, git_sources, user_config, options
+        )
+        conflicts << conflict if conflict
+      end
+      conflicts
+    end
+
+    def report_path_upstream_would_conflicts(project, previous, selected, options)
+      conflicts = plan_path_upstream_conflicts(project, previous, selected, options)
+      return if conflicts.empty?
+
+      messages = conflicts.map do |conflict|
+        puts "would-conflict #{conflict.package_name}: #{conflict.paths.join(", ")}"
+        merge_conflict_message(
+          conflict.package_name,
+          conflict.upstream_name,
+          conflict.old_version,
+          conflict.new_version,
+          conflict.paths
+        )
+      end
+      raise Error.resolution(messages.join("\n"))
+    end
+
+    def plan_one_path_upstream_conflict(project, package, previous, sources, git_sources, user_config, options)
+      new_upstream = package.upstream
+      return nil unless new_upstream && package.declaration.path
+
+      local_content = local_content_for_refresh(package.root, package.spec)
+      return nil if local_content.empty?
+
+      old_upstream = previous&.package&.find { |entry| entry.name == package.declaration.name }&.upstream
+      return nil unless old_upstream
+      return nil if old_upstream.version == new_upstream.version && old_upstream.tree_hash == new_upstream.tree_hash
+
+      old_package, new_package = resolve_upstream_pair(
+        project, previous, sources, git_sources, user_config, options, old_upstream, new_upstream
+      )
+      old_content = content_file_bytes(old_package.root, old_package.spec)
+      new_content = content_file_bytes(new_package.root, new_package.spec)
+      _merged, conflict_paths = try_merge_content_files(old_content, new_content, local_content)
+      return nil if conflict_paths.empty?
+
+      PathUpstreamConflict.new(
+        package_name: package.declaration.name,
+        upstream_name: old_upstream.name,
+        old_version: old_upstream.version,
+        new_version: new_upstream.version,
+        paths: conflict_paths
+      )
+    end
+    private_class_method :plan_one_path_upstream_conflict
+  end
+end

data/lib/pray/version.rb

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

data/lib/pray.rb

@@ -13,6 +13,7 @@ require_relative "pray/manifest"
 require_relative "pray/format_serialize"
 require_relative "pray/format_manifest"
 require_relative "pray/package_spec"
+require_relative "pray/package_spec_paths"
 require_relative "pray/package_spec_version"
 require_relative "pray/local_prayer"
 require_relative "pray/lockfile"
@@ -25,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"
@@ -38,6 +40,7 @@ require_relative "pray/upstream"
 require_relative "pray/upstream_merge"
 require_relative "pray/package_spec_render"
 require_relative "pray/upstream_refresh"
+require_relative "pray/upstream_plan"
 require_relative "pray/upstream_drift"
 require_relative "pray/upstream_latest"
 require_relative "pray/compose_dest"
@@ -57,6 +60,7 @@ require_relative "pray/http_body"
 require_relative "pray/registry_install"
 require_relative "pray/registry_integrity"
 require_relative "pray/registry"
+require_relative "pray/derived_metadata"
 require_relative "pray/archive_unpack"
 require_relative "pray/archive"
 require_relative "pray/plan"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pray-cli
 version: !ruby/object:Gem::Version
-  version: 1.21.0
+  version: 1.23.0
 platform: ruby
 authors:
 - Andrei Makarov
@@ -129,6 +129,7 @@ files:
 - lib/pray/config.rb
 - lib/pray/constraint.rb
 - lib/pray/dependency_graph.rb
+- lib/pray/derived_metadata.rb
 - lib/pray/destination.rb
 - lib/pray/distribution.rb
 - lib/pray/dotenv.rb
@@ -138,6 +139,7 @@ files:
 - lib/pray/format_serialize.rb
 - lib/pray/git_cache.rb
 - lib/pray/git_clone.rb
+- lib/pray/git_legacy.rb
 - lib/pray/git_materialize.rb
 - lib/pray/git_refresh.rb
 - lib/pray/git_run.rb
@@ -160,6 +162,7 @@ files:
 - lib/pray/manifest_parser_publish.rb
 - lib/pray/materialize.rb
 - lib/pray/package_spec.rb
+- lib/pray/package_spec_paths.rb
 - lib/pray/package_spec_render.rb
 - lib/pray/package_spec_version.rb
 - lib/pray/path_safety.rb
@@ -179,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
@@ -191,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
@@ -209,6 +214,7 @@ files:
 - lib/pray/upstream_drift.rb
 - lib/pray/upstream_latest.rb
 - lib/pray/upstream_merge.rb
+- lib/pray/upstream_plan.rb
 - lib/pray/upstream_refresh.rb
 - lib/pray/verify.rb
 - lib/pray/verify_locked_dest.rb
@@ -240,7 +246,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.20
 specification_version: 4
 summary: Package manager for the language placed before inference (Prayfile)
 test_files: []