codacy-coverage 2.1.0 → 2.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2ef11befe972c081e590d67224d6c20f82a76fdd
-  data.tar.gz: 83f0a81143e64065dfac22a3e3a08e6928b8e436
+SHA256:
+  metadata.gz: 1be5b80740480276200a84a0d55133ca61b44082c1e72e076a67587bc06b3cb0
+  data.tar.gz: 0ad0414f542367603e0759863ae412da6bb24740583b7739250dea045b2fa607
 SHA512:
-  metadata.gz: 4d6fab0296e7bcb72ecbfe68217ea3a359baafc3c6e5d516c9073b3702c77a8c1fedbdf6b62d6430203fa38d949dfd3bb8c3c4f537bd675dea4a3d9f9724e584
-  data.tar.gz: 58ce4f05aa1344f663167b4c8a2165ffabaa2eac72d1b36d481bb5b5c54872928e38c51507092b5e5590b9c204f7688c85eb1cad3b82586c3b934075190c3cda
+  metadata.gz: 34c7dcc7802a3b863a87bfd29e8cd0e432af8463f86c65a8818187d9dd564cc85eccecd379ff82cce93ae3ca48e89d8c4841831ecbfcd2a1d74a2d6e8bcaa9dc
+  data.tar.gz: 026cc0ab653ee84eec81c5c4c254ede2a3e15b06c4c3fd818d89e09bd841450259bc44788ffa2b561ad7c0aa17ceadf4e18e937bc3307b73742b1e91cfedf044

data/.circleci/config.yml

@@ -0,0 +1,105 @@
+version: 2.1
+
+orbs:
+  codacy: codacy/base@1.0.0
+
+jobs:
+  build_and_test:
+    parameters:
+        ruby_version:
+          type: string
+        persist_to_workspace:
+          type: boolean
+          default: false
+    docker:
+      - image: circleci/ruby:<< parameters.ruby_version >>
+    working_directory: ~/workdir
+    steps:
+      - attach_workspace:
+          at: ~/
+
+      - run: gem install bundler
+
+      - restore_cache:
+          keys:
+            - ruby-codacy-coverage-{{ checksum "Gemfile.lock" }}
+            - ruby-codacy-coverage-
+
+      - run: bundle install --path vendor/bundle
+
+      - save_cache:
+          key: ruby-codacy-coverage-{{ checksum "Gemfile.lock" }}
+          paths:
+            - vendor/bundle
+
+      - run: bundle exec rspec
+      - when:
+          condition: << parameters.persist_to_workspace >>
+          steps:
+            - persist_to_workspace:
+                root: ~/
+                paths:
+                  - workdir/*
+  publish:
+    docker:
+      - image: circleci/ruby:2
+    working_directory: ~/workdir
+    steps:
+      - attach_workspace:
+          at: ~/
+      - run:
+          name: Setup Rubygems
+          command: bash .circleci/setup-rubygems.sh
+      - run:
+          name: Publish to Rubygems
+          command: |
+            export PUBLISH_VERSION=$(cat .version)
+            gem build codacy-coverage.gemspec
+            gem push codacy-coverage-$(cat .version).gem
+
+workflows:
+  version: 2
+  build_and_publish:
+    jobs:
+      - codacy/checkout_and_version
+      - build_and_test:
+          name: build_and_test_2
+          ruby_version: "2"
+          persist_to_workspace: true
+          requires:
+            - codacy/checkout_and_version
+      - build_and_test:
+          name: build_and_test_2.3
+          ruby_version: "2.3"
+          requires:
+            - codacy/checkout_and_version
+      - build_and_test:
+          name: build_and_test_2.4
+          ruby_version: "2.4"
+          requires:
+            - codacy/checkout_and_version
+      - build_and_test:
+          name: build_and_test_2.5
+          ruby_version: "2.5"
+          requires:
+            - codacy/checkout_and_version
+      - build_and_test:
+          name: build_and_test_2.6
+          ruby_version: "2.6"
+          requires:
+            - codacy/checkout_and_version
+      - publish:
+          requires:
+            - build_and_test_2
+            - build_and_test_2.3
+            - build_and_test_2.4
+            - build_and_test_2.5
+            - build_and_test_2.6
+          filters:
+            branches:
+              only:
+                - master
+      - codacy/tag_version:
+          name: tag_version
+          requires:
+            - publish

data/.circleci/setup-rubygems.sh

@@ -0,0 +1,3 @@
+mkdir ~/.gem
+echo -e "---\r\n:rubygems_api_key: $RUBYGEMS_API_KEY" > ~/.gem/credentials
+chmod 0600 /home/circleci/.gem/credentials

data/.github/CODEOWNERS

@@ -0,0 +1,4 @@
+* @lolgab @ljmf00 @andreaTP @rtfpessoa @bmbferreira @DReigada @pedrocodacy
+
+*.yml @h314to @paulopontesm
+

data/.gitignore

@@ -3,7 +3,6 @@
 .bundle
 .config
 .yardoc
-Gemfile.lock
 InstalledFiles
 _yardoc
 coverage

data/Gemfile.lock

@@ -0,0 +1,43 @@
+PATH
+  remote: .
+  specs:
+    codacy-coverage (1.0.dev)
+      simplecov
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    diff-lcs (1.3)
+    docile (1.3.2)
+    json (2.2.0)
+    rake (13.0.0)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.0)
+      rspec-support (~> 3.9.0)
+    rspec-expectations (3.9.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.0)
+    simplecov (0.17.1)
+      docile (~> 1.1)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler
+  codacy-coverage!
+  rake
+  rspec
+
+BUNDLED WITH
+   2.0.2

data/bin/codacy_final_reporter

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+require 'codacy/client'
+
+Codacy::ClientAPI.notify_final

data/codacy-coverage.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |gem|
   gem.license       = "MIT"
 
   gem.files         = `git ls-files`.split($\)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.executables   = ["codacy_final_reporter"]
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "codacy-coverage"
   gem.require_paths = ["lib"]

data/lib/codacy/client.rb

@@ -1,17 +1,16 @@
 require 'json'
-require "uri"
-require "net/https"
+require 'uri'
+require 'net/https'
+require 'codacy/git'
 
 module Codacy
   module ClientAPI
-    def self.post_results(parsed_result)
+    def self.post_results(parsed_result, partial: false)
       logger.info('Preparing payload...')
       logger.debug(parsed_result)
 
-      project_token = ENV['CODACY_PROJECT_TOKEN']
-      codacy_base_api = ENV['CODACY_BASE_API_URL'] || 'https://api.codacy.com'
-      commit = Codacy::Git.commit_id
-      url = create_url(codacy_base_api, commit)
+      project_token, codacy_base_api, commit = get_parameters
+      url = create_url(codacy_base_api, commit, partial: partial)
 
       result = parsed_result.to_json
 
@@ -33,7 +32,7 @@ module Codacy
     def self.send_request(url, content, project_token, redirects = 3)
       uri = URI.parse(url)
       http = Net::HTTP.new(uri.host, uri.port)
-      request = Net::HTTP::Post.new(uri.path)
+      request = Net::HTTP::Post.new(uri)
       http.use_ssl = uri.scheme == "https"
       request["project_token"] = project_token
       request["Content-Type"] = "application/json"
@@ -52,9 +51,40 @@ module Codacy
       Codacy::Configuration.logger
     end
 
-    def self.create_url(codacy_base_api, commit)
+    def self.create_url(codacy_base_api, commit, final: false, partial: false)
       commit = commit.gsub(/[^[:alnum:]]/, "")
-      codacy_base_api + '/2.0/coverage/' + commit + '/ruby'
+      if final
+        codacy_base_api + '/2.0/commit/' + commit + '/coverageFinal'
+      else
+        query_params = partial ? '?partial=true' : ''
+        codacy_base_api + '/2.0/coverage/' + commit + '/ruby' + query_params
+      end
+    end
+
+    def self.notify_final
+      project_token, codacy_base_api, commit = get_parameters
+      url = create_url(codacy_base_api, commit, final: true)
+
+      if project_token.to_s == ''
+        puts 'Could not find Codacy API token, make sure you have it configured in your environment.'
+        false
+      elsif commit.to_s == ''
+        puts 'Could not find the current commit, make sure that you are running inside a git project.'
+        false
+      else
+        puts 'Posting Coverage Final Notice to ' + url
+        response = send_request(url, '{}', project_token)
+
+        puts response
+        response.to_s.include? 'success'
+      end
+    end
+
+    def self.get_parameters
+      project_token = ENV['CODACY_PROJECT_TOKEN']
+      codacy_base_api = ENV['CODACY_BASE_API_URL'] || 'https://api.codacy.com'
+      commit = Codacy::Git.commit_id
+      return project_token, codacy_base_api, commit
     end
   end
 end

data/lib/codacy/formatter.rb

@@ -4,7 +4,7 @@ module Codacy
     def format(result)
       if should_run?
         parse_result = Codacy::Parser.parse_file(result)
-        Codacy::ClientAPI.post_results(parse_result)
+        Codacy::ClientAPI.post_results(parse_result, partial: partial)
       else
         logger.info("Running locally, skipping Codacy coverage")
       end
@@ -15,6 +15,10 @@ module Codacy
 
     private
 
+    def partial
+      false
+    end
+
     def should_run?
       ENV["CI"] || ENV["JENKINS_URL"] || ENV['TDDIUM'] || ENV["CODACY_RUN_LOCAL"]
     end
@@ -24,4 +28,10 @@ module Codacy
     end
 
   end
+
+  class PartialFormatter < Formatter
+    def partial
+      true
+    end
+  end
 end

data/lib/codacy/reporter.rb

@@ -2,9 +2,9 @@ require 'simplecov'
 
 module Codacy
   module Reporter
-    def self.start
-      SimpleCov.formatter = Codacy::Formatter
-      SimpleCov.start
+    def self.start(profile = nil, partial = true)
+      SimpleCov.formatter = partial ? Codacy::Formatter::Partial : Codacy::Formatter
+      SimpleCov.start(profile)
     end
   end
 end

data/spec/codacy/client_spec.rb

@@ -2,16 +2,41 @@ require "spec_helper"
 
 describe Codacy::ClientAPI do
   describe 'create url' do
-      it 'checks if the url is correct.' do
-        codacy_base_api = 'https://api.codacy.com'
-
-        expected_commit_uuid = "9a7d25976a11f2a145f8fee7c4e4ad58b621d560"
-        expected_url = Codacy::ClientAPI.create_url(codacy_base_api, expected_commit_uuid)
-        
-        wrong_commit_uuid = "'9a7d25976a11f2a145f8fee7c4e4ad58b621d560'"
-        fixed_url = Codacy::ClientAPI.create_url(codacy_base_api, wrong_commit_uuid)
-        
-        expect(fixed_url).to eq expected_url
+    let(:codacy_base_api) {'https://api.codacy.com'}
+
+    it 'checks if the url is correct.' do
+      expected_commit_uuid = "9a7d25976a11f2a145f8fee7c4e4ad58b621d560"
+      expected_url = Codacy::ClientAPI.create_url(codacy_base_api, expected_commit_uuid)
+
+      wrong_commit_uuid = "'9a7d25976a11f2a145f8fee7c4e4ad58b621d560'"
+      fixed_url = Codacy::ClientAPI.create_url(codacy_base_api, wrong_commit_uuid)
+
+      expect(fixed_url).to eq expected_url
+    end
+
+    it 'generates coverage final url' do
+      commit_uuid = "9a7d25976a11f2a145f8fee7c4e4ad58b621d560"
+
+      url = Codacy::ClientAPI.create_url(codacy_base_api, commit_uuid, final: true)
+
+      expect(url).to include('coverageFinal')
+    end
+
+    it 'generates url with partial query parameter' do
+      commit_uuid = "9a7d25976a11f2a145f8fee7c4e4ad58b621d560"
+
+      url = Codacy::ClientAPI.create_url(codacy_base_api, commit_uuid, partial: true)
+
+      expect(url).to include('partial=true')
+    end
+  end
+
+  describe '.notify_final' do
+    context 'missing project token' do
+      it 'returns false' do
+        ENV['CODACY_PROJECT_TOKEN'] = ''
+        expect(Codacy::ClientAPI.notify_final).to be false
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: codacy-coverage
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.4
 platform: ruby
 authors:
 - Nuno Teixeira
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-20 00:00:00.000000000 Z
+date: 2019-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
@@ -71,16 +71,21 @@ description: Post code coverage results to Codacy.
 email:
 - nuno@codacy.com
 - rodrigo@codacy.com
-executables: []
+executables:
+- codacy_final_reporter
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
+- ".circleci/setup-rubygems.sh"
+- ".github/CODEOWNERS"
 - ".github/ISSUE_TEMPLATE.md"
 - ".gitignore"
 - Gemfile
+- Gemfile.lock
 - Gemfile.ruby-19
 - README.md
-- circle.yml
+- bin/codacy_final_reporter
 - codacy-coverage.gemspec
 - lib/codacy-coverage.rb
 - lib/codacy/client.rb
@@ -89,7 +94,6 @@ files:
 - lib/codacy/git.rb
 - lib/codacy/parser.rb
 - lib/codacy/reporter.rb
-- scripts/ci.sh
 - spec/codacy/client_spec.rb
 - spec/codacy/git_spec.rb
 - spec/spec_helper.rb
@@ -112,8 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Post code coverage results to Codacy.

data/circle.yml

@@ -1,15 +0,0 @@
-dependencies:
-  pre:
-    - git config --global user.email "ci@codacy.com"
-    - git config --global user.name "Codacy CI"
-  override:
-    - rvm install 2.0.0-p648
-    - rvm install 2.1.10
-    - rvm install 2.2.5
-    - rvm install 2.3.1
-  cache_directories:
-    - "~/.rvm"
-
-test:
-  override:
-    - scripts/ci.sh

data/scripts/ci.sh

@@ -1,23 +0,0 @@
-#!/bin/bash --login
-
-set -e
-
-rvm use 2.0.0-p648
-ruby -v
-bundle install
-bundle exec rspec
-
-rvm use 2.1.10
-ruby -v
-bundle install
-bundle exec rspec
-
-rvm use 2.2.5
-ruby -v
-bundle install
-bundle exec rspec
-
-rvm use 2.3.1
-ruby -v
-bundle install
-bundle exec rspec