slather 2.7.1 → 2.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82acbc5ecfb8610c49f39cdea2ff67387d30b3c41bf78c34095a59c7b572e802
-  data.tar.gz: a1c830dddd4d52d8641665086ad6a63c294f00a7dd3370c7cd588c8c586db06e
+  metadata.gz: f178bd0539ca115a1da1191be8870c014198bfd19f0932e0c0aa4bbc4cde4ef4
+  data.tar.gz: e2e94ab2f8e93febbd583980e83bbf356a298b2e8f466a2a076b4ecd7ed1c969
 SHA512:
-  metadata.gz: 239d29e6e221b6119be23af3dc92a7f28d4608dd71acf3f7ed03530953878ab42942903ed3f505a81051c3aa6903ba2a167b37867274b24ab7fc948b9006f08c
-  data.tar.gz: c918c164b1da93699be34bef38291b3c43d3d43eb1d258919dc3de0bd84beb855a44318a8d6638d567543ddad7a2e647ca07a1fe12d14678b9c54bbde25a749a
+  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,34 @@
 # 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
+  [adamyanalunas](https://github.com/adamyanalunas)
+  [#502](https://github.com/SlatherOrg/slather/pull/502)
+
+* Update nokogiri version
+  [jwelton](https://github.com/jwelton)
+  [#503](https://github.com/SlatherOrg/slather/pull/503)
+
+* Support alternate CI systems in coveralls output
+  [fermoyadrop](https://github.com/fermoyadrop)
+  [#504](https://github.com/SlatherOrg/slather/pull/504)
+
+* Add Bitrise support to coveralls output
+  [fermoyadrop](https://github.com/fermoyadrop)
+  [#504](https://github.com/SlatherOrg/slather/pull/505)
+
 ## v2.7.1
 
 * Support generating coverage for framework targets

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

@@ -41,6 +41,16 @@ module Slather
       end
       private :github_job_id
 
+      def bitrise_job_id
+        ENV['BITRISE_BUILD_NUMBER']
+      end
+      private :bitrise_job_id
+
+      def bitrise_pull_request
+        ENV['BITRISE_PULL_REQUEST']
+      end
+      private :bitrise_pull_request
+
       def github_pull_request
         ENV['CI_PULL_REQUEST'] || ""
       end
@@ -71,6 +81,11 @@ module Slather
       end
       private :github_branch_name
 
+      def bitrise_branch_name
+        ENV['BITRISE_GIT_BRANCH'] || `git ls-remote --heads origin | grep $(git rev-parse HEAD) | cut -d / -f 3-`.chomp
+      end
+      private :bitrise_branch_name
+
       def buildkite_job_id
         ENV['BUILDKITE_BUILD_NUMBER']
       end
@@ -151,16 +166,39 @@ module Slather
       end
       private :github_git_info
 
+      def bitrise_git_info
+        {
+          :head => {
+            :id => ENV['BITRISE_GIT_COMMIT'],
+            :committer_name => (ENV['GIT_CLONE_COMMIT_AUTHOR_NAME'] || `git log --format=%an -n 1 HEAD`.chomp || ""),
+            :committer_email => (ENV['GIT_CLONE_COMMIT_AUTHOR_EMAIL'] || `git log --format=%ae -n 1 HEAD`.chomp || ""),
+            :message => (ENV['BITRISE_GIT_MESSAGE'] || `git log --format=%s -n 1 HEAD`.chomp || "")
+          },
+          :branch => bitrise_branch_name
+        }
+      end
+      private :bitrise_git_info
+
       def github_build_url
         "https://github.com/" + ENV['GITHUB_REPOSITORY'] + "/actions/runs/" + ENV['GITHUB_RUN_ID']
       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
@@ -170,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."
@@ -258,13 +296,42 @@ 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?"
           end
+        elsif ci_service == :bitrise
+          {
+            :service_job_id => bitrise_job_id,
+            :service_name => 'bitrise',
+            :repo_token => coverage_access_token,
+            :source_files => coverage_files.map(&:as_json),
+            :service_pull_request => bitrise_pull_request,
+            :service_branch => bitrise_branch_name,
+            :git => bitrise_git_info
+          }.to_json
         else
-          raise StandardError, "No support for ci named #{ci_service}"
+          {
+            :service_job_id => ENV['CI_BUILD_NUMBER'],
+            :service_name => ENV['CI_NAME'] || ci_service,
+            :repo_token => coverage_access_token,
+            :source_files => coverage_files.map(&:as_json),
+            :service_build_url => ENV['CI_BUILD_URL'],
+            :service_pull_request => ENV['CI_PULL_REQUEST'],
+            :service_branch => ENV['CI_BRANCH'],
+            :git => {
+              :head => {
+                :id => ENV['CI_COMMIT'],
+                :committer_name => (`git log --format=%an -n 1 HEAD`.chomp || ""),
+                :committer_email => (`git log --format=%ae -n 1 HEAD`.chomp || ""),
+                :message => (`git log --format=%s -n 1 HEAD`.chomp || "")
+              },
+              :branch => ENV['CI_BRANCH']
+            }
+          }.to_json
         end
       end
       private :coveralls_coverage_data
@@ -277,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/project.rb

@@ -375,7 +375,7 @@ module Slather
     end
 
     def configure_ci_service
-      self.ci_service ||= (self.class.yml["ci_service"] || :travis_ci)
+      self.ci_service ||= (ENV["CI_SERVICE"] || self.class.yml["ci_service"] || :other)
     end
 
     def configure_input_format

data/lib/slather/version.rb

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

data/slather.gemspec

@@ -28,8 +28,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'equivalent-xml', '~> 0.6'
 
   spec.add_dependency 'clamp', '~> 1.3'
-  spec.add_dependency 'xcodeproj', '~> 1.7'
-  spec.add_dependency 'nokogiri', '~> 1.11'
+  spec.add_dependency 'xcodeproj', '~> 1.21'
+  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.1
+  version: 2.7.3
 platform: ruby
 authors:
 - Mark Larsen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-02 00:00:00.000000000 Z
+date: 2022-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -156,28 +156,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.21'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.21'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: 1.13.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.11'
+        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