badge 0.9.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0d501aaf87aefbb2c0b0cf15b5b0aa72612a7008
-  data.tar.gz: 795a37d2fea3c8900806c73eef04a22d4459076d
+SHA256:
+  metadata.gz: cde282fe94dedab5bdc9545d4e9b1519268a3cef9b1653b23bd7356c6cd03c89
+  data.tar.gz: 86bc387e9bdddf2d7015f13917895db8d12f0608db2e1543b2b69d90fca485e2
 SHA512:
-  metadata.gz: 958509781bdf8f9131da9bbd46c5406aaece814c398bb12640664744cb1e92be26e075dc0080aa2fb1e6a7a14b1f000e887fcb7ca4e44118d123ee20e24f41f3
-  data.tar.gz: b4a3a0c5fb4c358ad9302085883eb676678d4373f167c92b0ee1934f7722fa1ba55eea6bbd7c75a4bffcb82bfdd26e76683632f0faff0afc38e6da7c6b8b96ad
+  metadata.gz: 1da1500396eaf05ffb16208af5dc5d48f269f43254cff36f59ec8adfab7ba650866ef4af8ea88d6dad779e707ebd65448b0d259c9b62bf62ef216ab7a16ebd61
+  data.tar.gz: 9ebfcdd75567fbddf15a4c72c9e8e6b1e65b13aff0e66bfb3a7274a947ef189cce38f886f4843d4c49e4e2f5f32c37eda3890ce31a64d084e8294ae5d48bff0b

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 Daniel Griesser <daniel.griesser.86@gmail.com>
+Copyright (c) 2019 Daniel Griesser <daniel.griesser.86@gmail.com>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -104,7 +104,9 @@ Sometimes the response from shields.io takes a long time and can timeout. You ca
 
 `--shield_gravity North` changes the postion of the shield on the icon. Choices include: NorthWest, North, NorthEast, West, Center, East, SouthWest, South, SouthEast.
 
-In version [0.4.0](https://github.com/HazAT/badge/releases/tag/0.4.0) the default behavior of the shield graphic has been changed. The shield graphic will always be resized to **aspect fill** the icon instead of just adding the shield on the icon. The disable to new behaviour use `--shield_no_resize` which now only puts the shield on the icon again.
+`--shield_parameters "colorA=abcdef&style=flat"` changes the parameters of the shield image. It uses a string of key-value pairs separated by ampersand as specified on shields.io, eg: colorA=abcdef&style=flat.
+
+In version [0.4.0](https://github.com/HazAT/badge/releases/tag/0.4.0) the default behavior of the shield graphic has been changed. The shield graphic will always be resized to **aspect fill** the icon instead of just adding the shield on the icon. To disable the new behaviour use `--shield_no_resize` which now only puts the shield on the icon again.
 
 Add ```--no_badge``` as an option to hide the beta badge completely if you just want to add a shield.
 

data/lib/badge/base.rb

@@ -1,6 +1,6 @@
 module Badge
 
-	VERSION = "0.9.0"
+	VERSION = "0.13.0"
 	DESCRIPTION = "Add a badge overlay to your app icon"
 
 	def self.root
@@ -28,6 +28,10 @@ module Badge
 	end
 
 	def self.shield_base_url
+		'https://raster.shields.io'
+	end
+
+	def self.shield_svg_base_url
 		'https://img.shields.io'
 	end
 

data/lib/badge/options.rb

@@ -11,7 +11,7 @@ module Badge
                                      optional: true),
 
         FastlaneCore::ConfigItem.new(key: :alpha,
-                                     description: "Uses the work alpha instead of beta",
+                                     description: "Uses the word alpha instead of beta",
                                      is_string: false,
                                      optional: true),
 
@@ -32,7 +32,7 @@ module Badge
         FastlaneCore::ConfigItem.new(key: :badge_gravity,
                                      description: "Position of the badge on icon. Default: SouthEast - Choices include: #{AVAILABLE_GRAVITIES.join(', ')}",
                                      verify_block: proc do |value|
-                                       UI.user_error!("badge_gravity #{value} is invalid") unless AVAILABLE_GRAVITIES.include?
+                                       UI.user_error!("badge_gravity #{value} is invalid") unless AVAILABLE_GRAVITIES.map(&:upcase).include? value.upcase
                                      end,
                                      optional: true),
 
@@ -40,8 +40,12 @@ module Badge
                                      description: "Overlay a shield from shields.io on your icon, eg: Version-1.2-green",
                                      optional: true),
 
+        FastlaneCore::ConfigItem.new(key: :shield_parameters,
+                                     description: "Parameters of the shield image. String of key-value pairs separated by ampersand as specified on shields.io, eg: colorA=abcdef&style=flat",
+                                     optional: true),
+
         FastlaneCore::ConfigItem.new(key: :shield_io_timeout,
-                                     description: "The timeout in seconds we should wait the get a response from shields.io",
+                                     description: "The timeout in seconds we should wait to get a response from shields.io",
                                      type: Integer,
                                      optional: true),
 
@@ -50,7 +54,10 @@ module Badge
                                      optional: true),
 
         FastlaneCore::ConfigItem.new(key: :shield_gravity,
-                                     description: "Position of shield on icon. Default: North - Choices include: NorthWest, North, NorthEast, West, Center, East, South, West, South, SouthEast",
+                                     description: "Position of shield on icon. Default: North - Choices include: #{AVAILABLE_GRAVITIES.join(', ')}",
+                                     verify_block: proc do |value|
+                                       UI.user_error!("badge_gravity #{value} is invalid") unless AVAILABLE_GRAVITIES.map(&:upcase).include? value.upcase
+                                     end,
                                      optional: true),
 
         FastlaneCore::ConfigItem.new(key: :shield_scale,
@@ -58,12 +65,12 @@ module Badge
                                      optional: true),
 
         FastlaneCore::ConfigItem.new(key: :shield_no_resize,
-                                     description: "Shield image will no longer be resized to aspect fill the full icon. Instead it will only be shrinked to not exceed the icon graphic",
+                                     description: "Shield image will no longer be resized to aspect fill the full icon. Instead it will only be shrunk to not exceed the icon graphic",
                                      is_string: false,
                                      optional: true),
 
         FastlaneCore::ConfigItem.new(key: :glob,
-                                     description: "Glob pattern for finding image files Default: CURRENT_PATH/**/*.appiconset/*.{png,PNG}",
+                                     description: "Glob pattern for finding image files. Default: CURRENT_PATH/**/*.appiconset/*.{png,PNG}",
                                      optional: true),
 
         FastlaneCore::ConfigItem.new(key: :grayscale,

data/lib/badge/runner.rb

@@ -1,7 +1,7 @@
 require 'fastimage'
 require 'timeout'
 require 'mini_magick'
-require 'curb'
+require 'open-uri'
 
 module Badge
   class Runner
@@ -35,11 +35,11 @@ module Badge
           timeout = Badge.shield_io_timeout
           timeout = options[:shield_io_timeout] if options[:shield_io_timeout]
           Timeout.timeout(timeout.to_i) do
-            shield = load_shield(options[:shield]) if options[:shield]
+            shield = load_shield(options[:shield], options[:shield_parameters]) if options[:shield]
           end
         rescue Timeout::Error
           UI.error "Error loading image from shields.io timeout reached. Use --verbose for more info".red
-        rescue Curl::Err::CurlError => error
+        rescue OpenURI::HTTPError => error
           response = error.io
           UI.error "Error loading image from shields.io response Error. Use --verbose for more info".red
           UI.verbose response.status if FastlaneCore::Globals.verbose?
@@ -90,12 +90,6 @@ module Badge
         else
           UI.message "Did nothing... Enable --verbose for more info.".red
         end
-
-        if shield
-          File.delete(shield) if File.exist?(shield)
-          File.delete("#{shield.path}.png") if File.exist?("#{shield.path}.png")
-        end
-
       else
         UI.error "Could not find any app icons...".red
       end
@@ -109,10 +103,15 @@ module Badge
 
       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}`
+        begin
+          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
+        rescue Exception => error
+          UI.error "Other error occured. Use --verbose for more info".red
+          UI.verbose error if FastlaneCore::Globals.verbose?
         end
         new_shield = MiniMagick::Image.open(new_path)
       else
@@ -127,17 +126,16 @@ module Badge
       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 + (@@rsvg_enabled ? ".svg" : ".png")
-      file_name = shield_string + (@@rsvg_enabled ? ".svg" : ".png")
+    def load_shield(shield_string, shield_parameters)
+      url = (@@rsvg_enabled ? Badge.shield_svg_base_url : Badge.shield_base_url) + Badge.shield_path + shield_string + (@@rsvg_enabled ? ".svg" : ".png")
+      if shield_parameters
+        url = url + "?" + shield_parameters
+      end
 
       UI.verbose "Trying to load image from shields.io. Timeout: #{Badge.shield_io_timeout}s".blue
       UI.verbose "URL: #{url}".blue
 
-      Curl::Easy.download(url, file_name)
-      MiniMagick::Image.open(file_name) unless @@rsvg_enabled
-
-      File.open(file_name)
+      MiniMagick::Image.open(url)
     end
 
     def check_tools!

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: badge
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Daniel Griesser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-04 00:00:00.000000000 Z
+date: 2021-03-31 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: curb
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: fastlane
   requirement: !ruby/object:Gem::Requirement
@@ -58,15 +44,21 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.5'
+        version: 4.9.4
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.5'
-description: 0.9.0
+        version: 4.9.4
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 5.0.0
+description: 0.13.0
 email:
 - daniel.griesser.86@gmail.com
 executables:
@@ -105,8 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Add a badge overlay to your app icon