danger-code_coverage 0.0.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f951b48390fd47e430b9454eeb47ed4194162c4d18b4fe1754ba9e808e38c271
-  data.tar.gz: b542a4473db470c8d08560d8d8975fbfd434ec96868031283241cdd43653f064
+  metadata.gz: 87f7da211148028a249f9cc7c7148dbb062afff5f9051ab10a61f41f9ff099fb
+  data.tar.gz: 56e1a510efb6328c2503bfe5b2d8d692e47d7e41215ea7e8db94b5f0afb7a537
 SHA512:
-  metadata.gz: de0610354f92718bcd63a2f97f8dafefd017d0ffb5d4620608ae1ddced52aaffcca0156eae6c12e94dfa2a6c99200cae87945a1f5f95dfc6b8af7d02b54dfedc
-  data.tar.gz: 000ad24ce437e14e9db515e923c64312cc73ff9e34b0d7bd79e8c24753cfa207c06fbfd23451df073c3a731efcc99a188c62a50769c8e53cd83b36b2af4c8472
+  metadata.gz: 0be58244b5414e839169c53a33e08d2578baf4b6dc576584d9bd6a5e43fa7d186171b5d6588816b9c9150dda50e187c5916096330e719a6571b4a0ae50af78a1
+  data.tar.gz: 3bd3619c9e8c63258e40d955d05666d969c3bfb48e37816f29a37914957a8829fa39801d8512be2f769354b198618eccb247b1f15e2853947540fbcd40cfddcf

data/CHANGELOG.md

@@ -4,9 +4,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [0.0.2] - 2019-6-22
-### Changed
-- Search for files in subdirectories
+## [1.0.0] - 2019-6-26
+### Fixed
+- Catch all errors while parsing url content
+
+### Added
+- Sort options `:ascending`, `:descending`
 
 ## [0.0.1] - 2019-6-22
 ### Added

data/README.md

@@ -97,8 +97,12 @@ This plugin is inspired and works only with the jenkins [code-coverage-api-plugi
 ## Usage
 
     code_coverage.report
+    
+### Sort option
 
-## Authentication
+    code_coverage.report(sort: :ascending)
+
+### Authentication
 
 If you run a jenkins server with required authentication you can pass them to `danger-code_coverage`.
 Create an API token with your CI user and do not pass normal password credentials.

data/lib/code_coverage/coverage_parser.rb

@@ -15,7 +15,9 @@ module CodeCoverage
       raw_json =
         begin
           JSON.parse(content)
-        rescue JSON::ParserError
+          # rubocop:disable Style/RescueStandardError
+        rescue
+          # rubocop:enable Style/RescueStandardError
           {}
         end
       parse_coverage(raw_json)

data/lib/code_coverage/gem_version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CodeCoverage
-  VERSION = '0.0.2'
+  VERSION = '1.0.0'
 end

data/lib/code_coverage/plugin.rb

@@ -49,12 +49,22 @@ module Danger
     # @return [void]
     def report(*args)
       options = args.first
+      sort_order = options && options[:sort]
+      if sort_order && !sort_order.eql?(:ascending) && !sort_order.eql?(:descending)
+        raise(ArgumentError, 'Invalid configuration, use [:ascending, :descending]')
+      end
       check_auth(options)
 
       items = coverage_items
       items.select! { |item| file_in_changeset?(item.file) }
       items.each(&method(:update_item))
-      items.sort_by! { |item| -item.total }
+      items.sort_by! do |item|
+        if sort_order.eql?(:ascending)
+          item.total
+        else
+          -item.total
+        end
+      end
       items.each(&method(:add_entry))
 
       return if @table.size.zero?

data/spec/code_coverage_spec.rb

@@ -100,7 +100,7 @@ module Danger
           expect(entries[2]).to(eq('51.26'))
         end
 
-        it 'sorts lines by total value descending' do
+        it 'sorts lines by total value descending as default' do
           mock_coverage_json('/assets/coverage_jacoco_multiple_unordered.json')
           mock_file_in_changeset(true)
 
@@ -117,6 +117,53 @@ module Danger
           expect(third[1]).to(include('MainActivity.java'))
         end
 
+        it 'sorts lines by total value descending with config' do
+          mock_coverage_json('/assets/coverage_jacoco_multiple_unordered.json')
+          mock_file_in_changeset(true)
+
+          @plugin.report(
+            sort: :descending
+          )
+          markdowns = @dangerfile.status_report[:markdowns]
+          expect(markdowns.length).to(be(1))
+          lines = markdowns.first.message.split("\n")
+          first = lines[4].split('|')
+          second = lines[5].split('|')
+          third = lines[6].split('|')
+
+          expect(first[1]).to(include('MainActivity2.java'))
+          expect(second[1]).to(include('MainActivity3.java'))
+          expect(third[1]).to(include('MainActivity.java'))
+        end
+
+        it 'sorts lines by total value ascending with config' do
+          mock_coverage_json('/assets/coverage_jacoco_multiple_unordered.json')
+          mock_file_in_changeset(true)
+
+          @plugin.report(
+            sort: :ascending
+          )
+          markdowns = @dangerfile.status_report[:markdowns]
+          expect(markdowns.length).to(be(1))
+          lines = markdowns.first.message.split("\n")
+          first = lines[4].split('|')
+          second = lines[5].split('|')
+          third = lines[6].split('|')
+
+          expect(first[1]).to(include('MainActivity.java'))
+          expect(second[1]).to(include('MainActivity3.java'))
+          expect(third[1]).to(include('MainActivity2.java'))
+        end
+
+        it 'throws error if sort config invalid' do
+          mock_coverage_json('/assets/coverage_jacoco_single.json')
+          expect {
+            @plugin.report(
+              sort: :invalid
+            )
+          }.to(raise_error(%r{:ascending, :descending}))
+        end
+
         it 'finds changed file in subdirectory' do
           mock_coverage_json('/assets/coverage_jacoco_single.json')
           mock_target_files(['src/main/java/com/example/kyaak/myapplication/MainActivity.java'])
@@ -137,13 +184,21 @@ module Danger
           markdowns = @dangerfile.status_report[:markdowns]
           expect(markdowns.length).to(be(0))
         end
+
+        it 'does not fail if request returns null' do
+          mock_coverage_json(nil)
+
+          @plugin.report
+          markdowns = @dangerfile.status_report[:markdowns]
+          expect(markdowns.length).to(be_zero)
+        end
       end
     end
   end
 end
 
 def mock_coverage_json(file)
-  content = File.read(File.dirname(__FILE__) + file)
+  content = file ? File.read(File.dirname(__FILE__) + file) : file
   @plugin.stubs(:coverage_json).returns(content)
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: danger-code_coverage
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 1.0.0
 platform: ruby
 authors:
 - Kyaak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-23 00:00:00.000000000 Z
+date: 2019-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: danger-plugin-api