coveralls-lcov 1.3.1 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 07df77be1dae739e054c8b7531ed8b306fd7f955
-  data.tar.gz: 509e1f2db6eade7b29cdc79c579b430e94ec4248
+SHA256:
+  metadata.gz: ecff8406287e594bd44a2a6e519dea024a2d22fac3cb4e6639ddebd9540aa738
+  data.tar.gz: d3860be529759a2c33c4c0642a2a8498274e611a5cb2be8fb9357bc7ccb15cc1
 SHA512:
-  metadata.gz: 115a0b90154ec7659dd55d4e2da2b6edd85215757cd5d84d32f32485f841f1a1505be5ac951f6eb9f0ddf1371f085fad746c648e96004cb55ce96196dc2217ad
-  data.tar.gz: 6f79390f63a5b751b7acb7573d12a6b1f3bf7ff96c3586bb2b06bc81a9f22df3d24ff2b62500eb8c71488debc2d625b3c33276b5c26db6a38ae6a5e835d677b9
+  metadata.gz: ad739f55ad21ed4d1ea62ab01a0e06c28d22e777429efa6c3c1179f6022cc47fb0d26ce739f7010ad570431ba61aba9b522fbae7caafb0bfcf897f2b64d19d7e
+  data.tar.gz: 8cbfb33e126ea010121f4a86af5b655d7c1435f779d3be277440584539db8afd35370bd47495dc13fd098ffc85b7b01f51be45066b7e4d00eed0998f3d5c359b

data/README.md

@@ -2,7 +2,7 @@
 
 Upload coverage information generated by LCOV to coveralls.io.
 
-coveralls-lcov supports travis-ci.org only.
+coveralls-lcov supports travis-ci.org and travis-ci.com (via the `--service-name` switch).
 
 ## Installation
 
@@ -18,13 +18,17 @@ Or install it yourself as:
 
     $ gem install coveralls-lcov
 
+Alternatively if you want to install your own build of `coveralls-lcov` system-wide (one-step installation):
+
+    $ sudo rake install
+
 ## Usage
 
 In .travis.yml
 
 Do not use `sudo` when install Gem because `sudo` doesn't refer PATH changed by RVM.
 
-```
+```yaml
 install:
   - sudo apt-get install -y lcov
   - gem install coveralls-lcov
@@ -44,9 +48,52 @@ or by hand
 $ coveralls-lcov --repo-token "YOUR TOKEN" coverage.info
 ```
 
+you can also put the token into the config file `.coveralls.yml` like this
+
+```yaml
+repo_token: abcd....
+```
+
+and then execute
+
+```
+$ coveralls-lcov coverage.info
+```
+
+### C1 coverage support
+
+You can report C1 coverage using `--rc lcov_branch_coverage=1`.
+
+```yaml
+after_success:
+  - lcov --compat-libtool --directory . --capture --rc lcov_branch_coverage=1 --output-file coverage.info 
+  - coveralls-lcov coverage.info
+```
+
+See also lcovrc(5).
+
+## Available command line flags
+
+Flag | Description
+--- | ---
+`-t` `--repo-token=TOKEN` | The secret token for your repository, found at the bottom of your repository’s page on Coveralls.
+`-s` `--service_name=SERVICE` | The CI service or other environment in which the test suite was run. This can be anything, but certain services have special features (travis-ci, travis-pro, or coveralls-ruby).
+`--service-job-id=JOB_ID` | A unique identifier of the job on the service specified by service_name.
+`-b` `--branch=BRANCH` | The current Git branch to be reported to Coveralls (not needed for Travis or if `git rev-parse` properly reports the branch).
+`--service-pull-request=PULL_REQUEST` | The associated pull request ID of the build. Used for updating the status and/or commenting.
+`--flag-name=FLAG_NAME` | If this is set, the job being reported will be named in the view and have it’s own independent status reported to your VCS provider.
+`--retry=N` | Retries sending coverage data on failure to Coveralls N times (default: 3)
+`--delay=N` | Delays the next retry by N seconds (default: 3)
+`--source-encoding=ENCODING` | The encoding of the source file (default: UTF-8)
+`-v` `--verbose` | Prints debug information like the HTTP request payload.
+`-n` `--dry-run` | Converts coverage data and optionally prints coverage data in verbose mode, but does not send it to Coveralls.
+`-h` `--host=HOST` | Host of Coveralls endpoint (default: coveralls.io)
+`-p` `--port=PORT` | Post of Coveralls endpoint (default: 443)
+`--[no]ssl` | Use SSL for connecting to Coveralls (default)
+
 ## Contributing
 
-1. Fork it ( http://github.com/<my-github-username>/coveralls-lcov/fork )
+1. Fork it ( http://github.com/okkez/coveralls-lcov/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/coveralls-lcov.gemspec

@@ -20,6 +20,6 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = ">= 1.9.3"
 
-  spec.add_development_dependency "bundler", "~> 1.5"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
 end

data/lib/coveralls/lcov.rb

@@ -2,6 +2,5 @@ require "coveralls/lcov/version"
 
 module Coveralls
   module Lcov
-    # Your code goes here...
   end
 end

data/lib/coveralls/lcov/converter.rb

@@ -2,11 +2,12 @@
 module Coveralls
   module Lcov
     class Converter
-      def initialize(tracefile, source_encoding = Encoding::UTF_8, service_name = "travis-ci", service_job_id = nil)
+      def initialize(tracefile, source_encoding = Encoding::UTF_8, service_name = "travis-ci", service_job_id = nil, branch = nil)
         @tracefile = tracefile
         @source_encoding = source_encoding
         @service_name = service_name
         @service_job_id = service_job_id
+        @branch = branch
       end
 
       def convert
@@ -25,7 +26,7 @@ module Coveralls
       end
 
       def parse_tracefile
-        lcov_info = Hash.new {|h, k| h[k] = {} }
+        lcov_info = Hash.new {|h, k| h[k] = { "coverage" => {}, "branches" => {} } }
         source_file = nil
         File.readlines(@tracefile).each do |line|
           case line.chomp
@@ -34,7 +35,20 @@ module Coveralls
           when /\ADA:(\d+),(\d+)/
             line_no = $1.to_i
             count = $2.to_i
-            lcov_info[source_file][line_no] = count
+            coverage = lcov_info[source_file]["coverage"]
+            coverage[line_no] = (coverage[line_no] || 0) + count
+          when /\ABRDA:(\d+),(\d+),(\d+),(\d+|-)/
+            line_no = $1.to_i
+            block_no = $2.to_i
+            branch_no = $3.to_i
+            hits = 0
+            unless $4 == "-"
+              hits = $4.to_i
+            end
+            branches = lcov_info[source_file]['branches']
+            branches_line = branches[line_no] = branches[line_no] || {}
+            branches_block = branches_line[block_no] = branches_line[block_no] || {}
+            branches_block[branch_no] = (branches_block[branch_no] || 0) + hits
           when /\Aend_of_record/
             source_file = nil
           end
@@ -51,14 +65,26 @@ module Coveralls
         lines = source.lines
         coverage = Array.new(lines.to_a.size)
         source.lines.each_with_index do |_line, index|
-          coverage[index] = info[index + 1]
+          coverage[index] = info["coverage"][index + 1]
         end
         top_src_dir = Dir.pwd
-        {
+        source_file = {
           name: filename.sub(%r!#{top_src_dir}/!, ""),
           source: source,
           coverage: coverage,
         }
+        unless info["branches"].empty?
+          branches = []
+          info["branches"].each do |line_no, blocks_no|
+            blocks_no.each do |block_no, branches_no|
+              branches_no.each do |branch_no, hits|
+                branches.push(line_no, block_no, branch_no, hits)
+              end
+            end
+          end
+          source_file["branches"] = branches
+        end
+        source_file
       end
 
       def git_info
@@ -72,7 +98,7 @@ module Coveralls
             message: `git log -1 --format=%s`,
           },
           remotes: [], # FIXME need this?
-          branch: `git rev-parse --abbrev-ref HEAD`,
+          branch: @branch || ENV["TRAVIS_BRANCH"] || `git rev-parse --abbrev-ref HEAD`,
         }
       end
 

data/lib/coveralls/lcov/runner.rb

@@ -1,12 +1,12 @@
 require "optparse"
 require "json"
+require "yaml"
 require "net/http"
 require "net/https"
 require "coveralls/lcov/converter"
 
 module Coveralls
   # URI: https://coveralls.io/api/v1/jobs
-  HOST = "coveralls.io"
   PATH = "/api/v1/jobs"
 
   module Lcov
@@ -19,8 +19,15 @@ module Coveralls
         @source_encoding = Encoding::UTF_8
         @service_name = "travis-ci"
         @service_job_id = nil
+        @branch = nil
+        @service_pull_request = nil
+        @flag_name = nil
         @verbose = false
         @dry_run = false
+        @host = "coveralls.io"
+        @port = 443
+        @use_ssl = true
+        @parallel = ENV["COVERALLS_PARALLEL"] == "true"
         @parser = OptionParser.new(@argv)
         @parser.banner = <<BANNER
   Usage: coveralls-lcov [options] coverage.info
@@ -37,6 +44,15 @@ BANNER
         @parser.on("--service-job-id=JOB_ID", "Service job id. ex. TRAVIS_JOB_ID") do |service_job_id|
           @service_job_id = service_job_id
         end
+        @parser.on("-b", "--branch=BRANCH", "The current Git branch. ex. TRAVIS_BRANCH") do |branch|
+          @branch = branch
+        end
+        @parser.on("--service-pull-request=PULL_REQUEST", "Service pull request number. ex. TRAVIS_PULL_REQUEST") do |service_pull_request|
+          @service_pull_request = service_pull_request
+        end
+        @parser.on("--flag-name=FLAG_NAME", "Flag name. ex. \"domain_layer\"") do |flag_name|
+          @flag_name = flag_name
+        end
         @parser.on("--retry=N", Integer, "Retry to POST N times (default: 3)") do |n_times|
           @n_times = n_times
         end
@@ -53,6 +69,15 @@ BANNER
         @parser.on("-n", "--dry-run", "Dry run") do
           @dry_run = true
         end
+        @parser.on("-h", "--host=HOST", "Host of Coveralls endpoint (default: coveralls.io)") do |host|
+          @host = host
+        end
+        @parser.on("-p", "--port=PORT", "Port of Coveralls endpoint (default: 443)") do |port|
+          @port = port
+        end
+        @parser.on("--[no-]ssl", "Use SSL for connecting (default)") do |use_ssl|
+          @use_ssl = use_ssl
+        end
       end
 
       def run
@@ -63,9 +88,21 @@ BANNER
           exit false
         end
         tracefile = @argv.shift
-        converter = Converter.new(tracefile, @source_encoding, @service_name, @service_job_id)
+        converter = Converter.new(tracefile, @source_encoding, @service_name, @service_job_id, @branch)
         payload = converter.convert
-        payload[:repo_token] = @repo_token if @repo_token
+        coveralls_config = YAML.load_file(".coveralls.yml") if File.exist? ".coveralls.yml"
+        if @repo_token
+          payload[:repo_token] = @repo_token
+        elsif coveralls_config && coveralls_config["repo_token"]
+          payload[:repo_token] = coveralls_config["repo_token"]
+        end
+        if @service_pull_request
+          payload[:service_pull_request] = @service_pull_request
+        end
+        if @flag_name
+          payload[:flag_name] = @flag_name
+        end
+        payload[:parallel] = @parallel
         payload_json = payload.to_json
         puts payload_json if @verbose
         unless @dry_run
@@ -82,8 +119,8 @@ BANNER
         Net::HTTP.version_1_2
         response = nil
 
-        http = Net::HTTP.new(HOST, 443)
-        http.use_ssl = true
+        http = Net::HTTP.new(@host, @port)
+        http.use_ssl = @use_ssl
         http.start do
           request = Net::HTTP::Post.new(PATH)
           request["content-type"] = "multipart/form-data; boundary=boundary"

data/lib/coveralls/lcov/version.rb

@@ -1,5 +1,5 @@
 module Coveralls
   module Lcov
-    VERSION = "1.3.1"
+    VERSION = "1.7.0"
   end
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: coveralls-lcov
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.7.0
 platform: ruby
 authors:
 - Kenji Okimoto
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-04-08 00:00:00.000000000 Z
+date: 2021-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -61,7 +61,7 @@ homepage: https://github.com/okkez/coveralls-lcov
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -76,9 +76,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Post coverage information to coveralls.io
 test_files: []