image_optim 0.5.1 → 0.6.0

data/bin/image_optim

@@ -4,6 +4,7 @@
 require 'image_optim'
 require 'progress'
 require 'optparse'
+require 'find'
 
 options = {}
 
@@ -20,7 +21,7 @@ Usege:
     options[:threads] = threads
   end
 
-  op.on('--[no-]nice NUMBER', Integer, 'Nice levle (defaults to 10)') do |nice|
+  op.on('--[no-]nice NUMBER', Integer, 'Nice level (defaults to 10)') do |nice|
     options[:nice] = nice
   end
 
@@ -31,6 +32,10 @@ Usege:
     end
   end
 
+  op.on('-r', '-R', '--recursive', 'Scan directories') do |recursive|
+    options[:recursive] = recursive
+  end
+
   op.on('-v', '--verbose', 'Verbose info') do |verbose|
     options[:verbose] = verbose
   end
@@ -55,14 +60,29 @@ end
 if ARGV.empty?
   abort "specify image paths to optimize\n\n#{option_parser.help}"
 else
+  recursive = options.delete(:recursive)
   io = begin
     ImageOptim.new(options)
   rescue ImageOptim::ConfigurationError, ImageOptim::BinaryNotFoundError => e
     abort e
   end
-  paths = ARGV.reject do |arg|
-    unless File.file?(arg)
-      $stderr << "WARN: #{arg} is not a file\n"
+
+  paths = []
+  ARGV.each do |arg|
+    if File.file?(arg)
+      if io.optimizable?(arg)
+        paths << arg
+      else
+        warn "#{arg} is not an image or there is no optimizer for it"
+      end
+    else
+      if recursive
+        Find.find(arg) do |path|
+          paths << path if File.file?(path) && io.optimizable?(path)
+        end
+      else
+        warn "#{arg} is not a file"
+      end
     end
   end
   paths = paths.with_progress('optimizing') if paths.length > 1

data/image_optim.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'image_optim'
-  s.version     = '0.5.1'
+  s.version     = '0.6.0'
   s.summary     = %q{Optimize (lossless compress) images (jpeg, png, gif) using external utilities (advpng, gifsicle, jpegoptim, jpegtran, optipng, pngcrush, pngout)}
   s.homepage    = "http://github.com/toy/#{s.name}"
   s.authors     = ['Ivan Kuchin']

data/lib/image_optim.rb

@@ -149,6 +149,10 @@ class ImageOptim
     Gem.loaded_specs['image_optim'].version.to_s rescue nil
   end
 
+  def optimizable?(path)
+    !!workers_for_image(path)
+  end
+
 private
 
   def run_method_for(paths, method_name, &block)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: image_optim
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 7
   prerelease: 
   segments: 
   - 0
-  - 5
-  - 1
-  version: 0.5.1
+  - 6
+  - 0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Ivan Kuchin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-06 00:00:00 Z
+date: 2012-11-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: fspath
@@ -173,3 +173,4 @@ test_files:
 - spec/images/transparency1.png
 - spec/images/transparency2.png
 - spec/images/vergroessert.jpg
+has_rdoc: