danger-rcov 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63667e8810c7bbabb9090870ac9e7c819179c9b1052dac34400d5f19f5cd6435
-  data.tar.gz: cd455620f49bc1db1e90bd609f7d3c629dd9602dcbefae1b1a62c71b1e082dad
+  metadata.gz: fb3eca7183e1ece80cabaf4b95fc6c37d7e4c433faa8c5360163a642c31edf37
+  data.tar.gz: c91b8bdef890dbf67834ab98d69906bf85a85ff866c67cda07760430a7afdc8d
 SHA512:
-  metadata.gz: 5c7634c90b57061edf0ffa1d60e262b279eaea62ce2fc52f2595ca956a6be94aefbec2ced0af935f2045f37dea8d7ec5e7adf53c57c28af7d39d9b79b8389a07
-  data.tar.gz: dfcb8306c635a1a4b0f5e293a3070679d13762293a31dfaba650cdcab7a7150eac446e0443a763e49fb5e13a463d697792eab00536dad69be962934feb9734c8
+  metadata.gz: 07cb2c4f88c4e1a4c7981e845d54c34b1d7d4c2e522cf01df559ab62891537e9a20b33649dc6275f6b55d16052356b802174a8e246c29ef84514166d34b3f1ce
+  data.tar.gz: 0b91fd1b178bc80fd0b52e78b436e60bb6f51ebe8b94d8c04aa271f9e4184214ac081e7f757aad2c80448e64370ee1e2e7009e4f84c2bb3e59cf0927f5fac513

data/danger-rcov.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
+  spec.add_runtime_dependency 'circle_ci_wrapper', '~> 0.0.1'
   spec.add_runtime_dependency 'danger-plugin-api', '~> 1.0'
 
   # General ruby development

data/lib/rcov/gem_version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Rcov
-  VERSION = '2.0.1'
+  VERSION = '2.0.2'
 end

data/lib/rcov/plugin.rb

@@ -2,12 +2,12 @@
 
 require 'open-uri'
 require 'net/http'
-require_relative 'circle_ci'
+require 'circle_ci_wrapper'
 
 module Danger
   class DangerRcov < Plugin
     def report(branch_name, build_name = 'build', show_warning = true)
-      current_url, master_url = Rcov::CircleCi.get_report_urls_by_branch(branch_name, build_name)
+      current_url, master_url = CircleCiWrapper.report_urls_by_branch(branch_name, build_name)
 
       # Get code coverage report as json from url
       @current_report = get_report(url: current_url)

data/spec/rcov_spec.rb

@@ -29,7 +29,7 @@ module Danger
       end
 
       it 'code coverage different' do
-        allow(Rcov::CircleCi).to receive(:get_report_urls_by_branch).and_return(
+        allow(CircleCiWrapper).to receive(:report_urls_by_branch).and_return(
           [
             'https://current.circle-artifacts.com/0/coverage/coverage.json?circle-token=circle-token',
             'https://master.circle-artifacts.com/0/coverage/coverage.json?circle-token=circle-token'
@@ -56,7 +56,7 @@ module Danger
       end
 
       it 'same code coverage' do
-        allow(Rcov::CircleCi).to receive(:get_report_urls_by_branch).and_return(
+        allow(CircleCiWrapper).to receive(:report_urls_by_branch).and_return(
           [
             'https://current.circle-artifacts.com/0/coverage/coverage.json?circle-token=circle-token',
             'https://master.circle-artifacts.com/0/coverage/coverage.json?circle-token=circle-token'

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: danger-rcov
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Guilherme Pereira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-28 00:00:00.000000000 Z
+date: 2020-09-01 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: circle_ci_wrapper
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.1
 - !ruby/object:Gem::Dependency
   name: danger-plugin-api
   requirement: !ruby/object:Gem::Requirement
@@ -199,10 +213,8 @@ files:
 - danger-rcov.gemspec
 - lib/danger_plugin.rb
 - lib/danger_rcov.rb
-- lib/rcov/circle_ci.rb
 - lib/rcov/gem_version.rb
 - lib/rcov/plugin.rb
-- spec/rcov/circle_ci_spec.rb
 - spec/rcov_spec.rb
 - spec/spec_helper.rb
 - spec/support/fixtures/current_circle_ci.json
@@ -234,7 +246,6 @@ signing_key:
 specification_version: 4
 summary: Plugin that allows code coverage print
 test_files:
-- spec/rcov/circle_ci_spec.rb
 - spec/rcov_spec.rb
 - spec/spec_helper.rb
 - spec/support/fixtures/current_circle_ci.json

data/lib/rcov/circle_ci.rb

@@ -1,42 +0,0 @@
-# frozen_string_literal: true
-
-module Rcov
-  module CircleCi
-    CIRCLE_CI_API_URL = 'https://circleci.com/api/v1.1/project/github'
-
-    def self.get_report_urls_by_branch(branch_name, build_name = 'build')
-      url = "#{base_url}/tree/#{branch_name}?circle-token=#{ENV['CIRCLE_TOKEN']}&limit=6&filter=completed"
-
-      return nil if Net::HTTP.get_response(URI.parse(url)).code != '200'
-
-      data = JSON.parse(URI.parse(url).read)
-
-      latest_build_num = data.select do |build|
-        build&.[]('build_parameters')&.[]('CIRCLE_JOB') == build_name
-      end&.first&.[]('build_num')
-
-      return nil unless latest_build_num
-
-      return [
-        get_report_url("#{base_url}/#{ENV['CIRCLE_BUILD_NUM']}/artifacts?circle-token=#{ENV['CIRCLE_TOKEN']}"),
-        get_report_url("#{base_url}/#{latest_build_num}/artifacts?circle-token=#{ENV['CIRCLE_TOKEN']}", branch_name)
-      ]
-    end
-
-    def self.get_report_url(url, branch_name = nil)
-      return nil if Net::HTTP.get_response(URI.parse(url)).code != '200'
-
-      artifacts = JSON.parse(URI.parse(url).read).map { |a| a['url'] }
-
-      coverage_url = artifacts.find { |artifact| artifact&.end_with?('coverage/coverage.json') }
-
-      return nil unless coverage_url
-
-      return "#{coverage_url}?circle-token=#{ENV['CIRCLE_TOKEN']}&branch=#{branch_name}"
-    end
-
-    def self.base_url
-      "#{CIRCLE_CI_API_URL}/#{ENV['CIRCLE_PROJECT_USERNAME']}/#{ENV['CIRCLE_PROJECT_REPONAME']}"
-    end
-  end
-end

data/spec/rcov/circle_ci_spec.rb

@@ -1,41 +0,0 @@
-# frozen_string_literal: true
-
-require File.expand_path('../spec_helper', __dir__)
-
-RSpec.describe Rcov::CircleCi do
-  before do
-    allow(ENV).to receive(:[]).with('CIRCLE_PROJECT_USERNAME').and_return('EdgePetrol')
-    allow(ENV).to receive(:[]).with('CIRCLE_PROJECT_REPONAME').and_return('danger-rcov')
-  end
-
-  describe '#get_report_urls_by_branch' do
-    let(:response) { File.read(File.dirname(__FILE__) + '/../support/fixtures/tree_ci.json') }
-    let(:curr_cov_response) { File.read(File.dirname(__FILE__) + '/../support/fixtures/current_circle_ci.json') }
-    let(:master_cov_response) { File.read(File.dirname(__FILE__) + '/../support/fixtures/master_circle_ci.json') }
-
-    before do
-      allow(ENV).to receive(:[]).with('CIRCLE_TOKEN').and_return('token')
-      allow(ENV).to receive(:[]).with('CIRCLE_BUILD_NUM').and_return(56)
-
-      allow(Net::HTTP).to receive_message_chain(:get_response, :code).and_return('200')
-      allow(URI).to receive_message_chain(:parse, :read).and_return(response)
-
-      current_coverage = Struct.new(:read)
-      allow(URI).to receive(:parse).with('https://circleci.com/api/v1.1/project/github/EdgePetrol/danger-rcov/56/artifacts?circle-token=token').and_return(current_coverage)
-      allow(current_coverage).to receive(:read).and_return(curr_cov_response)
-
-      coverage = Struct.new(:read)
-      allow(URI).to receive(:parse).with('https://circleci.com/api/v1.1/project/github/EdgePetrol/danger-rcov/85/artifacts?circle-token=token').and_return(coverage)
-      allow(coverage).to receive(:read).and_return(master_cov_response)
-    end
-
-    it 'returns the correct urls' do
-      expect(described_class.get_report_urls_by_branch('staging')).to eq(
-        [
-          'https://current.circle-artifacts.com/0/coverage/coverage.json?circle-token=token&branch=',
-          'https://master.circle-artifacts.com/0/coverage/coverage.json?circle-token=token&branch=staging'
-        ]
-      )
-    end
-  end
-end