badge 0.8.3 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 634c171444367823ade8b25dd57d5acc3f1db205
-  data.tar.gz: d15327718aa5ca6f9fdbb16c467c7d0860b06c15
+  metadata.gz: 822c906789564ef26e5abed06f3e8845404e1f68
+  data.tar.gz: 7f095560ba04b4dec08b23ab2aeb38cc6794f9d9
 SHA512:
-  metadata.gz: 2c99091527da163c04b70464725917f7959b25ee6b0f541f713ea8cd33f1e1a282a21fcc4172dd9ce279ae083fca8247745e9eb2cf46391c9b491b2786e13dfd
-  data.tar.gz: 2db03ee2d24680fc6a51cb459ec65ce4c153574101bb1612dd49c944e4b2b6a1759b9fbb1814013b516385a576a6a797d2c0f097f1ed805a4454bccb0208b1e4
+  metadata.gz: 442d51f3e18a91b18f3943c1f083bbfe940f685e1e1c5afa5638b0e1436408aff766118abf72f3de0058e33187a68ba20df9b536b8d79cae8afe5580ecc2bd9f
+  data.tar.gz: 2f1950e78e67c15e030165dce7e16f97511365f445da152e9dafb200fc61e9a976ed7ea50902739a1a396c11a41a6e49f01600cb0a58ee65029781398d2140d1

data/lib/badge/base.rb

@@ -1,6 +1,6 @@
 module Badge
 
-	VERSION = "0.8.3"
+	VERSION = "0.8.4"
 	DESCRIPTION = "Add a badge overlay to your app icon"
 
 	def self.root

data/lib/badge/runner.rb

@@ -6,6 +6,7 @@ require 'curb'
 module Badge
   class Runner
     @@retry_count = Badge.shield_io_retries
+    @@rsvg_enabled = true
 
     def run(path, options)
       check_tools!
@@ -91,21 +92,31 @@ module Badge
       UI.message "'#{icon.path}'"
       UI.verbose "Adding shield.io image ontop of icon".blue
 
-      new_path = "#{shield.path}.png"
       shield_scale = shield_scale ? shield_scale.to_f : 1.0
 
-      if shield_no_resize
-        `rsvg-convert #{shield.path} -z #{shield_scale} -o #{new_path}`
+      if @@rsvg_enabled
+        new_path = "#{shield.path}.png"
+        if shield_no_resize
+          `rsvg-convert #{shield.path} -z #{shield_scale} -o #{new_path}`
+        else
+          `rsvg-convert #{shield.path} -w #{(icon.width * shield_scale).to_i} -a -o #{new_path}`
+        end
+        new_shield = MiniMagick::Image.open(new_path)
       else
-        `rsvg-convert #{shield.path} -w #{(icon.width * shield_scale).to_i} -a -o #{new_path}`
+        new_shield = MiniMagick::Image.open(shield.path)
+        if icon.width > new_shield.width && !shield_no_resize
+          new_shield.resize "#{(icon.width * shield_scale).to_i}x#{icon.height}<"
+        else
+          new_shield.resize "#{icon.width}x#{icon.height}>"
+        end
       end
 
-      result = composite(result, MiniMagick::Image.open(new_path), alpha_channel, shield_gravity || "north", shield_geometry)
+      result = composite(result, new_shield, alpha_channel, shield_gravity || "north", shield_geometry)
     end
 
     def load_shield(shield_string)
-      url = Badge.shield_base_url + Badge.shield_path + shield_string + ".svg"
-      file_name = shield_string + ".svg"
+      url = Badge.shield_base_url + Badge.shield_path + shield_string + (@@rsvg_enabled ? ".svg" : ".png")
+      file_name = shield_string + (@@rsvg_enabled ? ".svg" : ".png")
 
       UI.verbose "Trying to load image from shield.io. Timeout: #{Badge.shield_io_timeout}s".blue
       UI.verbose "URL: #{url}".blue
@@ -117,11 +128,12 @@ module Badge
 
     def check_tools!
         if !`which rsvg-convert`.include?('rsvg-convert')
-          UI.error("You have to install RSVG to use `badge`")
-          UI.error("")
-          UI.error("Install it using (RSVG):")
+          UI.important("Install RSVG to get better results for shields ontop of your icon")
+          UI.important("")
+          UI.important("Install it using (RSVG):")
           UI.command("brew install librsvg")
-          UI.user_error!("Install RSVG and start your lane again!")
+          UI.important("")
+          @@rsvg_enabled = false
         end
         return if `which convert`.include?('convert')
         return if `which gm`.include?('gm')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: badge
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.4
 platform: ruby
 authors:
 - Daniel Griesser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-15 00:00:00.000000000 Z
+date: 2017-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curb
@@ -66,7 +66,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.5'
-description: 0.8.3
+description: 0.8.4
 email:
 - daniel.griesser.86@gmail.com
 executables: