image_optim 0.4.2 → 0.5.0

data/bin/image_optim

@@ -31,12 +31,16 @@ Usege:
     end
   end
 
+  op.on('-v', '--verbose', 'Verbose info') do |verbose|
+    options[:verbose] = verbose
+  end
+
   op.on_tail('-h', '--help', 'Show full help') do
     puts option_parser.help
     exit
   end
 
-  op.on_tail('-v', '--version', 'Show version') do
+  op.on_tail('--version', 'Show version') do
     puts ImageOptim.version
     exit
   end

data/image_optim.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'image_optim'
-  s.version     = '0.4.2'
+  s.version     = '0.5.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

@@ -56,6 +56,8 @@ class ImageOptim
     end
     @threads = limit_with_range(threads, 1..16)
 
+    verbose = options.delete(:verbose)
+
     @workers_by_format = {}
     Worker.klasses.each do |klass|
       case worker_options = options.delete(klass.underscored_name.to_sym)
@@ -69,7 +71,7 @@ class ImageOptim
       else
         raise "Got #{worker_options.inspect} for #{klass.name} options"
       end
-      worker = klass.new({:nice => nice}.merge(worker_options))
+      worker = klass.new({:nice => nice, :verbose => verbose}.merge(worker_options))
       klass.image_formats.each do |format|
         @workers_by_format[format] ||= []
         @workers_by_format[format] << worker

data/lib/image_optim/worker.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 require 'shellwords'
 require 'image_optim'
 
@@ -34,10 +36,14 @@ class ImageOptim
     # Binary name or path
     attr_reader :nice
 
+    # Be verbose
+    attr_reader :verbose
+
     # Configure (raises on extra options), find binary (raises if not found)
     def initialize(options = {})
       get_option!(options, :bin, default_bin)
       get_option!(options, :nice, 10){ |v| v.to_i }
+      get_option!(options, :verbose, false)
       parse_options(options)
       raise "`#{bin}` not found" if `which #{bin.to_s.shellescape}`.empty?
       assert_options_empty!(options)
@@ -54,17 +60,24 @@ class ImageOptim
 
     # Optimize file from src to dst, return boolean representing success status
     def optimize(src, dst)
+      command = [bin, *command_args(src, dst)].map(&:to_s).shelljoin
+      start = Time.now
       pid = fork do
         $stdout.reopen('/dev/null', 'w')
         $stderr.reopen('/dev/null', 'w')
         Process.setpriority(Process::PRIO_PROCESS, 0, nice)
-        exec bin, *command_args(src, dst)
+        exec command
       end
       Process.wait pid
+      duration = Time.now - start
       if $?.signaled?
         raise SignalException.new($?.termsig)
       end
-      $?.success? && dst.size? && dst.size < src.size
+      success = $?.success? && dst.size? && dst.size < src.size
+      if verbose
+        print "#{success ? '✓' : '✗'} #{duration}s #{command}\n"
+      end
+      success
     end
 
     # Name of binary determined from class name

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: 
   segments: 
   - 0
-  - 4
-  - 2
-  version: 0.4.2
+  - 5
+  - 0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Ivan Kuchin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-26 00:00:00 Z
+date: 2012-08-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: fspath
@@ -159,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: image_optim
-rubygems_version: 1.8.17
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Optimize (lossless compress) images (jpeg, png, gif) using external utilities (advpng, gifsicle, jpegoptim, jpegtran, optipng, pngcrush, pngout)
@@ -173,4 +173,3 @@ test_files:
 - spec/images/transparency1.png
 - spec/images/transparency2.png
 - spec/images/vergroessert.jpg
-has_rdoc: