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