kintsugi 0.7.1 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d6a3f2f971989db51d411587800237c653c8c09f23ed14a5d6e7ab4acbdc0c0
-  data.tar.gz: f9eb196e1cb97a9a683ec237d71d4943eb11371409ddd918500d898059c4f16f
+  metadata.gz: 4b91e9f248374504482055ac67da839cd50a808dc6127f5c248a219cd6dfaa50
+  data.tar.gz: 57792bfd58532ecd09aba7e248b8614761202fd51ba1975537ecd337247e7028
 SHA512:
-  metadata.gz: caa76ce1cae66040d14851dc37f9cbe63269e6565be887f7f31db0016249af5a95bc05e414041aa1f4a2d4e23d534a976383faacf391f6f9bfd2ab880cb524f0
-  data.tar.gz: e92ee6af254ea336b067abd7bfc805bc5d878873f5de74ed4d06c2847e75e24b836a8ad2a4f81edfee78d0c9db8378f6e84f41a6fc210b69ee6e5f31a7b938e1
+  metadata.gz: 557bd57300f1320b986f4d017dde29779464d528b082ac8552ffbb67353f5d6569ed69861f6c3585ee150b93cb4fa760e1ba3babc32a91010b6cd24c792a3e5f
+  data.tar.gz: '0902141e6cb1342c97e3821f4c47e3a5a9bf6e5ef8ce6c0c60b95055c372087c553d4442a279ddfa9698a9ca74ada829025ef16556035fa2455da28497f55c4d'

data/kintsugi.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "tty-prompt", "~> 0"
-  spec.add_dependency "xcodeproj", ">= 1.19.0", "<= 1.22.0"
+  spec.add_dependency "xcodeproj", ">= 1.19.0", "<= 1.23.0"
 
   spec.add_development_dependency "git", "~> 1.11"
   spec.add_development_dependency "rake", "~> 13.0"

data/lib/kintsugi/apply_change_to_project.rb

@@ -281,7 +281,8 @@ module Kintsugi
       end
 
       if change["isa"]
-        component = replace_component_with_new_type(parent_component, attribute_name, change)
+        component = replace_component_with_new_type(parent_component, attribute_name, change,
+                                                    change_path)
         change = change_for_component_of_new_type(component, change)
       else
         component = child_component(parent_component, change_name)
@@ -340,8 +341,9 @@ module Kintsugi
         else
           parent_component
         end
+      parent_change_path = change_path.split("/")[0...-1].join("/")
       add_child_to_component(non_object_list_parent, source_project_component.to_tree_hash,
-                             change_path)
+                             parent_change_path)
       component_at_path(non_object_list_parent.project, change_path)
     end
 
@@ -381,9 +383,10 @@ module Kintsugi
       end
     end
 
-    def replace_component_with_new_type(parent_component, name_in_parent_component, change)
+    def replace_component_with_new_type(parent_component, name_in_parent_component, change,
+                                        change_path)
       old_component = parent_component.send(name_in_parent_component)
-      new_component = component_of_new_type(parent_component, change, old_component)
+      new_component = component_of_new_type(parent_component, change, old_component, change_path)
 
       copy_attributes_to_new_component(old_component, new_component)
 
@@ -391,18 +394,32 @@ module Kintsugi
       new_component
     end
 
-    def component_of_new_type(parent_component, change, old_component)
+    def component_of_new_type(parent_component, change, old_component, change_path)
       if change["isa"][:added] == "PBXFileReference"
-        path = (change["path"] && change["path"][:added]) || old_component.path
+        source_project_component =
+          component_at_path(@change_source_project, change_path.split("/")[0...-1].join("/"))
+        if source_project_component.nil?
+          raise MergeError, "Couldn't find file reference in the project where the file should " \
+                            "reside. The file's change is #{change}. Change path is #{change_path}"
+        end
+
         case parent_component
         when Xcodeproj::Project::XCBuildConfiguration
-          parent_component.base_configuration_reference = find_file(parent_component.project, path)
+          parent_component.base_configuration_reference =
+            parent_component.project.group_or_file_at_path(
+              source_project_component.base_configuration_reference.hierarchy_path
+                .delete_prefix("/")
+            )
           return parent_component.base_configuration_reference
         when Xcodeproj::Project::PBXNativeTarget
-          parent_component.product_reference = find_file(parent_component.project, path)
+          parent_component.product_reference = parent_component.project.group_or_file_at_path(
+            source_project_component.product_reference.hierarchy_path.delete_prefix("/")
+          )
           return parent_component.product_reference
         when Xcodeproj::Project::PBXBuildFile
-          parent_component.file_ref = find_file(parent_component.project, path)
+          parent_component.file_ref = parent_component.project.group_or_file_at_path(
+            source_project_component.file_ref.hierarchy_path.delete_prefix("/")
+          )
           return parent_component.file_ref
         end
       end
@@ -891,14 +908,19 @@ module Kintsugi
         end
       return if !Settings.allow_duplicates && !existing_subproject.nil?
 
-      filter_subproject_without_project_references = lambda do |file_reference|
+      source_project_subproject_reference = component_at_path(@change_source_project, change_path)
+      if source_project_subproject_reference.nil?
+        raise MergeError, "Project reference with change #{project_reference_change} doesn't " \
+                          "exist in the source project. Change path is #{change_path}"
+      end
+
+      subproject_reference = root_object.project.files.find do |file_reference|
+        file_reference.hierarchy_path ==
+          source_project_subproject_reference.project_ref.hierarchy_path &&
         root_object.project_references.find do |project_reference|
           project_reference.project_ref.uuid == file_reference.uuid
         end.nil?
       end
-      subproject_reference =
-        find_file(root_object.project, project_reference_change["ProjectRef"]["path"],
-                  file_filter: filter_subproject_without_project_references)
 
       unless subproject_reference
         raise MergeError, "No file reference was found for project reference with change " \
@@ -941,17 +963,29 @@ module Kintsugi
     end
 
     def add_file_reference(containing_component, change, change_path)
-      # base configuration reference and product reference always reference a file that exists
-      # inside a group, therefore in these cases the file is searched for.
+      source_project_component =
+        component_at_path(@change_source_project, change_path.split("/")[0...-1].join("/"))
+      if source_project_component.nil?
+        raise MergeError, "Couldn't find file reference in the project where the file should " \
+                          "reside. The file's change is #{change}. Change path is #{change_path}"
+      end
+
       case containing_component
       when Xcodeproj::Project::XCBuildConfiguration
         containing_component.base_configuration_reference =
-          find_file(containing_component.project, change["path"])
+          containing_component.project.group_or_file_at_path(
+            source_project_component.base_configuration_reference.hierarchy_path.delete_prefix("/")
+          )
       when Xcodeproj::Project::PBXNativeTarget
         containing_component.product_reference =
-          find_file(containing_component.project, change["path"])
+          containing_component.project.group_or_file_at_path(
+            source_project_component.product_reference.hierarchy_path.delete_prefix("/")
+          )
       when Xcodeproj::Project::PBXBuildFile
-        containing_component.file_ref = find_file(containing_component.project, change["path"])
+        containing_component.file_ref =
+          containing_component.project.group_or_file_at_path(
+            source_project_component.file_ref.hierarchy_path.delete_prefix("/")
+          )
       when Xcodeproj::Project::PBXGroup
         # Adding files to groups is handled by another part of the code.
       else
@@ -1002,7 +1036,8 @@ module Kintsugi
           add_child_to_component(component, change_value, change_path)
         when Array
           change_value.each do |added_attribute_element|
-            add_child_to_component(component, added_attribute_element, change_path)
+            add_child_to_component(component, added_attribute_element,
+                                   "#{change_path}/#{change_name}")
           end
         else
           raise MergeError, "Trying to add attribute of unsupported type '#{change_value.class}' " \
@@ -1017,19 +1052,6 @@ module Kintsugi
       end.default_value
     end
 
-    def find_file(project, path, file_filter: ->(_) { true })
-      file_references = project.files.select do |file_reference|
-        file_reference.path == path && file_filter.call(file_reference)
-      end
-      if file_references.length > 1
-        puts "Debug: Found more than one matching file with path '#{path}'. Using the first one."
-      elsif file_references.empty?
-        return
-      end
-
-      file_references.first
-    end
-
     def find_reference_proxy(project, change, reference_filter: ->(_) { true })
       reference_proxies = project.root_object.project_references.map do |project_ref_and_products|
         project_ref_and_products[:product_group].children.find do |reference_proxy|

data/lib/kintsugi/version.rb

@@ -3,6 +3,6 @@
 module Kintsugi
   # This module holds the Kintsugi version information.
   module Version
-    STRING = "0.7.1"
+    STRING = "0.7.3"
   end
 end

data/lib/kintsugi/xcodeproj_extensions.rb

@@ -113,6 +113,18 @@ module Xcodeproj
           string.scan(/ *((['"]?).*?[^\\]\2)(?=( |\z))/).map(&:first)
         end
       end
+
+      # Modifies `PBXTargetDependency`'s `to_tree_hash` to not crash if `target_proxy` is `nil`.
+      # The same fix was done in https://github.com/CocoaPods/Xcodeproj/pull/915/.
+      class PBXTargetDependency
+        def to_tree_hash
+          hash = {}
+          hash['displayName'] = display_name
+          hash['isa'] = isa
+          hash['targetProxy'] = target_proxy.to_tree_hash if target_proxy
+          hash
+        end
+      end
     end
   end
 

data/spec/kintsugi_apply_change_to_project_spec.rb

@@ -585,6 +585,26 @@ describe Kintsugi, :apply_change_to_project do
       expect(base_project).to be_equivalent_to_project(theirs_project)
     end
 
+    it "keeps different files with the same name in their respective targets" do
+      file_reference = base_project.main_group.new_reference("file1.swift")
+      base_project.targets[0].source_build_phase.add_file_reference(file_reference)
+
+      base_project.new_target("com.apple.product-type.library.static", "bar", :ios)
+      base_project.main_group.find_subpath("new_group", true).new_reference("file1.swift")
+      base_project.save
+
+      theirs_project = create_copy_of_project(base_project.path, "theirs")
+      second_target = theirs_project.targets[1]
+      second_file_reference = theirs_project.main_group.find_subpath("new_group/file1.swift")
+      second_target.source_build_phase.add_file_reference(second_file_reference)
+
+      changes_to_apply = get_diff(theirs_project, base_project)
+
+      described_class.apply_change_to_project(base_project, changes_to_apply, theirs_project)
+      expect(base_project).to be_equivalent_to_project(theirs_project)
+      expect(base_project.main_group.find_subpath("new_group/file1.swift").build_files).not_to be_empty
+    end
+
     it "moves file that is referenced by a target from a group to the main group" do
       file_reference = base_project.main_group.find_subpath("new_group", true).new_reference("bar")
       base_project.targets[0].source_build_phase.add_file_reference(file_reference)
@@ -1764,7 +1784,7 @@ describe Kintsugi, :apply_change_to_project do
     end
   end
 
-  describe "resovling conflicts interactively" do
+  describe "resolving conflicts interactively" do
     let(:test_prompt) { TTY::Prompt::Test.new }
 
     before do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kintsugi
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.3
 platform: ruby
 authors:
 - Ben Yohay
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-10 00:00:00.000000000 Z
+date: 2023-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tty-prompt
@@ -33,7 +33,7 @@ dependencies:
         version: 1.19.0
     - - "<="
       - !ruby/object:Gem::Version
-        version: 1.22.0
+        version: 1.23.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
         version: 1.19.0
     - - "<="
       - !ruby/object:Gem::Version
-        version: 1.22.0
+        version: 1.23.0
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
@@ -184,7 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.4.20
 signing_key: 
 specification_version: 4
 summary: pbxproj files git conflicts solver