Merge pull request #119 from ashdnazg/feature/fix-paths

apply_change_to_project: use attribute_name for building change_path.
Lightricks · May 13, 2024 · 943a897 · 943a897
2 parents 5f9d548 + 4c26a59
commit 943a897
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 10 deletions.
diff --git a/lib/kintsugi/apply_change_to_project.rb b/lib/kintsugi/apply_change_to_project.rb
@@ -306,7 +306,8 @@ def apply_change_to_component(parent_component, change_name, change, parent_chan
         component = child_component(parent_component, change_name)
       elsif change[:added].is_a?(Array)
         (change[:added]).each do |added_change|
-          add_child_to_component(parent_component, added_change, change_path)
+          add_child_to_component(parent_component, added_change,
+                                 join_path(change_path, added_change["displayName"]))
         end
       elsif !change[:added].nil?
         raise MergeError, "Unsupported added change type for #{change[:added]}"
@@ -341,9 +342,8 @@ def resolve_nonexistent_component(parent_component, change_path)
         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,
-                             parent_change_path)
+                             change_path)
       component_at_path(non_object_list_parent.project, change_path)
     end
 
@@ -637,9 +637,7 @@ def remove_build_files_of_file_reference(file_reference)
       end
     end
 
-    def add_child_to_component(component, change, component_change_path)
-      change_path = join_path(component_change_path, change["displayName"])
-
+    def add_child_to_component(component, change, change_path)
       if change["ProjectRef"] && change["ProductGroup"]
         add_subproject_reference(component, change, change_path)
         return
@@ -1031,13 +1029,14 @@ def add_attributes_to_component(component, change, change_path, ignore_keys: [])
           next
         end
 
+        child_path = join_path(change_path, change_name)
         case change_value
         when Hash
-          add_child_to_component(component, change_value, change_path)
+          add_child_to_component(component, change_value, child_path)
         when Array
           change_value.each do |added_attribute_element|
-            add_child_to_component(component, added_attribute_element,
-                                   "#{change_path}/#{change_name}")
+            element_path = join_path(child_path, added_attribute_element["displayName"])
+            add_child_to_component(component, added_attribute_element, element_path)
           end
         else
           raise MergeError, "Trying to add attribute of unsupported type '#{change_value.class}' " \

diff --git a/spec/kintsugi_apply_change_to_project_spec.rb b/spec/kintsugi_apply_change_to_project_spec.rb
@@ -1399,8 +1399,9 @@
       expect(base_project).to be_equivalent_to_project(theirs_project)
     end
 
-    it "adds base configuration reference to new target" do
+    it "adds base configuration reference" do
       base_project.main_group.new_reference("baz")
+      base_project.save
 
       theirs_project = create_copy_of_project(base_project.path, "theirs")
       configuration_reference = theirs_project.main_group.find_subpath("baz")
@@ -1414,6 +1415,28 @@
 
       expect(base_project).to be_equivalent_to_project(theirs_project)
     end
+
+    it "adds base configuration reference to new configuration in a new list" do
+      base_project.main_group.new_reference("baz")
+      base_project.targets[0].build_configuration_list = nil
+      base_project.save
+
+      theirs_project = create_copy_of_project(base_project.path, "theirs")
+      configuration_reference = theirs_project.main_group.find_subpath("baz")
+
+      configuration_list = theirs_project.new(Xcodeproj::Project::XCConfigurationList)
+      theirs_project.targets[0].build_configuration_list = configuration_list
+
+      build_configuration = theirs_project.new(Xcodeproj::Project::XCBuildConfiguration)
+      build_configuration.base_configuration_reference = configuration_reference
+      configuration_list.build_configurations << build_configuration
+
+      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)
+    end
   end
 
   it "adds known regions" do