kintsugi 0.6.1 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1bb4d750b89e3f7648a84bb65fefe78abcba67a04f4c92bde7a636a3af0e5b0
-  data.tar.gz: eec2d98b161b7079af42c8fbfb1da27960d4557bb1a1fcda1473c82873fc6c62
+  metadata.gz: f9f20babc40a6ddf7228d2455e23d165a2d696929f5507fc8de0a9878353280f
+  data.tar.gz: 8ffd34dd7f504193c0a35d1347fa92c6edde6976602b5e62658ba9a637b6bc81
 SHA512:
-  metadata.gz: '09aaa8afe8d45faa843182e86d883e60996782967ce3d6f03fac9310a5197659c4c3f218293d71752d3feabd3aa44b8f9f36ddeae6a78ec1da2317ed48fcb1be'
-  data.tar.gz: 9eb2ebc3653c1d6ecf3467b9d0a125902313c3221ef53599e5a5b343bc6eda346f31306651a8ec8014086f695abd68b9283983b6f10136c1e854e1975d66eae7
+  metadata.gz: d8477aaafe2a4afed13fce37f5a5963b79ab2d3e26e4816abf4cd7b082b5a9a09cd189260713bbd5f82eaf9f8f8227b92bcd5dc79ad90acf1c0cc5d4ee9e8971
+  data.tar.gz: d63cf3848b727c894a9c294b75023c46e12b5672f03144bb7068477edc7765372b2e5e586c03bc69560f71a8145b7c2b3074a5246a4726a965b98a87050a59cb

data/lib/kintsugi/apply_change_to_project.rb

@@ -103,6 +103,12 @@ module Kintsugi
         group_type = Module.const_get("Xcodeproj::Project::#{change["isa"]}")
         containing_group = path.empty? ? project.main_group : project[path]
 
+        if containing_group.nil?
+          raise MergeError, "Trying to add or move a group with change #{change} to a group that " \
+            "no longer exists with path '#{path}'. This is considered a conflict that should be " \
+            "resolved manually."
+        end
+
         next if !Settings.allow_duplicates &&
           !find_group_in_group(containing_group, group_type, change).nil?
 
@@ -144,6 +150,12 @@ module Kintsugi
         containing_group = path.empty? ? project.main_group : project[path]
         change_key = file_reference_key(change)
 
+        if containing_group.nil?
+          raise MergeError, "Trying to add or move a file with change #{change} to a group that " \
+            "no longer exists with path '#{path}'. This is considered a conflict that should be " \
+            "resolved manually."
+        end
+
         if (removal_keys_to_references[change_key] || []).empty?
           apply_file_addition(containing_group, change, "rootObject/mainGroup/#{path}")
         elsif addition_keys_to_paths[change_key].length == 1 &&
@@ -195,12 +207,17 @@ module Kintsugi
     end
 
     def apply_group_removals(project, removals)
-      removals.each do |change, path|
+      removals.sort_by(&:last).reverse.each do |change, path|
         next unless %w[PBXGroup PBXVariantGroup].include?(change["isa"])
 
         group_path = join_path(path, change["displayName"])
 
-        remove_component(project[group_path], change)
+        # by now we've deleted all of this group's children in the project, so we need to adapt the
+        # change to the expected current state of the group, that is, without any children.
+        change_without_children = change.dup
+        change_without_children["children"] = []
+
+        remove_component(project[group_path], change_without_children)
       end
     end
 
@@ -687,7 +704,7 @@ module Kintsugi
       end
 
       existing_build_file = build_phase.files.find do |build_file|
-        build_file.file_ref.path == change["fileRef"]["path"]
+        build_file.file_ref && build_file.file_ref.path == change["fileRef"]["path"]
       end
       return if !Settings.allow_duplicates && !existing_build_file.nil?
 

data/lib/kintsugi/version.rb

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

data/spec/kintsugi_apply_change_to_project_spec.rb

@@ -159,6 +159,59 @@ describe Kintsugi, :apply_change_to_project do
       expect(base_project).to be_equivalent_to_project(theirs_project)
     end
 
+    it "raises if trying to move file to another group that no longer exists" do
+      base_project.main_group.find_subpath("new_group", true)
+      base_project.save
+
+      theirs_project = create_copy_of_project(base_project.path, "theirs")
+      new_group = theirs_project.main_group.find_subpath("new_group")
+      file_reference = theirs_project.main_group.find_file_by_path(filepath)
+      file_reference.move(new_group)
+
+      changes_to_apply = get_diff(theirs_project, base_project)
+
+      base_project.main_group.find_subpath("new_group").remove_from_project
+
+      expect {
+        described_class.apply_change_to_project(base_project, changes_to_apply)
+      }.to raise_error(Kintsugi::MergeError)
+    end
+
+    it "raises if trying to add file to a group that no longer exists" do
+      base_project.main_group.find_subpath("new_group", true)
+      base_project.save
+
+      theirs_project = create_copy_of_project(base_project.path, "theirs")
+      theirs_project.main_group.find_subpath("new_group").new_reference("foo")
+
+      changes_to_apply = get_diff(theirs_project, base_project)
+
+      base_project.main_group.find_subpath("new_group").remove_from_project
+
+      expect {
+        described_class.apply_change_to_project(base_project, changes_to_apply)
+      }.to raise_error(Kintsugi::MergeError)
+    end
+
+    it "does nothing if trying to remove a file from a group that no longer exists" do
+      base_project.main_group.find_subpath("new_group", true).new_reference("foo")
+      base_project.save
+
+      theirs_project = create_copy_of_project(base_project.path, "theirs")
+      theirs_project.main_group.find_subpath("new_group/foo").remove_from_project
+
+      changes_to_apply = get_diff(theirs_project, base_project)
+
+      base_project.main_group.find_subpath("new_group").remove_from_project
+
+      base_project.save
+      expected_project = create_copy_of_project(base_project.path, "expected")
+
+      described_class.apply_change_to_project(base_project, changes_to_apply)
+
+      expect(base_project).to be_equivalent_to_project(expected_project)
+    end
+
     it "raises when a file is split into two" do
       base_project.main_group.find_subpath("new_group", true)
       base_project.main_group.find_subpath("new_group2", true)
@@ -203,6 +256,88 @@ describe Kintsugi, :apply_change_to_project do
       expect(base_project).to be_equivalent_to_project(theirs_project)
     end
 
+    it "moves a group with files in it" do
+      new_group = base_project.main_group.find_subpath("new_group", true)
+      new_group.new_reference("new_file")
+      base_project.save
+
+      theirs_project = create_copy_of_project(base_project.path, "theirs")
+      new_group2 = theirs_project.main_group.find_subpath("new_group2", true)
+      theirs_project["new_group"].move(new_group2)
+
+      changes_to_apply = get_diff(theirs_project, base_project)
+
+      described_class.apply_change_to_project(base_project, changes_to_apply)
+
+      expect(base_project).to be_equivalent_to_project(theirs_project)
+    end
+
+    it "raises when trying to add a group to a group that no longer exists" do
+      base_project.main_group.find_subpath("new_group", true)
+      base_project.save
+
+      theirs_project = create_copy_of_project(base_project.path, "theirs")
+      theirs_project["new_group"].find_subpath("sub_group", true)
+
+      changes_to_apply = get_diff(theirs_project, base_project)
+
+      base_project.main_group.find_subpath("new_group").remove_from_project
+
+      expect {
+        described_class.apply_change_to_project(base_project, changes_to_apply)
+      }.to raise_error(Kintsugi::MergeError)
+    end
+
+    it "raises when trying to move a group to a group that no longer exists" do
+      base_project.main_group.find_subpath("new_group", true)
+      base_project.main_group.find_subpath("other_group", true)
+      base_project.save
+
+      theirs_project = create_copy_of_project(base_project.path, "theirs")
+      theirs_project["other_group"].move(theirs_project["new_group"])
+
+      changes_to_apply = get_diff(theirs_project, base_project)
+
+      base_project.main_group.find_subpath("new_group").remove_from_project
+
+      expect {
+        described_class.apply_change_to_project(base_project, changes_to_apply)
+      }.to raise_error(Kintsugi::MergeError)
+    end
+
+    it "moves a group with a group in it" do
+      new_group = base_project.main_group.find_subpath("new_group", true)
+      new_group.find_subpath("sub_group", true)
+      base_project.save
+
+      theirs_project = create_copy_of_project(base_project.path, "theirs")
+      new_group2 = theirs_project.main_group.find_subpath("new_group2", true)
+      theirs_project["new_group"].move(new_group2)
+
+      changes_to_apply = get_diff(theirs_project, base_project)
+
+      described_class.apply_change_to_project(base_project, changes_to_apply)
+
+      expect(base_project).to be_equivalent_to_project(theirs_project)
+    end
+
+    it "moves a group with a group with a file in it" do
+      new_group = base_project.main_group.find_subpath("new_group", true)
+      sub_group = new_group.find_subpath("sub_group", true)
+      sub_group.new_reference("new_file")
+      base_project.save
+
+      theirs_project = create_copy_of_project(base_project.path, "theirs")
+      new_group2 = theirs_project.main_group.find_subpath("new_group2", true)
+      theirs_project["new_group"].move(new_group2)
+
+      changes_to_apply = get_diff(theirs_project, base_project)
+
+      described_class.apply_change_to_project(base_project, changes_to_apply)
+
+      expect(base_project).to be_equivalent_to_project(theirs_project)
+    end
+
     it "adds file with include in index and last known file type as nil" do
       theirs_project = create_copy_of_project(base_project.path, "theirs")
       file_reference = theirs_project.main_group.new_reference("#{filepath}.h")
@@ -595,6 +730,22 @@ describe Kintsugi, :apply_change_to_project do
       expect(base_project).to be_equivalent_to_project(theirs_project, ignore_keys: ["containerPortal"])
     end
 
+    it "adds build when there is a build file without file ref" do
+      target = base_project.new_target("com.apple.product-type.library.static", "foo", :ios)
+      target.frameworks_build_phase.add_file_reference(nil)
+      base_project.save
+
+      theirs_project = create_copy_of_project(base_project.path, "theirs")
+      file_reference = theirs_project.main_group.new_reference("bar")
+      theirs_project.targets[0].frameworks_build_phase.add_file_reference(file_reference)
+
+      changes_to_apply = get_diff(theirs_project, base_project)
+      other_project = create_copy_of_project(base_project.path, "theirs")
+      described_class.apply_change_to_project(other_project, changes_to_apply)
+
+      expect(other_project).to be_equivalent_to_project(theirs_project)
+    end
+
     it "adds product ref to build file" do
       base_project.main_group.new_reference("bar")
       base_project.save

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kintsugi
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.3
 platform: ruby
 authors:
 - Ben Yohay
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-29 00:00:00.000000000 Z
+date: 2022-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj
@@ -168,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.21
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: pbxproj files git conflicts solver