slather 2.7.2 → 2.7.4
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.gitignore +1 -1
- data/CHANGELOG.md +17 -0
- data/lib/slather/command/coverage_command.rb +1 -1
- data/lib/slather/coverage_file.rb +1 -1
- data/lib/slather/coverage_service/coveralls.rb +17 -5
- data/lib/slather/project.rb +2 -2
- data/lib/slather/version.rb +1 -1
- data/slather.gemspec +1 -1
- data/spec/slather/coverage_service/cobertura_xml_spec.rb +1 -1
- data/spec/slather/coverage_service/json_spec.rb +1 -1
- data/spec/slather/coverage_service/llvm_cov_spec.rb +1 -1
- data/spec/slather/coverage_service/sonarqube_xml_spec.rb +1 -1
- metadata +7 -7
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: b43954fd6f31e519f192e32ad881197d35830912e22158ca17cf333b86f97e0d
|
4
|
+
data.tar.gz: 97cf7f9b6eb50d2472aec42c3f698c3a299c38cfd8757cdb2a6e2dcad0933bc6
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: f38c40172a16f8375b56cdc873e92339f1f275cef7848bc0d9947714073dd5ff93ba11dc1957781c69316eec59a213c079067b99cb48c134aeb24c20ae2cb945
|
7
|
+
data.tar.gz: 1a098f9ab86b11d5c65cea0c309a99a709de76dfdc0f1171f0e100784522a74613cdb3fb06346f4fb1d6e27825250f01ece561ac07bea6e59a489837c7c0c654
|
data/.gitignore
CHANGED
data/CHANGELOG.md
CHANGED
@@ -1,5 +1,22 @@
|
|
1
1
|
# CHANGELOG
|
2
2
|
|
3
|
+
## v2.7.4
|
4
|
+
|
5
|
+
* Support Ruby 3.2.0
|
6
|
+
[crazymanish](https://github.com/crazymanish)
|
7
|
+
[#532](https://github.com/SlatherOrg/slather/pull/532)
|
8
|
+
|
9
|
+
## v2.7.3
|
10
|
+
|
11
|
+
* Support Coveralls parallel runs
|
12
|
+
[paulz](https://github.com/paulz)
|
13
|
+
[#523](https://github.com/SlatherOrg/slather/pull/523)
|
14
|
+
|
15
|
+
* Update nokogiri version
|
16
|
+
[anil291987](https://github.com/anil291987)
|
17
|
+
[#518](https://github.com/SlatherOrg/slather/pull/518)
|
18
|
+
[#524](https://github.com/SlatherOrg/slather/pull/524)
|
19
|
+
|
3
20
|
## v2.7.2
|
4
21
|
|
5
22
|
* Update xcodeproj version
|
@@ -30,7 +30,7 @@ class CoverageCommand < Clamp::Command
|
|
30
30
|
option ["--scheme"], "SCHEME", "The scheme for which the coverage was generated"
|
31
31
|
option ["--configuration"], "CONFIGURATION", "The configuration for test that the project was set"
|
32
32
|
option ["--workspace"], "WORKSPACE", "The workspace that the project was built in"
|
33
|
-
option ["--binary-file"], "BINARY_FILE", "The binary file against
|
33
|
+
option ["--binary-file"], "BINARY_FILE", "The binary file against which the coverage will be run", :multivalued => true
|
34
34
|
option ["--binary-basename"], "BINARY_BASENAME", "Basename of the file against which the coverage will be run", :multivalued => true
|
35
35
|
option ["--arch"], "ARCH", "Architecture to use from universal binaries"
|
36
36
|
option ["--source-files"], "SOURCE_FILES", "A Dir.glob compatible pattern used to limit the lookup to specific source files. Ignored in gcov mode.", :multivalued => true
|
@@ -51,7 +51,7 @@ module Slather
|
|
51
51
|
gcov_files_created = gcov_output.scan(/creating '(.+\..+\.gcov)'/)
|
52
52
|
|
53
53
|
gcov_file_name = "./#{source_file_pathname.basename}.gcov"
|
54
|
-
if File.
|
54
|
+
if File.exist?(gcov_file_name)
|
55
55
|
gcov_data = File.new(gcov_file_name).read
|
56
56
|
else
|
57
57
|
gcov_data = ""
|
@@ -184,11 +184,21 @@ module Slather
|
|
184
184
|
end
|
185
185
|
private :github_build_url
|
186
186
|
|
187
|
+
def is_parallel
|
188
|
+
ENV['IS_PARALLEL'] != nil
|
189
|
+
end
|
190
|
+
private :is_parallel
|
191
|
+
|
192
|
+
def github_job_name
|
193
|
+
ENV['GITHUB_JOB']
|
194
|
+
end
|
195
|
+
private :github_job_name
|
196
|
+
|
187
197
|
def coveralls_coverage_data
|
188
198
|
if ci_service == :travis_ci || ci_service == :travis_pro
|
189
199
|
if travis_job_id
|
190
200
|
if ci_service == :travis_ci
|
191
|
-
|
201
|
+
|
192
202
|
if coverage_access_token.to_s.strip.length > 0
|
193
203
|
raise StandardError, "Access token is set. Uploading coverage data for public repositories doesn't require an access token."
|
194
204
|
end
|
@@ -198,7 +208,7 @@ module Slather
|
|
198
208
|
:service_name => "travis-ci",
|
199
209
|
:source_files => coverage_files.map(&:as_json)
|
200
210
|
}.to_json
|
201
|
-
elsif ci_service == :travis_pro
|
211
|
+
elsif ci_service == :travis_pro
|
202
212
|
|
203
213
|
if coverage_access_token.to_s.strip.length == 0
|
204
214
|
raise StandardError, "Access token is not set. Uploading coverage data for private repositories requires an access token."
|
@@ -286,7 +296,9 @@ module Slather
|
|
286
296
|
:source_files => coverage_files.map(&:as_json),
|
287
297
|
:service_build_url => github_build_url,
|
288
298
|
:service_pull_request => github_pull_request,
|
289
|
-
:git => github_git_info
|
299
|
+
:git => github_git_info,
|
300
|
+
:parallel => is_parallel,
|
301
|
+
:flag_name => github_job_name
|
290
302
|
}.to_json
|
291
303
|
else
|
292
304
|
raise StandardError, "Environment variable `GITHUB_RUN_ID` not set. Is this running on github build?"
|
@@ -332,8 +344,8 @@ module Slather
|
|
332
344
|
|
333
345
|
curl_result = `curl -s --form json_file=@#{f.path} #{coveralls_api_jobs_path}`
|
334
346
|
|
335
|
-
if curl_result.is_a? String
|
336
|
-
curl_result_json = JSON.parse(curl_result)
|
347
|
+
if curl_result.is_a? String
|
348
|
+
curl_result_json = JSON.parse(curl_result)
|
337
349
|
|
338
350
|
if curl_result_json["error"]
|
339
351
|
error_message = curl_result_json["message"]
|
data/lib/slather/project.rb
CHANGED
@@ -208,7 +208,7 @@ module Slather
|
|
208
208
|
|
209
209
|
def profdata_coverage_dir
|
210
210
|
@profdata_coverage_dir ||= begin
|
211
|
-
raise StandardError, "The specified build directory (#{self.build_directory}) does not exist" unless File.
|
211
|
+
raise StandardError, "The specified build directory (#{self.build_directory}) does not exist" unless File.exist?(self.build_directory)
|
212
212
|
dir = nil
|
213
213
|
if self.scheme
|
214
214
|
dir = Dir[File.join(build_directory,"/**/CodeCoverage/#{self.scheme}")].first
|
@@ -503,7 +503,7 @@ module Slather
|
|
503
503
|
end
|
504
504
|
end
|
505
505
|
|
506
|
-
raise StandardError, "No scheme named '#{self.scheme}' found in #{self.path}" unless File.
|
506
|
+
raise StandardError, "No scheme named '#{self.scheme}' found in #{self.path}" unless File.exist? xcscheme_path
|
507
507
|
|
508
508
|
xcscheme = Xcodeproj::XCScheme.new(xcscheme_path)
|
509
509
|
|
data/lib/slather/version.rb
CHANGED
data/slather.gemspec
CHANGED
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
|
|
29
29
|
|
30
30
|
spec.add_dependency 'clamp', '~> 1.3'
|
31
31
|
spec.add_dependency 'xcodeproj', '~> 1.21'
|
32
|
-
spec.add_dependency 'nokogiri', '
|
32
|
+
spec.add_dependency 'nokogiri', '>= 1.13.9'
|
33
33
|
spec.add_dependency 'CFPropertyList', '>= 2.2', '< 4'
|
34
34
|
|
35
35
|
spec.add_runtime_dependency 'activesupport'
|
@@ -45,7 +45,7 @@ describe Slather::CoverageService::CoberturaXmlOutput do
|
|
45
45
|
fixtures_project.post
|
46
46
|
|
47
47
|
filepath = "#{fixtures_project.output_directory}/cobertura.xml"
|
48
|
-
expect(File.
|
48
|
+
expect(File.exist?(filepath)).to be_truthy
|
49
49
|
|
50
50
|
FileUtils.rm_rf(fixtures_project.output_directory)
|
51
51
|
end
|
@@ -35,7 +35,7 @@ describe Slather::CoverageService::JsonOutput do
|
|
35
35
|
fixtures_project.post
|
36
36
|
|
37
37
|
filepath = "#{fixtures_project.output_directory}/report.json"
|
38
|
-
expect(File.
|
38
|
+
expect(File.exist?(filepath)).to be_truthy
|
39
39
|
|
40
40
|
FileUtils.rm_rf(fixtures_project.output_directory)
|
41
41
|
end
|
@@ -38,7 +38,7 @@ describe Slather::CoverageService::LlvmCovOutput do
|
|
38
38
|
fixtures_project.post
|
39
39
|
|
40
40
|
filepath = "#{fixtures_project.output_directory}/report.llcov"
|
41
|
-
expect(File.
|
41
|
+
expect(File.exist?(filepath)).to be_truthy
|
42
42
|
|
43
43
|
FileUtils.rm_rf(fixtures_project.output_directory)
|
44
44
|
end
|
@@ -38,7 +38,7 @@ describe Slather::CoverageService::SonarqubeXmlOutput do
|
|
38
38
|
fixtures_project.post
|
39
39
|
|
40
40
|
filepath = "#{fixtures_project.output_directory}/sonarqube-generic-coverage.xml"
|
41
|
-
expect(File.
|
41
|
+
expect(File.exist?(filepath)).to be_truthy
|
42
42
|
|
43
43
|
FileUtils.rm_rf(fixtures_project.output_directory)
|
44
44
|
end
|
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.4
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Mark Larsen
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2023-01-12 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: bundler
|
@@ -168,16 +168,16 @@ dependencies:
|
|
168
168
|
name: nokogiri
|
169
169
|
requirement: !ruby/object:Gem::Requirement
|
170
170
|
requirements:
|
171
|
-
- - "
|
171
|
+
- - ">="
|
172
172
|
- !ruby/object:Gem::Version
|
173
|
-
version:
|
173
|
+
version: 1.13.9
|
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:
|
180
|
+
version: 1.13.9
|
181
181
|
- !ruby/object:Gem::Dependency
|
182
182
|
name: CFPropertyList
|
183
183
|
requirement: !ruby/object:Gem::Requirement
|
@@ -341,7 +341,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
341
341
|
- !ruby/object:Gem::Version
|
342
342
|
version: '0'
|
343
343
|
requirements: []
|
344
|
-
rubygems_version: 3.
|
344
|
+
rubygems_version: 3.2.22
|
345
345
|
signing_key:
|
346
346
|
specification_version: 4
|
347
347
|
summary: Test coverage reports for Xcode projects
|