image-optimizer 0.2.1 → 0.2.2

data/Gemfile

@@ -8,6 +8,7 @@ source "http://rubygems.org"
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "bundler", ">= 1.0.14"
-  gem "jeweler2", ">= 2.0.0"
+  gem "bundler"
+  gem "jeweler"
+  gem "rake"
 end

data/Gemfile.lock

@@ -4,15 +4,22 @@ GEM
     abstract (1.0.0)
     facade (1.0.5)
     git (1.2.5)
-    hash-utils (2.0.0)
-      ruby-version
-    jeweler2 (2.0.9)
+    hash-utils (2.0.2)
+      ruby-version (>= 0.4.0)
+    jeweler (1.8.4)
+      bundler (~> 1.0)
       git (>= 1.2.5)
+      rake
+      rdoc
+    json (1.7.5)
     multitype-introspection (0.2.0)
       hash-utils (>= 0.16.0)
     pathname2 (1.6.5)
       facade
-    ruby-version (0.3.1)
+    rake (0.9.2.2)
+    rdoc (3.12)
+      json (~> 1.4)
+    ruby-version (0.4.2)
     types (0.1.3)
       abstract (>= 1.0.0)
       multitype-introspection (>= 0.1.0)
@@ -26,8 +33,9 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (>= 1.0.14)
+  bundler
   hash-utils (>= 2.0.0)
-  jeweler2 (>= 2.0.0)
+  jeweler
+  rake
   which
   yaop (>= 0.2.0)

data/Rakefile

@@ -12,7 +12,7 @@ rescue Bundler::BundlerError => e
 end
 
 require 'rake'
-require 'jeweler2'
+require 'jeweler'
 
 Jeweler::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/bin/image-optimizer

@@ -20,7 +20,7 @@ if opts.arguments["--help"]
     puts "\t--verbose   be verbose"
     exit
 elsif opts.arguments["--version"]
-    puts "image-optimizer 0.2.0"
+    puts "image-optimizer 0.2.2"
     puts "Copyright (C) 2011-2012 Martin Kozák (martinkozak@martinkozak.net)"
     puts
     puts "Optimizes given JPEG and PNG images or all images in given folders."
@@ -68,4 +68,4 @@ if verbose
     delta = total - total_new
     ratio = (delta / total.to_f) * 100
     puts "In total: " + delta.to_s + " B (" + ratio.round.to_s + " %)"
-end
+end

data/image-optimizer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "image-optimizer"
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Martin Koz\u{e1}k"]
-  s.date = "2012-08-06"
+  s.date = "2012-10-11"
   s.email = "martinkozak@martinkozak.net"
   s.executables = ["image-optimizer"]
   s.extra_rdoc_files = [
@@ -44,21 +44,24 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<yaop>, [">= 0.2.0"])
       s.add_runtime_dependency(%q<which>, [">= 0"])
       s.add_runtime_dependency(%q<hash-utils>, [">= 2.0.0"])
-      s.add_development_dependency(%q<bundler>, [">= 1.0.14"])
-      s.add_development_dependency(%q<jeweler2>, [">= 2.0.0"])
+      s.add_development_dependency(%q<bundler>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
+      s.add_development_dependency(%q<rake>, [">= 0"])
     else
       s.add_dependency(%q<yaop>, [">= 0.2.0"])
       s.add_dependency(%q<which>, [">= 0"])
       s.add_dependency(%q<hash-utils>, [">= 2.0.0"])
-      s.add_dependency(%q<bundler>, [">= 1.0.14"])
-      s.add_dependency(%q<jeweler2>, [">= 2.0.0"])
+      s.add_dependency(%q<bundler>, [">= 0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<rake>, [">= 0"])
     end
   else
     s.add_dependency(%q<yaop>, [">= 0.2.0"])
     s.add_dependency(%q<which>, [">= 0"])
     s.add_dependency(%q<hash-utils>, [">= 2.0.0"])
-    s.add_dependency(%q<bundler>, [">= 1.0.14"])
-    s.add_dependency(%q<jeweler2>, [">= 2.0.0"])
+    s.add_dependency(%q<bundler>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<rake>, [">= 0"])
   end
 end
 

data/lib/image-optimizer/png.rb

@@ -22,54 +22,72 @@ module ImageOptimizer
             block.call(path.dup, ImageOptimizer::BEFORE)
                       
             # New method (GIMP & XcfTools)
-            if ImageOptimizer.available? :gimp and ImageOptimizer.available? :xcf2png 
-                dirname = File.dirname(path)
-                basename = File.basename(path, '.png')
-                basepath = dirname + '/' + basename
-                png_path = basepath + '.png'
-                xcf_path = basepath + '.xcf'
-                protect = File.exists? xcf_path
+            if ImageOptimizer.available? :gimp and ImageOptimizer.available? :xcf2png and ImageOptimizer.available? :convert
                 
-                if protect
-                    protect = Dir.tmpdir + '/' + File.basename(xcf_path)
-                    FileUtils.mv(xcf_path, protect)
-                end
-              
-                # GIMP
-                block.call(:gimp, ImageOptimizer::METHOD)
-                gimp = File.read(File.dirname(__FILE__) + '/png.script')
-                gimp.gsub!(':path', png_path)
-                `#{gimp}`
+                Dir.mktmpdir do |tmpdir|
+                    original_size = File.size(path)                
+                    dirname = tmpdir
+                    basename = File.basename(path, '.png')
+                    basepath = dirname + '/' + basename 
+                    png_path = basepath + '.png'
+                    xcf_path = basepath + '.xcf'
+                    tif_path = basepath + '.tif'
+                    
+                    # ImageMagick
+                    block.call(:mogrify, ImageOptimizer::METHOD)
+                    `convert #{path_escaped} #{Shellwords::escape(tif_path)} 2> /dev/null`
+                  
+                    # GIMP
+                    block.call(:gimp, ImageOptimizer::METHOD)
+                    gimp = File.read(File.dirname(__FILE__) + '/png.script')
+                    gimp.gsub!(':path', tif_path)
+                    `#{gimp}`
 
-                # xcf2png
-                block.call(:xcf2png, ImageOptimizer::METHOD)
-                `xcf2png #{Shellwords::escape(xcf_path)} > #{Shellwords::escape(png_path)} 2> /dev/null`
-                FileUtils.rm(xcf_path)
-                
-                if protect
-                    FileUtils.mv(protect, xcf_path)
+                    # xcf2png
+                    block.call(:xcf2png, ImageOptimizer::METHOD)
+                    `xcf2png #{Shellwords::escape(xcf_path)} > #{Shellwords::escape(png_path)} 2> /dev/null`
+                    
+                    # General optimizers
+                    self.__general_optimizers(png_path, &block)
+
+                    # Copy back
+                    new_size = File.size(png_path)
+                    if new_size < original_size
+                        FileUtils.cp(png_path, path)
+                    end
+                    
                 end
-                         
+                
             # Old method (ImageMagick)
-            elsif ImageOptimizer.available? :convert
+            elsif ImageOptimizer.available? :mogrify
+            
+                # Mogrify
                 block.call(:convert, ImageOptimizer::METHOD)
-                `convert #{path_escaped} -quality 100 #{path_escaped} 2> /dev/null`
+                `mogrify #{path_escaped} -quality 100 2> /dev/null`
+            
+                # General optimizers
+                self.__general_optimizers(path, &block)
+                
             end
 
-            # General optimizers
+            # Calls back
+            block.call(path.dup, ImageOptimizer::AFTER)
+            
+        end
+        
+        private
+        
+        def self.__general_optimizers(path, &block)
+            path_escaped = Shellwords::escape(path)
+            
             if ImageOptimizer.available? :optipng
                 block.call(:optipng, ImageOptimizer::METHOD)
                 `optipng -o 7 #{path_escaped} 2> /dev/null`
             elsif ImageOptimizer.available? :pngcrush
                 block.call(:pngcrush, ImageOptimizer::METHOD)
                 `pngcrush -reduce -brute -ow #{path_escaped} 2> /dev/null`
-
-            end            
-          
-            # calls back
-            block.call(path.dup, ImageOptimizer::AFTER)
-            
+            end                 
         end
         
     end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: image-optimizer
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-06 00:00:00.000000000 Z
+date: 2012-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yaop
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.14
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,15 +74,15 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.14
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: jeweler2
+  name: jeweler
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,23 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: martinkozak@martinkozak.net
 executables:
@@ -128,7 +144,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4132611269577949455
+      hash: 735012564858542787
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: