kintsugi 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ebc10e7941cd3b92850cefb1d5fc0d0046b178b0b3e6bdc929833ff9474302f
-  data.tar.gz: 5cddf2267408f4361862e68f7391783626c6bf7f536962d0c0021b559c0cc637
+  metadata.gz: cdc0655ad443f7511adec336aef55e40ed0bb5458cf5fd9ae7747294bf40881d
+  data.tar.gz: 214a8426b955d0c36b2ff51f55b2016ed69861ccc5d99fa2d463567cbc6872fc
 SHA512:
-  metadata.gz: b052e5047b603307043b708d804678094ac38ee4e392a3de1d5f94b1ca37a552ff5999320a1168f976f803620cb2072e44712dd49a6fc87d929e666248b64ccf
-  data.tar.gz: 213fea0a670e021ae68dae8669e216da4fc19039e71e059e6c33b57adbc753ae824e28d1a5d6b806527215b057a8fd354481c8772794337d73daa88e6c884300
+  metadata.gz: 79d21fb3b3ddcb977a0b09bb5f80d19d6337574cb5b975a342d261bd689b53ff387a4ef2c7f0fb9a33d6698ce0e739b76824515ecf4b869f5858228635d99047
+  data.tar.gz: 4a902033e2f4236d82f3db8b1fa832ec78e8201b264a32a11599b3c0df3b048bb82e5abee8cb3d3fac7e74ae4d6ff37029ae9cd809fee5ebbe65723c997862e7

data/kintsugi.gemspec

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

data/lib/kintsugi/apply_change_to_project.rb

@@ -167,7 +167,7 @@ module Kintsugi
       new_value = nil
 
       if change.key?(:removed)
-        new_value = apply_removal_to_simple_attribute(old_value, change[:removed])
+        new_value = apply_removal_to_simple_attribute(old_value, change[:removed], change[:added])
       end
 
       if change.key?(:added)
@@ -183,30 +183,31 @@ module Kintsugi
       new_value
     end
 
-    def apply_removal_to_simple_attribute(old_value, change)
-      case change
+    def apply_removal_to_simple_attribute(old_value, removed_change, added_change)
+      case removed_change
       when Array
-        (old_value || []) - change
+        (old_value || []) - removed_change
       when Hash
         (old_value || {}).reject do |key, value|
-          if value != change[key]
-            raise "Trying to remove value #{change[key]} of hash with key #{key} but it changed " \
-              "to #{value}. This is considered a conflict that should be resolved manually."
+          if value != removed_change[key] && added_change[key] != value
+            raise "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."
           end
 
-          change.key?(key)
+          removed_change.key?(key)
         end
       when String
-        if old_value != change && !old_value.nil?
-          raise "Trying to remove value #{change}, but the existing value is #{old_value}. This " \
-            "is considered a conflict that should be resolved manually."
+        if old_value != removed_change && !old_value.nil? && added_change != old_value
+          raise "Trying to remove value '#{removed_change}', but the existing value is " \
+            "'#{old_value}'. This is considered a conflict that should be resolved manually."
         end
 
         nil
       when nil
         nil
       else
-        raise "Unsupported change #{change} of type #{change.class}"
+        raise "Unsupported change #{removed_change} of type #{removed_change.class}"
       end
     end
 

data/lib/kintsugi/version.rb

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

data/spec/kintsugi_apply_change_to_project_spec.rb

@@ -176,6 +176,23 @@ describe Kintsugi, :apply_change_to_project do
       expect(base_project).to be_equivalent_to_project(theirs_project)
     end
 
+    it "changes simple attribute of a file that has a build file" do
+      target = base_project.new_target("com.apple.product-type.library.static", "bar", :ios)
+      file_reference = base_project.main_group.find_file_by_path(filepath)
+      target.frameworks_build_phase.add_file_reference(file_reference)
+      base_project.save
+
+      theirs_project = create_copy_of_project(base_project.path, "theirs")
+      file_reference = theirs_project.main_group.find_file_by_path(filepath)
+      file_reference.include_in_index = "4"
+
+      changes_to_apply = get_diff(theirs_project, base_project)
+
+      described_class.apply_change_to_project(base_project, changes_to_apply)
+
+      expect(base_project).to be_equivalent_to_project(theirs_project)
+    end
+
     it "removes build files of a removed file" do
       target = base_project.new_target("com.apple.product-type.library.static", "foo", :ios)
       target.source_build_phase.add_file_reference(
@@ -845,6 +862,24 @@ describe Kintsugi, :apply_change_to_project do
     expect(ours_project).to be_equivalent_to_project(theirs_project)
   end
 
+  it "doesn't throw if existing attribute target change is same as added change" do
+    base_project.root_object.attributes["TargetAttributes"] = {"foo" => "1140"}
+    base_project.save
+
+    theirs_project = create_copy_of_project(base_project.path, "theirs")
+    theirs_project.root_object.attributes["TargetAttributes"]["foo"] = "1111"
+
+    ours_project = create_copy_of_project(base_project.path, "ours")
+    ours_project.root_object.attributes["TargetAttributes"]["foo"] = "1111"
+
+    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).to be_equivalent_to_project(theirs_project)
+  end
+
   it "identifies subproject added at separate times when adding a product to the subproject" do
     framework_filename = "baz"
 

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: kintsugi
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Ben Yohay
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-27 00:00:00.000000000 Z
+date: 2021-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.19.0
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 1.21.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.19.0
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 1.21.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement