codeclimate_circle_ci_coverage 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 80efd9d157477409d66776b499feef2d0369abb2
-  data.tar.gz: 065d5b230669202674010522e1fa3f83ddc8d88e
+SHA256:
+  metadata.gz: 2f71f70c8e89c3094db834517ac6230d75713190a3e839bcde3e21a54d0067fa
+  data.tar.gz: c8af9c061ec72fa28cf89669caf6ad5fe9ad326c2d4d2807479b18fb526fc32e
 SHA512:
-  metadata.gz: cdf9361215d3bd25a79c446debe4d4e692f3795a66245669906e5d63f2e19d4214238b0875d97dbcfd6ff5932d81f1711e2282dbbd82ad9ccf53315b507a63ac
-  data.tar.gz: 5de1ba8c318c31f5a6280dd9bfc6364c346a7e0c6e95687436dfd2dd100a11cc990ab2e1078f610c5dbb081f7636cd7308e68cb75a6c8ad469582eb05588b8dd
+  metadata.gz: 14fc78b9b8a9c689d29b6de34f0ffa426f2034fb3648e65b3665252eb30f6110d1bcebf73cbc3c36de796629c11e8cc58e9e6d0feab88dcb6b7453bfdcc2b794
+  data.tar.gz: '08c87f8e5690392983e05b79b084decad0953aaf128d6858a1f155f3793ebc32b17e8776d721cd1404580ec6fa957a8127ba0348ad15f8a8b64905cd3b2c8a71'

data/bin/report_coverage

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 require 'codeclimate_circle_ci_coverage'
 require 'optparse'
 

data/lib/codeclimate_circle_ci_coverage.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "codeclimate_circle_ci_coverage/version"
 require "codeclimate_circle_ci_coverage/patch_simplecov"
 require "codeclimate_circle_ci_coverage/coverage_reporter"

data/lib/codeclimate_circle_ci_coverage/circle_ci_1.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'fileutils'
 require 'json'
 
@@ -32,7 +34,7 @@ class CircleCi1
 
     # Load coverage results from all nodes
     files = Dir.glob(File.join(target_directory, "*.resultset.json"))
-    files.map do |file, i|
+    files.map do |file, _i|
       JSON.load(File.read(file))
     end
   end

data/lib/codeclimate_circle_ci_coverage/circle_ci_2.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'open-uri'
 require 'json'
 
@@ -6,18 +8,33 @@ class CircleCi2
 
   def download_files
     if ENV["CIRCLE_TOKEN"].nil?
-      puts "You must create a Circle CI API token to use this on Circle CI 2.0"
+      puts "You must create a Circle CI Artifacts-API token to use this on Circle CI 2.0"
       puts "Please create that, and store the key as CIRCLE_TOKEN"
       return []
     end
-
+    # rubocop:disable Metrics/LineLength
     api_url = "https://circleci.com/api/v1.1/project/github/#{ENV['CIRCLE_PROJECT_USERNAME']}/#{ENV['CIRCLE_PROJECT_REPONAME']}/#{ENV['CIRCLE_BUILD_NUM']}/artifacts?circle-token=#{ENV['CIRCLE_TOKEN']}"
+    # rubocop:enable Metrics/LineLength
     artifacts = open(api_url)
 
-    JSON.load(artifacts).select do |artifact|
-      artifact['path'] == "home/circleci/project/#{ARTIFACT_PREFIX}/.resultset.json"
+    paths = matching_urls(JSON.load(artifacts))
+
+    if paths.none?
+      puts "No Results Found. Did you store the artifacts with 'store_artifacts'?"
+      puts "did you use 'prefix: coverage'?"
+      return []
+    end
+
+    paths.map do |path|
+      JSON.load(open("#{path}?circle-token=#{ENV['CIRCLE_TOKEN']}"))
+    end
+  end
+
+  def matching_urls(json)
+    json.select do |artifact|
+      artifact['path'].match("#{ARTIFACT_PREFIX}/.resultset.json")
     end.map do |artifact|
-      JSON.load(open("#{artifact['url']}?circle-token=#{ENV['CIRCLE_TOKEN']}"))
+      artifact['url']
     end
   end
 end

data/lib/codeclimate_circle_ci_coverage/coverage_reporter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # from https://github.com/codeclimate/ruby-test-reporter/issues/10
 # https://gist.github.com/evanwhalen/f74879e0549b67eb17bb
 

data/lib/codeclimate_circle_ci_coverage/patch_simplecov.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "simplecov"
 # Without this change, merging results erroneously marks blank comment lines as
 # uncovered.

data/lib/codeclimate_circle_ci_coverage/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module CodeclimateCircleCiCoverage
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/spec/coverage_reporter_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe CoverageReporter do
@@ -9,9 +11,9 @@ describe CoverageReporter do
         {
           "RSpec" => {
             "coverage" => {
-              "#{SimpleCov.root}/spec/fixtures/fake_project/fake_project.rb" => [5,3,nil,0]
+              "#{SimpleCov.root}/spec/fixtures/fake_project/fake_project.rb" => [5, 3, nil, 0]
             },
-            "timestamp" => Time.now.to_i,
+            "timestamp" => Time.now.to_i
           }
         }
       ]

data/spec/spec_helper.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 require 'codeclimate_circle_ci_coverage'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: codeclimate_circle_ci_coverage
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Robin Dunlop
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-07 00:00:00.000000000 Z
+date: 2018-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
@@ -90,16 +90,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.38'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.38'
+        version: '0'
 description: A set of tools to support reporting SimpleCov Coverage to CodeClimate
   with Parallel tests on CircleCI
 email: robin@dunlopweb.com
@@ -137,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.7
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: CodeClimate Code Coverage reporting script for CircleCI