slather 2.7.1 → 2.7.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +18 -0
- data/lib/slather/coverage_service/coveralls.rb +56 -1
- data/lib/slather/project.rb +1 -1
- data/lib/slather/version.rb +1 -1
- data/slather.gemspec +2 -2
- metadata +6 -6
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 6791a42172a6764126080d1fa51acce74d384c68687e3bb657bd0311e54cac0a
|
4
|
+
data.tar.gz: 11b47fcf1ff99baa4ea01cbe9fd202a0db9f3f9e7ad76c5b8b79b23516128cd0
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 07bfabe0e5af2083b8aba45676989ea8d90b7e26ba276a17a64e93e184be42229e1e869b990623c0a8fa4df0306748b4e0c6b68821c90d5b18dc88109dc52ae1
|
7
|
+
data.tar.gz: bc8b62cc1b47b59d67f8acff77a9b2910c4b82273035257470ded7376e3ca4930146aa3105d3c8bb910c12acbb5cf36a35909d825ef4e85b593ce65a7cba99e5
|
data/CHANGELOG.md
CHANGED
@@ -1,5 +1,23 @@
|
|
1
1
|
# CHANGELOG
|
2
2
|
|
3
|
+
## v2.7.2
|
4
|
+
|
5
|
+
* Update xcodeproj version
|
6
|
+
[adamyanalunas](https://github.com/adamyanalunas)
|
7
|
+
[#502](https://github.com/SlatherOrg/slather/pull/502)
|
8
|
+
|
9
|
+
* Update nokogiri version
|
10
|
+
[jwelton](https://github.com/jwelton)
|
11
|
+
[#503](https://github.com/SlatherOrg/slather/pull/503)
|
12
|
+
|
13
|
+
* Support alternate CI systems in coveralls output
|
14
|
+
[fermoyadrop](https://github.com/fermoyadrop)
|
15
|
+
[#504](https://github.com/SlatherOrg/slather/pull/504)
|
16
|
+
|
17
|
+
* Add Bitrise support to coveralls output
|
18
|
+
[fermoyadrop](https://github.com/fermoyadrop)
|
19
|
+
[#504](https://github.com/SlatherOrg/slather/pull/505)
|
20
|
+
|
3
21
|
## v2.7.1
|
4
22
|
|
5
23
|
* Support generating coverage for framework targets
|
@@ -41,6 +41,16 @@ module Slather
|
|
41
41
|
end
|
42
42
|
private :github_job_id
|
43
43
|
|
44
|
+
def bitrise_job_id
|
45
|
+
ENV['BITRISE_BUILD_NUMBER']
|
46
|
+
end
|
47
|
+
private :bitrise_job_id
|
48
|
+
|
49
|
+
def bitrise_pull_request
|
50
|
+
ENV['BITRISE_PULL_REQUEST']
|
51
|
+
end
|
52
|
+
private :bitrise_pull_request
|
53
|
+
|
44
54
|
def github_pull_request
|
45
55
|
ENV['CI_PULL_REQUEST'] || ""
|
46
56
|
end
|
@@ -71,6 +81,11 @@ module Slather
|
|
71
81
|
end
|
72
82
|
private :github_branch_name
|
73
83
|
|
84
|
+
def bitrise_branch_name
|
85
|
+
ENV['BITRISE_GIT_BRANCH'] || `git ls-remote --heads origin | grep $(git rev-parse HEAD) | cut -d / -f 3-`.chomp
|
86
|
+
end
|
87
|
+
private :bitrise_branch_name
|
88
|
+
|
74
89
|
def buildkite_job_id
|
75
90
|
ENV['BUILDKITE_BUILD_NUMBER']
|
76
91
|
end
|
@@ -151,6 +166,19 @@ module Slather
|
|
151
166
|
end
|
152
167
|
private :github_git_info
|
153
168
|
|
169
|
+
def bitrise_git_info
|
170
|
+
{
|
171
|
+
:head => {
|
172
|
+
:id => ENV['BITRISE_GIT_COMMIT'],
|
173
|
+
:committer_name => (ENV['GIT_CLONE_COMMIT_AUTHOR_NAME'] || `git log --format=%an -n 1 HEAD`.chomp || ""),
|
174
|
+
:committer_email => (ENV['GIT_CLONE_COMMIT_AUTHOR_EMAIL'] || `git log --format=%ae -n 1 HEAD`.chomp || ""),
|
175
|
+
:message => (ENV['BITRISE_GIT_MESSAGE'] || `git log --format=%s -n 1 HEAD`.chomp || "")
|
176
|
+
},
|
177
|
+
:branch => bitrise_branch_name
|
178
|
+
}
|
179
|
+
end
|
180
|
+
private :bitrise_git_info
|
181
|
+
|
154
182
|
def github_build_url
|
155
183
|
"https://github.com/" + ENV['GITHUB_REPOSITORY'] + "/actions/runs/" + ENV['GITHUB_RUN_ID']
|
156
184
|
end
|
@@ -263,8 +291,35 @@ module Slather
|
|
263
291
|
else
|
264
292
|
raise StandardError, "Environment variable `GITHUB_RUN_ID` not set. Is this running on github build?"
|
265
293
|
end
|
294
|
+
elsif ci_service == :bitrise
|
295
|
+
{
|
296
|
+
:service_job_id => bitrise_job_id,
|
297
|
+
:service_name => 'bitrise',
|
298
|
+
:repo_token => coverage_access_token,
|
299
|
+
:source_files => coverage_files.map(&:as_json),
|
300
|
+
:service_pull_request => bitrise_pull_request,
|
301
|
+
:service_branch => bitrise_branch_name,
|
302
|
+
:git => bitrise_git_info
|
303
|
+
}.to_json
|
266
304
|
else
|
267
|
-
|
305
|
+
{
|
306
|
+
:service_job_id => ENV['CI_BUILD_NUMBER'],
|
307
|
+
:service_name => ENV['CI_NAME'] || ci_service,
|
308
|
+
:repo_token => coverage_access_token,
|
309
|
+
:source_files => coverage_files.map(&:as_json),
|
310
|
+
:service_build_url => ENV['CI_BUILD_URL'],
|
311
|
+
:service_pull_request => ENV['CI_PULL_REQUEST'],
|
312
|
+
:service_branch => ENV['CI_BRANCH'],
|
313
|
+
:git => {
|
314
|
+
:head => {
|
315
|
+
:id => ENV['CI_COMMIT'],
|
316
|
+
:committer_name => (`git log --format=%an -n 1 HEAD`.chomp || ""),
|
317
|
+
:committer_email => (`git log --format=%ae -n 1 HEAD`.chomp || ""),
|
318
|
+
:message => (`git log --format=%s -n 1 HEAD`.chomp || "")
|
319
|
+
},
|
320
|
+
:branch => ENV['CI_BRANCH']
|
321
|
+
}
|
322
|
+
}.to_json
|
268
323
|
end
|
269
324
|
end
|
270
325
|
private :coveralls_coverage_data
|
data/lib/slather/project.rb
CHANGED
@@ -375,7 +375,7 @@ module Slather
|
|
375
375
|
end
|
376
376
|
|
377
377
|
def configure_ci_service
|
378
|
-
self.ci_service ||= (self.class.yml["ci_service"] || :
|
378
|
+
self.ci_service ||= (ENV["CI_SERVICE"] || self.class.yml["ci_service"] || :other)
|
379
379
|
end
|
380
380
|
|
381
381
|
def configure_input_format
|
data/lib/slather/version.rb
CHANGED
data/slather.gemspec
CHANGED
@@ -28,8 +28,8 @@ Gem::Specification.new do |spec|
|
|
28
28
|
spec.add_development_dependency 'equivalent-xml', '~> 0.6'
|
29
29
|
|
30
30
|
spec.add_dependency 'clamp', '~> 1.3'
|
31
|
-
spec.add_dependency 'xcodeproj', '~> 1.
|
32
|
-
spec.add_dependency 'nokogiri', '~> 1.
|
31
|
+
spec.add_dependency 'xcodeproj', '~> 1.21'
|
32
|
+
spec.add_dependency 'nokogiri', '~> 1.12'
|
33
33
|
spec.add_dependency 'CFPropertyList', '>= 2.2', '< 4'
|
34
34
|
|
35
35
|
spec.add_runtime_dependency 'activesupport'
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: slather
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.7.
|
4
|
+
version: 2.7.2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Mark Larsen
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2021-
|
11
|
+
date: 2021-10-10 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: bundler
|
@@ -156,28 +156,28 @@ dependencies:
|
|
156
156
|
requirements:
|
157
157
|
- - "~>"
|
158
158
|
- !ruby/object:Gem::Version
|
159
|
-
version: '1.
|
159
|
+
version: '1.21'
|
160
160
|
type: :runtime
|
161
161
|
prerelease: false
|
162
162
|
version_requirements: !ruby/object:Gem::Requirement
|
163
163
|
requirements:
|
164
164
|
- - "~>"
|
165
165
|
- !ruby/object:Gem::Version
|
166
|
-
version: '1.
|
166
|
+
version: '1.21'
|
167
167
|
- !ruby/object:Gem::Dependency
|
168
168
|
name: nokogiri
|
169
169
|
requirement: !ruby/object:Gem::Requirement
|
170
170
|
requirements:
|
171
171
|
- - "~>"
|
172
172
|
- !ruby/object:Gem::Version
|
173
|
-
version: '1.
|
173
|
+
version: '1.12'
|
174
174
|
type: :runtime
|
175
175
|
prerelease: false
|
176
176
|
version_requirements: !ruby/object:Gem::Requirement
|
177
177
|
requirements:
|
178
178
|
- - "~>"
|
179
179
|
- !ruby/object:Gem::Version
|
180
|
-
version: '1.
|
180
|
+
version: '1.12'
|
181
181
|
- !ruby/object:Gem::Dependency
|
182
182
|
name: CFPropertyList
|
183
183
|
requirement: !ruby/object:Gem::Requirement
|