kintsugi 0.4.3 → 0.5.3

data/spec/kintsugi_integration_spec.rb

@@ -0,0 +1,148 @@
+# Copyright (c) 2021 Lightricks. All rights reserved.
+# Created by Ben Yohay.
+# frozen_string_literal: true
+
+require "git"
+require "json"
+require "rspec"
+require "tempfile"
+require "tmpdir"
+
+require "kintsugi"
+
+shared_examples "tests" do |git_command, project_name|
+  let(:temporary_directories_paths) { [] }
+  let(:git_directory_path) { make_temp_directory }
+  let(:git) { Git.init(git_directory_path) }
+
+  before do
+    git.config("user.email", "you@example.com")
+    git.config("user.name", "Your Name")
+  end
+
+  after do
+    temporary_directories_paths.each do |directory_path|
+      FileUtils.remove_entry(directory_path)
+    end
+  end
+
+  context "running 'git #{git_command}' with project name '#{project_name}'" do
+    it "resolves conflicts with root command" do
+      File.write(File.join(git_directory_path, ".gitattributes"), "*.pbxproj merge=Unset")
+
+      project = create_new_project_at_path(File.join(git_directory_path, project_name))
+
+      git.add(File.join(git_directory_path, ".gitattributes"))
+      git.add(project.path)
+      git.commit("Initial project")
+
+      project.new_target("com.apple.product-type.library.static", "foo", :ios)
+      project.save
+
+      git.add(all: true)
+      git.commit("Add target foo")
+      first_commit_hash = git.revparse("HEAD")
+
+      git.checkout("HEAD^")
+      project = Xcodeproj::Project.open(project.path)
+      project.new_target("com.apple.product-type.library.static", "bar", :ios)
+      project.save
+      git.add(all: true)
+      git.commit("Add target bar")
+
+      `git -C #{git_directory_path} #{git_command} #{first_commit_hash} &> /dev/null`
+      Kintsugi.run([File.join(project.path, "project.pbxproj")])
+
+      project = Xcodeproj::Project.open(project.path)
+      expect(project.targets.map(&:display_name)).to contain_exactly("foo", "bar")
+    end
+
+    it "resolves conflicts automatically with driver" do
+      git.config("merge.kintsugi.name", "Kintsugi driver")
+      git.config("merge.kintsugi.driver", "#{__dir__}/../bin/kintsugi driver %O %A %B %P")
+      File.write(File.join(git_directory_path, ".gitattributes"), "*.pbxproj merge=kintsugi")
+
+      project = create_new_project_at_path(File.join(git_directory_path, project_name))
+
+      git.add(File.join(git_directory_path, ".gitattributes"))
+      git.add(project.path)
+      git.commit("Initial project")
+
+      project.new_target("com.apple.product-type.library.static", "foo", :ios)
+      project.save
+
+      git.add(all: true)
+      git.commit("Add target foo")
+      first_commit_hash = git.revparse("HEAD")
+
+      git.checkout("HEAD^")
+      project = Xcodeproj::Project.open(project.path)
+      project.new_target("com.apple.product-type.library.static", "bar", :ios)
+      project.save
+      git.add(all: true)
+      git.commit("Add target bar")
+
+      `git -C #{git_directory_path} #{git_command} #{first_commit_hash} &> /dev/null`
+
+      project = Xcodeproj::Project.open(project.path)
+      expect(project.targets.map(&:display_name)).to contain_exactly("foo", "bar")
+    end
+
+    it "keeps conflicts if failed to resolve conflicts" do
+      File.write(File.join(git_directory_path, ".gitattributes"), "*.pbxproj merge=Unset")
+
+      project = create_new_project_at_path(File.join(git_directory_path, project_name))
+      project.new_target("com.apple.product-type.library.static", "foo", :ios)
+      project.save
+
+      git.add(File.join(git_directory_path, ".gitattributes"))
+      git.add(project.path)
+      git.commit("Initial project")
+
+      project.targets[0].build_configurations.each do |configuration|
+        configuration.build_settings["PRODUCT_NAME"] = "bar"
+      end
+      project.save
+      git.add(all: true)
+      git.commit("Change target product name to bar")
+      first_commit_hash = git.revparse("HEAD")
+
+      git.checkout("HEAD^")
+      project = Xcodeproj::Project.open(project.path)
+      project.targets[0].build_configurations.each do |configuration|
+        configuration.build_settings["PRODUCT_NAME"] = "baz"
+      end
+      project.save
+      git.add(all: true)
+      git.commit("Change target product name to baz")
+
+      `git -C #{git_directory_path} #{git_command} #{first_commit_hash} &> /dev/null`
+
+      expect {
+        Kintsugi.run([File.join(project.path, "project.pbxproj")])
+      }.to raise_error(Kintsugi::MergeError)
+      expect(`git -C #{git_directory_path} diff --name-only --diff-filter=U`.chomp)
+        .to eq("#{project_name}/project.pbxproj")
+    end
+  end
+
+  def make_temp_directory
+    directory_path = Dir.mktmpdir
+    temporary_directories_paths << directory_path
+    directory_path
+  end
+end
+
+def create_new_project_at_path(path)
+  project = Xcodeproj::Project.new(path)
+  project.save
+  project
+end
+
+describe Kintsugi, :kintsugi do
+  %w[rebase cherry-pick merge].each do |git_command|
+    ["foo.xcodeproj", "foo with space.xcodeproj"].each do |project_name|
+      it_behaves_like("tests", git_command, project_name)
+    end
+  end
+end

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.3
+  version: 0.5.3
 platform: ruby
 authors:
 - Ben Yohay
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-07 00:00:00.000000000 Z
+date: 2022-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj
@@ -30,6 +30,20 @@ dependencies:
     - - "<="
       - !ruby/object:Gem::Version
         version: 1.21.0
+- !ruby/object:Gem::Dependency
+  name: git
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.11'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.11'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -109,7 +123,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/workflows/ci.yml"
+- ".github/workflows/release.yml"
+- ".github/workflows/tests.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -124,12 +139,14 @@ files:
 - lib/kintsugi/apply_change_to_project.rb
 - lib/kintsugi/cli.rb
 - lib/kintsugi/error.rb
+- lib/kintsugi/merge.rb
 - lib/kintsugi/utils.rb
 - lib/kintsugi/version.rb
 - lib/kintsugi/xcodeproj_extensions.rb
 - logo/kintsugi.png
 - spec/be_equivalent_to_project.rb
 - spec/kintsugi_apply_change_to_project_spec.rb
+- spec/kintsugi_integration_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/Lightricks/Kintsugi
 licenses:
@@ -150,12 +167,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.3
+rubygems_version: 3.3.15
 signing_key: 
 specification_version: 4
 summary: pbxproj files git conflicts solver
 test_files:
 - spec/be_equivalent_to_project.rb
 - spec/kintsugi_apply_change_to_project_spec.rb
+- spec/kintsugi_integration_spec.rb
 - spec/spec_helper.rb