kintsugi 0.5.0 → 0.5.4
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 +33 -0
- data/.github/workflows/{ci.yml → tests.yml} +2 -1
- data/.rubocop.yml +3 -0
- data/Gemfile +0 -5
- data/bin/kintsugi +2 -30
- data/kintsugi.gemspec +2 -1
- data/lib/kintsugi/apply_change_to_project.rb +141 -91
- data/lib/kintsugi/cli.rb +2 -1
- 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 +24 -7
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.4
|
|
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-26 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: xcodeproj
|
|
@@ -19,7 +19,7 @@ dependencies:
|
|
|
19
19
|
version: 1.19.0
|
|
20
20
|
- - "<="
|
|
21
21
|
- !ruby/object:Gem::Version
|
|
22
|
-
version: 1.
|
|
22
|
+
version: 1.22.0
|
|
23
23
|
type: :runtime
|
|
24
24
|
prerelease: false
|
|
25
25
|
version_requirements: !ruby/object:Gem::Requirement
|
|
@@ -29,7 +29,21 @@ dependencies:
|
|
|
29
29
|
version: 1.19.0
|
|
30
30
|
- - "<="
|
|
31
31
|
- !ruby/object:Gem::Version
|
|
32
|
-
version: 1.
|
|
32
|
+
version: 1.22.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
|
|
@@ -109,7 +123,8 @@ executables:
|
|
|
109
123
|
extensions: []
|
|
110
124
|
extra_rdoc_files: []
|
|
111
125
|
files:
|
|
112
|
-
- ".github/workflows/
|
|
126
|
+
- ".github/workflows/release.yml"
|
|
127
|
+
- ".github/workflows/tests.yml"
|
|
113
128
|
- ".gitignore"
|
|
114
129
|
- ".rspec"
|
|
115
130
|
- ".rubocop.yml"
|
|
@@ -124,12 +139,14 @@ files:
|
|
|
124
139
|
- lib/kintsugi/apply_change_to_project.rb
|
|
125
140
|
- lib/kintsugi/cli.rb
|
|
126
141
|
- lib/kintsugi/error.rb
|
|
142
|
+
- lib/kintsugi/merge.rb
|
|
127
143
|
- lib/kintsugi/utils.rb
|
|
128
144
|
- lib/kintsugi/version.rb
|
|
129
145
|
- lib/kintsugi/xcodeproj_extensions.rb
|
|
130
146
|
- logo/kintsugi.png
|
|
131
147
|
- spec/be_equivalent_to_project.rb
|
|
132
148
|
- spec/kintsugi_apply_change_to_project_spec.rb
|
|
149
|
+
- spec/kintsugi_integration_spec.rb
|
|
133
150
|
- spec/spec_helper.rb
|
|
134
151
|
homepage: https://github.com/Lightricks/Kintsugi
|
|
135
152
|
licenses:
|
|
@@ -150,12 +167,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
150
167
|
- !ruby/object:Gem::Version
|
|
151
168
|
version: '0'
|
|
152
169
|
requirements: []
|
|
153
|
-
|
|
154
|
-
rubygems_version: 2.7.6.3
|
|
170
|
+
rubygems_version: 3.3.16
|
|
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
|