simplecov-small-badge 0.1 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6cda28fa5acf4a144d0c11620b9bf580154e9229401a79bddb78f15930cefe81
-  data.tar.gz: 4792e1b6e9bbac3887e9e97ed4e1a1eaddb405c736b5af87dfe19cb33b3da91b
+  metadata.gz: 0b77c22bed299dc020a8aaf8969d02fa5e4aec211fdf2a1e383bba0b3c8086b4
+  data.tar.gz: bad90c04e8c9d4b132b5404cb97b553b28a45b9d455c228fb101b31808e9fd68
 SHA512:
-  metadata.gz: 6bf1b6d227a5e57356c4a1d1ea7df521c7118f91f0f37d53e06cd0a9160b53280c163a185469fc23473bb67d6728500aa85eaed7886558ed09f6144cdf31a032
-  data.tar.gz: 29c7c74b841243ba08e8c724d0dac233e795ad30f4e168e6a3d42ed5171597aa4ba0e00f913cb8e951e1b495cbc2d89647d06366866197785dffd6592a2757a3
+  metadata.gz: 6a152639aba57094258da3921d7d5d6a984209c5b9a6456bbae45fef5e58db43469365b4e7e0eac87af6363c28d68057f7c6f4a887d5018886d36a6b9713936e
+  data.tar.gz: bf3853ad9dfc1a89a486a810cda5fb3596cf17ad2a456928680fc5ff8c183186b8f9eb5d682ccf982b16950126ae8dc6307824f8f48f8844753f8b94b91707b7

data/README.md

@@ -1,8 +1,9 @@
 # SimpleCovSmallBadge
 
+[![Gem Version](https://badge.fury.io/rb/simplecov-small-badge.svg)](https://badge.fury.io/rb/simplecov-small-badge)
 [![Build Status](https://api.travis-ci.org/MarcGrimme/simplecov-small-badge.svg?branch=master)](https://secure.travis-ci.org/MarcGrimme/simplecov-small-badge)
 [![Depfu](https://badges.depfu.com/badges/48a6c1c7c649f62eede6ffa2be843180/count.svg)](https://depfu.com/github/MarcGrimme/simplecov-small-badge?project_id=6900)
-![Coverage](https://marcgrimme.github.io/simplecov-small-badge/badges/coverage_badge_total.png)
+![Coverage](https://marcgrimme.github.io/simplecov-small-badge/badges/coverage_badge_total.svg)
 
 *SimpleCovBadge* is a gem that can be added to the `Gemfile` and will produce a file called `coverage_badge.png` in the `coverage` directory.
 It could be looking as follows dependent on how it is configured.

data/lib/simplecov_small_badge/configuration.rb

@@ -8,26 +8,28 @@ module SimpleCovSmallBadge
     # rubocop:disable Metrics/MethodLength
     def self.options
       {
-        format: 'png',
+        format: 'svg',
         with_groups: false,
-        background: 'transparent',
+        background: '#fff',
         title_prefix: 'scov',
-        title_background: '#595959',
-        title_font: 'Helvetica',
-        title_font_size: 16,
-        title_font_color: 'white',
-        coverage_background_bad: 'red',
-        coverage_background_unknown: 'yellow',
+        title_background: '#555',
+        font: 'Helvetica',
+        font_size: 16,
+        title_color: '#fff',
+        coverage_background_bad: '#ff0000',
+        coverage_background_unknown: '#cccc00',
         coverage_background_good: '#4dc71f',
         coverage_font: 'Helvetica-Narrow-Bold',
-        coverage_font_color: 'white',
+        coverage_font_color: '#fff',
         coverage_font_size: 16,
-        badge_height: 30,
+        badge_height: 20,
+        badge_width: 200,
         filename_prefix: 'coverage_badge',
         output_path: SimpleCov.coverage_path,
         log_level: 'info',
         rounded_border: true,
-        rounded_edge_radius: 3
+        rounded_edge_radius: 3,
+        percent_sign: '%'
       }
     end
     # rubocop:enable Metrics/MethodLength

data/lib/simplecov_small_badge/formatter.rb

@@ -9,20 +9,29 @@ module SimpleCovSmallBadge
     def initialize(output = nil)
       @output = output || STDOUT
       @config = SimpleCovSmallBadge.config
-      @image = RepoSmallBadge::Image.new(map_image_config)
     end
 
     def format(result)
-      covered_percent = result.source_files.covered_percent.round(0)
-      @image.badge('total', 'total', covered_percent,
-                   state(covered_percent))
-      group_percent_from_result(result) do |name, title, percent|
-        @image.badge(name, title, percent, state(percent))
+      percent = result.source_files.covered_percent.round(0)
+      @image = RepoSmallBadge::Image.new(map_image_config(state(percent)))
+      badge('total', 'total', percent)
+      group_percent_from_result(result) do |name, title, cov_percent|
+        badge(name, title, cov_percent.round(0))
       end
     end
 
     private
 
+    def badge(name, title, percent)
+      percent_txt = percent_text(percent)
+      @image.config_merge(map_image_config(state(percent)))
+      @image.badge(name, title, percent_txt)
+    end
+
+    def percent_text(percent)
+      "#{percent}#{@config.percent_sign}"
+    end
+
     def state(covered_percent)
       if SimpleCov.minimum_coverage&.positive?
         if covered_percent >= SimpleCov.minimum_coverage
@@ -35,9 +44,12 @@ module SimpleCovSmallBadge
       end
     end
 
-    def map_image_config
+    def map_image_config(state)
       hash = {}
       @config.to_hash.map do |key, value|
+        key = key
+              .to_s.sub(/^coverage_background_#{state}/, 'value_background')
+              .to_sym
         key = key.to_s.sub(/^coverage_/, 'value_').to_sym
         hash[key] = value
       end

data/lib/simplecov_small_badge/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SimpleCovSmallBadge
-  VERSION = '0.1'
+  VERSION = '0.2'
 end

data/script/travis.sh

@@ -8,5 +8,5 @@ gem install bundler-audit && bundle-audit update && bundle-audit check
 gem install rubycritic && rubycritic app lib config ${RUBYCRITICPARAMS} --format console --minimum-score ${RUBYCRITICLIMIT}
 echo "Pushing badges upstream"
 [ -d badges ] || mkdir badges
-cp coverage/*.png badges/
+cp coverage/coverage_badge* badges/
 ls badges

data/simplecov-small-badge.gemspec

@@ -16,12 +16,11 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = 'simplecov-small-badge'
 
-  s.add_dependency 'mini_magick'
-  s.add_dependency 'repo-small-badge'
-  s.add_dependency 'simplecov'
-  s.add_development_dependency 'rake'
-  s.add_development_dependency 'rspec'
-  s.add_development_dependency 'rubocop'
+  s.add_dependency 'repo-small-badge', '~> 0.2.1'
+  s.add_dependency 'simplecov', '~> 0.16'
+  s.add_development_dependency 'rake', '~> 12'
+  s.add_development_dependency 'rspec', '~> 3.8'
+  s.add_development_dependency 'rubocop', '~> 0.63'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/spec/simplecov_small_badge_formatter_spec.rb

@@ -10,35 +10,30 @@ describe SimpleCovSmallBadge::Formatter do
     context 'bad result' do
       it do
         allow(SimpleCov).to receive(:minimum_coverage).and_return(90)
-        mock_mini_magick(name: 'total', title: 'scov total',
-                         color: 'red', coverage: '50',
-                         stack: stack)
+        mock_repo_badge_image(cov: '50%', state: 'bad')
         result = mock_result(50)
         expect(subject.format(result)).to be_truthy
       end
     end
+
     context 'good result' do
       it do
         allow(SimpleCov).to receive(:minimum_coverage).and_return(100)
-        mock_mini_magick(name: 'library', title: 'scov library',
-                         color: '#4dc71f', coverage: '100',
-                         stack: stack, convert:
-                         mock_mini_magick(name: 'total', title: 'scov total',
-                                          color: '#4dc71f', coverage: '100',
-                                          stack: stack))
-        result = mock_result(100, 'library': mock_result_group(100))
+        image_mock = mock_repo_badge_image(title: 'total', name: 'total',
+                                           cov: '100%')
+        mock_repo_badge_image(title: 'library', name: 'library',
+                              cov: '100%', mock: image_mock)
+        result = mock_result(100, 'library' => mock_result_group(100))
         expect(subject.format(result)).to be_truthy
       end
 
       it do
         allow(SimpleCov).to receive(:minimum_coverage).and_return(90)
-        mock_mini_magick(name: 'library', title: 'scov library',
-                         color: '#4dc71f', coverage: '90',
-                         stack: stack, convert:
-                         mock_mini_magick(name: 'total', title: 'scov total',
-                                          color: '#4dc71f', coverage: '90',
-                                          stack: stack))
-        result = mock_result(90, 'library': mock_result_group(90))
+        image_mock = mock_repo_badge_image(title: 'total', name: 'total',
+                                           cov: '90%')
+        mock_repo_badge_image(title: 'library', name: 'library',
+                              cov: '90%', mock: image_mock)
+        result = mock_result(90, 'library' => mock_result_group(90))
         expect(subject.format(result)).to be_truthy
       end
     end
@@ -46,13 +41,11 @@ describe SimpleCovSmallBadge::Formatter do
     context 'bad result' do
       it do
         allow(SimpleCov).to receive(:minimum_coverage).and_return(91)
-        mock_mini_magick(name: 'library', title: 'scov library',
-                         color: 'red', coverage: '90',
-                         stack: stack, convert:
-                         mock_mini_magick(name: 'total', title: 'scov total',
-                                          color: 'red', coverage: '90',
-                                          stack: stack))
-        result = mock_result(90, 'library': mock_result_group(90))
+        image_mock = mock_repo_badge_image(title: 'total', name: 'total',
+                                           cov: '90%', state: 'bad')
+        mock_repo_badge_image(title: 'library', name: 'library',
+                              cov: '90%', state: 'bad', mock: image_mock)
+        result = mock_result(90, 'library' => mock_result_group(90))
         expect(subject.format(result)).to be_truthy
       end
     end
@@ -60,13 +53,11 @@ describe SimpleCovSmallBadge::Formatter do
     context 'unknown result' do
       it do
         allow(SimpleCov).to receive(:minimum_coverage).and_return(nil)
-        mock_mini_magick(name: 'library', title: 'scov library',
-                         color: 'yellow', coverage: '90',
-                         stack: stack, convert:
-                         mock_mini_magick(name: 'total', title: 'scov total',
-                                          color: 'yellow', coverage: '90',
-                                          stack: stack))
-        result = mock_result(90, 'library': mock_result_group(90))
+        image_mock = mock_repo_badge_image(title: 'total', name: 'total',
+                                           cov: '90%', state: 'unknown')
+        mock_repo_badge_image(title: 'library', name: 'library',
+                              cov: '90%', state: 'unknown', mock: image_mock)
+        result = mock_result(90, 'library' => mock_result_group(90))
         expect(subject.format(result)).to be_truthy
       end
     end
@@ -74,13 +65,11 @@ describe SimpleCovSmallBadge::Formatter do
     context 'mixed result' do
       it do
         allow(SimpleCov).to receive(:minimum_coverage).and_return(90)
-        mock_mini_magick(name: 'library', title: 'scov library',
-                         color: '#4dc71f', coverage: '90',
-                         stack: stack, convert:
-                         mock_mini_magick(name: 'total', title: 'scov total',
-                                          color: 'red', coverage: '89',
-                                          stack: stack))
-        result = mock_result(89, 'library': mock_result_group(90))
+        image_mock = mock_repo_badge_image(title: 'total', name: 'total',
+                                           cov: '89%', state: 'bad')
+        mock_repo_badge_image(title: 'library', name: 'library',
+                              cov: '90%', state: 'good', mock: image_mock)
+        result = mock_result(89, 'library' => mock_result_group(90))
         expect(subject.format(result)).to be_truthy
       end
     end

data/spec/support/mocks.rb

@@ -2,50 +2,33 @@
 
 module TestSimpleCovSmallBadge
   module Mocks
-    # rubocop:disable Metrics/LineLength
-    def pango_text_match(title = 'scov total', color = 'green', cov = '100%')
-      %(<span foreground="white"
-             background="#595959"             size="16000"             font="Helvetica"        > #{title} </span><span foreground="white"
-             background="#{color}"             size="16000"             font="Helvetica-Narrow-Bold"        > #{cov} </span>)
+    # rubocop:disable Metrics/ParameterLists, Metrics/AbcSize
+    def mock_repo_badge_image(cov: 100, name: 'total',
+                              title: 'total',
+                              state: 'good',
+                              config: {},
+                              mock: instance_double('Image'))
+      config = map_config_options(config, state)
+      allow(RepoSmallBadge::Image).to receive(:new)
+        .with(config).and_return(mock)
+      allow(mock).to receive(:config_merge).with(config).and_return(config)
+      allow(mock).to receive(:badge).with(name, title, cov)
+      mock
     end
-    # rubocop:enable Metrics/LineLength
+    # rubocop:enable Metrics/ParameterLists, Metrics/AbcSize
 
-    # rubocop:disable Metrics/LineLength, Metrics/AbcSize
-    def mock_mini_magick_stack(stack = instance_double('Stack'))
-      allow(stack).to receive_message_chain('clone.+')
-      allow(stack).to receive(:alpha).with('extract')
-      allow(stack).to receive(:draw).with('fill black polygon 0,0 0,3 3,0 fill white circle 3,3 3,0')
-      allow(stack).to receive(:flip)
-      allow(stack).to receive(:flop)
-      allow(stack).to receive(:compose).with('Multiply')
-      allow(stack).to receive(:composite)
-      allow(stack).to receive(:stack).and_yield(stack)
-      stack
-    end
-    # rubocop:enable Metrics/LineLength, Metrics/AbcSize
-
-    # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
-    def mock_mini_magick(**keys)
-      keys[:convert] ||= instance_double('Convert')
-      convert = keys[:convert]
-      pango_text = pango_text_match(keys[:title], keys[:color], keys[:coverage])
-      allow(MiniMagick::Tool::Convert)
-        .to receive(:new).and_yield(keys[:convert])
-      allow(convert).to receive(:gravity).with('center')
-      allow(convert).to receive(:background).with('transparent')
-      allow(convert).to receive(:pango).with(pango_text)
-
-      if keys.fetch(:rounded_border, true)
-        allow(convert).to receive(:stack).and_yield(keys[:stack])
-        allow(convert).to receive(:compose).with('CopyOpacity')
-        allow(convert).to receive(:alpha).with('off')
-        allow(convert).to receive(:composite)
+    def map_config_options(config_hash, state)
+      hash = {}
+      SimpleCovSmallBadge::Configuration.options.merge(config_hash)
+                                        .map do |key, value|
+        key = key.to_s
+                 .sub(/^coverage_background_#{state}/, 'value_background')
+                 .to_sym
+        key = key.to_s.sub(/^coverage_/, 'value_').to_sym
+        hash[key] = value
       end
-      allow(convert).to receive(:<<)
-        .with("#{SimpleCov.coverage_path}/coverage_badge_#{keys[:name]}.png")
-      convert
+      hash
     end
-    # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
 
     def mock_result(total_cov, groups_hash = {})
       result_double = instance_double('Result')

metadata

@@ -1,99 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: simplecov-small-badge
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.2'
 platform: ruby
 authors:
 - Marc Grimme
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-11 00:00:00.000000000 Z
+date: 2019-02-16 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: mini_magick
-  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: repo-small-badge
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.16'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.16'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '12'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.8'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.63'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.63'
 description: Small Badge generator for SimpleCov coverage tool for ruby
 email:
 - marc.grimme at gmail dot com