kintsugi 0.7.0 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd0bf9dde374b1b29b0e386ff0f4f051f6686e04b140199c8b62d6a73c053285
-  data.tar.gz: 8845644c3e18fb6244f402d2b432966a0f6e437ced4f441cdd1d43a06369ef51
+  metadata.gz: c3024a2418328a3a3fb120f6b2bb7250477079f922dbd1882785ed065b3ff8a8
+  data.tar.gz: 98e1e7752eee2e47555b8eb0d21189b06869f284426279ff5aed403c7daa1e7f
 SHA512:
-  metadata.gz: 0fd505102998df8f7b0c16d7a0fe7b437e5b6402db784383f752f7b0272fe5b7f2ab2c7b9c18e3de2ee3c071b5cf21577bb4089c792a6ca15286efa3f1f9ae7d
-  data.tar.gz: 85d252a8135e10b536b042156dc787e9a8d9ac5286736d01113ea4380a49d049f8837430d15490f15c3d14cbdf0f7a3cf75ac5dc4f2047bef55cc7f6fb00f837
+  metadata.gz: c3a847fa528aaddb9c537c6f6a7aa91434ddf4d817f8434173d162617a854a3f0f9c012c7c2699c20e6901617f6c2eb91eb429c72a2181163e72a25898dc7ce8
+  data.tar.gz: ef5f8ae4c8da4c79aac9510892b714c0801b58829af83a84146add68404be0106c09cd71f219d6a6b1e832d2c05e596a5bd44428388ef91d35e33ff897ef4fa7

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/cli.rb

@@ -31,21 +31,12 @@ module Kintsugi
     Command = Struct.new(:option_parser, :action, :description, keyword_init: true)
 
     def create_driver_subcommand
-      option_parser =
-        OptionParser.new do |opts|
-          opts.banner = "Usage: kintsugi driver BASE OURS THEIRS ORIGINAL_FILE_PATH [options]\n" \
-            "Uses Kintsugi as a Git merge driver. Parameters " \
-            "should be the path to base version of the file, path to ours version, path to " \
-            "theirs version, and the original file path."
-
-          opts.on("--interactive-resolution=FLAG", TrueClass, "In case a conflict that requires " \
-            "human decision to resolve, show an interactive prompt with choices to resolve it")
-
-          opts.on("-h", "--help", "Prints this help") do
-            puts opts
-            exit
-          end
-        end
+      option_parser = create_base_option_parser
+      option_parser.banner = "Usage: kintsugi driver BASE OURS THEIRS ORIGINAL_FILE_PATH " \
+          "[options]\n" \
+          "Uses Kintsugi as a Git merge driver. Parameters " \
+          "should be the path to base version of the file, path to ours version, path to " \
+          "theirs version, and the original file path."
 
       driver_action = lambda { |options, arguments|
         if arguments.count != 4
@@ -54,9 +45,7 @@ module Kintsugi
           exit(1)
         end
 
-        unless options[:"interactive-resolution"].nil?
-          Settings.interactive_resolution = options[:"interactive-resolution"]
-        end
+        update_settings(options)
 
         Kintsugi.three_way_merge(arguments[0], arguments[1], arguments[2], arguments[3])
         warn "\e[32mKintsugi auto-merged #{arguments[3]}\e[0m"
@@ -70,17 +59,10 @@ module Kintsugi
     end
 
     def create_install_driver_subcommand
-      option_parser =
-        OptionParser.new do |opts|
-          opts.banner = "Usage: kintsugi install-driver [driver-options]\n" \
-            "Installs Kintsugi as a Git merge driver globally. `driver-options` will be passed " \
-            "to `kintsugi driver`."
-
-          opts.on("-h", "--help", "Prints this help") do
-            puts opts
-            exit
-          end
-        end
+      option_parser = create_base_option_parser
+      option_parser.banner = "Usage: kintsugi install-driver [driver-options]\n" \
+          "Installs Kintsugi as a Git merge driver globally. `driver-options` will be passed " \
+          "to `kintsugi driver`."
 
       action = lambda { |options, arguments|
         if arguments.count != 0
@@ -94,7 +76,9 @@ module Kintsugi
           exit(1)
         end
 
-        install_kintsugi_driver_globally(options)
+        driver_options = extract_driver_options(options, option_parser)
+
+        install_kintsugi_driver_globally(driver_options)
         puts "Done! 🪄"
       }
 
@@ -105,9 +89,30 @@ module Kintsugi
       )
     end
 
+    def extract_driver_options(options, option_parser)
+      options.map do |option_name, option_value|
+        switch = option_parser.top.search(:long, option_name.to_s)
+        prefix = "--"
+        if switch.nil?
+          switch = option_parser.top.search(:short, option_name.to_s)
+          prefix = "-"
+        end
+        case switch
+        when OptionParser::Switch::NoArgument
+          [prefix + option_name.to_s]
+        when NilClass
+          puts "Invalid flag #{option_name} passed to 'install-driver' subcommand\n\n"
+          puts option_parser
+          exit(1)
+        else
+          [prefix + option_name.to_s, option_value]
+        end
+      end.flatten
+    end
+
     def install_kintsugi_driver_globally(options)
       `git config --global merge.kintsugi.name "Kintsugi driver"`
-      kintsugi_command = "kintsugi driver %O %A %B %P #{options}"
+      kintsugi_command = "kintsugi driver %O %A %B %P #{options.join(" ")}".rstrip
       `git config --global merge.kintsugi.driver "#{kintsugi_command}"`
 
       attributes_file_path = global_attributes_file_path
@@ -173,33 +178,21 @@ module Kintsugi
     end
 
     def create_root_command
-      option_parser = OptionParser.new do |opts|
-        opts.banner = "Kintsugi, version #{Version::STRING}\n" \
-                      "Copyright (c) 2021 Lightricks\n\n" \
-                      "Usage: kintsugi <pbxproj_filepath> [options]\n" \
-                      "       kintsugi <subcommand> [options]"
-
-        opts.separator ""
-        opts.on("--changes-output-path=PATH", "Path to which changes applied to the project are " \
-                "written in JSON format. Used for debug purposes.")
-
-        opts.on("-h", "--help", "Prints this help") do
-          puts opts
-          exit
-        end
-
-        opts.on("-v", "--version", "Prints version") do
-          puts Version::STRING
-          exit
-        end
-
-        opts.on("--allow-duplicates", "Allow to add duplicates of the same entity")
+      option_parser = create_base_option_parser
+      option_parser.banner = "Kintsugi, version #{Version::STRING}\n" \
+          "Copyright (c) 2021 Lightricks\n\n" \
+          "Usage: kintsugi <pbxproj_filepath> [options]\n" \
+          "       kintsugi <subcommand> [options]"
+
+      option_parser.on("-v", "--version", "Prints version") do
+        puts Version::STRING
+        exit
+      end
 
-        opts.on("--interactive-resolution=FLAG", TrueClass, "In case a conflict that requires " \
-                "human decision to resolve, show an interactive prompt with choices to resolve it")
+      option_parser.on("--changes-output-path=PATH", "Path to which changes applied to the " \
+          "project are written in JSON format. Used for debug purposes.")
 
-        opts.on_tail("\nSUBCOMMANDS\n#{subcommands_descriptions(subcommands)}")
-      end
+      option_parser.on_tail("\nSUBCOMMANDS\n#{subcommands_descriptions(subcommands)}")
 
       root_action = lambda { |options, arguments|
         if arguments.count != 1
@@ -208,13 +201,7 @@ module Kintsugi
           exit(1)
         end
 
-        if options[:"allow-duplicates"]
-          Settings.allow_duplicates = true
-        end
-
-        unless options[:"interactive-resolution"].nil?
-          Settings.interactive_resolution = options[:"interactive-resolution"]
-        end
+        update_settings(options)
 
         project_file_path = File.expand_path(arguments[0])
         Kintsugi.resolve_conflicts(project_file_path, options[:"changes-output-path"])
@@ -228,6 +215,32 @@ module Kintsugi
       )
     end
 
+    def create_base_option_parser
+      OptionParser.new do |opts|
+        opts.separator ""
+
+        opts.on("-h", "--help", "Prints this help") do
+          puts opts
+          exit
+        end
+
+        opts.on("--allow-duplicates", "Allow to add duplicates of the same entity")
+
+        opts.on("--interactive-resolution=FLAG", TrueClass, "In case a conflict that requires " \
+                "human decision to resolve, show an interactive prompt with choices to resolve it")
+      end
+    end
+
+    def update_settings(options)
+      if options[:"allow-duplicates"]
+        Settings.allow_duplicates = true
+      end
+
+      unless options[:"interactive-resolution"].nil?
+        Settings.interactive_resolution = options[:"interactive-resolution"]
+      end
+    end
+
     def subcommands_descriptions(subcommands)
       longest_subcommand_length = subcommands.keys.map(&:length).max + 4
       format_string = "    %-#{longest_subcommand_length}s%s"

data/lib/kintsugi/version.rb

@@ -3,6 +3,6 @@
 module Kintsugi
   # This module holds the Kintsugi version information.
   module Version
-    STRING = "0.7.0"
+    STRING = "0.7.2"
   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.0
+  version: 0.7.2
 platform: ruby
 authors:
 - Ben Yohay
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-29 00:00:00.000000000 Z
+date: 2023-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tty-prompt
@@ -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.18
 signing_key: 
 specification_version: 4
 summary: pbxproj files git conflicts solver