kintsugi 0.7.8 → 0.7.10

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.
Files changed (8) hide show
  1. checksums.yaml +4 -4
  2. data/kintsugi.gemspec +1 -1
  3. data/lib/kintsugi/apply_change_to_project.rb +280 -10
  4. data/lib/kintsugi/version.rb +1 -1
  5. data/lib/kintsugi/xcodeproj_extensions.rb +63 -0
  6. data/spec/kintsugi_apply_change_to_project_spec.rb +587 -0
  7. data/spec/kintsugi_integration_spec.rb +45 -0
  8. metadata +191 -168
metadata CHANGED
@@ -1,193 +1,216 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: kintsugi
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.7.8
4
+ version: 0.7.10
5
5
  platform: ruby
6
6
  authors:
7
- - Ben Yohay
7
+ - Ben Yohay
8
8
  bindir: bin
9
9
  cert_chain: []
10
- date: 2024-10-26 00:00:00.000000000 Z
10
+ date: 1980-01-02 00:00:00.000000000 Z
11
11
  dependencies:
12
- - !ruby/object:Gem::Dependency
13
- name: tty-prompt
14
- requirement: !ruby/object:Gem::Requirement
15
- requirements:
16
- - - "~>"
17
- - !ruby/object:Gem::Version
18
- version: '0'
19
- type: :runtime
20
- prerelease: false
21
- version_requirements: !ruby/object:Gem::Requirement
22
- requirements:
23
- - - "~>"
24
- - !ruby/object:Gem::Version
25
- version: '0'
26
- - !ruby/object:Gem::Dependency
27
- name: xcodeproj
28
- requirement: !ruby/object:Gem::Requirement
29
- requirements:
30
- - - ">="
31
- - !ruby/object:Gem::Version
32
- version: 1.19.0
33
- - - "<="
34
- - !ruby/object:Gem::Version
35
- version: 1.25.0
36
- type: :runtime
37
- prerelease: false
38
- version_requirements: !ruby/object:Gem::Requirement
39
- requirements:
40
- - - ">="
41
- - !ruby/object:Gem::Version
42
- version: 1.19.0
43
- - - "<="
44
- - !ruby/object:Gem::Version
45
- version: 1.25.0
46
- - !ruby/object:Gem::Dependency
47
- name: git
48
- requirement: !ruby/object:Gem::Requirement
49
- requirements:
50
- - - "~>"
51
- - !ruby/object:Gem::Version
52
- version: '1.11'
53
- type: :development
54
- prerelease: false
55
- version_requirements: !ruby/object:Gem::Requirement
56
- requirements:
57
- - - "~>"
58
- - !ruby/object:Gem::Version
59
- version: '1.11'
60
- - !ruby/object:Gem::Dependency
61
- name: rake
62
- requirement: !ruby/object:Gem::Requirement
63
- requirements:
64
- - - "~>"
65
- - !ruby/object:Gem::Version
66
- version: '13.0'
67
- type: :development
68
- prerelease: false
69
- version_requirements: !ruby/object:Gem::Requirement
70
- requirements:
71
- - - "~>"
72
- - !ruby/object:Gem::Version
73
- version: '13.0'
74
- - !ruby/object:Gem::Dependency
75
- name: rspec
76
- requirement: !ruby/object:Gem::Requirement
77
- requirements:
78
- - - "~>"
79
- - !ruby/object:Gem::Version
80
- version: '3.9'
81
- type: :development
82
- prerelease: false
83
- version_requirements: !ruby/object:Gem::Requirement
84
- requirements:
85
- - - "~>"
86
- - !ruby/object:Gem::Version
87
- version: '3.9'
88
- - !ruby/object:Gem::Dependency
89
- name: rubocop
90
- requirement: !ruby/object:Gem::Requirement
91
- requirements:
92
- - - '='
93
- - !ruby/object:Gem::Version
94
- version: 1.12.0
95
- type: :development
96
- prerelease: false
97
- version_requirements: !ruby/object:Gem::Requirement
98
- requirements:
99
- - - '='
100
- - !ruby/object:Gem::Version
101
- version: 1.12.0
102
- - !ruby/object:Gem::Dependency
103
- name: rubocop-rspec
104
- requirement: !ruby/object:Gem::Requirement
105
- requirements:
106
- - - '='
107
- - !ruby/object:Gem::Version
108
- version: 2.2.0
109
- type: :development
110
- prerelease: false
111
- version_requirements: !ruby/object:Gem::Requirement
112
- requirements:
113
- - - '='
114
- - !ruby/object:Gem::Version
115
- version: 2.2.0
116
- - !ruby/object:Gem::Dependency
117
- name: simplecov
118
- requirement: !ruby/object:Gem::Requirement
119
- requirements:
120
- - - "~>"
121
- - !ruby/object:Gem::Version
122
- version: '0.21'
123
- type: :development
124
- prerelease: false
125
- version_requirements: !ruby/object:Gem::Requirement
126
- requirements:
127
- - - "~>"
128
- - !ruby/object:Gem::Version
129
- version: '0.21'
130
- description: "\n Kintsugi resolves conflicts in .pbxproj files, with the aim
131
- to resolve 99.9% of the conflicts\n automatically.\n "
12
+ - !ruby/object:Gem::Dependency
13
+ name: tty-prompt
14
+ requirement: !ruby/object:Gem::Requirement
15
+ requirements:
16
+ -
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
+ - ~>
26
+ - !ruby/object:Gem::Version
27
+ version: "0"
28
+ - !ruby/object:Gem::Dependency
29
+ name: xcodeproj
30
+ requirement: !ruby/object:Gem::Requirement
31
+ requirements:
32
+ -
33
+ - ">="
34
+ - !ruby/object:Gem::Version
35
+ version: 1.26.0
36
+ -
37
+ - "<="
38
+ - !ruby/object:Gem::Version
39
+ version: 1.27.0
40
+ type: :runtime
41
+ prerelease: false
42
+ version_requirements: !ruby/object:Gem::Requirement
43
+ requirements:
44
+ -
45
+ - ">="
46
+ - !ruby/object:Gem::Version
47
+ version: 1.26.0
48
+ -
49
+ - "<="
50
+ - !ruby/object:Gem::Version
51
+ version: 1.27.0
52
+ - !ruby/object:Gem::Dependency
53
+ name: git
54
+ requirement: !ruby/object:Gem::Requirement
55
+ requirements:
56
+ -
57
+ - ~>
58
+ - !ruby/object:Gem::Version
59
+ version: "1.11"
60
+ type: :development
61
+ prerelease: false
62
+ version_requirements: !ruby/object:Gem::Requirement
63
+ requirements:
64
+ -
65
+ - ~>
66
+ - !ruby/object:Gem::Version
67
+ version: "1.11"
68
+ - !ruby/object:Gem::Dependency
69
+ name: rake
70
+ requirement: !ruby/object:Gem::Requirement
71
+ requirements:
72
+ -
73
+ - ~>
74
+ - !ruby/object:Gem::Version
75
+ version: "13.0"
76
+ type: :development
77
+ prerelease: false
78
+ version_requirements: !ruby/object:Gem::Requirement
79
+ requirements:
80
+ -
81
+ - ~>
82
+ - !ruby/object:Gem::Version
83
+ version: "13.0"
84
+ - !ruby/object:Gem::Dependency
85
+ name: rspec
86
+ requirement: !ruby/object:Gem::Requirement
87
+ requirements:
88
+ -
89
+ - ~>
90
+ - !ruby/object:Gem::Version
91
+ version: "3.9"
92
+ type: :development
93
+ prerelease: false
94
+ version_requirements: !ruby/object:Gem::Requirement
95
+ requirements:
96
+ -
97
+ - ~>
98
+ - !ruby/object:Gem::Version
99
+ version: "3.9"
100
+ - !ruby/object:Gem::Dependency
101
+ name: rubocop
102
+ requirement: !ruby/object:Gem::Requirement
103
+ requirements:
104
+ -
105
+ - "="
106
+ - !ruby/object:Gem::Version
107
+ version: 1.12.0
108
+ type: :development
109
+ prerelease: false
110
+ version_requirements: !ruby/object:Gem::Requirement
111
+ requirements:
112
+ -
113
+ - "="
114
+ - !ruby/object:Gem::Version
115
+ version: 1.12.0
116
+ - !ruby/object:Gem::Dependency
117
+ name: rubocop-rspec
118
+ requirement: !ruby/object:Gem::Requirement
119
+ requirements:
120
+ -
121
+ - "="
122
+ - !ruby/object:Gem::Version
123
+ version: 2.2.0
124
+ type: :development
125
+ prerelease: false
126
+ version_requirements: !ruby/object:Gem::Requirement
127
+ requirements:
128
+ -
129
+ - "="
130
+ - !ruby/object:Gem::Version
131
+ version: 2.2.0
132
+ - !ruby/object:Gem::Dependency
133
+ name: simplecov
134
+ requirement: !ruby/object:Gem::Requirement
135
+ requirements:
136
+ -
137
+ - ~>
138
+ - !ruby/object:Gem::Version
139
+ version: "0.21"
140
+ type: :development
141
+ prerelease: false
142
+ version_requirements: !ruby/object:Gem::Requirement
143
+ requirements:
144
+ -
145
+ - ~>
146
+ - !ruby/object:Gem::Version
147
+ version: "0.21"
148
+ description: |-
149
+
150
+ Kintsugi resolves conflicts in .pbxproj files, with the aim to resolve 99.9% of the conflicts
151
+ automatically.
152
+
132
153
  email:
133
- - ben@lightricks.com
154
+ - ben@lightricks.com
134
155
  executables:
135
- - kintsugi
156
+ - kintsugi
136
157
  extensions: []
137
158
  extra_rdoc_files: []
138
159
  files:
139
- - ".github/dependabot.yml"
140
- - ".github/workflows/release.yml"
141
- - ".github/workflows/tests.yml"
142
- - ".gitignore"
143
- - ".rspec"
144
- - ".rubocop.yml"
145
- - CONTRIBUTING.md
146
- - Gemfile
147
- - LICENSE
148
- - README.md
149
- - Rakefile
150
- - assets/interactive-conflict-resolution.png
151
- - bin/kintsugi
152
- - kintsugi.gemspec
153
- - lib/kintsugi.rb
154
- - lib/kintsugi/apply_change_to_project.rb
155
- - lib/kintsugi/cli.rb
156
- - lib/kintsugi/conflict_resolver.rb
157
- - lib/kintsugi/error.rb
158
- - lib/kintsugi/merge.rb
159
- - lib/kintsugi/settings.rb
160
- - lib/kintsugi/utils.rb
161
- - lib/kintsugi/version.rb
162
- - lib/kintsugi/xcodeproj_extensions.rb
163
- - logo/kintsugi.png
164
- - spec/be_equivalent_to_project.rb
165
- - spec/kintsugi_apply_change_to_project_spec.rb
166
- - spec/kintsugi_integration_spec.rb
167
- - spec/spec_helper.rb
168
- homepage: https://github.com/Lightricks/Kintsugi
160
+ - .github/dependabot.yml
161
+ - .github/workflows/release.yml
162
+ - .github/workflows/tests.yml
163
+ - .gitignore
164
+ - .rspec
165
+ - .rubocop.yml
166
+ - CONTRIBUTING.md
167
+ - Gemfile
168
+ - LICENSE
169
+ - README.md
170
+ - Rakefile
171
+ - assets/interactive-conflict-resolution.png
172
+ - bin/kintsugi
173
+ - kintsugi.gemspec
174
+ - lib/kintsugi.rb
175
+ - lib/kintsugi/apply_change_to_project.rb
176
+ - lib/kintsugi/cli.rb
177
+ - lib/kintsugi/conflict_resolver.rb
178
+ - lib/kintsugi/error.rb
179
+ - lib/kintsugi/merge.rb
180
+ - lib/kintsugi/settings.rb
181
+ - lib/kintsugi/utils.rb
182
+ - lib/kintsugi/version.rb
183
+ - lib/kintsugi/xcodeproj_extensions.rb
184
+ - logo/kintsugi.png
185
+ - spec/be_equivalent_to_project.rb
186
+ - spec/kintsugi_apply_change_to_project_spec.rb
187
+ - spec/kintsugi_integration_spec.rb
188
+ - spec/spec_helper.rb
189
+ homepage: "https://github.com/Lightricks/Kintsugi"
169
190
  licenses:
170
- - MIT
191
+ - MIT
171
192
  metadata: {}
172
193
  rdoc_options: []
173
194
  require_paths:
174
- - lib
195
+ - lib
175
196
  required_ruby_version: !ruby/object:Gem::Requirement
176
197
  requirements:
177
- - - ">="
178
- - !ruby/object:Gem::Version
179
- version: 2.5.0
198
+ -
199
+ - ">="
200
+ - !ruby/object:Gem::Version
201
+ version: 2.5.0
180
202
  required_rubygems_version: !ruby/object:Gem::Requirement
181
203
  requirements:
182
- - - ">="
183
- - !ruby/object:Gem::Version
184
- version: '0'
204
+ -
205
+ - ">="
206
+ - !ruby/object:Gem::Version
207
+ version: "0"
185
208
  requirements: []
186
- rubygems_version: 3.6.0.dev
209
+ rubygems_version: 4.1.0.dev
187
210
  specification_version: 4
188
211
  summary: pbxproj files git conflicts solver
189
212
  test_files:
190
- - spec/be_equivalent_to_project.rb
191
- - spec/kintsugi_apply_change_to_project_spec.rb
192
- - spec/kintsugi_integration_spec.rb
193
- - spec/spec_helper.rb
213
+ - spec/be_equivalent_to_project.rb
214
+ - spec/kintsugi_apply_change_to_project_spec.rb
215
+ - spec/kintsugi_integration_spec.rb
216
+ - spec/spec_helper.rb