codeclimate_circle_ci_coverage 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 67bfae6c72737c855a4b3c6be69979a3ee84add6
-  data.tar.gz: 92e7931968750958c8d59795d4da3620d2538c28
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NjJhM2VjY2MzNWNjMGZiZTA1OGUxMWJkMGVjZGFmOGY4MTY5N2I3Mg==
+  data.tar.gz: !binary |-
+    ZWVlZjNhY2MzNTI2Y2RlN2RhMzhkMjE3MDBjZmYxNDFkZjYwNTJkYg==
 SHA512:
-  metadata.gz: cfbd85a77c464ffc845b7d8a6d497ff4489fc7cfa2d3afa26c4af362cdac5912f62e675f90a1434f3bb9ed268b120f481c597ec434d5bded13daaec423a2e492
-  data.tar.gz: fb71b420138d3ab440c58440648b99d19af3653eaee7620a56e4e17c3f1e21fb63f9a4088a084aa0a8423ca4f5a4bfadd749143c0a6595fa6ff1f30d0f7449b6
+  metadata.gz: !binary |-
+    M2JhMzFiNjNjMmZiNDIzYmJlNjY2ZTE3MGI2NWUyOTlhODg0MmZmNjU4MzE1
+    MmM3NDEzYjk3NTdhZWJjNmE5NDU1ZGMxMjkyZTE5NDk5MzEwMWM0YWRkNGRl
+    MjNkMzdjYmVjYjlkNzkyYTI0NGVhZDdlNDI2YjliNzFjMTIzN2M=
+  data.tar.gz: !binary |-
+    NDM0ZGJiYTk1ZTU4OTg3MWUxNGM0ZjBhYTQ0NzJmYWJmOGNmNjE3MzRlZDQz
+    ZWU4Mzg3YzZiYTRlNzI1NGQyY2MzM2YxZTJjOTUxZjI1YTFmZGM1OTFjOGJj
+    ZDk1OGE5MzYzYzk1NTg4MzliZDFlN2UyM2ViODRmNGZmZGE5YTU=

data/lib/codeclimate_circle_ci_coverage/coverage_reporter.rb

@@ -19,58 +19,89 @@ class CoverageReporter
     @target_branch = target_branch
   end
 
+  def current_branch
+    ENV['CIRCLE_BRANCH']
+  end
+
+  def current_node
+    ENV['CIRCLE_NODE_INDEX'].to_i
+  end
+
   def run
-    branch = ENV['CIRCLE_BRANCH']
-    node_index = ENV['CIRCLE_NODE_INDEX'].to_i
-    node_total = ENV['CIRCLE_NODE_TOTAL'].to_i
-    coverage_dir = File.join("coverage")
+    # Only submit coverage to codeclimate on target branch
+    return if current_branch != target_branch
+    # Only run on node0
+    return unless current_node.zero?
 
-    # Create directory if it doesn't exist
-    FileUtils.mkdir_p coverage_dir
+    all_coverage_dir = File.join("all_coverage")
+    download_files(all_coverage_dir)
+    final_coverage_dir = File.join("combined_coverage")
 
-    filename = '.resultset.json'
+    merged_result = load_and_merge_files(all_coverage_dir, final_coverage_dir)
+    output_result_html(merged_result)
+    upload_result_file(merged_result)
+  end
 
-    SimpleCov.coverage_dir(coverage_dir)
+  # Public: Download the .resultset.json files from each of the nodes
+  # and store them in the `target_directory`
+  #
+  # They will be numbered 0.resultset.json, 1.resultset.json, etc.
+  def download_files(target_directory)
+    node_total = ENV['CIRCLE_NODE_TOTAL'].to_i
 
-    # Only run on node0
-    exit unless node_index.zero?
+    # Create directory if it doesn't exist
+    FileUtils.mkdir_p target_directory
 
     if node_total > 0
       # Copy coverage results from all nodes to circle artifacts directory
-      1.upto(node_total - 1) do |i|
+      0.upto(node_total - 1) do |i|
         node = "node#{i}"
         # Modified because circleCI doesn't appear to deal with artifacts in the expected manner
         node_project_dir = `ssh #{node} 'printf $CIRCLE_PROJECT_REPONAME'`
-        from = File.join("~/", node_project_dir, 'coverage', filename)
-        to = File.join(coverage_dir, "#{i}#{filename}")
+        from = File.join("~/", node_project_dir, 'coverage', ".resultset.json")
+        to = File.join(target_directory, "#{i}.resultset.json")
         command = "scp #{node}:#{from} #{to}"
 
         puts "running command: #{command}"
         `#{command}`
       end
     end
+  end
 
-    # Merge coverage results from other nodes
-    # .resultset.json is a hidden file and thus ignored by the glob
-    files = Dir.glob(File.join(coverage_dir, "*#{filename}"))
+  def load_and_merge_files(source_directory, target_directory)
+    FileUtils.mkdir_p target_directory
+    SimpleCov.coverage_dir(target_directory)
+
+    # Merge coverage results from all nodes
+    files = Dir.glob(File.join(source_directory, "*.resultset.json"))
     files.each_with_index do |file, i|
       resultset = JSON.load(File.read(file))
       resultset.each do |_command_name, data|
         result = SimpleCov::Result.from_hash(['command', i].join => data)
+
+        puts "Resetting result #{i} created_at from #{result.created_at} to #{Time.now}"
+        # It appears that sometimes the nodes provided by CircleCI have
+        # clocks which are not accurate/synchronized
+        # So we always set the created_at to Time.now so that the ResultMerger
+        # doesn't discard any results
+        result.created_at = Time.now
+
         SimpleCov::ResultMerger.store_result(result)
       end
     end
 
     merged_result = SimpleCov::ResultMerger.merged_result
     merged_result.command_name = 'RSpec'
+    merged_result
+  end
 
+  def output_result_html(merged_result)
     # Format merged result with html
     html_formatter = SimpleCov::Formatter::HTMLFormatter.new
     html_formatter.format(merged_result)
+  end
 
-    # Only submit coverage to codeclimate on target branch
-    exit if branch != target_branch
-
+  def upload_result_file(merged_result)
     # Post merged coverage result to codeclimate
     codeclimate_formatter = CodeClimate::TestReporter::Formatter.new
     codeclimate_formatter.format(merged_result)

data/spec/coverage_reporter_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe CoverageReporter do
+  describe "#initial_test" do
+    it "passes" do
+      expect(1).to eq(1)
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,98 @@
+require 'codeclimate_circle_ci_coverage'
+
+# This file was generated by the `rspec --init` command. Conventionally, all
+# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
+# The generated `.rspec` file contains `--require spec_helper` which will cause
+# this file to always be loaded, without a need to explicitly require it in any
+# files.
+#
+# Given that it is always loaded, you are encouraged to keep this file as
+# light-weight as possible. Requiring heavyweight dependencies from this file
+# will add to the boot time of your test suite on EVERY test run, even for an
+# individual file that may not need all of that loaded. Instead, consider making
+# a separate helper file that requires the additional dependencies and performs
+# the additional setup, and require it from the spec files that actually need
+# it.
+#
+# The `.rspec` file also contains a few flags that are not defaults but that
+# users commonly want.
+#
+# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+RSpec.configure do |config|
+  # rspec-expectations config goes here. You can use an alternate
+  # assertion/expectation library such as wrong or the stdlib/minitest
+  # assertions if you prefer.
+  config.expect_with :rspec do |expectations|
+    # This option will default to `true` in RSpec 4. It makes the `description`
+    # and `failure_message` of custom matchers include text for helper methods
+    # defined using `chain`, e.g.:
+    #     be_bigger_than(2).and_smaller_than(4).description
+    #     # => "be bigger than 2 and smaller than 4"
+    # ...rather than:
+    #     # => "be bigger than 2"
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+  end
+
+  # rspec-mocks config goes here. You can use an alternate test double
+  # library (such as bogus or mocha) by changing the `mock_with` option here.
+  config.mock_with :rspec do |mocks|
+    # Prevents you from mocking or stubbing a method that does not exist on
+    # a real object. This is generally recommended, and will default to
+    # `true` in RSpec 4.
+    mocks.verify_partial_doubles = true
+  end
+
+# The settings below are suggested to provide a good initial experience
+# with RSpec, but feel free to customize to your heart's content.
+=begin
+  # These two settings work together to allow you to limit a spec run
+  # to individual examples or groups you care about by tagging them with
+  # `:focus` metadata. When nothing is tagged with `:focus`, all examples
+  # get run.
+  config.filter_run :focus
+  config.run_all_when_everything_filtered = true
+
+  # Allows RSpec to persist some state between runs in order to support
+  # the `--only-failures` and `--next-failure` CLI options. We recommend
+  # you configure your source control system to ignore this file.
+  config.example_status_persistence_file_path = "spec/examples.txt"
+
+  # Limits the available syntax to the non-monkey patched syntax that is
+  # recommended. For more details, see:
+  #   - http://rspec.info/blog/2012/06/rspecs-new-expectation-syntax/
+  #   - http://www.teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
+  #   - http://rspec.info/blog/2014/05/notable-changes-in-rspec-3/#zero-monkey-patching-mode
+  config.disable_monkey_patching!
+
+  # This setting enables warnings. It's recommended, but in some cases may
+  # be too noisy due to issues in dependencies.
+  config.warnings = true
+
+  # Many RSpec users commonly either run the entire suite or an individual
+  # file, and it's useful to allow more verbose output when running an
+  # individual spec file.
+  if config.files_to_run.one?
+    # Use the documentation formatter for detailed output,
+    # unless a formatter has already been configured
+    # (e.g. via a command-line flag).
+    config.default_formatter = 'doc'
+  end
+
+  # Print the 10 slowest examples and example groups at the
+  # end of the spec run, to help surface which specs are running
+  # particularly slow.
+  config.profile_examples = 10
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = :random
+
+  # Seed global randomization in this process using the `--seed` CLI option.
+  # Setting this allows you to use `--seed` to deterministically reproduce
+  # test failures related to randomization by passing the same `--seed` value
+  # as the one that triggered the failure.
+  Kernel.srand config.seed
+=end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: codeclimate_circle_ci_coverage
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Robin Dunlop
@@ -14,44 +14,58 @@ dependencies:
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.2'
 description: A set of tools to support reporting SimpleCov Coverage to CodeClimate
   with Parallel tests on CircleCI
 email: robin@dunlopweb.com
@@ -63,6 +77,8 @@ files:
 - bin/report_coverage
 - lib/codeclimate_circle_ci_coverage.rb
 - lib/codeclimate_circle_ci_coverage/coverage_reporter.rb
+- spec/coverage_reporter_spec.rb
+- spec/spec_helper.rb
 homepage: http://rubygems.org/gems/codeclimate_circle_ci_coverage
 licenses:
 - MIT
@@ -73,18 +89,20 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: CodeClimate Code Coverage reporting script for CircleCI
-test_files: []
+test_files:
+- spec/coverage_reporter_spec.rb
+- spec/spec_helper.rb