codecov 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 28cb9ca7e98d8d586f0c8118cc099def187c61c2cd1bc36882dd835959030404
-  data.tar.gz: 2ae5223947def7a015e0b92fb591f1090cb086406d7f44e284a241a022a54fa4
+  metadata.gz: 7e4bfdd1a36904d0b501d1e6ad97d5242e4a5ffa17a13b1c2968a8346bc26396
+  data.tar.gz: f0ee40b20016417dafc3aa0d68685872bd4ad2a6795cee3233b04f4de1ea3fec
 SHA512:
-  metadata.gz: f43851f9d6c5b8603bea783df5f52dfc40cc5290dfeb741cee23639bd00a60ab1916b73001f7b17652b11839f995b8bc963b151a71e4a7615510f1f129fe6d28
-  data.tar.gz: '082f364e342d308a06b25c7955949e225bc8c93d730cbb86d1542c881175441740ffd802e070c071a65f45a8e5df4a536fd4811ef0fc18d732d9e04a8dc046bb'
+  metadata.gz: 4e669367d900a5b432fb511986f6e9276df0594378347de38d1a9462f344262fcc28f33333dfec8475afc68888811507cfb3db56398cea78bd28e0f557bbeddd
+  data.tar.gz: 1ff31b938ed8383c7dc6c067f607283d9d9aafe468302aef8957eb0ba64148c2361feb4b9c5e2129bf529987f09399c020288b542ca5741f8956948d358fcc27

data/lib/codecov.rb

@@ -11,7 +11,7 @@ require_relative 'codecov/uploader'
 
 class SimpleCov::Formatter::Codecov
   def format(result, disable_net_blockers = true)
-    report = Codecov::SimpleCov::Formatter.format(result)
+    report = Codecov::SimpleCov::Formatter.new.format(result)
     Codecov::Uploader.upload(report, disable_net_blockers)
   end
 end

data/lib/codecov/formatter.rb

@@ -4,122 +4,121 @@ require 'simplecov'
 
 require_relative 'version'
 
-module Codecov::SimpleCov
-  class Formatter
-    def self.format(report)
-      result = {
-        'meta' => {
-          'version' => "codecov-ruby/v#{::Codecov::VERSION}"
+module Codecov
+  module SimpleCov
+    class Formatter
+      RESULT_FILE_NAME = 'codecov-result.json'
+
+      def format(report)
+        result = {
+          'meta' => {
+            'version' => "codecov-ruby/v#{::Codecov::VERSION}"
+          }
         }
-      }
-      result.update(result_to_codecov(report))
-      result
-    end
-
-    private
-
-    # Format SimpleCov coverage data for the Codecov.io API.
-    #
-    # @param result [SimpleCov::Result] The coverage data to process.
-    # @return [Hash]
-    def self.result_to_codecov(result)
-      {
-        'codecov' => result_to_codecov_report(result),
-        'coverage' => result_to_codecov_coverage(result),
-        'messages' => result_to_codecov_messages(result)
-      }
-    end
+        result.update(result_to_codecov(report))
 
-    def self.result_to_codecov_report(result)
-      report = file_network.join("\n").concat("\n")
-      report.concat({ 'coverage' => result_to_codecov_coverage(result) }.to_json)
-    end
-
-    def self.file_network
-      invalid_file_types = [
-        'woff', 'eot', 'otf', # fonts
-        'gif', 'png', 'jpg', 'jpeg', 'psd', # images
-        'ptt', 'pptx', 'numbers', 'pages', 'md', 'txt', 'xlsx', 'docx', 'doc', 'pdf', 'csv', # docs
-        'yml', 'yaml', '.gitignore'
-      ].freeze
-
-      invalid_directories = [
-        'node_modules/',
-        'public/',
-        'storage/',
-        'tmp/',
-        'vendor/'
-      ]
-
-      puts [green('==>'), 'Appending file network'].join(' ')
-      network = []
-      Dir['**/*'].keep_if do |file|
-        if File.file?(file) && !file.end_with?(*invalid_file_types) && invalid_directories.none? { |dir| file.include?(dir) }
-          network.push(file)
+        result_path = File.join(::SimpleCov.coverage_path, RESULT_FILE_NAME)
+        if File.writable?(result_path)
+          File.write(result_path, result['codecov'])
+          puts "Coverage report generated to #{result_path}.\#{result}"
+        else
+          puts "Could not write coverage report to file #{result_path}.\n#{result}"
         end
+
+        result
       end
 
-      network.push('<<<<<< network')
-      network
-    end
+      private
+
+      # Format SimpleCov coverage data for the Codecov.io API.
+      #
+      # @param result [SimpleCov::Result] The coverage data to process.
+      # @return [Hash]
+      def result_to_codecov(result)
+        {
+          'codecov' => result_to_codecov_report(result),
+          'coverage' => result_to_codecov_coverage(result),
+          'messages' => result_to_codecov_messages(result)
+        }
+      end
 
-    # Format SimpleCov coverage data for the Codecov.io coverage API.
-    #
-    # @param result [SimpleCov::Result] The coverage data to process.
-    # @return [Hash<String, Array>]
-    def self.result_to_codecov_coverage(result)
-      result.files.each_with_object({}) do |file, memo|
-        memo[shortened_filename(file)] = file_to_codecov(file)
+      def result_to_codecov_report(result)
+        report = file_network.join("\n").concat("\n")
+        report.concat({ 'coverage' => result_to_codecov_coverage(result) }.to_json)
       end
-    end
 
-    # Format SimpleCov coverage data for the Codecov.io messages API.
-    #
-    # @param result [SimpleCov::Result] The coverage data to process.
-    # @return [Hash<String, Hash>]
-    def self.result_to_codecov_messages(result)
-      result.files.each_with_object({}) do |file, memo|
-        memo[shortened_filename(file)] = file.lines.each_with_object({}) do |line, lines_memo|
-          lines_memo[line.line_number.to_s] = 'skipped' if line.skipped?
+      def file_network
+        invalid_file_types = [
+          'woff', 'eot', 'otf', # fonts
+          'gif', 'png', 'jpg', 'jpeg', 'psd', # images
+          'ptt', 'pptx', 'numbers', 'pages', 'md', 'txt', 'xlsx', 'docx', 'doc', 'pdf', 'csv', # docs
+          'yml', 'yaml', '.gitignore'
+        ].freeze
+
+        invalid_directories = [
+          'node_modules/',
+          'public/',
+          'storage/',
+          'tmp/',
+          'vendor/'
+        ]
+
+        network = []
+        Dir['**/*'].keep_if do |file|
+          if File.file?(file) && !file.end_with?(*invalid_file_types) && invalid_directories.none? { |dir| file.include?(dir) }
+            network.push(file)
+          end
         end
+
+        network.push('<<<<<< network')
+        network
       end
-    end
 
-    # Format coverage data for a single file for the Codecov.io API.
-    #
-    # @param file [SimpleCov::SourceFile] The file to process.
-    # @return [Array<nil, Integer>]
-    def self.file_to_codecov(file)
-      # Initial nil is required to offset line numbers.
-      [nil] + file.lines.map do |line|
-        if line.skipped?
-          nil
-        else
-          line.coverage
+      # Format SimpleCov coverage data for the Codecov.io coverage API.
+      #
+      # @param result [SimpleCov::Result] The coverage data to process.
+      # @return [Hash<String, Array>]
+      def result_to_codecov_coverage(result)
+        result.files.each_with_object({}) do |file, memo|
+          memo[shortened_filename(file)] = file_to_codecov(file)
         end
       end
-    end
 
-    # Get a filename relative to the project root. Based on
-    # https://github.com/colszowka/simplecov-html, copyright Christoph Olszowka.
-    #
-    # @param file [SimpleCov::SourceFile] The file to use.
-    # @return [String]
-    def self.shortened_filename(file)
-      file.filename.gsub(/^#{SimpleCov.root}/, '.').gsub(%r{^\./}, '')
-    end
-
-    # Convenience color methods
-    def self.black(str)
-      str.nil? ? '' : "\e[30m#{str}\e[0m"
-    end
+      # Format SimpleCov coverage data for the Codecov.io messages API.
+      #
+      # @param result [SimpleCov::Result] The coverage data to process.
+      # @return [Hash<String, Hash>]
+      def result_to_codecov_messages(result)
+        result.files.each_with_object({}) do |file, memo|
+          memo[shortened_filename(file)] = file.lines.each_with_object({}) do |line, lines_memo|
+            lines_memo[line.line_number.to_s] = 'skipped' if line.skipped?
+          end
+        end
+      end
 
-    def self.red(str)
-      str.nil? ? '' : "\e[31m#{str}\e[0m"
-    end
+      # Format coverage data for a single file for the Codecov.io API.
+      #
+      # @param file [SimpleCov::SourceFile] The file to process.
+      # @return [Array<nil, Integer>]
+      def file_to_codecov(file)
+        # Initial nil is required to offset line numbers.
+        [nil] + file.lines.map do |line|
+          if line.skipped?
+            nil
+          else
+            line.coverage
+          end
+        end
+      end
 
-    def self.green(str)
-      str.nil? ? '' : "\e[32m#{str}\e[0m"
+      # Get a filename relative to the project root. Based on
+      # https://github.com/colszowka/simplecov-html, copyright Christoph Olszowka.
+      #
+      # @param file [SimpleCov::SourceFile] The file to use.
+      # @return [String]
+      def shortened_filename(file)
+        file.filename.gsub(/^#{::SimpleCov.root}/, '.').gsub(%r{^\./}, '')
+      end
     end
   end
 end

data/lib/codecov/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Codecov
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: codecov
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Steve Peak
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-25 00:00:00.000000000 Z
+date: 2021-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov