Merge branch 'toy-master'

Conflicts:
	lib/image_optim.rb
	lib/image_optim/worker.rb

bin/image_optim

@@ -17,6 +17,12 @@ Usege:
 
   TEXT
 
+  op.on('-r', '-R', '--recursive', 'Recurively scan directories for images') do |recursive|
+    options[:recursive] = recursive
+  end
+
+  op.separator nil
+
   op.on('--[no-]threads NUMBER', Integer, 'Number of threads or disable (defaults to number of processors)') do |threads|
     options[:threads] = threads
   end
@@ -25,16 +31,16 @@ Usege:
     options[:nice] = nice
   end
 
+  op.separator nil
+
   ImageOptim::Worker.klasses.each do |klass|
     bin = klass.underscored_name.to_sym
     op.on("--no-#{bin}", "disable #{bin} worker") do |enable|
       options[bin] = enable
     end
   end
 
-  op.on('-r', '-R', '--recursive', 'Scan directories') do |recursive|
-    options[:recursive] = recursive
-  end
+  op.separator nil
 
   op.on('-v', '--verbose', 'Verbose info') do |verbose|
     options[:verbose] = verbose

image_optim.gemspec

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

lib/image_optim.rb

@@ -1,11 +1,11 @@
 require 'in_threads'
 require 'shellwords'
 
-class ImageOptim
-  autoload :ImagePath, 'image_optim/image_path'
-  autoload :OptionHelpers, 'image_optim/option_helpers'
-  autoload :Worker, 'image_optim/worker'
+require 'image_optim/image_path'
+require 'image_optim/option_helpers'
+require 'image_optim/worker'
 
+class ImageOptim
   class ConfigurationError < StandardError; end
   class BinNotFoundError < StandardError; end
 
@@ -175,9 +175,9 @@ def resolve_bin!(bin)
           symlink.make_symlink(File.expand_path(path))
           at_exit{ symlink.unlink }
 
-          @resolved_bins[bin] = system(*%W[which #{symlink}])
+          @resolved_bins[bin] = bin_accessible?(symlink)
         else
-          @resolved_bins[bin] = system(*%W[which #{bin}])
+          @resolved_bins[bin] = bin_accessible?(bin)
         end
       end
     end
@@ -208,6 +208,11 @@ def apply_threading(array)
     end
   end
 
+  # Check if bin can be accessed
+  def bin_accessible?(bin)
+    `which #{bin.to_s.shellescape}` != ''
+  end
+
   # http://stackoverflow.com/questions/891537/ruby-detect-number-of-cpus-installed
   def processor_count
     @processor_count ||= case host_os = RbConfig::CONFIG['host_os']

lib/image_optim/image_path.rb

@@ -1,6 +1,8 @@
 require 'fspath'
 require 'image_size'
 
+require 'image_optim'
+
 class ImageOptim
   class ImagePath < FSPath
     # Get temp path for this file with same extension

lib/image_optim/option_helpers.rb

@@ -1,3 +1,5 @@
+require 'image_optim'
+
 class ImageOptim
   module OptionHelpers
     # Remove option from hash and run through block or return default

lib/image_optim/worker.rb

@@ -1,6 +1,7 @@
 # encoding: UTF-8
 
 require 'shellwords'
+
 require 'image_optim'
 
 class ImageOptim
@@ -59,15 +60,10 @@ def execute(bin, *arguments)
       resolve_bin!(bin)
 
       command = [bin, *arguments].map(&:to_s).shelljoin
+      env_path = "#{@image_optim.resolve_dir}:#{ENV['PATH']}"
       start = Time.now
 
-      Process.wait(fork do
-        ENV['PATH'] = "#{@image_optim.resolve_dir}:#{ENV['PATH']}"
-        $stdout.reopen('/dev/null')
-        $stderr.reopen('/dev/null')
-        Process.setpriority(Process::PRIO_PROCESS, 0, @image_optim.nice)
-        exec command
-      end)
+      system "env PATH=#{env_path.shellescape} nice -n #{@image_optim.nice} #{command} >& /dev/null"
 
       raise SignalException.new($?.termsig) if $?.signaled?
 

spec/image_optim_spec.rb

@@ -196,7 +196,7 @@ def with_env(key, value)
     it "should resolve bin in path" do
       with_env 'LS_BIN', nil do
         image_optim = ImageOptim.new
-        image_optim.should_receive(:system).with(*%w[which -s ls]).once.and_return(true)
+        image_optim.should_receive(:bin_accessible?).with(:ls).once.and_return(true)
         FSPath.should_not_receive(:temp_dir)
 
         5.times do
@@ -212,7 +212,7 @@ def with_env(key, value)
         symlink = stub(:symlink)
 
         image_optim = ImageOptim.new
-        image_optim.should_receive(:system).with(*%W[which -s #{symlink}]).once.and_return(true)
+        image_optim.should_receive(:bin_accessible?).with(symlink).once.and_return(true)
         FSPath.should_receive(:temp_dir).once.and_return(tmpdir)
         tmpdir.should_receive(:/).with(:image_optim).once.and_return(symlink)
         symlink.should_receive(:make_symlink).with(File.expand_path(path)).once
@@ -235,7 +235,7 @@ def with_env(key, value)
     it "should raise on failure to resolve bin" do
       with_env 'SHOULD_NOT_EXIST_BIN', nil do
         image_optim = ImageOptim.new
-        image_optim.should_receive(:system).with(*%w[which -s should_not_exist]).once.and_return(false)
+        image_optim.should_receive(:bin_accessible?).with(:should_not_exist).once.and_return(false)
         FSPath.should_not_receive(:temp_dir)
 
         5.times do
@@ -253,7 +253,7 @@ def with_env(key, value)
         symlink = stub(:symlink)
 
         image_optim = ImageOptim.new
-        image_optim.should_receive(:system).with(*%W[which -s #{symlink}]).once.and_return(false)
+        image_optim.should_receive(:bin_accessible?).with(symlink).once.and_return(false)
         FSPath.should_receive(:temp_dir).once.and_return(tmpdir)
         tmpdir.should_receive(:/).with(:should_not_exist).once.and_return(symlink)
         symlink.should_receive(:make_symlink).with(File.expand_path(path)).once