kintsugi 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d58044d1f7c23e62f290c33defa4d9b3e95c0012b62754997a7c628d96e4358
-  data.tar.gz: 6d63f1e0cf56c131fe7222c9d316f4f152310077fa2a9f4e386fba54ab82a340
+  metadata.gz: 8ebc10e7941cd3b92850cefb1d5fc0d0046b178b0b3e6bdc929833ff9474302f
+  data.tar.gz: 5cddf2267408f4361862e68f7391783626c6bf7f536962d0c0021b559c0cc637
 SHA512:
-  metadata.gz: 1aa18d3fd3456e1aa44f6497bc3e2f4e4877836e8722887050725012591e43b0086efa490df8eab8f1b63800f900897365a81c87935fb68341b1727e4c432e99
-  data.tar.gz: f8aa152a98e35b9620a3c855eb010781a7fb65e843c6323ea4d14fb27ba414416c2e585273f797e0d8698dfae67d9f7a963e626cc2a2f40ca0d6cce0707cfc0d
+  metadata.gz: b052e5047b603307043b708d804678094ac38ee4e392a3de1d5f94b1ca37a552ff5999320a1168f976f803620cb2072e44712dd49a6fc87d929e666248b64ccf
+  data.tar.gz: 213fea0a670e021ae68dae8669e216da4fc19039e71e059e6c33b57adbc753ae824e28d1a5d6b806527215b057a8fd354481c8772794337d73daa88e6c884300

data/.rubocop.yml

@@ -6,6 +6,9 @@ RSpec/ExampleLength:
 RSpec/DescribeClass:
   Enabled: false
 
+RSpec/MultipleExpectations:
+  Enabled: false
+
 AllCops:
   DisplayCopNames: true
   TargetRubyVersion: 2.5

data/Gemfile

@@ -2,5 +2,3 @@
 
 source "https://rubygems.org"
 gemspec
-gem "ruby-debug-ide", "0.7.2"
-gem "debase", "0.2.5.beta2"

data/lib/kintsugi/apply_change_to_project.rb

@@ -266,6 +266,8 @@ module Kintsugi
       case change["isa"]
       when "PBXNativeTarget"
         add_target(component, change)
+      when "PBXAggregateTarget"
+        add_aggregate_target(component, change)
       when "PBXFileReference"
         add_file_reference(component, change)
       when "PBXGroup"
@@ -307,7 +309,22 @@ module Kintsugi
     def add_reference_proxy(containing_component, change)
       case containing_component
       when Xcodeproj::Project::PBXBuildFile
-        containing_component.file_ref = find_file(containing_component.project, change)
+        # If there are two file references that refer to the same file, one with a build file and
+        # the other one without, this method will prefer to take the one without the build file.
+        # This assumes that it's preferred to have a file reference with build file than a file
+        # reference without/with two build files.
+        filter_references_without_build_files = lambda do |reference|
+          reference.referrers.find do |referrer|
+            referrer.is_a?(Xcodeproj::Project::PBXBuildFile)
+          end.nil?
+        end
+        file_reference =
+          find_reference_proxy(containing_component.project, change["remoteRef"],
+                               reference_filter: filter_references_without_build_files)
+        if file_reference.nil?
+          file_reference = find_reference_proxy(containing_component.project, change["remoteRef"])
+        end
+        containing_component.file_ref = file_reference
       when Xcodeproj::Project::PBXGroup
         reference_proxy = containing_component.project.new(Xcodeproj::Project::PBXReferenceProxy)
         containing_component << reference_proxy
@@ -459,7 +476,14 @@ module Kintsugi
     end
 
     def add_subproject_reference(root_object, project_reference_change)
-      subproject_reference = find_file(root_object.project, project_reference_change["ProjectRef"])
+      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"],
+                  file_filter: filter_subproject_without_project_references)
 
       attribute =
         Xcodeproj::Project::PBXProject.references_by_keys_attributes
@@ -489,6 +513,12 @@ module Kintsugi
       add_attributes_to_component(target, change)
     end
 
+    def add_aggregate_target(root_object, change)
+      target = root_object.project.new(Xcodeproj::Project::PBXAggregateTarget)
+      root_object.project.targets << target
+      add_attributes_to_component(target, change)
+    end
+
     def add_file_reference(containing_component, change)
       # base configuration reference and product reference always reference a file that exists
       # inside a group, therefore in these cases the file is searched for.
@@ -556,25 +586,29 @@ module Kintsugi
       end
     end
 
-    def find_file(project, file_reference_change)
-      case file_reference_change["isa"]
-      when "PBXFileReference"
-        project.files.find do |file_reference|
-          next file_reference.path == file_reference_change["path"]
-        end
-      when "PBXReferenceProxy"
-        find_reference_proxy(project, file_reference_change["remoteRef"])
-      else
-        raise "Unsupported file reference change of type #{file_reference["isa"]}."
+    def find_file(project, file_reference_change, file_filter: ->(_) { true })
+      file_references = project.files.select do |file_reference|
+        file_reference.path == file_reference_change["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."
+      elsif file_references.empty?
+        puts "Debug: No file reference found for file with path " \
+          "'#{file_reference_change["path"]}'."
+        return
+      end
+
+      file_references.first
     end
 
-    def find_reference_proxy(project, container_item_proxy_change)
+    def find_reference_proxy(project, container_item_proxy_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 |product|
           product.remote_ref.remote_global_id_string ==
             container_item_proxy_change["remoteGlobalIDString"] &&
-            product.remote_ref.remote_info == container_item_proxy_change["remoteInfo"]
+            product.remote_ref.remote_info == container_item_proxy_change["remoteInfo"] &&
+            reference_filter.call(product)
         end
       end.compact
 

data/lib/kintsugi/version.rb

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

data/lib/kintsugi.rb

@@ -2,6 +2,7 @@
 # Created by Ben Yohay.
 # frozen_string_literal: true
 
+require "json"
 require "tmpdir"
 require "tempfile"
 require "xcodeproj"
@@ -16,7 +17,7 @@ module Kintsugi
     # @param  [String] project_file_path
     #         Project to which to apply the changes.
     #
-    # @param  [String] output_changes_path
+    # @param  [String] changes_output_path
     #         Path to where the changes to apply to the project are written in JSON format.
     #
     # @raise [ArgumentError]

data/spec/kintsugi_apply_change_to_project_spec.rb

@@ -38,6 +38,18 @@ describe Kintsugi, :apply_change_to_project do
     expect(base_project).to be_equivalent_to_project(theirs_project)
   end
 
+  it "adds new aggregate target" do
+    theirs_project = create_copy_of_project(base_project.path, "theirs")
+    theirs_project.new_aggregate_target("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
+
   it "adds new subproject" do
     theirs_project = create_copy_of_project(base_project.path, "theirs")
     add_new_subproject_to_project(theirs_project, "foo", "foo")
@@ -50,6 +62,26 @@ describe Kintsugi, :apply_change_to_project do
     expect(base_project).to be_equivalent_to_project(theirs_project, ignore_keys: ["containerPortal"])
   end
 
+  it "adds subproject that already exists" do
+    theirs_project = create_copy_of_project(base_project.path, "theirs")
+
+    subproject = add_new_subproject_to_project(theirs_project, "foo", "foo")
+    theirs_project.save
+
+    ours_project = create_copy_of_project(base_project.path, "ours")
+    add_existing_subproject_to_project(ours_project, subproject, "foo")
+
+    changes_to_apply = get_diff(theirs_project, base_project)
+
+    described_class.apply_change_to_project(ours_project, changes_to_apply)
+    ours_project.save
+
+    expect(ours_project.root_object.project_references[0][:project_ref].uuid)
+      .not_to equal(ours_project.root_object.project_references[1][:project_ref].uuid)
+    expect(ours_project.root_object.project_references[0][:project_ref].proxy_containers).not_to be_empty
+    expect(ours_project.root_object.project_references[1][:project_ref].proxy_containers).not_to be_empty
+  end
+
   # Checks that the order the changes are applied in is correct.
   it "adds new subproject and reference to its framework" do
     theirs_project = create_copy_of_project(base_project.path, "theirs")
@@ -417,6 +449,30 @@ describe Kintsugi, :apply_change_to_project do
       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.save
+
+      theirs_project = create_copy_of_project(base_project.path, "theirs")
+
+      theirs_file_reference = theirs_project.main_group.files.find do |file|
+        !file.referrers.find { |referrer| referrer.is_a?(Xcodeproj::Project::PBXBuildFile) } &&
+          file.display_name == "bar"
+      end
+      theirs_project.targets[0].frameworks_build_phase.add_file_reference(theirs_file_reference)
+
+      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 file reference to build file" do
       file_reference = base_project.main_group.new_reference("bar")
 
@@ -789,7 +845,7 @@ describe Kintsugi, :apply_change_to_project do
     expect(ours_project).to be_equivalent_to_project(theirs_project)
   end
 
-  it "identifies subproject added in separate times" do
+  it "identifies subproject added at separate times when adding a product to the subproject" do
     framework_filename = "baz"
 
     subproject = new_subproject("subproj", framework_filename)
@@ -870,10 +926,10 @@ describe Kintsugi, :apply_change_to_project do
       file_reference.path == subproject_product_name
     end.remove_from_project
 
-    project.root_object.project_references[0][:product_group] =
+    project.root_object.project_references[-1][:product_group] =
       project.new(Xcodeproj::Project::PBXGroup)
-    project.root_object.project_references[0][:product_group].name = "Products"
-    project.root_object.project_references[0][:product_group] <<
+    project.root_object.project_references[-1][:product_group].name = "Products"
+    project.root_object.project_references[-1][:product_group] <<
       create_reference_proxy_from_product_reference(project, subproject_reference,
                                                     subproject.products_group.files[0])
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kintsugi
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Ben Yohay
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-20 00:00:00.000000000 Z
+date: 2021-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj
@@ -143,7 +143,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubyforge_project:
+rubygems_version: 2.7.3
 signing_key:
 specification_version: 4
 summary: pbxproj files git conflicts solver