favicon_maker 1.2.1 → 1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a96b698809c2a16905b7b58d0118b5106c4fc39b
-  data.tar.gz: 023d995146b9e3f1842b4ab0da7702486397089d
+  metadata.gz: e9f56d73840c0d1a741f3eb58b7b429491fcdcc9
+  data.tar.gz: 658309f9a8a5841224b9be54f00f20b38f10c013
 SHA512:
-  metadata.gz: a0a5f276df6378394239bbd6b55e007a936014a0530eb2db797f9ec48face70ad9dfc280f0eaace01dc0471c93f35ac16985b7fc7ca77c22682893ece16968dc
-  data.tar.gz: c988f8e0869737b39a5a909192db88ea94f5f15917a81d030a620547a838d9a1cef5a78e9fbb7f7ea5c9c097ef7d6f62633c61b062c54da95563f1f43f8f63a7
+  metadata.gz: f6a390aff4cc5751c65a73d5acef579e32d78b9ba4bd778aac642617de2e1d0f08189534605e3801ceff5c2ad9788fc9c0f38a79b4f5b433f68c27476df4c449
+  data.tar.gz: ebec04c983eb2ecc4ecaf9d72dc19bb713ed16a26618709f33635989d584d04a2c0eec8205be2d88eaab98813f9e0a10b240da5a28f49ba3694edf5cc380f46e

data/lib/favicon_maker.rb

@@ -1,4 +1,7 @@
 require "favicon_maker/maker_config"
 require "favicon_maker/generator"
 require "favicon_maker/creator"
-require "favicon_maker/input_validator"
+require "favicon_maker/base_command"
+require "favicon_maker/ico_command"
+require "favicon_maker/png_command"
+require "favicon_maker/input_validator"

data/lib/favicon_maker/base_command.rb

@@ -0,0 +1,30 @@
+module BaseCommand
+
+  def run_convert(template_file_path, output_file_path, convert_settings, options, format, &block)
+    ico_cmd =   [ "convert -background none #{options}".strip ]
+    ico_cmd +=  [ "\"#{template_file_path}\" #{options_to_args(convert_settings)}" ]
+    ico_cmd +=  yield([]) if block_given?
+    ico_cmd +=  [ " #{format}:\"#{output_file_path}\"" ]
+    @command = ico_cmd.join(' ')
+  end
+
+  def options_to_args(options)
+    return nil if options.nil?
+    options.map { |k,v|
+      if [ :xc, :null ].include?(k)
+        "#{k}:#{v}"
+      else
+        "-#{k} #{v}".strip
+      end
+    }.join(' ')
+  end
+
+  def on_windows?
+    (RbConfig::CONFIG['host_os'].match /mswin|mingw|cygwin/)
+  end
+
+  def to_s
+    @command
+  end
+
+end

data/lib/favicon_maker/creator.rb

@@ -4,7 +4,6 @@ module FaviconMaker
 
   class Creator
     RECENT_IM_VERSION         = "6.8.0"
-    COLORSPACE_MIN_IM_VERSION = "6.7.5"
 
     attr_accessor :template_file_path
     attr_accessor :output_path
@@ -16,6 +15,7 @@ module FaviconMaker
       @output_path        = output_path
       @options            = options
       @finished_block     = finished_block
+      @command_set        = []
 
       im_version = fetch_image_magick_version
 
@@ -33,9 +33,14 @@ module FaviconMaker
 
       validate_input(format, size)
 
-      generate_file(template_file_path, output_file_path, size, format)
+      @command_set << [ generate_command(template_file_path, output_file_path, size, format), output_file_path, template_file_path ]
+    end
 
-      finished_block.call(output_file_path, template_file_path) if finished_block
+    def run
+      @command_set.map do |cmd, output_file_path, template_file_path|
+        `#{cmd}`
+        finished_block.call(output_file_path, template_file_path) if finished_block
+      end
     end
 
     private
@@ -65,56 +70,12 @@ module FaviconMaker
       matches[1] if matches
     end
 
-    def generate_file(template_file_path, output_file_path, size, format)
+    def generate_command(template_file_path, output_file_path, size, format)
+      args = template_file_path, output_file_path, size, @options
       case format.to_sym
-      when :png
-        convert_settings = [
-          [ :define,      "png:include-chunk=none,trns,gama"  ],
-          [ :format,      "png"                               ],
-          [ :resize,      size                                ],
-          [ :gravity,     "center"                            ],
-          [ :background,  "none"                              ],
-          [ :extent,      size                                ],
-        ]
-
-        run_convert(template_file_path, convert_settings, output_file_path, format)
-      when :ico
-        convert_settings = [
-          [ :quiet,       nil                                 ],
-        ]
-
-        center_settings = [
-          [ :gravity,     "center"                            ],
-          [ :background,  "none"                              ],
-        ]
-
-        run_convert(template_file_path, convert_settings, output_file_path, format) do |ico_cmd|
-          escapes = "\\" unless on_windows?
-          size.split(',').sort_by{|s| s.split('x')[0].to_i}.each do |s|
-            ico_cmd << "#{escapes}( -clone 0 -resize #{s}  #{options_to_args(center_settings)} -extent #{s} #{escapes}) "
-          end
-          ico_cmd << "-delete 0"
-        end
-      end
-    end
-
-    def run_convert(template_file_path, convert_settings, output_file_path, format, &block)
-      ico_cmd = "convert -background none #{@options} "
-      ico_cmd << "\"#{template_file_path}\" #{options_to_args(convert_settings)} "
-      ico_cmd = yield(ico_cmd) if block_given?
-      ico_cmd << " #{format}:\"#{output_file_path}\""
-      print `#{ico_cmd}`
-    end
-
-    def options_to_args(options)
-      return nil if options.nil?
-      options.map { |k,v|
-        if [ :xc, :null ].include?(k)
-          "#{k}:#{v}"
-        else
-          "-#{k} #{v}"
-        end
-      }.join(' ')
+      when :png then PngCommand.new(*args)
+      when :ico then IcoCommand.new(*args)
+      end.to_s
     end
 
     def print_image_magick_ancient_version_warning
@@ -126,10 +87,6 @@ module FaviconMaker
       puts "FaviconMaker: WARNING! The version of your installed ImageMagick could not be detected!"
     end
 
-    def on_windows?
-      (RbConfig::CONFIG['host_os'].match /mswin|mingw|cygwin/)
-    end
-
   end
 
 end

data/lib/favicon_maker/generator.rb

@@ -38,7 +38,7 @@ module FaviconMaker
       creators.each do |template_filename, options_and_block|
         template_file = File.join(template_dir, template_filename)
         options, creator_block = *options_and_block
-        Docile.dsl_eval(Creator.new(template_file, output_dir, options, finished_block), &creator_block)
+        Docile.dsl_eval(Creator.new(template_file, output_dir, options, finished_block), &creator_block).run
       end
     end
   end

data/lib/favicon_maker/ico_command.rb

@@ -0,0 +1,25 @@
+class IcoCommand
+
+  include ::BaseCommand
+
+  def initialize(template_file_path, output_file_path, size, options)
+
+    convert_settings = [
+      [ :quiet,       nil      ],
+    ]
+
+    center_settings = [
+      [ :gravity,     "center" ],
+      [ :background,  "none"   ],
+    ]
+
+    run_convert(template_file_path, output_file_path, convert_settings, options, :ico) do |ico_cmd|
+      escapes = "\\" unless on_windows?
+      size.split(',').sort_by{|s| s.split('x')[0].to_i}.each do |s|
+        ico_cmd += [ "#{escapes}( -clone 0 -resize #{s}  #{options_to_args(center_settings)} -extent #{s} #{escapes})" ]
+      end
+      ico_cmd += [ "-delete 0" ]
+    end
+
+  end
+end

data/lib/favicon_maker/png_command.rb

@@ -0,0 +1,19 @@
+class PngCommand
+
+  include ::BaseCommand
+
+  def initialize(template_file_path, output_file_path, size, options)
+
+    convert_settings = [
+      [ :define,      "png:include-chunk=none,trns,gama"  ],
+      [ :format,      "png"                               ],
+      [ :resize,      size                                ],
+      [ :gravity,     "center"                            ],
+      [ :background,  "none"                              ],
+      [ :extent,      size                                ],
+    ]
+
+    run_convert(template_file_path, output_file_path, convert_settings, options, :png)
+
+  end
+end

data/lib/favicon_maker/version.rb

@@ -1,7 +1,7 @@
   module FaviconMaker
     MAJOR = 1
-    MINOR = 2
-    PATCH = 1
+    MINOR = 3
+    PATCH = nil
     BUILD = nil
 
     VERSION = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: favicon_maker
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: '1.3'
 platform: ruby
 authors:
 - Andreas Follmann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-29 00:00:00.000000000 Z
+date: 2014-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docile
@@ -75,10 +75,13 @@ files:
 - README.md
 - favicon_maker.gemspec
 - lib/favicon_maker.rb
+- lib/favicon_maker/base_command.rb
 - lib/favicon_maker/creator.rb
 - lib/favicon_maker/generator.rb
+- lib/favicon_maker/ico_command.rb
 - lib/favicon_maker/input_validator.rb
 - lib/favicon_maker/maker_config.rb
+- lib/favicon_maker/png_command.rb
 - lib/favicon_maker/version.rb
 - spec/favicon_maker_spec.rb
 - spec/input_validator_spec.rb