kintsugi 0.5.2 → 0.5.3
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.
- checksums.yaml +4 -4
- data/.github/workflows/release.yml +8 -0
- data/.github/workflows/tests.yml +1 -0
- data/.rubocop.yml +3 -0
- data/bin/kintsugi +2 -30
- data/kintsugi.gemspec +1 -0
- data/lib/kintsugi/apply_change_to_project.rb +141 -91
- data/lib/kintsugi/cli.rb +1 -0
- data/lib/kintsugi/merge.rb +146 -0
- data/lib/kintsugi/version.rb +1 -1
- data/lib/kintsugi/xcodeproj_extensions.rb +84 -0
- data/lib/kintsugi.rb +29 -148
- data/spec/kintsugi_apply_change_to_project_spec.rb +56 -2
- data/spec/kintsugi_integration_spec.rb +148 -0
- metadata +20 -3
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: kintsugi
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.5.
|
|
4
|
+
version: 0.5.3
|
|
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-
|
|
11
|
+
date: 2022-06-14 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: xcodeproj
|
|
@@ -30,6 +30,20 @@ dependencies:
|
|
|
30
30
|
- - "<="
|
|
31
31
|
- !ruby/object:Gem::Version
|
|
32
32
|
version: 1.21.0
|
|
33
|
+
- !ruby/object:Gem::Dependency
|
|
34
|
+
name: git
|
|
35
|
+
requirement: !ruby/object:Gem::Requirement
|
|
36
|
+
requirements:
|
|
37
|
+
- - "~>"
|
|
38
|
+
- !ruby/object:Gem::Version
|
|
39
|
+
version: '1.11'
|
|
40
|
+
type: :development
|
|
41
|
+
prerelease: false
|
|
42
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
43
|
+
requirements:
|
|
44
|
+
- - "~>"
|
|
45
|
+
- !ruby/object:Gem::Version
|
|
46
|
+
version: '1.11'
|
|
33
47
|
- !ruby/object:Gem::Dependency
|
|
34
48
|
name: rake
|
|
35
49
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -125,12 +139,14 @@ files:
|
|
|
125
139
|
- lib/kintsugi/apply_change_to_project.rb
|
|
126
140
|
- lib/kintsugi/cli.rb
|
|
127
141
|
- lib/kintsugi/error.rb
|
|
142
|
+
- lib/kintsugi/merge.rb
|
|
128
143
|
- lib/kintsugi/utils.rb
|
|
129
144
|
- lib/kintsugi/version.rb
|
|
130
145
|
- lib/kintsugi/xcodeproj_extensions.rb
|
|
131
146
|
- logo/kintsugi.png
|
|
132
147
|
- spec/be_equivalent_to_project.rb
|
|
133
148
|
- spec/kintsugi_apply_change_to_project_spec.rb
|
|
149
|
+
- spec/kintsugi_integration_spec.rb
|
|
134
150
|
- spec/spec_helper.rb
|
|
135
151
|
homepage: https://github.com/Lightricks/Kintsugi
|
|
136
152
|
licenses:
|
|
@@ -151,11 +167,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
151
167
|
- !ruby/object:Gem::Version
|
|
152
168
|
version: '0'
|
|
153
169
|
requirements: []
|
|
154
|
-
rubygems_version: 3.3.
|
|
170
|
+
rubygems_version: 3.3.15
|
|
155
171
|
signing_key:
|
|
156
172
|
specification_version: 4
|
|
157
173
|
summary: pbxproj files git conflicts solver
|
|
158
174
|
test_files:
|
|
159
175
|
- spec/be_equivalent_to_project.rb
|
|
160
176
|
- spec/kintsugi_apply_change_to_project_spec.rb
|
|
177
|
+
- spec/kintsugi_integration_spec.rb
|
|
161
178
|
- spec/spec_helper.rb
|