kintsugi 0.6.3 → 0.7.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.github/workflows/release.yml +1 -1
- data/.github/workflows/tests.yml +1 -1
- data/README.md +10 -0
- data/assets/interactive-conflict-resolution.png +0 -0
- data/kintsugi.gemspec +1 -0
- data/lib/kintsugi/apply_change_to_project.rb +204 -122
- data/lib/kintsugi/cli.rb +83 -53
- data/lib/kintsugi/conflict_resolver.rb +130 -0
- data/lib/kintsugi/merge.rb +7 -4
- data/lib/kintsugi/settings.rb +8 -0
- data/lib/kintsugi/version.rb +1 -1
- data/lib/kintsugi/xcodeproj_extensions.rb +49 -1
- data/spec/kintsugi_apply_change_to_project_spec.rb +605 -113
- data/spec/kintsugi_integration_spec.rb +2 -1
- metadata +19 -3
|
@@ -118,8 +118,9 @@ shared_examples "tests" do |git_command, project_name|
|
|
|
118
118
|
|
|
119
119
|
`git -C #{git_directory_path} #{git_command} #{first_commit_hash} &> /dev/null`
|
|
120
120
|
|
|
121
|
+
arguments = [File.join(project.path, "project.pbxproj"), "--interactive-resolution", "false"]
|
|
121
122
|
expect {
|
|
122
|
-
Kintsugi.run(
|
|
123
|
+
Kintsugi.run(arguments)
|
|
123
124
|
}.to raise_error(Kintsugi::MergeError)
|
|
124
125
|
expect(`git -C #{git_directory_path} diff --name-only --diff-filter=U`.chomp)
|
|
125
126
|
.to eq("#{project_name}/project.pbxproj")
|
metadata
CHANGED
|
@@ -1,15 +1,29 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: kintsugi
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.
|
|
4
|
+
version: 0.7.1
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Ben Yohay
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date:
|
|
11
|
+
date: 2023-04-10 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
|
+
- !ruby/object:Gem::Dependency
|
|
14
|
+
name: tty-prompt
|
|
15
|
+
requirement: !ruby/object:Gem::Requirement
|
|
16
|
+
requirements:
|
|
17
|
+
- - "~>"
|
|
18
|
+
- !ruby/object:Gem::Version
|
|
19
|
+
version: '0'
|
|
20
|
+
type: :runtime
|
|
21
|
+
prerelease: false
|
|
22
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
23
|
+
requirements:
|
|
24
|
+
- - "~>"
|
|
25
|
+
- !ruby/object:Gem::Version
|
|
26
|
+
version: '0'
|
|
13
27
|
- !ruby/object:Gem::Dependency
|
|
14
28
|
name: xcodeproj
|
|
15
29
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -133,11 +147,13 @@ files:
|
|
|
133
147
|
- LICENSE
|
|
134
148
|
- README.md
|
|
135
149
|
- Rakefile
|
|
150
|
+
- assets/interactive-conflict-resolution.png
|
|
136
151
|
- bin/kintsugi
|
|
137
152
|
- kintsugi.gemspec
|
|
138
153
|
- lib/kintsugi.rb
|
|
139
154
|
- lib/kintsugi/apply_change_to_project.rb
|
|
140
155
|
- lib/kintsugi/cli.rb
|
|
156
|
+
- lib/kintsugi/conflict_resolver.rb
|
|
141
157
|
- lib/kintsugi/error.rb
|
|
142
158
|
- lib/kintsugi/merge.rb
|
|
143
159
|
- lib/kintsugi/settings.rb
|
|
@@ -168,7 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
168
184
|
- !ruby/object:Gem::Version
|
|
169
185
|
version: '0'
|
|
170
186
|
requirements: []
|
|
171
|
-
rubygems_version: 3.
|
|
187
|
+
rubygems_version: 3.4.10
|
|
172
188
|
signing_key:
|
|
173
189
|
specification_version: 4
|
|
174
190
|
summary: pbxproj files git conflicts solver
|