badge 0.7.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2045ea909e4cf1c36ed2c8ea02e57184698de4a
-  data.tar.gz: 680e442f03ae757874699aedc9c8683cec516275
+  metadata.gz: ff14105ef1cf3a54cf1bd6e4029aea9cf193da8f
+  data.tar.gz: 5a85c1c81155d8d99c731726e92b5a0e92b02a52
 SHA512:
-  metadata.gz: 54fcc23128d5508b62ba7cb65b9d34edf62b227346b5280aa894bc345942f739a02cb73933a13ff0eb76ff5962dbeed08570c63625662a1c0647ebff3839c3b5
-  data.tar.gz: 190439d191a43c3a26a8429deff9f72cd4a8383e63b0ecdb1b0283431cd839dd0f0edbd95442239797f51b659742cd5ffccb21808090bdd63d566dfab3d96b56
+  metadata.gz: b12697a64cf84ff0167b1bac0451403f6ae52f9721c3e644f82c34edea7920d62e0c9b29fb23c692f2e94d8071c0cd013280e3bc22d9c5a08ec187bec436f02e
+  data.tar.gz: 0dba6d198924d70f24bb0b391c9a91c10c7fc696bf262920d088818d0f335801e5190ecf41dfa109ec7257c57663fbf4e76fb6c3389959ef4d0c06592ff35d6b

data/lib/badge/base.rb

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

data/lib/badge/options.rb

@@ -41,10 +41,18 @@ module Badge
                                      type: Integer,
                                      optional: true),
 
+        FastlaneCore::ConfigItem.new(key: :shield_geometry,
+                                     description: "Position of shield on icon, relative to gravity e.g, +50+10%",
+                                     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",
                                      optional: true),
 
+        FastlaneCore::ConfigItem.new(key: :shield_scale,
+                                     description: "Shield image scale factor; e.g, 0.5, 2, etc. - works with --shield_no_resize",
+                                     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",
                                      is_string: false,

data/lib/badge/runner.rb

@@ -1,13 +1,14 @@
 require 'fastimage'
 require 'timeout'
 require 'mini_magick'
+require 'curb'
 
 module Badge
   class Runner
     @@retry_count = Badge.shield_io_retries
 
     def run(path, options)
-      check_imagemagick!
+      check_tools!
       glob = "/**/*.appiconset/*.{png,PNG}"
       glob = options[:glob] if options[:glob]
 
@@ -33,7 +34,7 @@ module Badge
           end
         rescue Timeout::Error
           UI.error "Error loading image from shield.io timeout reached. Skipping Shield. Use --verbose for more info".red
-        rescue OpenURI::HTTPError => error
+        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 response.status if $verbose
@@ -55,19 +56,19 @@ module Badge
           icon = MiniMagick::Image.new(full_path)
 
           result = MiniMagick::Image.new(full_path)
-          
+
           if !options[:no_badge]
             result = add_badge(options[:custom], options[:dark], icon, options[:alpha], alpha_channel, options[:badge_gravity])
             icon_changed = true
           end
           if shield
-            result = add_shield(icon, result, shield, alpha_channel, options[:shield_gravity], options[:shield_no_resize])
+            result = add_shield(icon, result, shield, alpha_channel, options[:shield_gravity], options[:shield_no_resize], options[:shield_scale], options[:shield_geometry])
             icon_changed = true
           end
-          
+
           if icon_changed
             result.format "png"
-            result.write full_path 
+            result.write full_path
           end
         end
         if icon_changed
@@ -80,52 +81,58 @@ module Badge
       end
     end
 
-    def add_shield(icon, result, shield, alpha_channel, shield_gravity, shield_no_resize)
+    def add_shield(icon, result, shield, alpha_channel, shield_gravity, shield_no_resize, shield_scale, shield_geometry)
       UI.message "'#{icon.path}'"
       UI.verbose "Adding shield.io image ontop of icon".blue
 
-      current_shield = MiniMagick::Image.open(shield.path)
-      
-      if icon.width > current_shield.width && !shield_no_resize
-        current_shield.resize "#{icon.width}x#{icon.height}<"
+      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}`
       else
-        current_shield.resize "#{icon.width}x#{icon.height}>"
+        `rsvg-convert #{shield.path} -w #{(icon.width * shield_scale).to_i} -a -o #{new_path}`
       end
-      
-      result = composite(result, current_shield, alpha_channel, shield_gravity || "north")
+
+      result = composite(result, MiniMagick::Image.open(new_path), alpha_channel, shield_gravity || "north", shield_geometry)
     end
 
     def load_shield(shield_string)
-      url = Badge.shield_base_url + Badge.shield_path + shield_string + ".png"
-      file_name = shield_string + ".png"
+      url = Badge.shield_base_url + Badge.shield_path + shield_string + ".svg"
+      file_name = shield_string + ".svg"
 
       UI.verbose "Trying to load image from shield.io. Timeout: #{Badge.shield_io_timeout}s".blue
       UI.verbose "URL: #{url}".blue
 
-      shield = Tempfile.new(file_name).tap do |file|
-        file.binmode
-        file.write(open(url).read)
-        file.close
-      end
+      Curl::Easy.download(url, file_name)
+
+      File.open(file_name)
     end
-    
-    def check_imagemagick!
+
+    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.command("brew install librsvg")
+          UI.user_error!("Install RSVG and start your lane again!")
+        end
         return if `which convert`.include?('convert')
         return if `which gm`.include?('gm')
 
         UI.error("You have to install ImageMagick or GraphicsMagick to use `badge`")
         UI.error("")
         UI.error("Install it using (ImageMagick):")
-        UI.command("brew update && brew install imagemagick")
+        UI.command("brew install imagemagick")
         UI.error("")
         UI.error("Install it using (GraphicsMagick):")
-        UI.command("brew update && brew install graphicsmagick")
+        UI.command("brew install graphicsmagick")
         UI.error("")
         UI.error("If you don't have homebrew, visit http://brew.sh")
 
         UI.user_error!("Install ImageMagick and start your lane again!")
     end
-    
+
     def add_badge(custom_badge, dark_badge, icon, alpha_badge, alpha_channel, badge_gravity)
       UI.message "'#{icon.path}'"
       UI.verbose "Adding badge image ontop of icon".blue
@@ -143,11 +150,12 @@ module Badge
       result = composite(icon, badge, alpha_channel, badge_gravity || "SouthEast")
     end
 
-    def composite(image, overlay, alpha_channel, gravity)
+    def composite(image, overlay, alpha_channel, gravity, geometry = nil)
       image.composite(overlay, 'png') do |c|
         c.compose "Over"
         c.alpha 'On' unless !alpha_channel
         c.gravity gravity
+        c.geometry geometry if geometry
       end
     end
   end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: badge
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
 platform: ruby
 authors:
 - Daniel Griesser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-16 00:00:00.000000000 Z
+date: 2017-03-13 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
@@ -52,7 +66,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.5'
-description: 0.7.1
+description: 0.8.0
 email:
 - daniel.griesser.86@gmail.com
 executables: