codeclimate-test-reporter 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d2f0e7b87f4bc69171433370ccf94daad9e76fbc
-  data.tar.gz: 163b2bea6c8a18aaedb6d9b87b082759d90b1980
+  metadata.gz: 8288228e25163162b6b30325990ffbc7b5b665a2
+  data.tar.gz: 65905735dfec5e174f58a603673f7f12814c36f7
 SHA512:
-  metadata.gz: 396899f8c5af9bb10709879343ac12ded0c1868b776833d41c67046df2d9953f7468f5e948732f86bc96f6b60928839d21aac235a79fc1279da7a942152d717f
-  data.tar.gz: 94df47b0ef15d9f5687d9621a75555fa634844bc108e44cb86d748571d61758c9f777a3afc1d7c5ba44e4e7038004206ac87bc0a35ea7c19e7ac187a3313cae8
+  metadata.gz: b521cd941110f5cf514d272ce80c1f85da62058ac9f42ec6668bf96400893eba8f3d792cc20954fad4db622e6cbcd254a86e363f03866b2a4ee760f2d995c3fc
+  data.tar.gz: f10dc131ba15d256e90bee8c482819b0801a800e28a9dc8b05f470108bbe3840f3082f85d516302e5c091b7863c0c44011391f80e6e5a42a0e38da0d53c2ebdf

data/README.md

@@ -11,34 +11,8 @@ Code Climate - [https://codeclimate.com](https://codeclimate.com)
 
 This gem requires a user, but not necessarily a paid account, on Code Climate,
 so if you don't have one the first step is to signup at:
-[https://codeclimate.com](https://codeclimate.com). Then:
-
-* Add this to your Gemfile:
-
-  ```ruby
-  group :test do
-    gem "simplecov"
-    gem "codeclimate-test-reporter", "~> 1.0.0"
-  end
-  ```
-
-* Start [SimpleCov](https://github.com/colszowka/simplecov) right at the top of
-  your `spec/spec_helper.rb`, `test/test_helper.rb`, or cucumber `env.rb`.
-
-  ```ruby
-  require 'simplecov'
-  SimpleCov.start
-  ```
-
-* Set the `CODECLIMATE_REPO_TOKEN` environment variable (provided after you add
-  your repo to your Code Climate account by clicking on "Setup Test Coverage" on
-  the right hand side of your feed)
-* Run the `codeclimate-test-reporter` executable after your test suite
-
-  ```
-  bundle exec rake
-  bundle exec codeclimate-test-reporter
-  ```
+[https://codeclimate.com](https://codeclimate.com). Then follow the
+instructions on our [documentation site](https://docs.codeclimate.com/docs/ruby)
 
 Please contact hello@codeclimate.com if you need any assistance setting this up.
 
@@ -51,42 +25,11 @@ documentation here: https://docs.codeclimate.com/docs/setting-up-test-coverage
 
 ## Upgrading from pre-1.0 Versions
 
-Version `1.0` of the this gem introduces new, breaking changes to the way the
+Version `1.0` of this gem introduced new, breaking changes to the way the
 test reporter is meant to be executed. The following list summarizes the major
 differences:
 
-* Previously, this gem extended `Simplecov` with a custom formatter which posted
-  results to Code Climate. Now, you are responsible for executing `Simplecov`
-  yourself.
-
-  * If you already have the following in your test/test_helper.rb
-    (or spec_helper.rb, cucumber env.rb, etc)
-
-    ```ruby
-    require 'codeclimate-test-reporter'
-    CodeClimate::TestReporter.start
-    ```
-
-    then you should replace it with
-
-    ```ruby
-    require 'simplecov'
-    SimpleCov.start
-    ```
-
-* Previously, the `codeclimate-test-reporter` automatically uploaded results at
-  the end of your test suite.  Now, you are responsible for running
-  `codeclimate-test-reporter` as a separate step in your build.
-* Previously, this gem added some exclusion rules tuned according to feedback
-  from its users, and now these no longer happen automatically. *If you are
-  experiencing a discrepancy in test coverage % after switching to the new gem
-  version, it may be due to missing exclusions. Filtering `vendor`, `spec`, or
-  `test` directories may fix this issue.*
-* Previously, during the execution of multiple test suites, this gem would send
-  results from the first suite completed. You are now expected to run an
-  executable packaged with this gem as a separate build step, which means that
-  whatever results are there (likely the results from the last suite) will be
-  posted to Code Climate.
+See [the changelog entry for v1.0.0](CHANGELOG.md#v100-2016-11-03) for details.
 
 ## Contributions
 
@@ -94,7 +37,21 @@ Patches, bug fixes, feature requests, and pull requests are welcome on the
 GitHub page for this project:
 [https://github.com/codeclimate/ruby-test-reporter](https://github.com/codeclimate/ruby-test-reporter)
 
-This gem is maintained by Bryan Helmkamp (bryan@codeclimate.com).
+When making a pull request, please update the [changelog](CHANGELOG.md).
+
+This gem is maintained by Code Climate (hello@codeclimate.com).
+
+### Release Process
+
+* Update the changelog to mark the unreleased changes as part of the new release.
+* Update the version.rb with the new version number
+* Make a pull request with those changes
+* Merge those changes to master
+* Check out and pull down the latest master locally
+* `rake release` which will
+  * tag the latest commit based on version.rb
+  * push to github
+  * push to rubygems
 
 ## Copyright
 

data/bin/codeclimate-test-reporter

@@ -2,23 +2,20 @@
 
 require "codeclimate-test-reporter"
 
-COVERAGE_FILE = "coverage/.resultset.json".freeze
+repo_token = ENV["CODECLIMATE_REPO_TOKEN"]
+if repo_token.nil? || repo_token.empty?
+  STDERR.puts "Cannot post results: environment variable CODECLIMATE_REPO_TOKEN must be set."
+  exit
+end
+
+COVERAGE_FILE = ARGV.first || "coverage/.resultset.json"
 
-if (repo_token = ENV["CODECLIMATE_REPO_TOKEN"]) && !repo_token.empty?
-  if File.exist?(COVERAGE_FILE)
-    begin
-      results = JSON.parse(File.read(COVERAGE_FILE))
-    rescue JSON::ParserError => e
-      $stderr.puts "Error encountered while parsing #{COVERAGE_FILE}: #{e}"
-      exit(1)
-    end
+abort "Coverage results not found" unless File.exist?(COVERAGE_FILE)
 
-    CodeClimate::TestReporter.run(results)
-  else
-    $stderr.puts "Coverage results not found"
-    exit(1)
-  end
-else
-  $stderr.puts "Cannot post results: environment variable CODECLIMATE_REPO_TOKEN must be set."
-  exit(0)
+begin
+  results = JSON.parse(File.read(COVERAGE_FILE))
+rescue JSON::ParserError => e
+  abort "Error encountered while parsing #{COVERAGE_FILE}: #{e}"
 end
+
+CodeClimate::TestReporter.run(results)

data/lib/code_climate/test_reporter/formatter.rb

@@ -12,18 +12,19 @@ require "code_climate/test_reporter/payload_validator"
 module CodeClimate
   module TestReporter
     class Formatter
-      class InvalidSimpleCovResultError < StandardError; end
-
       def format(results)
-        begin
-          validated_results = results.values.fetch(0).fetch("coverage")
-        rescue NoMethodError, KeyError => ex
-          raise InvalidSimpleCovResultError, ex.message
+        simplecov_results = results.map do |command_name, data|
+          SimpleCov::Result.from_hash(command_name => data)
         end
 
-        simplecov_results = SimpleCov::Result.new(validated_results)
+        simplecov_result =
+          if simplecov_results.size == 1
+            simplecov_results.first
+          else
+            merge_results(simplecov_results)
+          end
 
-        payload = to_payload(simplecov_results)
+        payload = to_payload(simplecov_result)
         PayloadValidator.validate(payload)
 
         payload
@@ -85,6 +86,19 @@ module CodeClimate
       def round(numeric, precision)
         Float(numeric).round(precision)
       end
+
+      # Re-implementation of Simplecov::ResultMerger#merged_result, which is
+      # needed because calling it directly gets you into caching land with files
+      # on disk.
+      def merge_results(results)
+        merged = {}
+        results.each do |result|
+          merged = result.original_result.merge_resultset(merged)
+        end
+        result = SimpleCov::Result.new(merged)
+        result.command_name = results.map(&:command_name).sort.join(", ")
+        result
+      end
     end
   end
 end

data/lib/code_climate/test_reporter/version.rb

@@ -1,5 +1,5 @@
 module CodeClimate
   module TestReporter
-    VERSION = "1.0.3".freeze
+    VERSION = "1.0.4".freeze
   end
 end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: codeclimate-test-reporter
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Bryan Helmkamp
+- Code Climate
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-09 00:00:00.000000000 Z
+date: 2016-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
@@ -98,6 +99,7 @@ description: Collects test coverage data from your Ruby test suite and sends it
   Code Climate's hosted, automated code review service. Based on SimpleCov.
 email:
 - bryan@brynary.com
+- hello@codeclimate.com
 executables:
 - cc-tddium-post-worker
 - codeclimate-test-reporter
@@ -143,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Uploads Ruby test coverage data to Code Climate.