kintsugi 0.5.0 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46711f40795142678185287c0035cb3ad3ebe304b418cf8add570c0e4f6db997
-  data.tar.gz: b2c6fd04f472dca7ca3ca436140b0256264a221228a8ae2c086ff3cef9ac9dc4
+  metadata.gz: 563ca542b9548a7627fbed93666f74046bb2d58d172c8d8669e9450935391804
+  data.tar.gz: '0049c73e560aefe9d627ac32cb2834914611ad9f7944ba6cd99f9b07744d5b9b'
 SHA512:
-  metadata.gz: 8b9a65bbd0796ce8e2f0da7fb50f772e753d03875fd79f5cc0816cd3197e049bc656cc14c2f521ab6c1a63b77b34290137d1b103dc5b51bc3e5b5daadac20b7f
-  data.tar.gz: 143a7a9d17799dde48c845570084ec94b7ea00ee482cd6f50773055c71efdca5e8e82360130d43f64989a5a4c5d945b7b938d2458e91b3d745c6e4700932863f
+  metadata.gz: 420b46d20c19b8ed5596d1034a4791a054820e1ad550c28bf6cd18bbc92334b1f969f65b9b9384b1d824430d11f41cb48e9cabc09a2bb5aea0cb85f68d6d3fca
+  data.tar.gz: dc09f81c4d329a6e2ba93624a7caf2e54bc38a29752076ba56bb347d12fcb7ad49537c50d6ea42af17d92d55e46250582da71f1b8b946537f3193e0b1b58faba

data/.github/workflows/release.yml

@@ -0,0 +1,33 @@
+name: Release
+
+on: workflow_dispatch
+
+jobs:
+  main-job:
+    name: Release
+    runs-on: ubuntu-latest
+    env:
+      GEM_HOST_API_KEY: ${{ secrets.GEM_HOST_API_KEY }}
+
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v2
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.5.8
+          rubygems: latest
+
+      - name: Draft a new release
+        run: |
+          echo ${{ secrets.GITHUB_TOKEN }} | gh auth login --with-token
+          version="v$(grep STRING lib/kintsugi/version.rb | cut -d \" -f 2)"
+          git tag $version
+          git push --tag
+          gh release create $version --generate-notes
+
+      - name: Publish to rubygems.org
+        run: |
+          gem build *.gemspec
+          gem push *.gem

data/.github/workflows/{ci.yml → tests.yml}

@@ -1,4 +1,4 @@
-name: CI
+name: Tests
 
 on:
   push:
@@ -19,6 +19,7 @@ jobs:
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: 2.5.8
+          rubygems: latest
           bundler-cache: true
 
       - name: Run Rake

data/.rubocop.yml

@@ -12,6 +12,9 @@ RSpec/MultipleExpectations:
 AllCops:
   DisplayCopNames: true
   TargetRubyVersion: 2.5
+  Exclude:
+    - 'lib/**/xcodeproj_extensions.rb'
+    - 'vendor/bundle/**/*'
   NewCops: enable
 
 Metrics/BlockLength:

data/Gemfile

@@ -2,8 +2,3 @@
 
 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

@@ -5,37 +5,9 @@
 # Created by Ben Yohay.
 
 require "kintsugi"
-require_relative "../lib/kintsugi/cli"
-require_relative "../lib/kintsugi/error"
-
-def parse_options!(command, argv)
-  options = {}
-  command.option_parser.parse!(argv, into: options)
-  options
-end
-
-def name_of_subcommand?(subcommands, argument)
-  subcommands.include?(argument)
-end
-
-first_argument = ARGV[0]
-cli = Kintsugi::CLI.new
-command =
-  if name_of_subcommand?(cli.subcommands, first_argument)
-    ARGV.shift
-    cli.subcommands[first_argument]
-  else
-    cli.root_command
-  end
-
-options = parse_options!(command, ARGV)
 
 begin
-  command.action.call(options, ARGV)
-rescue ArgumentError => e
-  puts "#{e.class}: #{e}"
-  exit(1)
-rescue Kintsugi::MergeError => e
-  puts e
+  Kintsugi.run(ARGV)
+rescue ArgumentError, Kintsugi::MergeError
   exit(1)
 end

data/kintsugi.gemspec

@@ -22,8 +22,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(spec)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "xcodeproj", ">= 1.19.0", "<= 1.21.0"
+  spec.add_dependency "xcodeproj", ">= 1.19.0", "<= 1.22.0"
 
+  spec.add_development_dependency "git", "~> 1.11"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.9"
   spec.add_development_dependency "rubocop", "1.12.0"

data/lib/kintsugi/apply_change_to_project.rb

@@ -29,26 +29,28 @@ module Kintsugi
           puts "Warning: Main group doesn't exist, ignoring changes to it."
         else
           apply_change_to_component(project.root_object, "mainGroup",
-                                    change["rootObject"]["mainGroup"])
+                                    change["rootObject"]["mainGroup"], "rootObject")
         end
       end
 
       unless change["rootObject"]["projectReferences"].nil?
         apply_change_to_component(project.root_object, "projectReferences",
-                                  change["rootObject"]["projectReferences"])
+                                  change["rootObject"]["projectReferences"], "rootObject")
       end
 
       apply_change_to_component(project, "rootObject",
                                 change["rootObject"].reject { |key|
                                   %w[mainGroup projectReferences].include?(key)
-                                })
+                                }, "")
     end
 
     private
 
-    def apply_change_to_component(parent_component, change_name, change)
+    def apply_change_to_component(parent_component, change_name, change, parent_change_path)
       return if change_name == "displayName"
 
+      change_path = parent_change_path.empty? ? change_name : "#{parent_change_path}/#{change_name}"
+
       attribute_name = attribute_name_from_change_name(change_name)
       if simple_attribute?(parent_component, attribute_name)
         apply_change_to_simple_attribute(parent_component, attribute_name, change)
@@ -62,7 +64,7 @@ module Kintsugi
         component = child_component(parent_component, change_name)
 
         if component.nil?
-          add_missing_component_if_valid(parent_component, change_name, change)
+          add_missing_component_if_valid(parent_component, change_name, change, change_path)
           return
         end
       end
@@ -76,11 +78,12 @@ module Kintsugi
 
       (change[:added] || []).each do |added_change|
         is_object_list = component.is_a?(Xcodeproj::Project::ObjectList)
-        add_child_to_component(is_object_list ? parent_component : component, added_change)
+        add_child_to_component(is_object_list ? parent_component : component, added_change,
+                               change_path)
       end
 
       subchanges_of_change(change).each do |subchange_name, subchange|
-        apply_change_to_component(component, subchange_name, subchange)
+        apply_change_to_component(component, subchange_name, subchange, change_path)
       end
     end
 
@@ -100,9 +103,9 @@ module Kintsugi
       end
     end
 
-    def add_missing_component_if_valid(parent_component, change_name, change)
+    def add_missing_component_if_valid(parent_component, change_name, change, change_path)
       if change[:added] && change.compact.count == 1
-        add_child_to_component(parent_component, change[:added])
+        add_child_to_component(parent_component, change[:added], change_path)
         return
       end
 
@@ -112,10 +115,7 @@ module Kintsugi
 
     def replace_component_with_new_type(parent_component, name_in_parent_component, change)
       old_component = parent_component.send(name_in_parent_component)
-
-      new_component = parent_component.project.new(
-        Module.const_get("Xcodeproj::Project::#{change["isa"][:added]}")
-      )
+      new_component = component_of_new_type(parent_component, change, old_component)
 
       copy_attributes_to_new_component(old_component, new_component)
 
@@ -123,6 +123,27 @@ module Kintsugi
       new_component
     end
 
+    def component_of_new_type(parent_component, change, old_component)
+      if change["isa"][:added] == "PBXFileReference"
+        path = (change["path"] && change["path"][:added]) || old_component.path
+        case parent_component
+        when Xcodeproj::Project::XCBuildConfiguration
+          parent_component.base_configuration_reference = find_file(parent_component.project, path)
+          return parent_component.base_configuration_reference
+        when Xcodeproj::Project::PBXNativeTarget
+          parent_component.product_reference = find_file(parent_component.project, path)
+          return parent_component.product_reference
+        when Xcodeproj::Project::PBXBuildFile
+          parent_component.file_ref = find_file(parent_component.project, path)
+          return parent_component.file_ref
+        end
+      end
+
+      parent_component.project.new(
+        Module.const_get("Xcodeproj::Project::#{change["isa"][:added]}")
+      )
+    end
+
     def copy_attributes_to_new_component(old_component, new_component)
       # The change won't describe the attributes that haven't changed, therefore the attributes
       # are copied to the new component.
@@ -298,63 +319,65 @@ module Kintsugi
       end
     end
 
-    def add_child_to_component(component, change)
+    def add_child_to_component(component, change, component_change_path)
+      change_path = "#{component_change_path}/#{change["displayName"]}"
+
       if change["ProjectRef"] && change["ProductGroup"]
-        add_subproject_reference(component, change)
+        add_subproject_reference(component, change, change_path)
         return
       end
 
       case change["isa"]
       when "PBXNativeTarget"
-        add_target(component, change)
+        add_target(component, change, change_path)
       when "PBXAggregateTarget"
-        add_aggregate_target(component, change)
+        add_aggregate_target(component, change, change_path)
       when "PBXFileReference"
-        add_file_reference(component, change)
+        add_file_reference(component, change, change_path)
       when "PBXGroup"
-        add_group(component, change)
+        add_group(component, change, change_path)
       when "PBXContainerItemProxy"
-        add_container_item_proxy(component, change)
+        add_container_item_proxy(component, change, change_path)
       when "PBXTargetDependency"
-        add_target_dependency(component, change)
+        add_target_dependency(component, change, change_path)
       when "PBXBuildFile"
-        add_build_file(component, change)
+        add_build_file(component, change, change_path)
       when "XCConfigurationList"
-        add_build_configuration_list(component, change)
+        add_build_configuration_list(component, change, change_path)
       when "XCBuildConfiguration"
-        add_build_configuration(component, change)
+        add_build_configuration(component, change, change_path)
       when "PBXHeadersBuildPhase"
-        add_headers_build_phase(component, change)
+        add_headers_build_phase(component, change, change_path)
       when "PBXSourcesBuildPhase"
-        add_sources_build_phase(component, change)
+        add_sources_build_phase(component, change, change_path)
       when "PBXCopyFilesBuildPhase"
-        add_copy_files_build_phase(component, change)
+        add_copy_files_build_phase(component, change, change_path)
       when "PBXShellScriptBuildPhase"
-        add_shell_script_build_phase(component, change)
+        add_shell_script_build_phase(component, change, change_path)
       when "PBXFrameworksBuildPhase"
-        add_frameworks_build_phase(component, change)
+        add_frameworks_build_phase(component, change, change_path)
       when "PBXResourcesBuildPhase"
-        add_resources_build_phase(component, change)
+        add_resources_build_phase(component, change, change_path)
       when "PBXBuildRule"
-        add_build_rule(component, change)
+        add_build_rule(component, change, change_path)
       when "PBXVariantGroup"
-        add_variant_group(component, change)
+        add_variant_group(component, change, change_path)
       when "PBXReferenceProxy"
-        add_reference_proxy(component, change)
+        add_reference_proxy(component, change, change_path)
       when "XCSwiftPackageProductDependency"
-        add_swift_package_product_dependency(component, change)
+        add_swift_package_product_dependency(component, change, change_path)
       when "XCRemoteSwiftPackageReference"
-        add_remote_swift_package_reference(component, change)
+        add_remote_swift_package_reference(component, change, change_path)
       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)
+    def add_remote_swift_package_reference(containing_component, change, change_path)
       remote_swift_package_reference =
         containing_component.project.new(Xcodeproj::Project::XCRemoteSwiftPackageReference)
-      add_attributes_to_component(remote_swift_package_reference, change)
+      add_attributes_to_component(remote_swift_package_reference, change, change_path)
 
       case containing_component
       when Xcodeproj::Project::XCSwiftPackageProductDependency
@@ -367,10 +390,10 @@ module Kintsugi
       end
     end
 
-    def add_swift_package_product_dependency(containing_component, change)
+    def add_swift_package_product_dependency(containing_component, change, change_path)
       swift_package_product_dependency =
         containing_component.project.new(Xcodeproj::Project::XCSwiftPackageProductDependency)
-      add_attributes_to_component(swift_package_product_dependency, change)
+      add_attributes_to_component(swift_package_product_dependency, change, change_path)
 
       case containing_component
       when Xcodeproj::Project::PBXBuildFile
@@ -383,7 +406,7 @@ module Kintsugi
       end
     end
 
-    def add_reference_proxy(containing_component, change)
+    def add_reference_proxy(containing_component, change, change_path)
       case containing_component
       when Xcodeproj::Project::PBXBuildFile
         # If there are two file references that refer to the same file, one with a build file and
@@ -405,74 +428,78 @@ module Kintsugi
       when Xcodeproj::Project::PBXGroup
         reference_proxy = containing_component.project.new(Xcodeproj::Project::PBXReferenceProxy)
         containing_component << reference_proxy
-        add_attributes_to_component(reference_proxy, change)
+        add_attributes_to_component(reference_proxy, change, change_path)
       else
         raise MergeError, "Trying to add reference proxy to an unsupported component type " \
           "#{containing_component.isa}. Change is: #{change}"
       end
     end
 
-    def add_variant_group(containing_component, change)
+    def add_variant_group(containing_component, change, change_path)
       case containing_component
       when Xcodeproj::Project::PBXBuildFile
         containing_component.file_ref =
           find_variant_group(containing_component.project, change["displayName"])
       when Xcodeproj::Project::PBXGroup, Xcodeproj::Project::PBXVariantGroup
+        unless adding_files_and_groups_allowed?(change_path)
+          return
+        end
+
         variant_group = containing_component.project.new(Xcodeproj::Project::PBXVariantGroup)
         containing_component.children << variant_group
-        add_attributes_to_component(variant_group, change)
+        add_attributes_to_component(variant_group, change, change_path)
       else
         raise MergeError, "Trying to add variant group to an unsupported component type " \
           "#{containing_component.isa}. Change is: #{change}"
       end
     end
 
-    def add_build_rule(target, change)
+    def add_build_rule(target, change, change_path)
       build_rule = target.project.new(Xcodeproj::Project::PBXBuildRule)
       target.build_rules << build_rule
-      add_attributes_to_component(build_rule, change)
+      add_attributes_to_component(build_rule, change, change_path)
     end
 
-    def add_shell_script_build_phase(target, change)
+    def add_shell_script_build_phase(target, change, change_path)
       build_phase = target.new_shell_script_build_phase(change["displayName"])
-      add_attributes_to_component(build_phase, change)
+      add_attributes_to_component(build_phase, change, change_path)
     end
 
-    def add_headers_build_phase(target, change)
-      add_attributes_to_component(target.headers_build_phase, change)
+    def add_headers_build_phase(target, change, change_path)
+      add_attributes_to_component(target.headers_build_phase, change, change_path)
     end
 
-    def add_sources_build_phase(target, change)
-      add_attributes_to_component(target.source_build_phase, change)
+    def add_sources_build_phase(target, change, change_path)
+      add_attributes_to_component(target.source_build_phase, change, change_path)
     end
 
-    def add_frameworks_build_phase(target, change)
-      add_attributes_to_component(target.frameworks_build_phase, change)
+    def add_frameworks_build_phase(target, change, change_path)
+      add_attributes_to_component(target.frameworks_build_phase, change, change_path)
     end
 
-    def add_resources_build_phase(target, change)
-      add_attributes_to_component(target.resources_build_phase, change)
+    def add_resources_build_phase(target, change, change_path)
+      add_attributes_to_component(target.resources_build_phase, change, change_path)
     end
 
-    def add_copy_files_build_phase(target, change)
+    def add_copy_files_build_phase(target, change, change_path)
       copy_files_phase_name = change["displayName"] == "CopyFiles" ? nil : change["displayName"]
       copy_files_phase = target.new_copy_files_build_phase(copy_files_phase_name)
 
-      add_attributes_to_component(copy_files_phase, change)
+      add_attributes_to_component(copy_files_phase, change, change_path)
     end
 
-    def add_build_configuration_list(target, change)
+    def add_build_configuration_list(target, change, change_path)
       target.build_configuration_list = target.project.new(Xcodeproj::Project::XCConfigurationList)
-      add_attributes_to_component(target.build_configuration_list, change)
+      add_attributes_to_component(target.build_configuration_list, change, change_path)
     end
 
-    def add_build_configuration(configuration_list, change)
+    def add_build_configuration(configuration_list, change, change_path)
       build_configuration = configuration_list.project.new(Xcodeproj::Project::XCBuildConfiguration)
       configuration_list.build_configurations << build_configuration
-      add_attributes_to_component(build_configuration, change)
+      add_attributes_to_component(build_configuration, change, change_path)
     end
 
-    def add_build_file(build_phase, change)
+    def add_build_file(build_phase, change, change_path)
       if change["fileRef"].nil?
         puts "Warning: Trying to add a build file without any file reference to build phase " \
           "'#{build_phase}'"
@@ -481,7 +508,7 @@ module Kintsugi
 
       build_file = build_phase.project.new(Xcodeproj::Project::PBXBuildFile)
       build_phase.files << build_file
-      add_attributes_to_component(build_file, change)
+      add_attributes_to_component(build_file, change, change_path)
     end
 
     def find_variant_group(project, display_name)
@@ -490,7 +517,7 @@ module Kintsugi
       end
     end
 
-    def add_target_dependency(target, change)
+    def add_target_dependency(target, change, change_path)
       target_dependency = find_target(target.project, change["displayName"])
 
       if target_dependency
@@ -501,14 +528,14 @@ module Kintsugi
       target_dependency = target.project.new(Xcodeproj::Project::PBXTargetDependency)
 
       target.dependencies << target_dependency
-      add_attributes_to_component(target_dependency, change)
+      add_attributes_to_component(target_dependency, change, change_path)
     end
 
     def find_target(project, display_name)
       project.targets.find { |target| target.display_name == display_name }
     end
 
-    def add_container_item_proxy(component, change)
+    def add_container_item_proxy(component, change, change_path)
       container_proxy = component.project.new(Xcodeproj::Project::PBXContainerItemProxy)
       container_proxy.container_portal = find_containing_project_uuid(component.project, change)
 
@@ -521,7 +548,8 @@ module Kintsugi
         raise MergeError, "Trying to add container item proxy to an unsupported component type " \
           "#{containing_component.isa}. Change is: #{change}"
       end
-      add_attributes_to_component(container_proxy, change, ignore_keys: ["containerPortal"])
+      add_attributes_to_component(container_proxy, change, change_path,
+                                  ignore_keys: ["containerPortal"])
     end
 
     def find_containing_project_uuid(project, container_item_proxy_change)
@@ -552,14 +580,14 @@ module Kintsugi
       container_item_proxies.first.container_portal
     end
 
-    def add_subproject_reference(root_object, project_reference_change)
+    def add_subproject_reference(root_object, project_reference_change, change_path)
       filter_subproject_without_project_references = lambda do |file_reference|
         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"],
+        find_file(root_object.project, project_reference_change["ProjectRef"]["path"],
                   file_filter: filter_subproject_without_project_references)
 
       unless subproject_reference
@@ -578,7 +606,7 @@ module Kintsugi
       updated_project_reference_change =
         change_with_updated_subproject_uuid(project_reference_change, subproject_reference.uuid)
       add_attributes_to_component(project_reference, updated_project_reference_change,
-                                  ignore_keys: ["ProjectRef"])
+                                  change_path, ignore_keys: ["ProjectRef"])
     end
 
     def change_with_updated_subproject_uuid(change, subproject_reference_uuid)
@@ -590,19 +618,19 @@ module Kintsugi
       new_change
     end
 
-    def add_target(root_object, change)
+    def add_target(root_object, change, change_path)
       target = root_object.project.new(Xcodeproj::Project::PBXNativeTarget)
       root_object.project.targets << target
-      add_attributes_to_component(target, change)
+      add_attributes_to_component(target, change, change_path)
     end
 
-    def add_aggregate_target(root_object, change)
+    def add_aggregate_target(root_object, change, change_path)
       target = root_object.project.new(Xcodeproj::Project::PBXAggregateTarget)
       root_object.project.targets << target
-      add_attributes_to_component(target, change)
+      add_attributes_to_component(target, change, change_path)
     end
 
-    def add_file_reference(containing_component, change)
+    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.
       # In the case of group and variant group, the file can't exist in another group, therefore a
@@ -610,12 +638,17 @@ module Kintsugi
       case containing_component
       when Xcodeproj::Project::XCBuildConfiguration
         containing_component.base_configuration_reference =
-          find_file(containing_component.project, change)
+          find_file(containing_component.project, change["path"])
       when Xcodeproj::Project::PBXNativeTarget
-        containing_component.product_reference = find_file(containing_component.project, change)
+        containing_component.product_reference =
+          find_file(containing_component.project, change["path"])
       when Xcodeproj::Project::PBXBuildFile
-        containing_component.file_ref = find_file(containing_component.project, change)
+        containing_component.file_ref = find_file(containing_component.project, change["path"])
       when Xcodeproj::Project::PBXGroup, Xcodeproj::Project::PBXVariantGroup
+        unless adding_files_and_groups_allowed?(change_path)
+          return
+        end
+
         file_reference = containing_component.project.new(Xcodeproj::Project::PBXFileReference)
         containing_component.children << file_reference
 
@@ -623,14 +656,23 @@ module Kintsugi
         # default.
         file_reference.include_in_index = nil
         file_reference.source_tree = nil
-        add_attributes_to_component(file_reference, change)
+        add_attributes_to_component(file_reference, change, change_path)
       else
         raise MergeError, "Trying to add file reference to an unsupported component type " \
           "#{containing_component.isa}. Change is: #{change}"
       end
     end
 
-    def add_group(containing_component, change)
+    def adding_files_and_groups_allowed?(change_path)
+      change_path.start_with?("rootObject/mainGroup") ||
+        change_path.start_with?("rootObject/projectReferences")
+    end
+
+    def add_group(containing_component, change, change_path)
+      unless adding_files_and_groups_allowed?(change_path)
+        return
+      end
+
       case containing_component
       when Xcodeproj::Project::ObjectDictionary
         # It is assumed that an `ObjectDictionary` always represents a project reference.
@@ -644,25 +686,29 @@ module Kintsugi
           "#{containing_component.isa}. Change is: #{change}"
       end
 
-      add_attributes_to_component(new_group, change)
+      add_attributes_to_component(new_group, change, change_path)
     end
 
-    def add_attributes_to_component(component, change, ignore_keys: [])
+    def add_attributes_to_component(component, change, change_path, ignore_keys: [])
       change.each do |change_name, change_value|
         next if (%w[isa displayName] + ignore_keys).include?(change_name)
 
         attribute_name = attribute_name_from_change_name(change_name)
         if simple_attribute?(component, attribute_name)
-          apply_change_to_simple_attribute(component, attribute_name, {added: change_value})
+          simple_attribute_change = {
+            added: change_value,
+            removed: simple_attribute_default_value(component, attribute_name)
+          }
+          apply_change_to_simple_attribute(component, attribute_name, simple_attribute_change)
           next
         end
 
         case change_value
         when Hash
-          add_child_to_component(component, change_value)
+          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)
+            add_child_to_component(component, added_attribute_element, change_path)
           end
         else
           raise MergeError, "Trying to add attribute of unsupported type '#{change_value.class}' " \
@@ -671,16 +717,20 @@ module Kintsugi
       end
     end
 
-    def find_file(project, file_reference_change, file_filter: ->(_) { true })
+    def simple_attribute_default_value(component, attribute_name)
+      component.simple_attributes.find do |attribute|
+        attribute.name == attribute_name
+      end.default_value
+    end
+
+    def find_file(project, path, file_filter: ->(_) { true })
       file_references = project.files.select do |file_reference|
-        file_reference.path == file_reference_change["path"] && file_filter.call(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 " \
-          "'#{file_reference_change["path"]}'. Using the first one."
+        puts "Debug: Found more than one matching file with path '#{path}'. Using the first one."
       elsif file_references.empty?
-        puts "Debug: No file reference found for file with path " \
-          "'#{file_reference_change["path"]}'."
+        puts "Debug: No file reference found for file with path '#{path}'."
         return
       end
 

data/lib/kintsugi/cli.rb

@@ -50,6 +50,7 @@ module Kintsugi
           exit(1)
         end
         Kintsugi.three_way_merge(arguments[0], arguments[1], arguments[2], arguments[3])
+        warn "\e[32mKintsugi auto-merged #{arguments[3]}\e[0m"
       }
 
       Command.new(
@@ -109,7 +110,7 @@ module Kintsugi
     def global_attributes_file_path
       # The logic to decide the path to the global attributes file is described at:
       # https://git-scm.com/docs/gitattributes.
-      config_attributes_file_path = `git config --global core.attributesfile`
+      config_attributes_file_path = `git config --global core.attributesfile`.chomp
       return config_attributes_file_path unless config_attributes_file_path.empty?
 
       if ENV["XDG_CONFIG_HOME"].nil? || ENV["XDG_CONFIG_HOME"].empty?