codeclimate_circle_ci_coverage 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1f80a30163ec1777ca121cec35b8930a20e5b1d
-  data.tar.gz: 183493acb07b5c5117a68f5034fe8a60780da247
+  metadata.gz: 80efd9d157477409d66776b499feef2d0369abb2
+  data.tar.gz: 065d5b230669202674010522e1fa3f83ddc8d88e
 SHA512:
-  metadata.gz: d84f3fb2ac10bfcd37a1239a8d5c89591f51e82d756ce395ec13d81ce2a80c45d7902b8a705bca9cb144a1f312e25445807f5a88547d8d63953a02cf8d766219
-  data.tar.gz: a7c54ff1fd50f9d29f4c45e4fe4e5148e93f4241e843142147aaebf609bbc3a8f106d0336100fb64a4665943b5feea21c9c375b673444f191eb41f3961026ec0
+  metadata.gz: cdf9361215d3bd25a79c446debe4d4e692f3795a66245669906e5d63f2e19d4214238b0875d97dbcfd6ff5932d81f1711e2282dbbd82ad9ccf53315b507a63ac
+  data.tar.gz: 5de1ba8c318c31f5a6280dd9bfc6364c346a7e0c6e95687436dfd2dd100a11cc990ab2e1078f610c5dbb081f7636cd7308e68cb75a6c8ad469582eb05588b8dd

data/lib/codeclimate_circle_ci_coverage/circle_ci_1.rb

@@ -25,7 +25,7 @@ class CircleCi1
         to = File.join(target_directory, "#{i}.resultset.json")
         command = "scp #{node}:#{from} #{to}"
 
-        puts "running command: #{command}"
+        puts "Downloading Result from CI Node: #{command}"
         `#{command}`
       end
     end

data/lib/codeclimate_circle_ci_coverage/coverage_reporter.rb

@@ -45,6 +45,7 @@ class CoverageReporter
     output_result_html(merged_result)
     upload_result_file(merged_result)
     store_code_climate_payload(merged_result)
+    puts "Reporting Complete."
     true
   end
 
@@ -63,7 +64,7 @@ class CoverageReporter
     json_files.each_with_index do |resultset, i|
       resultset.each do |_command_name, data|
         result = SimpleCov::Result.from_hash(['command', i].join => data)
-        check_and_fix_result_time(result)
+        check_and_fix_result_time(result, i)
         SimpleCov::ResultMerger.store_result(result)
       end
     end
@@ -73,11 +74,11 @@ class CoverageReporter
     merged_result
   end
 
-  def check_and_fix_result_time(result)
+  def check_and_fix_result_time(result, index)
     if Time.now - result.created_at >= SimpleCov.merge_timeout
-      puts "result #{i} has a created_at from #{result.created_at} (current time #{Time.now})"
+      puts "result #{index} has a created_at from #{result.created_at} (current time #{Time.now})"
       puts "This will prevent coverage from being combined. Please check your tests for Stub-Time-related issues"
-      put "Setting result created_at to current time to avoid this issue"
+      puts "Setting result created_at to current time to avoid this issue"
       # If the result is timestamped old, it is ignored by SimpleCov
       # So we always set the created_at to Time.now so that the ResultMerger
       # doesn't discard any results
@@ -94,7 +95,8 @@ class CoverageReporter
   def upload_result_file(merged_result)
     # Post merged coverage result to codeclimate
     codeclimate_formatter = CodeClimate::TestReporter::Formatter.new
-    codeclimate_formatter.format(merged_result.to_hash)
+    formatted_results = codeclimate_formatter.format(merged_result.to_hash)
+    CodeClimate::TestReporter::PostResults.new(formatted_results).post
   end
 
   # Internal: Debug function, in use to log the exact file which is sent to codeclimate

data/lib/codeclimate_circle_ci_coverage/version.rb

@@ -1,3 +1,3 @@
 module CodeclimateCircleCiCoverage
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/spec/coverage_reporter_spec.rb

@@ -36,4 +36,23 @@ describe CoverageReporter do
       # failing because creating a believable SimpleCov Result is more difficult than I thought
     end
   end
+
+  describe "#check_and_fix_result_time" do
+    context "when the time is new enough" do
+      let(:result) { OpenStruct.new(created_at: Time.now) }
+
+      it "does nothing" do
+        reporter.check_and_fix_result_time(result, 1)
+        expect(result.created_at).to be_within(1).of(Time.now)
+      end
+    end
+
+    context "when the time is in the past" do
+      let(:result) { OpenStruct.new(created_at: Time.now - 3600) }
+      it "can fix times" do
+        reporter.check_and_fix_result_time(result, 1)
+        expect(result.created_at).to be_within(1).of(Time.now)
+      end
+    end
+  end
 end

metadata

@@ -1,19 +1,22 @@
 --- !ruby/object:Gem::Specification
 name: codeclimate_circle_ci_coverage
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Robin Dunlop
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-01 00:00:00.000000000 Z
+date: 2017-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'
@@ -21,6 +24,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'
@@ -131,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: CodeClimate Code Coverage reporting script for CircleCI