kintsugi 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1bb4d750b89e3f7648a84bb65fefe78abcba67a04f4c92bde7a636a3af0e5b0
-  data.tar.gz: eec2d98b161b7079af42c8fbfb1da27960d4557bb1a1fcda1473c82873fc6c62
+  metadata.gz: 3cad34bb224a6760f052ff90ac433095e7fb071e7b59ca9018719e3c6a8f5c96
+  data.tar.gz: a0b9675697896041b08d60186804e3c112e51c0dd61d66d26ce9f9310c626f4e
 SHA512:
-  metadata.gz: '09aaa8afe8d45faa843182e86d883e60996782967ce3d6f03fac9310a5197659c4c3f218293d71752d3feabd3aa44b8f9f36ddeae6a78ec1da2317ed48fcb1be'
-  data.tar.gz: 9eb2ebc3653c1d6ecf3467b9d0a125902313c3221ef53599e5a5b343bc6eda346f31306651a8ec8014086f695abd68b9283983b6f10136c1e854e1975d66eae7
+  metadata.gz: 359e1799a2f313daf547645342677eca83f58a76dc857d2f72b6f97b06318455385cec7b0145344c380ec659376ff3228add2f6c91499f1bef1cd20d63beae11
+  data.tar.gz: 04c9e862353bef092c14464de1e781c3d2168ad958fb8c5d08ed53f74e4090921023f674e6759eff997fbe2994af9514a0d546de4a8d652b19e5a37b32ce3970

data/lib/kintsugi/apply_change_to_project.rb

@@ -195,12 +195,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 +692,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.2"
   end
 end

data/spec/kintsugi_apply_change_to_project_spec.rb

@@ -203,6 +203,55 @@ 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 "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 +644,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.2
 platform: ruby
 authors:
 - Ben Yohay
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-29 00:00:00.000000000 Z
+date: 2022-09-12 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.22
 signing_key: 
 specification_version: 4
 summary: pbxproj files git conflicts solver