image-optimizer 0.1.2 → 0.1.3

data/Gemfile

@@ -1,17 +1,17 @@
 source "http://rubygems.org"
 # Add dependencies required to use your gem here.
 # Example:
-   gem "yaop", ">= 0.1.0"
-   gem "jpegtran", ">= 0.1.0"
+   gem "yaop"
+   gem "jpegtran"
    gem "optipng", ">= 0.2.0"
    gem "jpegoptim", ">= 0.2.0"
-   gem "mini_magick", ">= 3.2.1"
-   gem "unix-whereis", ">= 0.1.0"
-   gem "options-hash", ">= 0.1.0"
+   gem "unix-whereis"
+   gem "options-hash"
+   gem "command-builder"
 
 # 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 "jeweler", "~> 1.6.0"
+  gem "bundler", ">= 1.0.14"
+  gem "jeweler2", ">= 2.0.0"
 end

data/Gemfile.lock

@@ -2,46 +2,37 @@ GEM
   remote: http://rubygems.org/
   specs:
     abstract (1.0.0)
-    command-builder (0.1.0)
-      hash-utils (>= 0.7.0)
+    command-builder (0.2.2)
+      hash-utils (>= 0.18.0)
+      pipe-run (>= 0.2.1)
     git (1.2.5)
-    hash-utils (0.15.0)
-    hashie (1.0.0)
-    jeweler (1.6.2)
-      bundler (~> 1.0)
+    hash-utils (1.1.0)
+      ruby-version
+    hashie (1.2.0)
+    jeweler2 (2.0.9)
       git (>= 1.2.5)
-      rake
-    jpegoptim (0.2.0)
-      command-builder (>= 0.1.0)
-      pipe-run (>= 0.2.0)
+    jpegoptim (0.2.1)
+      command-builder (>= 0.2.0)
       unix-whereis (>= 0.1.0)
-    jpegtran (0.1.1)
-      command-builder (>= 0.1.0)
-      hash-utils (>= 0.15.0)
-      lookup-hash (>= 0.2.0)
-      pipe-run (>= 0.2.1)
+    jpegtran (0.1.3)
+      command-builder (>= 0.2.0)
+      hash-utils (>= 0.18.0)
       unix-whereis (>= 0.1.0)
-    lookup-hash (0.2.0)
-      hash-utils (>= 0.11.0)
-    mini_magick (3.2.1)
-      subexec (~> 0.0.4)
-    multitype-introspection (0.1.2)
+    multitype-introspection (0.2.0)
+      hash-utils (>= 0.16.0)
     options-hash (0.1.0)
       hashie (>= 1.0.0)
-    optipng (0.2.0)
-      command-builder (>= 0.1.0)
-      pipe-run (>= 0.2.0)
+    optipng (0.2.1)
+      command-builder (>= 0.2.0)
       unix-whereis (>= 0.1.0)
-    pipe-run (0.2.1)
-    rake (0.9.1)
-    subexec (0.0.4)
+    pipe-run (0.3.0)
+    ruby-version (0.3.1)
     types (0.1.3)
       abstract (>= 1.0.0)
       multitype-introspection (>= 0.1.0)
-    unix-whereis (0.1.0)
-      command-builder (>= 0.1.0)
-      hash-utils (>= 0.9.0)
-      pipe-run (>= 0.1.0)
+    unix-whereis (0.1.1)
+      command-builder (>= 0.2.0)
+      hash-utils (>= 0.18.0)
     yaop (0.1.0)
       hash-utils (>= 0.1.0)
       types (>= 0.1.0)
@@ -50,12 +41,12 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.0.14)
-  jeweler (~> 1.6.0)
+  bundler (>= 1.0.14)
+  command-builder
+  jeweler2 (>= 2.0.0)
   jpegoptim (>= 0.2.0)
-  jpegtran (>= 0.1.0)
-  mini_magick (>= 3.2.1)
-  options-hash (>= 0.1.0)
+  jpegtran
+  options-hash
   optipng (>= 0.2.0)
-  unix-whereis (>= 0.1.0)
-  yaop (>= 0.1.0)
+  unix-whereis
+  yaop

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2011 Martin Kozák (martinkozak@martinkozak.net)
+Copyright (c) 2011 - 2012 Martin Kozák (martinkozak@martinkozak.net)
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -12,7 +12,7 @@ rescue Bundler::BundlerError => e
 end
 
 require 'rake'
-require 'jeweler'
+require 'jeweler2'
 
 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.1.2
+0.1.3

data/image-optimizer.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{image-optimizer}
-  s.version = "0.1.2"
+  s.name = "image-optimizer"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = [%q{Martin Kozák}]
-  s.date = %q{2011-06-01}
-  s.email = %q{martinkozak@martinkozak.net}
-  s.executables = [%q{image-optimizer}]
+  s.authors = ["Martin Koz\u{e1}k"]
+  s.date = "2012-01-22"
+  s.email = "martinkozak@martinkozak.net"
+  s.executables = ["image-optimizer"]
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.md"
@@ -28,46 +28,46 @@ Gem::Specification.new do |s|
     "image-optimizer.gemspec",
     "lib/image-optimizer.rb"
   ]
-  s.homepage = %q{http://github.com/martinkozak/image-optimizer}
-  s.licenses = [%q{MIT}]
-  s.require_paths = [%q{lib}]
-  s.rubygems_version = %q{1.8.5}
-  s.summary = %q{Optimizes given JPEG and PNG images or images in given folder.}
+  s.homepage = "http://github.com/martinkozak/image-optimizer"
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.15"
+  s.summary = "Optimizes given JPEG and PNG images or images in given folder."
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<yaop>, [">= 0.1.0"])
-      s.add_runtime_dependency(%q<jpegtran>, [">= 0.1.0"])
+      s.add_runtime_dependency(%q<yaop>, [">= 0"])
+      s.add_runtime_dependency(%q<jpegtran>, [">= 0"])
       s.add_runtime_dependency(%q<optipng>, [">= 0.2.0"])
       s.add_runtime_dependency(%q<jpegoptim>, [">= 0.2.0"])
-      s.add_runtime_dependency(%q<mini_magick>, [">= 3.2.1"])
-      s.add_runtime_dependency(%q<unix-whereis>, [">= 0.1.0"])
-      s.add_runtime_dependency(%q<options-hash>, [">= 0.1.0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.14"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.6.0"])
+      s.add_runtime_dependency(%q<unix-whereis>, [">= 0"])
+      s.add_runtime_dependency(%q<options-hash>, [">= 0"])
+      s.add_runtime_dependency(%q<command-builder>, [">= 0"])
+      s.add_development_dependency(%q<bundler>, [">= 1.0.14"])
+      s.add_development_dependency(%q<jeweler2>, [">= 2.0.0"])
     else
-      s.add_dependency(%q<yaop>, [">= 0.1.0"])
-      s.add_dependency(%q<jpegtran>, [">= 0.1.0"])
+      s.add_dependency(%q<yaop>, [">= 0"])
+      s.add_dependency(%q<jpegtran>, [">= 0"])
       s.add_dependency(%q<optipng>, [">= 0.2.0"])
       s.add_dependency(%q<jpegoptim>, [">= 0.2.0"])
-      s.add_dependency(%q<mini_magick>, [">= 3.2.1"])
-      s.add_dependency(%q<unix-whereis>, [">= 0.1.0"])
-      s.add_dependency(%q<options-hash>, [">= 0.1.0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.14"])
-      s.add_dependency(%q<jeweler>, ["~> 1.6.0"])
+      s.add_dependency(%q<unix-whereis>, [">= 0"])
+      s.add_dependency(%q<options-hash>, [">= 0"])
+      s.add_dependency(%q<command-builder>, [">= 0"])
+      s.add_dependency(%q<bundler>, [">= 1.0.14"])
+      s.add_dependency(%q<jeweler2>, [">= 2.0.0"])
     end
   else
-    s.add_dependency(%q<yaop>, [">= 0.1.0"])
-    s.add_dependency(%q<jpegtran>, [">= 0.1.0"])
+    s.add_dependency(%q<yaop>, [">= 0"])
+    s.add_dependency(%q<jpegtran>, [">= 0"])
     s.add_dependency(%q<optipng>, [">= 0.2.0"])
     s.add_dependency(%q<jpegoptim>, [">= 0.2.0"])
-    s.add_dependency(%q<mini_magick>, [">= 3.2.1"])
-    s.add_dependency(%q<unix-whereis>, [">= 0.1.0"])
-    s.add_dependency(%q<options-hash>, [">= 0.1.0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.14"])
-    s.add_dependency(%q<jeweler>, ["~> 1.6.0"])
+    s.add_dependency(%q<unix-whereis>, [">= 0"])
+    s.add_dependency(%q<options-hash>, [">= 0"])
+    s.add_dependency(%q<command-builder>, [">= 0"])
+    s.add_dependency(%q<bundler>, [">= 1.0.14"])
+    s.add_dependency(%q<jeweler2>, [">= 2.0.0"])
   end
 end
 

data/lib/image-optimizer.rb

@@ -84,12 +84,12 @@ module ImageOptimizer
                 block.call(path.dup)
                 
                 if Whereis.available? :convert
-                    begin
-                        image = MiniMagick::Image.open(path)
-                        image.write(path)
-                    rescue MiniMagick::Error
-                        # skips
-                    end
+                    cmd = CommandBuilder::new(:convert, ["-", " ", "-", " "])
+                    cmd << path
+                    cmd.arg(:quality, 100)
+                    cmd << path
+                    
+                    cmd.execute!
                 end
                 
                 if Optipng.available?

metadata

@@ -1,126 +1,124 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: image-optimizer
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.1.3
   prerelease: 
-  version: 0.1.2
 platform: ruby
-authors: 
-- "Martin Koz\xC3\xA1k"
+authors:
+- Martin Kozák
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-01 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-01-22 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: yaop
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &16022320 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.1.0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *16022320
+- !ruby/object:Gem::Dependency
   name: jpegtran
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &16020300 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.1.0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: *16020300
+- !ruby/object:Gem::Dependency
   name: optipng
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &16037180 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: *16037180
+- !ruby/object:Gem::Dependency
   name: jpegoptim
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &16035140 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: mini_magick
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *16035140
+- !ruby/object:Gem::Dependency
+  name: unix-whereis
+  requirement: &16033740 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 3.2.1
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: unix-whereis
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *16033740
+- !ruby/object:Gem::Dependency
+  name: options-hash
+  requirement: &16031340 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.1.0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: options-hash
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *16031340
+- !ruby/object:Gem::Dependency
+  name: command-builder
+  requirement: &16030640 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.1.0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
+  version_requirements: *16030640
+- !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &16647120 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.14
   type: :development
   prerelease: false
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: jeweler
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: *16647120
+- !ruby/object:Gem::Dependency
+  name: jeweler2
+  requirement: &16644900 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 1.6.0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.0
   type: :development
   prerelease: false
-  version_requirements: *id009
+  version_requirements: *16644900
 description: 
 email: martinkozak@martinkozak.net
-executables: 
+executables:
 - image-optimizer
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.md
-files: 
+files:
 - .document
 - Gemfile
 - Gemfile.lock
@@ -132,34 +130,31 @@ files:
 - image-optimizer.gemspec
 - lib/image-optimizer.rb
 homepage: http://github.com/martinkozak/image-optimizer
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: -2310788483444750640
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -2436871939392725205
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Optimizes given JPEG and PNG images or images in given folder.
 test_files: []
-