kintsugi 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7efc466f1583ea53deda2b4e77f030a1072ac4e93f8d8687f5eca22e2ea1d60c
-  data.tar.gz: 0c9dd29ad25b68fbb8c7d2b3b7ce4113e95a341234edaa3d3e11277dd691fc04
+  metadata.gz: 46711f40795142678185287c0035cb3ad3ebe304b418cf8add570c0e4f6db997
+  data.tar.gz: b2c6fd04f472dca7ca3ca436140b0256264a221228a8ae2c086ff3cef9ac9dc4
 SHA512:
-  metadata.gz: ee93b9b5f72d5ab35fb37a6fcc5464815e9ea13a9a985296d9132bd04be02edc9f542564b6cf5f495bc1a680b9b06a317bed0c709347ca641f5b31bb3145796e
-  data.tar.gz: c89520181be68ea61548b989a957e3d7fea7cef637b5a5cfa962ca3634b1db8d0e85906f947ea8868fa3a7ec5feed558d0ea156a77887f59d1123e4865bc6062
+  metadata.gz: 8b9a65bbd0796ce8e2f0da7fb50f772e753d03875fd79f5cc0816cd3197e049bc656cc14c2f521ab6c1a63b77b34290137d1b103dc5b51bc3e5b5daadac20b7f
+  data.tar.gz: 143a7a9d17799dde48c845570084ec94b7ea00ee482cd6f50773055c71efdca5e8e82360130d43f64989a5a4c5d945b7b938d2458e91b3d745c6e4700932863f

data/Gemfile

@@ -2,3 +2,8 @@
 
 source "https://rubygems.org"
 gemspec
+
+gem "ruby-debug-ide", "0.7.2"
+gem "debase", "0.2.5.beta2"
+
+gem "pry", "~> 0.14.1"

data/bin/kintsugi

@@ -34,6 +34,8 @@ begin
   command.action.call(options, ARGV)
 rescue ArgumentError => e
   puts "#{e.class}: #{e}"
+  exit(1)
 rescue Kintsugi::MergeError => e
   puts e
+  exit(1)
 end

data/lib/kintsugi/apply_change_to_project.rb

@@ -5,6 +5,7 @@
 require "xcodeproj"
 
 require_relative "utils"
+require_relative "error"
 require_relative "xcodeproj_extensions"
 
 module Kintsugi
@@ -92,7 +93,7 @@ module Kintsugi
     end
 
     def attribute_name_from_change_name(change_name)
-      if change_name == "fileEncoding"
+      if %w[fileEncoding repositoryURL].include?(change_name)
         change_name.to_sym
       else
         Xcodeproj::Project::Object::CaseConverter.convert_to_ruby(change_name)
@@ -164,15 +165,8 @@ module Kintsugi
     end
 
     def simple_attribute_value_with_change(old_value, change)
-      new_value = nil
-
-      if change.key?(:removed)
-        new_value = apply_removal_to_simple_attribute(old_value, change[:removed], change[:added])
-      end
-
-      if change.key?(:added)
-        new_value = apply_addition_to_simple_attribute(old_value, change[:added])
-      end
+      type = simple_attribute_type(old_value, change[:removed], change[:added])
+      new_value = new_simple_attribute_value(type, old_value, change[:removed], change[:added])
 
       subchanges_of_change(change).each do |subchange_name, subchange_value|
         new_value = new_value || old_value || {}
@@ -183,13 +177,67 @@ module Kintsugi
       new_value
     end
 
-    def apply_removal_to_simple_attribute(old_value, removed_change, added_change)
-      case removed_change
-      when Array
-        (old_value || []) - removed_change
-      when Hash
-        (old_value || {}).reject do |key, value|
-          if value != removed_change[key] && added_change[key] != value
+    def simple_attribute_type(old_value, removed_change, added_change)
+      types = [old_value.class, removed_change.class, added_change.class]
+
+      if types.include?(Hash)
+        unless types.to_set.subset?([Hash, NilClass].to_set)
+          raise MergeError, "Cannot apply changes because the types are not compatible. Existing " \
+            "value: '#{old_value}', removed change: '#{removed_change}', added change: " \
+            "'#{added_change}'"
+        end
+        Hash
+      elsif types.include?(Array)
+        unless types.to_set.subset?([Array, String, NilClass].to_set)
+          raise MergeError, "Cannot apply changes because the types are not compatible. Existing " \
+            "value: '#{old_value}', removed change: '#{removed_change}', added change: " \
+            "'#{added_change}'"
+        end
+        Array
+      elsif types.include?(String)
+        unless types.to_set.subset?([String, NilClass].to_set)
+          raise MergeError, "Cannot apply changes because the types are not compatible. Existing " \
+            "value: '#{old_value}', removed change: '#{removed_change}', added change: " \
+            "'#{added_change}'"
+        end
+        String
+      else
+        raise MergeError, "Unsupported types of all of the values. Existing value: " \
+          "'#{old_value}', removed change: '#{removed_change}', added change: '#{added_change}'"
+      end
+    end
+
+    def new_simple_attribute_value(type, old_value, removed_change, added_change)
+      if type == Hash
+        new_hash_simple_attribute_value(old_value, removed_change, added_change)
+      elsif type == Array
+        new_array_simple_attribute_value(old_value, removed_change, added_change)
+      elsif type == String
+        new_string_simple_attribute_value(old_value, removed_change, added_change)
+      else
+        raise MergeError, "Unsupported types of all of the values. Existing value: " \
+          "'#{old_value}', removed change: '#{removed_change}', added change: '#{added_change}'"
+      end
+    end
+
+    def new_hash_simple_attribute_value(old_value, removed_change, added_change)
+      return added_change if ((old_value || {}).to_a - (removed_change || {}).to_a).empty?
+
+      # First apply the added change to see if there are any conflicts with it.
+      new_value = (old_value || {}).merge(added_change || {})
+
+      unless (old_value.to_a - new_value.to_a).empty?
+        raise MergeError, "New hash #{change} contains values that conflict with old hash " \
+          "#{old_value}"
+      end
+
+      if removed_change.nil?
+        return new_value
+      end
+
+      new_value
+        .reject do |key, value|
+          if value != removed_change[key] && value != (added_change || {})[key]
             raise MergeError, "Trying to remove value '#{removed_change[key]}' of hash with key " \
               "'#{key}' but it changed to #{value}. This is considered a conflict that should be " \
               "resolved manually."
@@ -197,41 +245,31 @@ module Kintsugi
 
           removed_change.key?(key)
         end
-      when String
-        if old_value != removed_change && !old_value.nil? && added_change != old_value
-          raise MergeError, "Trying to remove value '#{removed_change}', but the existing value " \
-            "is '#{old_value}'. This is considered a conflict that should be resolved manually."
-        end
+    end
 
-        nil
-      when nil
-        nil
-      else
-        raise MergeError, "Unsupported change #{removed_change} of type #{removed_change.class}"
+    def new_array_simple_attribute_value(old_value, removed_change, added_change)
+      if old_value.is_a?(String)
+        old_value = [old_value]
+      end
+      if removed_change.is_a?(String)
+        removed_change = [removed_change]
+      end
+      if added_change.is_a?(String)
+        added_change = [added_change]
       end
-    end
 
-    def apply_addition_to_simple_attribute(old_value, change)
-      case change
-      when Array
-        (old_value || []) + change
-      when Hash
-        old_value ||= {}
-        new_value = old_value.merge(change)
+      return added_change if ((old_value || []) - (removed_change || [])).empty?
 
-        unless (old_value.to_a - new_value.to_a).empty?
-          raise MergeError, "New hash #{change} contains values that conflict with old hash " \
-            "#{old_value}"
-        end
+      (old_value || []) + (added_change || []) - (removed_change || [])
+    end
 
-        new_value
-      when String
-        change
-      when nil
-        nil
-      else
-        raise MergeError, "Unsupported change #{change} of type #{change.class}"
+    def new_string_simple_attribute_value(old_value, removed_change, added_change)
+      if old_value != removed_change && !old_value.nil? && added_change != old_value
+        raise MergeError, "Trying to remove value '#{removed_change || "nil"}', but the existing " \
+          "value is '#{old_value}'. This is considered a conflict that should be resolved manually."
       end
+
+      added_change
     end
 
     def remove_component(component, change)
@@ -303,12 +341,48 @@ module Kintsugi
         add_variant_group(component, change)
       when "PBXReferenceProxy"
         add_reference_proxy(component, change)
+      when "XCSwiftPackageProductDependency"
+        add_swift_package_product_dependency(component, change)
+      when "XCRemoteSwiftPackageReference"
+        add_remote_swift_package_reference(component, change)
       else
         raise MergeError, "Trying to add unsupported component type #{change["isa"]}. Full " \
           "component change is: #{change}"
       end
     end
 
+    def add_remote_swift_package_reference(containing_component, change)
+      remote_swift_package_reference =
+        containing_component.project.new(Xcodeproj::Project::XCRemoteSwiftPackageReference)
+      add_attributes_to_component(remote_swift_package_reference, change)
+
+      case containing_component
+      when Xcodeproj::Project::XCSwiftPackageProductDependency
+        containing_component.package = remote_swift_package_reference
+      when Xcodeproj::Project::PBXProject
+        containing_component.package_references << remote_swift_package_reference
+      else
+        raise MergeError, "Trying to add remote swift package reference to an unsupported " \
+          "component type #{containing_component.isa}. Change is: #{change}"
+      end
+    end
+
+    def add_swift_package_product_dependency(containing_component, change)
+      swift_package_product_dependency =
+        containing_component.project.new(Xcodeproj::Project::XCSwiftPackageProductDependency)
+      add_attributes_to_component(swift_package_product_dependency, change)
+
+      case containing_component
+      when Xcodeproj::Project::PBXBuildFile
+        containing_component.product_ref = swift_package_product_dependency
+      when Xcodeproj::Project::PBXNativeTarget
+        containing_component.package_product_dependencies << swift_package_product_dependency
+      else
+        raise MergeError, "Trying to add swift package product dependency to an unsupported " \
+          "component type #{containing_component.isa}. Change is: #{change}"
+      end
+    end
+
     def add_reference_proxy(containing_component, change)
       case containing_component
       when Xcodeproj::Project::PBXBuildFile
@@ -488,6 +562,12 @@ module Kintsugi
         find_file(root_object.project, project_reference_change["ProjectRef"],
                   file_filter: filter_subproject_without_project_references)
 
+      unless subproject_reference
+        raise MergeError, "No file reference was found for project reference with change " \
+          "#{project_reference_change}. This might mean that the file used to exist in the " \
+          "project the but was removed at some point"
+      end
+
       attribute =
         Xcodeproj::Project::PBXProject.references_by_keys_attributes
                                       .find { |attrb| attrb.name == :project_references }
@@ -539,8 +619,10 @@ module Kintsugi
         file_reference = containing_component.project.new(Xcodeproj::Project::PBXFileReference)
         containing_component.children << file_reference
 
-        # For some reason, `include_in_index` is set to `1` by default.
+        # For some reason, `include_in_index` is set to `1` and `source_tree` to `SDKROOT` by
+        # default.
         file_reference.include_in_index = nil
+        file_reference.source_tree = nil
         add_attributes_to_component(file_reference, change)
       else
         raise MergeError, "Trying to add file reference to an unsupported component type " \

data/lib/kintsugi/cli.rb

@@ -154,7 +154,10 @@ module Kintsugi
       `git config --global --unset merge.kintsugi.name`
       `git config --global --unset merge.kintsugi.driver`
 
-      `sed -i '' '/\*.pbxproj\ merge=kintsugi/d' "#{global_attributes_file_path}"`
+      attributes_file_path = global_attributes_file_path
+      return unless File.exist?(attributes_file_path)
+
+      `sed -i '' '/\*.pbxproj\ merge=kintsugi/d' "#{attributes_file_path}"`
     end
 
     def create_root_command
@@ -178,10 +181,7 @@ module Kintsugi
           exit
         end
 
-        subcommands_descriptions = @subcommands.map do |command_name, command|
-          "    #{command_name}:    #{command.description}"
-        end.join("\n")
-        opts.on_tail("\nSUBCOMMANDS\n#{subcommands_descriptions}")
+        opts.on_tail("\nSUBCOMMANDS\n#{subcommands_descriptions(subcommands)}")
       end
 
       root_action = lambda { |options, arguments|
@@ -202,5 +202,13 @@ module Kintsugi
         description: nil
       )
     end
+
+    def subcommands_descriptions(subcommands)
+      longest_subcommand_length = subcommands.keys.map(&:length).max + 4
+      format_string = "    %-#{longest_subcommand_length}s%s"
+      subcommands.map do |command_name, command|
+        format(format_string, "#{command_name}:", command.description)
+      end.join("\n")
+    end
   end
 end

data/lib/kintsugi/version.rb

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

data/lib/kintsugi/xcodeproj_extensions.rb

@@ -27,5 +27,43 @@ module Xcodeproj
         self[:project_ref]
       end
     end
+
+    module Object
+      # Extends `XCBuildConfiguration` to convert array settings (which might be either array or
+      # string) to actual arrays in `to_tree_hash` so diffs are always between arrays. This means
+      # that if the values in both `ours` and `theirs` are different strings, we will know to solve
+      # the conflict into an array containing both strings.
+      # Code was mostly copied from https://github.com/CocoaPods/Xcodeproj/blob/master/lib/xcodeproj/project/object/build_configuration.rb#L211
+      class XCBuildConfiguration
+        @@old_to_tree_hash = instance_method(:to_tree_hash)
+
+        def to_tree_hash
+          @@old_to_tree_hash.bind(self).call.tap do |hash|
+            convert_array_settings_to_arrays(hash['buildSettings'])
+          end
+        end
+
+        def convert_array_settings_to_arrays(settings)
+          return unless settings
+
+          array_settings = BuildSettingsArraySettingsByObjectVersion[project.object_version]
+
+          settings.each_key do |key|
+            value = settings[key]
+            next unless value.is_a?(String)
+
+            stripped_key = key.sub(/\[[^\]]+\]$/, '')
+            next unless array_settings.include?(stripped_key)
+
+            array_value = split_string_setting_into_array(value)
+            settings[key] = array_value
+          end
+        end
+
+        def split_string_setting_into_array(string)
+          string.scan(/ *((['"]?).*?[^\\]\2)(?=( |\z))/).map(&:first)
+        end
+      end
+    end
   end
 end

data/lib/kintsugi.rb

@@ -125,7 +125,7 @@ module Kintsugi
       Dir.mkdir(temp_directory_name)
       temp_project_file_path = File.join(temp_directory_name, PROJECT_FILE_NAME)
       Dir.chdir(File.dirname(project_file_path)) do
-        `git show HEAD:./project.pbxproj > #{temp_project_file_path}`
+        `git show HEAD:./project.pbxproj > "#{temp_project_file_path}"`
       end
       Xcodeproj::Project.open(File.dirname(temp_project_file_path))
     end
@@ -139,7 +139,7 @@ module Kintsugi
     def file_has_version_in_stage_numbers?(file_path, stage_numbers)
       file_absolute_path = File.absolute_path(file_path)
       actual_stage_numbers =
-        `git ls-files -u -- #{file_absolute_path}`.split("\n").map do |git_file_status|
+        `git ls-files -u -- "#{file_absolute_path}"`.split("\n").map do |git_file_status|
           git_file_status.split[2]
         end
       (stage_numbers - actual_stage_numbers.map(&:to_i)).empty?

data/spec/kintsugi_apply_change_to_project_spec.rb

@@ -8,6 +8,7 @@ require "tempfile"
 require "tmpdir"
 
 require "kintsugi/apply_change_to_project"
+require "kintsugi/error"
 
 require_relative "be_equivalent_to_project"
 
@@ -50,6 +51,20 @@ describe Kintsugi, :apply_change_to_project do
     expect(base_project).to be_equivalent_to_project(theirs_project)
   end
 
+  it "adds package reference" do
+    theirs_project = create_copy_of_project(base_project.path, "theirs")
+
+    theirs_project.root_object.package_references <<
+      create_remote_swift_package_reference(theirs_project)
+
+    changes_to_apply = get_diff(theirs_project, base_project)
+
+    described_class.apply_change_to_project(base_project, changes_to_apply)
+    base_project.save
+
+    expect(base_project).to be_equivalent_to_project(theirs_project)
+  end
+
   it "adds new subproject" do
     theirs_project = create_copy_of_project(base_project.path, "theirs")
     add_new_subproject_to_project(theirs_project, "foo", "foo")
@@ -100,6 +115,23 @@ describe Kintsugi, :apply_change_to_project do
     expect(base_project).to be_equivalent_to_project(theirs_project, ignore_keys: ["containerPortal"])
   end
 
+  it "raises if adding subproject whose file reference isn't found" do
+    ours_project = create_copy_of_project(base_project.path, "ours")
+
+    add_new_subproject_to_project(base_project, "foo", "foo")
+    base_project.save
+
+    theirs_project = create_copy_of_project(base_project.path, "theirs")
+
+    base_project.root_object.project_references.pop
+
+    changes_to_apply = get_diff(theirs_project, base_project)
+
+    expect {
+      described_class.apply_change_to_project(ours_project, changes_to_apply)
+    }.to raise_error(Kintsugi::MergeError)
+  end
+
   describe "file related changes" do
     let(:filepath) { "foo" }
 
@@ -370,6 +402,19 @@ describe Kintsugi, :apply_change_to_project do
       expect(base_project).to be_equivalent_to_project(theirs_project)
     end
 
+    it "adds package product dependency to target" do
+      theirs_project = create_copy_of_project(base_project.path, "theirs")
+      theirs_project.targets[0].package_product_dependencies <<
+        create_swift_package_product_dependency(theirs_project)
+
+      changes_to_apply = get_diff(theirs_project, base_project)
+
+      described_class.apply_change_to_project(base_project, changes_to_apply)
+      base_project.save
+
+      expect(base_project).to be_equivalent_to_project(theirs_project)
+    end
+
     it "changes framework from reference proxy to file reference" do
       framework_filename = "baz"
 
@@ -466,9 +511,28 @@ describe Kintsugi, :apply_change_to_project do
       expect(base_project).to be_equivalent_to_project(theirs_project, ignore_keys: ["containerPortal"])
     end
 
+    it "adds product ref to build file" do
+      base_project.main_group.new_reference("bar")
+      base_project.save
+
+      theirs_project = create_copy_of_project(base_project.path, "theirs")
+
+      file_reference = theirs_project.main_group.files.find { |file| file.display_name == "bar" }
+      build_file =
+        theirs_project.targets[0].frameworks_build_phase.add_file_reference(file_reference)
+      build_file.product_ref =
+        create_swift_package_product_dependency(theirs_project)
+
+      changes_to_apply = get_diff(theirs_project, base_project)
+
+      described_class.apply_change_to_project(base_project, changes_to_apply)
+      base_project.save
+
+      expect(base_project).to be_equivalent_to_project(theirs_project, ignore_keys: ["containerPortal"])
+    end
+
     it "adds build file to a file reference that already exist" do
-      file_reference = base_project.main_group.new_reference("bar")
-      base_project.targets[0].frameworks_build_phase.add_file_reference(file_reference)
+      base_project.main_group.new_reference("bar")
 
       base_project.main_group.new_reference("bar")
 
@@ -557,69 +621,427 @@ describe Kintsugi, :apply_change_to_project do
       expect(base_project).to be_equivalent_to_project(theirs_project, ignore_keys: ["containerPortal"])
     end
 
-    it "adds new build setting" do
-      theirs_project = create_copy_of_project(base_project.path, "theirs")
+    describe "build settings" do
+      it "adds new string build setting" do
+        theirs_project = create_copy_of_project(base_project.path, "theirs")
 
-      theirs_project.targets[0].build_configurations.each do |configuration|
-        configuration.build_settings["HEADER_SEARCH_PATHS"] = [
-          "$(SRCROOT)/../Foo",
-          "$(SRCROOT)/../Bar"
-        ]
+        theirs_project.targets[0].build_configurations.each do |configuration|
+          configuration.build_settings["HEADER_SEARCH_PATHS"] = "$(SRCROOT)/../Bar"
+        end
+
+        changes_to_apply = get_diff(theirs_project, base_project)
+
+        described_class.apply_change_to_project(base_project, changes_to_apply)
+        base_project.save
+
+        expect(base_project).to be_equivalent_to_project(theirs_project)
       end
 
-      changes_to_apply = get_diff(theirs_project, base_project)
+      it "adds new array build setting" do
+        base_project.targets[0].build_configurations.each do |configuration|
+          configuration.build_settings = {}
+        end
 
-      described_class.apply_change_to_project(base_project, changes_to_apply)
-      base_project.save
+        theirs_project = create_copy_of_project(base_project.path, "theirs")
 
-      expect(base_project).to be_equivalent_to_project(theirs_project)
-    end
+        theirs_project.targets[0].build_configurations.each do |configuration|
+          configuration.build_settings["HEADER_SEARCH_PATHS"] = [
+            "$(SRCROOT)/../Foo",
+            "$(SRCROOT)/../Bar"
+          ]
+        end
 
-    it "adds values to existing build setting" do
-      base_project.targets[0].build_configurations.each do |configuration|
-        configuration.build_settings["HEADER_SEARCH_PATHS"] = [
-          "$(SRCROOT)/../Foo"
-        ]
+        changes_to_apply = get_diff(theirs_project, base_project)
+
+        described_class.apply_change_to_project(base_project, changes_to_apply)
+        base_project.save
+
+        expect(base_project).to be_equivalent_to_project(theirs_project)
       end
 
-      theirs_project = create_copy_of_project(base_project.path, "theirs")
+      it "adds new hash build setting" do
+        theirs_project = create_copy_of_project(base_project.path, "theirs")
 
-      theirs_project.targets[0].build_configurations.each do |configuration|
-        configuration.build_settings["HEADER_SEARCH_PATHS"] = [
-          "$(SRCROOT)/../Foo",
-          "$(SRCROOT)/../Bar"
-        ]
+        theirs_project.targets[0].build_configurations.each do |configuration|
+          configuration.build_settings["HEADER_SEARCH_PATHS"] = [
+            "$(SRCROOT)/../Foo",
+            "$(SRCROOT)/../Bar"
+          ]
+        end
+
+        changes_to_apply = get_diff(theirs_project, base_project)
+
+        described_class.apply_change_to_project(base_project, changes_to_apply)
+        base_project.save
+
+        expect(base_project).to be_equivalent_to_project(theirs_project)
       end
 
-      changes_to_apply = get_diff(theirs_project, base_project)
+      it "adds values to existing array build setting" do
+        base_project.targets[0].build_configurations.each do |configuration|
+          configuration.build_settings["HEADER_SEARCH_PATHS"] = [
+            "$(SRCROOT)/../Foo"
+          ]
+        end
 
-      described_class.apply_change_to_project(base_project, changes_to_apply)
-      base_project.save
+        theirs_project = create_copy_of_project(base_project.path, "theirs")
 
-      expect(base_project).to be_equivalent_to_project(theirs_project)
-    end
+        theirs_project.targets[0].build_configurations.each do |configuration|
+          configuration.build_settings["HEADER_SEARCH_PATHS"] = [
+            "$(SRCROOT)/../Foo",
+            "$(SRCROOT)/../Bar"
+          ]
+        end
 
-    it "removes build setting" do
-      base_project.targets[0].build_configurations.each do |configuration|
-        configuration.build_settings["HEADER_SEARCH_PATHS"] = [
-          "$(SRCROOT)/../Foo",
-          "$(SRCROOT)/../Bar"
-        ]
+        changes_to_apply = get_diff(theirs_project, base_project)
+
+        described_class.apply_change_to_project(base_project, changes_to_apply)
+        base_project.save
+
+        expect(base_project).to be_equivalent_to_project(theirs_project)
       end
 
-      base_project.save
-      theirs_project = create_copy_of_project(base_project.path, "theirs")
+      it "adds array value to an existing string if no removed value" do
+        theirs_project = create_copy_of_project(base_project.path, "theirs")
 
-      theirs_project.targets[0].build_configurations.each do |configuration|
-        configuration.build_settings["HEADER_SEARCH_PATHS"] = nil
+        theirs_project.targets[0].build_configurations.each do |configuration|
+          configuration.build_settings["HEADER_SEARCH_PATHS"] = %w[bar foo]
+        end
+        changes_to_apply = get_diff(theirs_project, base_project)
+
+        ours_project = create_copy_of_project(base_project.path, "ours")
+        ours_project.targets[0].build_configurations.each do |configuration|
+          configuration.build_settings["HEADER_SEARCH_PATHS"] = "baz"
+        end
+        ours_project.save
+
+        described_class.apply_change_to_project(ours_project, changes_to_apply)
+        ours_project.save
+
+        expected_project = create_copy_of_project(base_project.path, "expected")
+        expected_project.targets[0].build_configurations.each do |configuration|
+          configuration.build_settings["HEADER_SEARCH_PATHS"] = %w[bar foo baz]
+        end
+        expect(ours_project).to be_equivalent_to_project(expected_project)
       end
 
-      changes_to_apply = get_diff(theirs_project, base_project)
+      it "adds string value to existing array value if no removed value" do
+        theirs_project = create_copy_of_project(base_project.path, "theirs")
 
-      described_class.apply_change_to_project(base_project, changes_to_apply)
-      base_project.save
+        theirs_project.targets[0].build_configurations.each do |configuration|
+          configuration.build_settings["HEADER_SEARCH_PATHS"] = "baz"
+        end
+        changes_to_apply = get_diff(theirs_project, base_project)
 
-      expect(base_project).to be_equivalent_to_project(theirs_project)
+        ours_project = create_copy_of_project(base_project.path, "ours")
+        ours_project.targets[0].build_configurations.each do |configuration|
+          configuration.build_settings["HEADER_SEARCH_PATHS"] = %w[bar foo]
+        end
+        ours_project.save
+
+        described_class.apply_change_to_project(ours_project, changes_to_apply)
+        ours_project.save
+
+        expected_project = create_copy_of_project(base_project.path, "expected")
+        expected_project.targets[0].build_configurations.each do |configuration|
+          configuration.build_settings["HEADER_SEARCH_PATHS"] = %w[bar foo baz]
+        end
+        expect(ours_project).to be_equivalent_to_project(expected_project)
+      end
+
+      it "removes array build setting" do
+        base_project.targets[0].build_configurations.each do |configuration|
+          configuration.build_settings["HEADER_SEARCH_PATHS"] = [
+            "$(SRCROOT)/../Foo",
+            "$(SRCROOT)/../Bar"
+          ]
+        end
+
+        base_project.save
+        theirs_project = create_copy_of_project(base_project.path, "theirs")
+
+        theirs_project.targets[0].build_configurations.each do |configuration|
+          configuration.build_settings["HEADER_SEARCH_PATHS"] = nil
+        end
+
+        changes_to_apply = get_diff(theirs_project, base_project)
+
+        described_class.apply_change_to_project(base_project, changes_to_apply)
+        base_project.save
+
+        expect(base_project).to be_equivalent_to_project(theirs_project)
+      end
+
+      it "removes string build setting" do
+        base_project.targets[0].build_configurations.each do |configuration|
+          configuration.build_settings["HEADER_SEARCH_PATHS"] = "bar"
+        end
+
+        base_project.save
+        theirs_project = create_copy_of_project(base_project.path, "theirs")
+
+        theirs_project.targets[0].build_configurations.each do |configuration|
+          configuration.build_settings =
+            configuration.build_settings.reject { |key, _| key == "HEADER_SEARCH_PATHS" }
+        end
+
+        changes_to_apply = get_diff(theirs_project, base_project)
+
+        described_class.apply_change_to_project(base_project, changes_to_apply)
+        base_project.save
+
+        expect(base_project).to be_equivalent_to_project(theirs_project)
+      end
+
+      it "removes hash build setting" do
+        base_project.targets[0].build_configurations.each do |configuration|
+          configuration.build_settings["HEADER_SEARCH_PATHS"] = "bar"
+        end
+
+        base_project.save
+        theirs_project = create_copy_of_project(base_project.path, "theirs")
+        theirs_project.targets[0].build_configurations.each do |configuration|
+          configuration.build_settings = nil
+        end
+
+        changes_to_apply = get_diff(theirs_project, base_project)
+
+        described_class.apply_change_to_project(base_project, changes_to_apply)
+        base_project.save
+
+        expect(base_project).to be_equivalent_to_project(theirs_project)
+      end
+
+      it "removes hash build setting if removed hash contains the existing hash" do
+        base_project.targets[0].build_configurations.each do |configuration|
+          configuration.build_settings["HEADER_SEARCH_PATHS"] = "bar"
+          configuration.build_settings["foo"] = "baz"
+        end
+
+        base_project.save
+        theirs_project = create_copy_of_project(base_project.path, "theirs")
+        theirs_project.targets[0].build_configurations.each do |configuration|
+          configuration.build_settings = nil
+        end
+
+        ours_project = create_copy_of_project(base_project.path, "theirs")
+        ours_project.targets[0].build_configurations.each do |configuration|
+          configuration.build_settings["foo"] = nil
+        end
+
+        changes_to_apply = get_diff(theirs_project, base_project)
+
+        described_class.apply_change_to_project(base_project, changes_to_apply)
+        base_project.save
+
+        expect(base_project).to be_equivalent_to_project(theirs_project)
+      end
+
+      it "removes value if existing is string and removed is array that contains it" do
+        theirs_project = create_copy_of_project(base_project.path, "theirs")
+
+        base_project.targets[0].build_configurations.each do |configuration|
+          configuration.build_settings["HEADER_SEARCH_PATHS"] = "bar"
+        end
+        base_project.save
+
+        before_theirs_project = create_copy_of_project(base_project.path, "before_theirs")
+        before_theirs_project.targets[0].build_configurations.each do |configuration|
+          configuration.build_settings["HEADER_SEARCH_PATHS"] = ["bar"]
+        end
+
+        changes_to_apply = get_diff(theirs_project, before_theirs_project)
+
+        described_class.apply_change_to_project(base_project, changes_to_apply)
+        base_project.save
+
+        expect(base_project).to be_equivalent_to_project(theirs_project)
+      end
+
+      it "removes value if removed value is string and existing is array that contains it" do
+        theirs_project = create_copy_of_project(base_project.path, "theirs")
+
+        base_project.targets[0].build_configurations.each do |configuration|
+          configuration.build_settings["HEADER_SEARCH_PATHS"] = ["bar"]
+        end
+        base_project.save
+
+        before_theirs_project = create_copy_of_project(base_project.path, "before_theirs")
+        before_theirs_project.targets[0].build_configurations.each do |configuration|
+          configuration.build_settings["HEADER_SEARCH_PATHS"] = "bar"
+        end
+
+        changes_to_apply = get_diff(theirs_project, before_theirs_project)
+
+        described_class.apply_change_to_project(base_project, changes_to_apply)
+        base_project.save
+
+        expect(base_project).to be_equivalent_to_project(theirs_project)
+      end
+
+      it "removes value if existing is string and removed is array that contains it among other " \
+          "values" do
+        theirs_project = create_copy_of_project(base_project.path, "theirs")
+
+        base_project.targets[0].build_configurations.each do |configuration|
+          configuration.build_settings["HEADER_SEARCH_PATHS"] = "bar"
+        end
+        base_project.save
+
+        before_theirs_project = create_copy_of_project(base_project.path, "before_theirs")
+        before_theirs_project.targets[0].build_configurations.each do |configuration|
+          configuration.build_settings["HEADER_SEARCH_PATHS"] = %w[bar baz]
+        end
+
+        changes_to_apply = get_diff(theirs_project, before_theirs_project)
+
+        described_class.apply_change_to_project(base_project, changes_to_apply)
+        base_project.save
+
+        expected_project = create_copy_of_project(base_project.path, "expected")
+        expected_project.targets[0].build_configurations.each do |configuration|
+          configuration.build_settings["HEADER_SEARCH_PATHS"] = nil
+        end
+        expect(base_project).to be_equivalent_to_project(expected_project)
+      end
+
+      it "changes to a single string value if removed is string and existing is array that " \
+          "contains it among another value" do
+        theirs_project = create_copy_of_project(base_project.path, "theirs")
+
+        base_project.targets[0].build_configurations.each do |configuration|
+          configuration.build_settings["HEADER_SEARCH_PATHS"] = %w[bar baz]
+        end
+        base_project.save
+
+        before_theirs_project = create_copy_of_project(base_project.path, "before_theirs")
+        before_theirs_project.targets[0].build_configurations.each do |configuration|
+          configuration.build_settings["HEADER_SEARCH_PATHS"] = "bar"
+        end
+
+        changes_to_apply = get_diff(theirs_project, before_theirs_project)
+
+        described_class.apply_change_to_project(base_project, changes_to_apply)
+        base_project.save
+
+        expected_project = create_copy_of_project(base_project.path, "expected")
+        expected_project.targets[0].build_configurations.each do |configuration|
+          configuration.build_settings["HEADER_SEARCH_PATHS"] = "baz"
+        end
+        expect(base_project).to be_equivalent_to_project(expected_project)
+      end
+
+      it "changes to string value if change contains removal of existing array" do
+        base_project.targets[0].build_configurations.each do |configuration|
+          configuration.build_settings["HEADER_SEARCH_PATHS"] = %w[bar foo]
+        end
+
+        base_project.save
+        theirs_project = create_copy_of_project(base_project.path, "theirs")
+
+        theirs_project.targets[0].build_configurations.each do |configuration|
+          configuration.build_settings["HEADER_SEARCH_PATHS"] = "baz"
+        end
+
+        changes_to_apply = get_diff(theirs_project, base_project)
+
+        described_class.apply_change_to_project(base_project, changes_to_apply)
+        base_project.save
+
+        expect(base_project).to be_equivalent_to_project(theirs_project)
+      end
+
+      it "changes to array value if change contains removal of existing string" do
+        base_project.targets[0].build_configurations.each do |configuration|
+          configuration.build_settings["HEADER_SEARCH_PATHS"] = "bar"
+        end
+
+        base_project.save
+        theirs_project = create_copy_of_project(base_project.path, "theirs")
+
+        theirs_project.targets[0].build_configurations.each do |configuration|
+          configuration.build_settings["HEADER_SEARCH_PATHS"] = %w[baz foo]
+        end
+
+        changes_to_apply = get_diff(theirs_project, base_project)
+
+        described_class.apply_change_to_project(base_project, changes_to_apply)
+        base_project.save
+
+        expect(base_project).to be_equivalent_to_project(theirs_project)
+      end
+
+      it "changes to array if added value is string and existing is another string and removal is" \
+          "nil for an array build setting" do
+        before_theirs_project = create_copy_of_project(base_project.path, "theirs")
+
+        base_project.targets[0].build_configurations.each do |configuration|
+          configuration.build_settings["HEADER_SEARCH_PATHS"] = "bar"
+        end
+        base_project.save
+
+        theirs_project = create_copy_of_project(base_project.path, "before_theirs")
+        theirs_project.targets[0].build_configurations.each do |configuration|
+          configuration.build_settings["HEADER_SEARCH_PATHS"] = "baz"
+        end
+
+        expected_project = create_copy_of_project(base_project.path, "expected")
+        expected_project.targets[0].build_configurations.each do |configuration|
+          configuration.build_settings["HEADER_SEARCH_PATHS"] = %w[bar baz]
+        end
+
+        changes_to_apply = get_diff(theirs_project, before_theirs_project)
+
+        described_class.apply_change_to_project(base_project, changes_to_apply)
+        base_project.save
+
+        expect(base_project).to be_equivalent_to_project(expected_project)
+      end
+
+      it "raises if added value is string and existing is another string and removal is nil for a " \
+          "string build setting" do
+        before_theirs_project = create_copy_of_project(base_project.path, "theirs")
+
+        base_project.targets[0].build_configurations.each do |configuration|
+          configuration.build_settings["PRODUCT_NAME"] = "bar"
+        end
+        base_project.save
+
+        theirs_project = create_copy_of_project(base_project.path, "before_theirs")
+        theirs_project.targets[0].build_configurations.each do |configuration|
+          configuration.build_settings["PRODUCT_NAME"] = "baz"
+        end
+
+        changes_to_apply = get_diff(theirs_project, before_theirs_project)
+
+        expect {
+          described_class.apply_change_to_project(base_project, changes_to_apply)
+        }.to raise_error(Kintsugi::MergeError)
+      end
+
+      it "raises if trying to remove hash entry whose value changed" do
+        base_project.targets[0].build_configurations.each do |configuration|
+          configuration.build_settings["HEADER_SEARCH_PATHS"] = "bar"
+        end
+
+        base_project.save
+        theirs_project = create_copy_of_project(base_project.path, "theirs")
+        theirs_project.targets[0].build_configurations.each do |configuration|
+          configuration.build_settings = nil
+        end
+
+        base_project.save
+        before_theirs_project = create_copy_of_project(base_project.path, "theirs")
+        before_theirs_project.targets[0].build_configurations.each do |configuration|
+          configuration.build_settings["HEADER_SEARCH_PATHS"] = "baz"
+        end
+
+        changes_to_apply = get_diff(theirs_project, before_theirs_project)
+
+        expect {
+          described_class.apply_change_to_project(base_project, changes_to_apply)
+        }.to raise_error(Kintsugi::MergeError)
+      end
     end
 
     it "adds build phases" do
@@ -752,7 +1174,7 @@ describe Kintsugi, :apply_change_to_project do
     base_project.save
     theirs_project = create_copy_of_project(base_project.path, "theirs")
 
-    theirs_project.root_object.known_regions += ["en"]
+    theirs_project.root_object.known_regions += ["fr"]
 
     changes_to_apply = get_diff(theirs_project, base_project)
 
@@ -763,12 +1185,9 @@ describe Kintsugi, :apply_change_to_project do
   end
 
   it "removes known regions" do
-    base_project.root_object.known_regions += ["en"]
-
-    base_project.save
     theirs_project = create_copy_of_project(base_project.path, "theirs")
 
-    theirs_project.root_object.known_regions = []
+    theirs_project.root_object.known_regions = nil
 
     changes_to_apply = get_diff(theirs_project, base_project)
 
@@ -934,7 +1353,15 @@ describe Kintsugi, :apply_change_to_project do
   end
 
   def get_diff(first_project, second_project)
-    Xcodeproj::Differ.project_diff(first_project, second_project, :added, :removed)
+    diff = Xcodeproj::Differ.project_diff(first_project, second_project, :added, :removed)
+
+    diff_without_display_name =
+      diff.merge("rootObject" => diff["rootObject"].reject { |key, _| key == "displayName" })
+    if diff_without_display_name == {"rootObject" => {}}
+      raise "Diff contains no changes. This probably means the test doesn't check anything."
+    end
+
+    diff
   end
 
   def add_new_subproject_to_project(project, subproject_name, subproject_product_name)
@@ -987,6 +1414,22 @@ describe Kintsugi, :apply_change_to_project do
     reference_proxy
   end
 
+  def create_swift_package_product_dependency(project)
+    product_dependency = project.new(Xcodeproj::Project::XCSwiftPackageProductDependency)
+    product_dependency.product_name = "foo"
+    product_dependency.package = create_remote_swift_package_reference(project)
+
+    product_dependency
+  end
+
+  def create_remote_swift_package_reference(project)
+    package_reference = project.new(Xcodeproj::Project::XCRemoteSwiftPackageReference)
+    package_reference.repositoryURL = "http://foo"
+    package_reference.requirement = {"foo" => "bar"}
+
+    package_reference
+  end
+
   def make_temp_directory(directory_prefix, directory_extension)
     directory_path = Dir.mktmpdir([directory_prefix, directory_extension])
     temporary_directories_paths << directory_path

data/spec/spec_helper.rb

@@ -44,6 +44,9 @@ RSpec.configure do |config|
     mocks.verify_partial_doubles = true
   end
 
+  config.filter_run focus: true
+  config.run_all_when_everything_filtered = true
+
   # This option will default to `:apply_to_host_groups` in RSpec 4 (and will
   # have no way to turn it off -- the option exists only for backwards
   # compatibility in RSpec 3). It causes shared context metadata to be

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kintsugi
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Ben Yohay
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-02 00:00:00.000000000 Z
+date: 2022-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj
@@ -135,7 +135,7 @@ homepage: https://github.com/Lightricks/Kintsugi
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -150,9 +150,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
+rubyforge_project: 
 rubygems_version: 2.7.6.3
-signing_key:
+signing_key: 
 specification_version: 4
 summary: pbxproj files git conflicts solver
 test_files: