slather 2.7.2 → 2.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6791a42172a6764126080d1fa51acce74d384c68687e3bb657bd0311e54cac0a
-  data.tar.gz: 11b47fcf1ff99baa4ea01cbe9fd202a0db9f3f9e7ad76c5b8b79b23516128cd0
+  metadata.gz: f178bd0539ca115a1da1191be8870c014198bfd19f0932e0c0aa4bbc4cde4ef4
+  data.tar.gz: e2e94ab2f8e93febbd583980e83bbf356a298b2e8f466a2a076b4ecd7ed1c969
 SHA512:
-  metadata.gz: 07bfabe0e5af2083b8aba45676989ea8d90b7e26ba276a17a64e93e184be42229e1e869b990623c0a8fa4df0306748b4e0c6b68821c90d5b18dc88109dc52ae1
-  data.tar.gz: bc8b62cc1b47b59d67f8acff77a9b2910c4b82273035257470ded7376e3ca4930146aa3105d3c8bb910c12acbb5cf36a35909d825ef4e85b593ce65a7cba99e5
+  metadata.gz: ffb1ae462f2f66a648f7353a327bfa42451f41bee1ffbd391f1de4089efa2a110908070e63b4a3aef4d55297afb10c615b2c4c173d135ec520522dc0ff3fb0fe
+  data.tar.gz: cf6c0763f817a72e9908cc899b22f03ca343016e29bdc696a87d04577836dd395fb8c975d2533a845ea649779b580aa9ba405125a026b7f6f993911c6e444497

data/.gitignore

@@ -20,7 +20,7 @@ tmp
 *.o
 *.a
 mkmf.log
-
+.vendor 
 # Xcode
 #
 *.pbxuser

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 # CHANGELOG
 
+## v2.7.3
+
+* Support Coveralls parallel runs
+  [paulz](https://github.com/paulz)
+  [#523](https://github.com/SlatherOrg/slather/pull/523)
+
+* Update nokogiri version
+  [anil291987](https://github.com/anil291987)
+  [#518](https://github.com/SlatherOrg/slather/pull/518)
+  [#524](https://github.com/SlatherOrg/slather/pull/524)
+
 ## v2.7.2
 
 * Update xcodeproj version

data/lib/slather/command/coverage_command.rb

@@ -30,7 +30,7 @@ class CoverageCommand < Clamp::Command
   option ["--scheme"], "SCHEME", "The scheme for which the coverage was generated"
   option ["--configuration"], "CONFIGURATION", "The configuration for test that the project was set"
   option ["--workspace"], "WORKSPACE", "The workspace that the project was built in"
-  option ["--binary-file"], "BINARY_FILE", "The binary file against the which the coverage will be run", :multivalued => true
+  option ["--binary-file"], "BINARY_FILE", "The binary file against which the coverage will be run", :multivalued => true
   option ["--binary-basename"], "BINARY_BASENAME", "Basename of the file against which the coverage will be run", :multivalued => true
   option ["--arch"], "ARCH", "Architecture to use from universal binaries"
   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

data/lib/slather/coverage_service/coveralls.rb

@@ -184,11 +184,21 @@ module Slather
       end
       private :github_build_url
 
+      def is_parallel
+        ENV['IS_PARALLEL'] != nil
+      end
+      private :is_parallel
+
+      def github_job_name
+        ENV['GITHUB_JOB']
+      end
+      private :github_job_name
+
       def coveralls_coverage_data
         if ci_service == :travis_ci || ci_service == :travis_pro
           if travis_job_id
             if ci_service == :travis_ci
-              
+
               if coverage_access_token.to_s.strip.length > 0
                 raise StandardError, "Access token is set. Uploading coverage data for public repositories doesn't require an access token."
               end
@@ -198,7 +208,7 @@ module Slather
                 :service_name => "travis-ci",
                 :source_files => coverage_files.map(&:as_json)
               }.to_json
-            elsif ci_service == :travis_pro              
+            elsif ci_service == :travis_pro
 
               if coverage_access_token.to_s.strip.length == 0
                 raise StandardError, "Access token is not set. Uploading coverage data for private repositories requires an access token."
@@ -286,7 +296,9 @@ module Slather
               :source_files => coverage_files.map(&:as_json),
               :service_build_url => github_build_url,
               :service_pull_request => github_pull_request,
-              :git => github_git_info
+              :git => github_git_info,
+              :parallel => is_parallel,
+              :flag_name => github_job_name
             }.to_json
           else
             raise StandardError, "Environment variable `GITHUB_RUN_ID` not set.  Is this running on github build?"
@@ -332,8 +344,8 @@ module Slather
 
           curl_result = `curl -s --form json_file=@#{f.path} #{coveralls_api_jobs_path}`
 
-          if curl_result.is_a? String 
-            curl_result_json = JSON.parse(curl_result)          
+          if curl_result.is_a? String
+            curl_result_json = JSON.parse(curl_result)
 
             if curl_result_json["error"]
               error_message = curl_result_json["message"]

data/lib/slather/version.rb

@@ -1,3 +1,3 @@
 module Slather
-  VERSION = '2.7.2' unless defined?(Slather::VERSION)
+  VERSION = '2.7.3' unless defined?(Slather::VERSION)
 end

data/slather.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'clamp', '~> 1.3'
   spec.add_dependency 'xcodeproj', '~> 1.21'
-  spec.add_dependency 'nokogiri', '~> 1.12'
+  spec.add_dependency 'nokogiri', '>= 1.13.9'
   spec.add_dependency 'CFPropertyList', '>= 2.2', '< 4'
 
   spec.add_runtime_dependency 'activesupport'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slather
 version: !ruby/object:Gem::Version
-  version: 2.7.2
+  version: 2.7.3
 platform: ruby
 authors:
 - Mark Larsen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-10 00:00:00.000000000 Z
+date: 2022-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -168,16 +168,16 @@ dependencies:
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: 1.13.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: 1.13.9
 - !ruby/object:Gem::Dependency
   name: CFPropertyList
   requirement: !ruby/object:Gem::Requirement
@@ -341,7 +341,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.3
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: Test coverage reports for Xcode projects