jpegoptim 0.1.0 → 0.2.0

data/Gemfile

@@ -3,7 +3,7 @@ source "http://rubygems.org"
 # Example:
 #   gem "depq", ">= 0.4"
 #   gem "hash-utils", ">= 0.9.0"
-   gem "pipe-run", ">= 0.1.0"
+   gem "pipe-run", ">= 0.2.0"
    gem "command-builder", ">= 0.1.0"
    gem "unix-whereis", ">= 0.1.0"
 

data/Gemfile.lock

@@ -9,7 +9,7 @@ GEM
       bundler (~> 1.0.0)
       git (>= 1.2.5)
       rake
-    pipe-run (0.1.0)
+    pipe-run (0.2.0)
     rake (0.8.7)
     unix-whereis (0.1.0)
       command-builder (>= 0.1.0)
@@ -23,5 +23,5 @@ DEPENDENCIES
   bundler (~> 1.0.0)
   command-builder (>= 0.1.0)
   jeweler (~> 1.5.2)
-  pipe-run (>= 0.1.0)
+  pipe-run (>= 0.2.0)
   unix-whereis (>= 0.1.0)

data/README.md

@@ -1,7 +1,7 @@
 Jpegoptim
 =========
 
-**Jpegoptim** provides Ruby interface to the `jpegoptim` tool. 
+**Jpegoptim** provides Ruby interface to the [`jpegoptim`][1] tool. 
 Some examples follow: (for details, see module documentation)
 
     require "jpegoptim"
@@ -10,10 +10,13 @@ Some examples follow: (for details, see module documentation)
     
     Jpegoptim.optimize(["foo.jpg", "empty.jpg", "nonexist.jpg"], { :preserve => true, :strip => :all })
     
-    # will run 'jpegoptim --strip-all --preserve foo.jpg bar.jpgug empty.jpg'
+    # will run 'jpegoptim --strip-all --preserve foo.jpg bar.jpg empty.jpg'
     # and then will return for example: 
     #   '#<struct Jpegoptim::Result succeed={"foo.jpg => -22.1}}, errors=[["empty.jpg", "ERROR"]]>
     
+It can be also run asynchronously by non-blocking way (with [`eventmachine`][4]) 
+simply by giving block with one argument to `#optimize`. See documentation. 
+    
 ### Call Result
 
 Result contains members `:success` and `:errors`. Sucess member contains 
@@ -57,5 +60,7 @@ Copyright
 Copyright &copy; 2011 [Martin Kozák][3]. See `LICENSE.txt` for
 further details.
 
+[1]: http://www.kokkonen.net/tjko/projects.html
 [2]: http://github.com/martinkozak/qrpc/issues
 [3]: http://www.martinkozak.net/
+[4]: http://rubyeventmachine.com/

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/lib/jpegoptim.rb

@@ -7,7 +7,7 @@ require "unix/whereis"
 
 ##
 # The +jpegoptim+ tool command frontend.
-# @see
+# @see http://www.kokkonen.net/tjko/projects.html
 #
 
 module Jpegoptim
@@ -67,8 +67,12 @@ module Jpegoptim
     # responsible for optimizing files on the right place. Use Ruby 
     # methods for it.
     #
+    # If block is given, runs +jpegoptim+ asynchronously. In that case, 
+    # +em-pipe-run+ file must be already required.
+    #
     # @param [String, Array] paths file path or array of paths for optimizing
     # @param [Hash] options options 
+    # @param [Proc] block block for giving back the results
     # @option options [Boolean, Symbol] :strip says what informations strip, see +jpegoptim+ documentation, default is +:all+
     # @option options [Boolean] :preserve turns on preserving the timestamps
     # @option options [Integer] :max set maximum image quality factor
@@ -76,7 +80,7 @@ module Jpegoptim
     # @return [Struct] see {Result}
     #
     
-    def self.optimize(paths, options = { })
+    def self.optimize(paths, options = { }, &block)
     
         # Command
         cmd = CommandBuilder::new(self::COMMAND)
@@ -111,13 +115,24 @@ module Jpegoptim
         if options[:debug] == true
             STDERR.write cmd.to_s + "\n"
         end
-        
-        output = Pipe.run(cmd.to_s)
-        
-        # Parses output
-        succeed, errors = __parse_output(output)
-        return self::Result::new(succeed, errors)
-        
+            
+            cmd = cmd.to_s
+            
+            # Blocking
+            if block.nil?
+                output = Pipe.run(cmd)
+
+                # Parses output
+                succeed, errors = __parse_output(output)
+                return self::Result::new(succeed, errors)
+                
+            # Non-blocking
+            else
+                Pipe.run(cmd) do |output|
+                    succeed, errors = __parse_output(output)
+                    block.call(self::Result::new(succeed, errors))
+                end
+            end
     end
     
     

data/test

@@ -3,6 +3,13 @@
 
 $:.push("./lib")
 require "jpegoptim"
+require "em-pipe-run"
 
-puts Jpegoptim.available?.inspect
-puts Jpegoptim.optimize(["foo.jpg", "bar.jpg", "empty.jpg"], { :preserve => true, :strip => :all, :debug => true })
+EM::run do
+    puts Jpegoptim.available?.inspect
+    Jpegoptim.optimize(["x.jpg"], { :preserve => true, :strip => :all, :debug => true }) do |results|
+        puts results.inspect
+    end
+    
+    puts "something"
+end

metadata

@@ -2,7 +2,7 @@
 name: jpegoptim
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - "Martin Koz\xC3\xA1k"
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-21 00:00:00 +01:00
+date: 2011-02-22 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.1.0
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: *id001
@@ -85,7 +85,6 @@ files:
 - README.md
 - Rakefile
 - VERSION
-- jpegoptim.gemspec
 - lib/jpegoptim.rb
 - test
 has_rdoc: true
@@ -102,7 +101,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -392424592510368295
+      hash: -56402776733951615
       segments: 
       - 0
       version: "0"

data/jpegoptim.gemspec

@@ -1,60 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{jpegoptim}
-  s.version = "0.1.0"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Martin Kozák"]
-  s.date = %q{2011-02-21}
-  s.email = %q{martinkozak@martinkozak.net}
-  s.extra_rdoc_files = [
-    "LICENSE.txt",
-    "README.md"
-  ]
-  s.files = [
-    ".document",
-    "Gemfile",
-    "Gemfile.lock",
-    "LICENSE.txt",
-    "README.md",
-    "Rakefile",
-    "VERSION",
-    "jpegoptim.gemspec",
-    "lib/jpegoptim.rb",
-    "test"
-  ]
-  s.homepage = %q{https://github.com/martinkozak/jpegoptim}
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.5.2}
-  s.summary = %q{Ruby interface to 'jpegoptim' tool.}
-
-  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<pipe-run>, [">= 0.1.0"])
-      s.add_runtime_dependency(%q<command-builder>, [">= 0.1.0"])
-      s.add_runtime_dependency(%q<unix-whereis>, [">= 0.1.0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
-    else
-      s.add_dependency(%q<pipe-run>, [">= 0.1.0"])
-      s.add_dependency(%q<command-builder>, [">= 0.1.0"])
-      s.add_dependency(%q<unix-whereis>, [">= 0.1.0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
-    end
-  else
-    s.add_dependency(%q<pipe-run>, [">= 0.1.0"])
-    s.add_dependency(%q<command-builder>, [">= 0.1.0"])
-    s.add_dependency(%q<unix-whereis>, [">= 0.1.0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
-  end
-end
-