ios_icon_generator 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4243f84a51081da8c4e3e7213d4c68afb325fc34
-  data.tar.gz: c88f2035019f517cf3c38efa734d1093278202fa
+  metadata.gz: d633ae350c09c576e31bd3e65b175496d1cd017f
+  data.tar.gz: 242575b699097b858353e9022c287910b9022d1f
 SHA512:
-  metadata.gz: 73a7463196407d741a49bf87004d5e2d046a233d90f8fd94db3d7e274962fb5ae2e2c0c11497d6de43816104bcd7fcafe227ae4504321991520f6b304c261556
-  data.tar.gz: 6985de411ffb1ba85d985de1a2c4add3feb6afd6677bb45d54e0a044bfc37a253fbd1a1de54983cc01300d1e2359a0f619382caac65292236758009c8993ba80
+  metadata.gz: f1ae670eed65e4ebe753c4380faacdae7bf1680d837ea70ac97a20ed84bb064f489c784db49d8e3c38cf6447850269ece94745c25d880947e21eb964974d0c79
+  data.tar.gz: 2709e7e77982fd356d24f8a59433a43875fcc866e337191a15c6d36cfe107e3540fddc3de185650043108ff417c884ecef8da1c4dfa1ebb3a1d51de40bf66192

data/lib/ios_icon_generator/cli/commands/generate.rb

@@ -18,7 +18,6 @@ require 'colored2'
 require 'parallel'
 require 'ruby-progressbar'
 require 'ios_icon_generator/helpers/generate_icon'
-require 'ios_icon_generator/helpers/check_dependencies'
 require 'hanami/cli'
 
 module IOSIconGenerator
@@ -26,18 +25,13 @@ module IOSIconGenerator
     module Commands
       class Generate < Hanami::CLI::Command
         desc 'Generate app icons'
-        argument :icon_path, required: true, desc: 'The unmasked pdf icon. The icon must be at least 1024x1024'
+        argument :icon_path, required: true, desc: 'The unmasked icon of any image file type. The icon must be at least 1024x1024.'
         argument :xcasset_folder, default: '.', desc: "The path to your .xcassets folder. \
           If not specified, the appiconsets will be generated in the current folder and can be draged\'n\'dropped there in xcode"
         option :type, type: :array, default: %w[iphone], desc: 'Which target to generate the icons for. Can be "iphone", "ipad", "watch", "mac" or "carplay" or a combination of any of them, or "imessage"'
         option :parallel_processes, type: :integer, default: -1, desc: 'Number of processes to use to process the files. Defaults to -1, meaning the number of cores the machine. \
           Set to 0 to disable parallel processing.'
         def call(icon_path:, xcasset_folder:, type:, **options)
-          Helpers.check_dependencies
-
-          raise "#{'ImageMagick'.blue.bold} is required. It can be installed via #{'homebrew'.bold.underlined} using #{'brew install imagemagick'.blue.bold.underlined}" unless Helpers.which('magick')
-          raise "#{'GhostScript'.blue.bold} is required. It can be installed via #{'homebrew'.bold.underlined} using #{'brew install ghostscript'.blue.bold.underlined}" unless Helpers.which('gs')
-
           types = type.map(&:to_sym)
 
           progress_bar = ProgressBar.create(total: nil)

data/lib/ios_icon_generator/cli/commands/mask.rb

@@ -49,8 +49,6 @@ module IOSIconGenerator
           option :parallel_processes, type: :integer, default: -1, desc: 'Number of processes to use to process the files. Defaults to -1, meaning the number of cores the machine. \
             Set to 0 to disable parallel processing.'
           def call(appiconset_path:, output_path:, **options)
-            Helpers.check_dependencies
-
             raise 'There is no App icon set at the path specified.' unless Dir.exist?(appiconset_path)
 
             progress_bar = ProgressBar.create(total: nil)

data/lib/ios_icon_generator/cli/commands/stub.rb

@@ -42,8 +42,6 @@ module IOSIconGenerator
         option :parallel_processes, type: :integer, default: -1, desc: 'Number of processes to use to process the files. Defaults to -1, meaning the number of cores the machine. \
           Set to 0 to disable parallel processing.'
         def call(text:, xcasset_folder:, type:, **options)
-          Helpers.check_dependencies
-
           types = type.map(&:to_sym)
 
           progress_bar = ProgressBar.create(total: nil)

data/lib/ios_icon_generator/helpers/check_dependencies.rb

@@ -18,9 +18,10 @@ require 'ios_icon_generator/helpers/which'
 
 module IOSIconGenerator
   module Helpers
-    def self.check_dependencies
+    def self.check_dependencies(requires_ghostscript: false)
       raise "#{'ImageMagick'.blue.bold} is required. It can be installed via #{'homebrew'.bold.underlined} using #{'brew install imagemagick'.blue.bold.underlined}" unless Helpers.which('magick')
-      raise "#{'GhostScript'.blue.bold} is required. It can be installed via #{'homebrew'.bold.underlined} using #{'brew install ghostscript'.blue.bold.underlined}" unless Helpers.which('gs')
+      raise "#{'GhostScript'.blue.bold} is required. It can be installed via #{'homebrew'.bold.underlined} using #{'brew install ghostscript'.blue.bold.underlined}" \
+        if requires_ghostscript && !Helpers.which('gs')
     end
   end
 end

data/lib/ios_icon_generator/helpers/generate_icon.rb

@@ -17,6 +17,7 @@
 require 'json'
 require 'fileutils'
 require 'ios_icon_generator/helpers/image_sets_definition'
+require 'ios_icon_generator/helpers/check_dependencies'
 
 module IOSIconGenerator
   module Helpers
@@ -26,7 +27,7 @@ module IOSIconGenerator
     # If +icon_path+ is set to +nil+, the function expects +generate_icon+ to be set or the function will raise.
     #
     # @param [String, #read] icon_path The path to the icon to use as the base icon.
-    #        If specified, it must point to a valid pdf file (with a .pdf extension), with a resolution over 1024x1024.
+    #        If specified, it must point to a valid image file, with a resolution over 1024x1024 when applicable.
     #        If not specified, +generate_icon+ must be specified.
     # @param [String, #read] output_folder The folder to create the app icon set in.
     # @param [Array<Symbol>, #read] types The types to generate the sets of images for. Each type must be one of +:iphone+, +:ipad+, +:watch+, +mac+ or +carplay+, or it can be an array of just +:imessage+.
@@ -47,21 +48,24 @@ module IOSIconGenerator
     #
     # @return [String] Return the path to the generated app icon set.
     def self.generate_icon(icon_path:, output_folder:, types:, parallel_processes: nil, generate_icon: nil, progress: nil)
+      is_pdf = icon_path && File.extname(icon_path) == '.pdf'
+
+      Helpers.check_dependencies(requires_ghostscript: is_pdf)
+
       if icon_path
         raise "There is no icon at #{icon_path}." unless File.exist?(icon_path)
 
-        raise 'The icon specified must be .pdf.' if File.extname(icon_path) != '.pdf'
-
         matches = /(\d+)x(\d+)/.match(`magick identify "#{icon_path}"`)
-        raise 'Unable to verify icon. Please make sure it\'s a valid pdf file and try again.' if matches.nil?
+        raise 'Unable to verify icon. Please make sure it\'s a valid image file and try again.' if matches.nil?
 
         width, height = matches.captures
-        raise 'Invalid pdf specified.' if width.nil? || height.nil?
+        raise 'Invalid image specified.' if width.nil? || height.nil?
 
         raise "The icon must at least be 1024x1024, it currently is #{width}x#{height}." unless width.to_i >= 1024 && height.to_i >= 1024
       elsif generate_icon.nil?
         raise 'icon_path has been set to nil, generate_icon must be specified'
       end
+
       appiconset_path = File.join(output_folder, "#{types.include?(:imessage) ? 'iMessage App Icon' : 'AppIcon'}.#{types.include?(:imessage) ? 'stickersiconset' : 'appiconset'}")
 
       FileUtils.mkdir_p(appiconset_path)
@@ -128,7 +132,7 @@ module IOSIconGenerator
       progress&.call(nil, total)
 
       max_size = smaller_sizes.flatten.max
-      temp_icon_path = File.join(output_folder, '.temp_icon.pdf')
+      temp_icon_path = File.join(output_folder, ".temp_icon#{is_pdf ? '.pdf' : '.png'}")
       begin
         system('magick', 'convert', '-density', '400', icon_path, '-colorspace', 'sRGB', '-type', 'truecolor', '-scale', "#{max_size}x#{max_size}", temp_icon_path) if icon_path
         progress&.call(1, total)

data/lib/ios_icon_generator/helpers/mask_icon.rb

@@ -17,6 +17,7 @@
 require 'json'
 require 'base64'
 require 'fileutils'
+require 'ios_icon_generator/helpers/check_dependencies'
 
 module IOSIconGenerator
   module Helpers
@@ -74,6 +75,8 @@ module IOSIconGenerator
       parallel_processes: nil,
       progress: nil
     )
+      Helpers.check_dependencies
+
       extension = File.extname(appiconset_path)
       output_folder = File.join(output_folder, "#{File.basename(appiconset_path, extension)}-#{mask[:suffix]}#{extension}")
 

data/lib/ios_icon_generator/version.rb

@@ -18,5 +18,5 @@ module IOSIconGenerator
   ##
   # The current version of the gem.
   #
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ios_icon_generator
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Stéphane Copin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-21 00:00:00.000000000 Z
+date: 2019-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored2
@@ -140,16 +140,16 @@ dependencies:
   name: debase
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.2
 - !ruby/object:Gem::Dependency
   name: phashion
   requirement: !ruby/object:Gem::Requirement
@@ -224,16 +224,16 @@ dependencies:
   name: ruby-debug-ide
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.1
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement