image_optim 0.3.2 → 0.4.0

data/README.markdown

@@ -4,6 +4,40 @@ Optimize images (jpeg, png, gif) using external utilities (advpng, gifsicle, jpe
 
 Based on [ImageOptim.app](http://imageoptim.pornel.net/).
 
+## Usage
+
+In terminal:
+
+    image_optim *.{jpg,png,gif}
+
+    image_optim -h
+
+Initilize optimizer (options are described in comments for ImageOptim, Worker and all workers):
+
+    io = ImageOptim.new
+
+    io = ImageOptim.new(:pngout => false)
+
+    io = ImageOptim.new(:nice => 20)
+
+Optimize image getting temp path:
+
+    io.optimize_image('a.png')
+
+Optimize image in place:
+
+    io.optimize_image('b.jpg')
+
+Multiple images:
+
+    io.optimize_images(Dir['*.png']) do |unoptimized, optimized|
+      if optimized
+        puts "#{unoptimized} => #{optimized}"
+      end
+    end
+
+    io.optimize_images!(Dir['*.*'])
+
 ## Copyright
 
 Copyright (c) 2012 Ivan Kuchin. See LICENSE.txt for details.

data/TODO

@@ -1,3 +1 @@
-allow setting nice level?
 timeout workers?
-cyclic run until got maximum optimization?

data/bin/image_optim

@@ -20,6 +20,10 @@ Usege:
     options[:threads] = threads
   end
 
+  op.on('--[no-]nice NUMBER', Integer, 'Nice levle (defaults to 10)') do |nice|
+    options[:nice] = nice
+  end
+
   ImageOptim::Worker.klasses.each do |klass|
     bin = klass.underscored_name.to_sym
     op.on("--[no-]#{bin} PATH", "#{bin} path or disable") do |path|

data/image_optim.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'image_optim'
-  s.version     = '0.3.2'
+  s.version     = '0.4.0'
   s.summary     = %q{Optimize 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

@@ -27,7 +27,35 @@ class ImageOptim
   # or hash with options to worker and :bin specifying binary
   #
   #     ImageOptim.new(:advpng => {:level => 3}, :optipng => {:level => 2}, :jpegoptim => {:bin => 'jpegoptim345'})
+  #
+  # use :threads to set number of parallel optimizers to run (passing true or nil determines number of processors, false disables parallel processing)
+  #
+  #     ImageOptim.new(:threads => 8)
+  #
+  # use :nice to specify optimizers nice level (true or nil makes it 10, false makes it 0)
+  #
+  #     ImageOptim.new(:threads => 8)
   def initialize(options = {})
+    nice = case nice = options.delete(:nice)
+    when true, nil
+      10
+    when false
+      0
+    else
+      nice.to_i
+    end
+
+    threads = options.delete(:threads)
+    threads = case threads
+    when true, nil
+      Util.processor_count
+    when false
+      1
+    else
+      threads.to_i
+    end
+    @threads = limit_with_range(threads, 1..16)
+
     @workers_by_format = {}
     Worker.klasses.each do |klass|
       case worker_options = options.delete(klass.underscored_name.to_sym)
@@ -41,7 +69,7 @@ class ImageOptim
       else
         raise "Got #{worker_options.inspect} for #{klass.name} options"
       end
-      worker = klass.new(worker_options)
+      worker = klass.new({:nice => nice}.merge(worker_options))
       klass.image_formats.each do |format|
         @workers_by_format[format] ||= []
         @workers_by_format[format] << worker
@@ -51,17 +79,6 @@ class ImageOptim
       workers.replace workers.sort_by(&:run_priority)
     end
 
-    threads = options.delete(:threads)
-    threads = case threads
-    when true, nil
-      Util.processor_count
-    when false
-      1
-    else
-      threads.to_i
-    end
-    @threads = limit_with_range(threads, 1..16)
-
     assert_options_empty!(options)
   end
 

data/lib/image_optim/util.rb

@@ -2,15 +2,6 @@ require 'shellwords'
 
 class ImageOptim
   module Util
-    # Run command redirecting both stdout and stderr to /dev/null, raising signal if command was signaled and return successfulness
-    def self.run(*args)
-      res = system "#{args.map(&:to_s).shelljoin} &> /dev/null"
-      if $?.signaled?
-        raise SignalException.new($?.termsig)
-      end
-      res
-    end
-
     # http://stackoverflow.com/questions/891537/ruby-detect-number-of-cpus-installed
     def self.processor_count
       @processor_count ||= case host_os = RbConfig::CONFIG['host_os']

data/lib/image_optim/worker.rb

@@ -31,9 +31,13 @@ class ImageOptim
     # Binary name or path
     attr_reader :bin
 
+    # Binary name or path
+    attr_reader :nice
+
     # 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 }
       parse_options(options)
       raise "`#{bin}` not found" if `which #{bin.to_s.shellescape}`.empty?
       assert_options_empty!(options)
@@ -43,20 +47,29 @@ class ImageOptim
     def run_first?
     end
 
-    # Optimize file, return new path or nil if optimization failed
+    # Priority in list of workers
+    def run_priority
+      run_first? ? 0 : 1
+    end
+
+    # Optimize file from src to dst, return boolean representing success status
     def optimize(src, dst)
-      Util.run(bin, *command_args(src, dst)) && dst.size? && dst.size < src.size
+      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)
+      end
+      Process.wait pid
+      if $?.signaled?
+        raise SignalException.new($?.termsig)
+      end
+      $?.success? && dst.size? && dst.size < src.size
     end
 
     # Name of binary determined from class name
     def default_bin
       self.class.underscored_name
     end
-
-  private
-
-    def run_priority
-      run_first? ? 0 : 1
-    end
   end
 end

data/spec/image_optim_spec.rb

@@ -13,7 +13,7 @@ def temp_copy_path(original)
   end
 end
 
-Tempfile.class_eval do
+class Tempfile
   alias_method :initialize_orig, :initialize
 
   def initialize(*args, &block)
@@ -141,14 +141,14 @@ describe ImageOptim do
       describe "given block" do
         it "should optimize images, yield path and result for each and return array of yield results" do
           io = ImageOptim.new
+          results = []
           srcs.each do |src|
-            io.should_receive(single_method).with(src).and_return("#{src}_")
+            dst = "#{src}_"
+            io.should_receive(single_method).with(src).and_return(dst)
+            results << "#{src} #{dst}"
           end
-          results = []
           io.send(list_method, srcs) do |src, dst|
-            result = "#{src} #{dst}"
-            results << "#{src} #{dst}"
-            result
+            "#{src} #{dst}"
           end.should == results
         end
       end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: image_optim
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 15
   prerelease: 
   segments: 
   - 0
-  - 3
-  - 2
-  version: 0.3.2
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Ivan Kuchin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-12 00:00:00 Z
+date: 2012-01-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: fspath