slather 2.7.3 → 2.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f178bd0539ca115a1da1191be8870c014198bfd19f0932e0c0aa4bbc4cde4ef4
-  data.tar.gz: e2e94ab2f8e93febbd583980e83bbf356a298b2e8f466a2a076b4ecd7ed1c969
+  metadata.gz: 2c4a1059a1eae7156ac2c98e509e9cc267e6dd29fbd18332155e94b81c56c3de
+  data.tar.gz: b4d09bcb4d70d24e482268791c1a86f80f62a5f9206b3188931dabd1e8673b30
 SHA512:
-  metadata.gz: ffb1ae462f2f66a648f7353a327bfa42451f41bee1ffbd391f1de4089efa2a110908070e63b4a3aef4d55297afb10c615b2c4c173d135ec520522dc0ff3fb0fe
-  data.tar.gz: cf6c0763f817a72e9908cc899b22f03ca343016e29bdc696a87d04577836dd395fb8c975d2533a845ea649779b580aa9ba405125a026b7f6f993911c6e444497
+  metadata.gz: 2a526985aec8bbf888ccdf584c3638c97349eddaff3b905df334a88ec42e865f1012c928aa520a3471ad6aadf911e60894576f018230da63aceeb27939a00921
+  data.tar.gz: fa77a74cef513c27b2e09101f20b0357c1cf163c1f94b273137a0738fd163bce9700f4e48b76bdfcd2a12e72ba4c3baaf24f0ce86738143f23f87f5a806fcda5

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # CHANGELOG
 
+## v2.7.5
+
+* Add `--cdn-assets` flag
+  [sushant-here](https://github.com/sushant-here)
+  [#537](https://github.com/SlatherOrg/slather/pull/537)
+
+* Update nokogiri version
+
+## v2.7.4
+
+* Support Ruby 3.2.0
+  [crazymanish](https://github.com/crazymanish)
+  [#532](https://github.com/SlatherOrg/slather/pull/532)
+
 ## v2.7.3
 
 * Support Coveralls parallel runs

data/README.md

@@ -134,13 +134,14 @@ test:
 
 ### Usage with Coveralls
 
-Login to [Coveralls](https://coveralls.io/) and enable your repository. Right now, `slather` supports Coveralls via [Travis CI](https://travis-ci.org) and [CircleCI](https://circleci.com).
+Login to [Coveralls](https://coveralls.io/) and enable your repository. Right now, `slather` supports Coveralls via [Travis CI](https://travis-ci.org), [CircleCI](https://circleci.com), [Jenkins](https://www.jenkins.io/), [Teamcity](https://www.jetbrains.com/teamcity/), [Buildkite](https://buildkite.com/), and [Bitrise](https://bitrise.io/).
 
-Make a `.slather.yml` file:
+Make a `.slather.yml` file and specify the CI Service you're using:
 
 ```yml
 # .slather.yml
 
+ci_service: circleci | travis_ci | travis_pro | jenkins | buildkite | teamcity
 coverage_service: coveralls
 xcodeproj: path/to/project.xcodeproj
 scheme: YourXcodeSchemeName
@@ -233,6 +234,8 @@ $ slather coverage --html --scheme YourXcodeSchemeName path/to/project.xcodeproj
 
 This will make a directory named `html` in your root directory (unless `--output-directory` is specified) and will generate all the reports as static html pages inside the directory. It will print out the report's path by default, but you can also specify `--show` flag to open it in your browser automatically.
 
+By default, the generated HTML will reference locally hosted assets (js, css). You can specify the `--cdn-assets` to specify that you prefer for the generated HTML to use externally hosted assets. This can be useful if publishing the HTML file as a build artifact. 
+
 ### TeamCity Reporting
 
 To report the coverage statistics to TeamCity:

data/lib/slather/command/coverage_command.rb

@@ -19,6 +19,7 @@ class CoverageCommand < Clamp::Command
   option ["--json"], :flag, "Output coverage results as simple JSON"
   option ["--html"], :flag, "Output coverage results as static html pages"
   option ["--show"], :flag, "Indicate that the static html pages will open automatically"
+  option ["--cdn-assets"], :flag, "Indicate that the static html pages will load assets from a CDN"
 
   option ["--build-directory", "-b"], "BUILD_DIRECTORY", "The directory where gcno files will be written to. Defaults to derived data."
   option ["--source-directory"], "SOURCE_DIRECTORY", "The directory where your source files are located."
@@ -126,6 +127,7 @@ class CoverageCommand < Clamp::Command
     elsif html?
       project.coverage_service = :html
       project.show_html = show?
+      project.cdn_assets = cdn_assets?
     elsif json?
       project.coverage_service = :json
     elsif sonarqube_xml?

data/lib/slather/coverage_file.rb

@@ -51,7 +51,7 @@ module Slather
           gcov_files_created = gcov_output.scan(/creating '(.+\..+\.gcov)'/)
 
           gcov_file_name = "./#{source_file_pathname.basename}.gcov"
-          if File.exists?(gcov_file_name)
+          if File.exist?(gcov_file_name)
             gcov_data = File.new(gcov_file_name).read
           else
             gcov_data = ""

data/lib/slather/coverage_service/html_output.rb

@@ -233,10 +233,17 @@ module Slather
       end
 
       def generate_html_template(title, is_index, is_file_empty)
-        logo_path = "logo.jpg"
-        css_path = "slather.css"
-        highlight_js_path = "highlight.pack.js"
-        list_js_path = "list.min.js"
+        if cdn_assets
+          logo_path = "https://cdn.jsdelivr.net/gh/SlatherOrg/slather/docs/logo.jpg"
+          css_path = "https://cdn.jsdelivr.net/gh/SlatherOrg/slather/assets/slather.css"
+          highlight_js_path = "https://cdn.jsdelivr.net/gh/SlatherOrg/slather/assets/highlight.pack.js"
+          list_js_path = "https://cdn.jsdelivr.net/gh/SlatherOrg/slather/assets/list.min.js"
+        else
+          logo_path = "logo.jpg"
+          css_path = "slather.css"
+          highlight_js_path = "highlight.pack.js"
+          list_js_path = "list.min.js"
+        end
 
         builder = Nokogiri::HTML::Builder.new do |doc|
           doc.html {

data/lib/slather/project.rb

@@ -44,7 +44,7 @@ module Slather
   class Project < Xcodeproj::Project
 
     attr_accessor :build_directory, :ignore_list, :ci_service, :coverage_service, :coverage_access_token, :source_directory,
-      :output_directory, :xcodeproj, :show_html, :verbose_mode, :input_format, :scheme, :workspace, :binary_file, :binary_basename, :arch, :source_files,
+      :output_directory, :xcodeproj, :show_html, :cdn_assets, :verbose_mode, :input_format, :scheme, :workspace, :binary_file, :binary_basename, :arch, :source_files,
       :decimals, :llvm_version, :configuration
 
     alias_method :setup_for_coverage, :slather_setup_for_coverage
@@ -208,7 +208,7 @@ module Slather
 
     def profdata_coverage_dir
       @profdata_coverage_dir ||= begin
-        raise StandardError, "The specified build directory (#{self.build_directory}) does not exist" unless File.exists?(self.build_directory)
+        raise StandardError, "The specified build directory (#{self.build_directory}) does not exist" unless File.exist?(self.build_directory)
         dir = nil
         if self.scheme
           dir = Dir[File.join(build_directory,"/**/CodeCoverage/#{self.scheme}")].first
@@ -503,7 +503,7 @@ module Slather
           end
         end
 
-        raise StandardError, "No scheme named '#{self.scheme}' found in #{self.path}" unless File.exists? xcscheme_path
+        raise StandardError, "No scheme named '#{self.scheme}' found in #{self.path}" unless File.exist? xcscheme_path
 
         xcscheme = Xcodeproj::XCScheme.new(xcscheme_path)
 

data/lib/slather/version.rb

@@ -1,3 +1,3 @@
 module Slather
-  VERSION = '2.7.3' unless defined?(Slather::VERSION)
+  VERSION = '2.7.5' 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.13.9'
+  spec.add_dependency 'nokogiri', '>= 1.14.3'
   spec.add_dependency 'CFPropertyList', '>= 2.2', '< 4'
 
   spec.add_runtime_dependency 'activesupport'

data/spec/slather/coverage_service/cobertura_xml_spec.rb

@@ -45,7 +45,7 @@ describe Slather::CoverageService::CoberturaXmlOutput do
       fixtures_project.post
 
       filepath = "#{fixtures_project.output_directory}/cobertura.xml"
-      expect(File.exists?(filepath)).to be_truthy
+      expect(File.exist?(filepath)).to be_truthy
 
       FileUtils.rm_rf(fixtures_project.output_directory)
     end

data/spec/slather/coverage_service/json_spec.rb

@@ -35,7 +35,7 @@ describe Slather::CoverageService::JsonOutput do
       fixtures_project.post
 
       filepath = "#{fixtures_project.output_directory}/report.json"
-      expect(File.exists?(filepath)).to be_truthy
+      expect(File.exist?(filepath)).to be_truthy
 
       FileUtils.rm_rf(fixtures_project.output_directory)
     end

data/spec/slather/coverage_service/llvm_cov_spec.rb

@@ -38,7 +38,7 @@ describe Slather::CoverageService::LlvmCovOutput do
       fixtures_project.post
 
       filepath = "#{fixtures_project.output_directory}/report.llcov"
-      expect(File.exists?(filepath)).to be_truthy
+      expect(File.exist?(filepath)).to be_truthy
 
       FileUtils.rm_rf(fixtures_project.output_directory)
     end

data/spec/slather/coverage_service/sonarqube_xml_spec.rb

@@ -38,7 +38,7 @@ describe Slather::CoverageService::SonarqubeXmlOutput do
       fixtures_project.post
 
       filepath = "#{fixtures_project.output_directory}/sonarqube-generic-coverage.xml"
-      expect(File.exists?(filepath)).to be_truthy
+      expect(File.exist?(filepath)).to be_truthy
 
       FileUtils.rm_rf(fixtures_project.output_directory)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slather
 version: !ruby/object:Gem::Version
-  version: 2.7.3
+  version: 2.7.5
 platform: ruby
 authors:
 - Mark Larsen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-20 00:00:00.000000000 Z
+date: 2023-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.13.9
+        version: 1.14.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.13.9
+        version: 1.14.3
 - !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.2.22
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Test coverage reports for Xcode projects