kintsugi 0.6.2 → 0.7.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -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([File.join(project.path, "project.pbxproj")])
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.6.2
4
+ version: 0.7.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ben Yohay
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2022-09-12 00:00:00.000000000 Z
11
+ date: 2023-03-29 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.3.22
187
+ rubygems_version: 3.4.10
172
188
  signing_key:
173
189
  specification_version: 4
174
190
  summary: pbxproj files git conflicts solver