image_optim 0.5.0 → 0.5.1

data/bin/image_optim

@@ -55,7 +55,11 @@ end
 if ARGV.empty?
   abort "specify image paths to optimize\n\n#{option_parser.help}"
 else
-  io = ImageOptim.new(options)
+  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"
@@ -112,5 +116,7 @@ else
     end
   end
   lines, src_sizes, dst_sizes = results.transpose
-  $stdout.puts lines, "Total: #{size_percent(src_sizes.inject(:+), dst_sizes.inject(:+))}\n"
+  if lines
+    $stdout.puts lines, "Total: #{size_percent(src_sizes.inject(:+), dst_sizes.inject(:+))}\n"
+  end
 end

data/image_optim.gemspec

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

@@ -6,6 +6,9 @@ class ImageOptim
   autoload :Util, 'image_optim/util'
   autoload :Worker, 'image_optim/worker'
 
+  class ConfigurationError < StandardError; end
+  class BinaryNotFoundError < StandardError; end
+
   include OptionHelpers
 
   # Hash of initialized workers by format they apply to
@@ -69,7 +72,7 @@ class ImageOptim
       when String
         worker_options = {:bin => worker_options}
       else
-        raise "Got #{worker_options.inspect} for #{klass.name} options"
+        raise ConfigurationError, "Got #{worker_options.inspect} for #{klass.name} options"
       end
       worker = klass.new({:nice => nice, :verbose => verbose}.merge(worker_options))
       klass.image_formats.each do |format|

data/lib/image_optim/option_helpers.rb

@@ -26,7 +26,7 @@ class ImageOptim
     # Raise unless all options are deleted
     def assert_options_empty!(options)
       unless options.empty?
-        raise "unknown options #{options.inspect} for #{self}"
+        raise ConfigurationError, "unknown options #{options.inspect} for #{self}"
       end
     end
   end

data/lib/image_optim/worker.rb

@@ -45,7 +45,7 @@ class ImageOptim
       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?
+      raise BinaryNotFoundError, "`#{bin}` not found" if `which #{bin.to_s.shellescape}`.empty?
       assert_options_empty!(options)
     end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: image_optim
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 0
   - 5
-  - 0
-  version: 0.5.0
+  - 1
+  version: 0.5.1
 platform: ruby
 authors: 
 - Ivan Kuchin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-05 00:00:00 Z
+date: 2012-08-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: fspath