badge 0.8.4 → 0.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 822c906789564ef26e5abed06f3e8845404e1f68
-  data.tar.gz: 7f095560ba04b4dec08b23ab2aeb38cc6794f9d9
+  metadata.gz: b6acfc4494a3c8e85fc4d8d0b19167d205ae50f3
+  data.tar.gz: 78305f25e672aa1fa2b82fa0c882d78c50fd56f1
 SHA512:
-  metadata.gz: 442d51f3e18a91b18f3943c1f083bbfe940f685e1e1c5afa5638b0e1436408aff766118abf72f3de0058e33187a68ba20df9b536b8d79cae8afe5580ecc2bd9f
-  data.tar.gz: 2f1950e78e67c15e030165dce7e16f97511365f445da152e9dafb200fc61e9a976ed7ea50902739a1a396c11a41a6e49f01600cb0a58ee65029781398d2140d1
+  metadata.gz: c9a9c38be73c5e278726f9e8ca2d088576b653e1afd0e640ce3781b232223f1ce359362825cb85a8513e62acb11b2745d4ea62277247126ca2a166782e40acb7
+  data.tar.gz: 30a96b6ed74e0d954b47b7cb1682cf5c5acaa2e334b0184bae9a82bca54102407651466a92b53a6526e115ff70aa3ae5886433753c455ad4ed5d9195830f1744

data/README.md

@@ -73,8 +73,10 @@ Call ```badge``` in your projects root folder
     
 It will search all subfolders for your asset catalog app icon set and add the badge to the icons. 
 
-But you can also run badge on your Android or tvOS icons.
-You have to use the `--glob "/**/*.appiconset/*.{png,PNG}"` parameter to adjust where to find your icons.
+You can also run badge on your Android, tvOS icons, or any other iconset.
+You have to use the `--glob "/**/*.appiconset/*.{png,PNG}"` parameter to adjust where to find your icons. 
+
+:warning: Note that you have to use a `/` in the beginning of the custom path, even if you're not starting from the root path, f.ex. if your icons are in `res/ios/beta/Appicon/*`, your badge call would be `badge --glob "/res/ios/beta/Appicon/*"`
 
 The keep the alpha channel in the icons use `--alpha_channel`
     

data/lib/badge/base.rb

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

data/lib/badge/options.rb

@@ -65,4 +65,3 @@ module Badge
     end
   end
 end
-

data/lib/badge/runner.rb

@@ -5,7 +5,7 @@ require 'curb'
 
 module Badge
   class Runner
-    @@retry_count = Badge.shield_io_retries
+    @@retry_attemps = 0
     @@rsvg_enabled = true
 
     def run(path, options)
@@ -26,7 +26,6 @@ module Badge
         UI.message "Start adding badges...".green
 
         shield = nil
-        response_error = false
         begin
           timeout = Badge.shield_io_timeout
           timeout = options[:shield_io_timeout] if options[:shield_io_timeout]
@@ -34,21 +33,27 @@ module Badge
             shield = load_shield(options[:shield]) if options[:shield]
           end
         rescue Timeout::Error
-          UI.error "Error loading image from shield.io timeout reached. Skipping Shield. Use --verbose for more info".red
+          UI.error "Error loading image from shield.io timeout reached. Use --verbose for more info".red
         rescue Curl::Err::CurlError => error
           response = error.io
-          UI.error "Error loading image from shield.io response Error. Skipping Shield. Use --verbose for more info".red
+          UI.error "Error loading image from shield.io response Error. Use --verbose for more info".red
           UI.verbose response.status if FastlaneCore::Globals.verbose?
-          response_error = true
+        rescue MiniMagick::Invalid
+          UI.error "Error validating image from shield.io. Use --verbose for more info".red
+        rescue Exception => error
+          UI.error "Other error occured. Use --verbose for more info".red
+          UI.verbose error if FastlaneCore::Globals.verbose?
         end
 
-        if @@retry_count <= 0
-          UI.error "Cannot load image from shield.io skipping it...".red
-        elsif response_error
-          UI.message "Waiting for #{timeout.to_i}s and retry to load image from shield.io tries remaining: #{@@retry_count}".red
-          sleep timeout.to_i
-          @@retry_count -= 1
-          return run(path, options)
+        if options[:shield] && shield == nil
+          if @@retry_attemps >= Badge.shield_io_retries
+            UI.error "Cannot load image from shield.io skipping it...".red
+          else
+            UI.message "Waiting for #{timeout.to_i}s and retry to load image from shield.io tries remaining: #{Badge.shield_io_retries - @@retry_attemps}".red
+            sleep timeout.to_i
+            @@retry_attemps += 1
+            return run(path, options)
+          end
         end
 
         icon_changed = false
@@ -122,13 +127,14 @@ module Badge
       UI.verbose "URL: #{url}".blue
 
       Curl::Easy.download(url, file_name)
+      MiniMagick::Image.open(file_name) unless @@rsvg_enabled
 
       File.open(file_name)
     end
 
     def check_tools!
         if !`which rsvg-convert`.include?('rsvg-convert')
-          UI.important("Install RSVG to get better results for shields ontop of your icon")
+          UI.important("Install RSVG to get better results for shields on top of your icon")
           UI.important("")
           UI.important("Install it using (RSVG):")
           UI.command("brew install librsvg")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: badge
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.8.5
 platform: ruby
 authors:
 - Daniel Griesser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-23 00:00:00.000000000 Z
+date: 2017-08-22 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.4
+description: 0.8.5
 email:
 - daniel.griesser.86@gmail.com
 executables: