jpegtran 0.1.1 → 0.1.2

data/CHANGES.txt

@@ -0,0 +1,10 @@
+
+0.1.2 (2011-07-30)
+* executing directly by 'command-builder'
+* switch to more modern 'hash-utils'
+
+0.1.1 (2011-02-30)
+* some subminor issues
+
+0.1.0 (2011-05-28) 
+* initial version

data/Gemfile

@@ -1,15 +1,14 @@
 source "http://rubygems.org"
 # Add dependencies required to use your gem here.
 # Example:
-   gem "hash-utils", ">= 0.15.0"
-   gem "pipe-run", ">= 0.2.1"
-   gem "command-builder", ">= 0.1.0"
+   gem "hash-utils", ">= 0.18.0"
+   gem "command-builder", ">= 0.2.0"
    gem "unix-whereis", ">= 0.1.0"
    gem "lookup-hash", ">= 0.2.0"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.5.2"
+  gem "bundler", ">= 1.0.0"
+  gem "jeweler", ">= 1.5.2"
 end

data/Gemfile.lock

@@ -1,18 +1,19 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    command-builder (0.1.0)
-      hash-utils (>= 0.7.0)
+    command-builder (0.2.0)
+      hash-utils (>= 0.18.0)
+      pipe-run (>= 0.2.1)
     git (1.2.5)
-    hash-utils (0.15.0)
-    jeweler (1.5.2)
-      bundler (~> 1.0.0)
+    hash-utils (0.18.0)
+    jeweler (1.6.4)
+      bundler (~> 1.0)
       git (>= 1.2.5)
       rake
     lookup-hash (0.2.0)
       hash-utils (>= 0.11.0)
     pipe-run (0.2.1)
-    rake (0.9.0)
+    rake (0.9.2)
     unix-whereis (0.1.0)
       command-builder (>= 0.1.0)
       hash-utils (>= 0.9.0)
@@ -22,10 +23,9 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.0.0)
-  command-builder (>= 0.1.0)
-  hash-utils (>= 0.15.0)
-  jeweler (~> 1.5.2)
+  bundler (>= 1.0.0)
+  command-builder (>= 0.2.0)
+  hash-utils (>= 0.18.0)
+  jeweler (>= 1.5.2)
   lookup-hash (>= 0.2.0)
-  pipe-run (>= 0.2.1)
   unix-whereis (>= 0.1.0)

data/Rakefile

@@ -1,6 +1,8 @@
 # encoding: utf-8
+
 require 'rubygems'
 require 'bundler'
+
 begin
   Bundler.setup(:default, :development)
 rescue Bundler::BundlerError => e
@@ -8,9 +10,10 @@ rescue Bundler::BundlerError => e
   $stderr.puts "Run `bundle install` to install missing gems"
   exit e.status_code
 end
-require 'rake'
 
+require 'rake'
 require 'jeweler'
+
 Jeweler::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
   gem.name = "jpegtran"
@@ -25,13 +28,3 @@ Jeweler::Tasks.new do |gem|
   #  gem.add_development_dependency 'rspec', '> 1.2.3'
 end
 Jeweler::RubygemsDotOrgTasks.new
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "qrpc #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/jpegtran.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{jpegtran}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   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-05-29}
+  s.date = %q{2011-07-30}
   s.email = %q{martinkozak@martinkozak.net}
   s.extra_rdoc_files = [
     "LICENSE.txt",
@@ -17,6 +17,7 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".document",
+    "CHANGES.txt",
     "Gemfile",
     "Gemfile.lock",
     "LICENSE.txt",
@@ -31,37 +32,34 @@ Gem::Specification.new do |s|
   s.homepage = %q{https://github.com/martinkozak/jpegtran}
   s.licenses = [%q{MIT}]
   s.require_paths = [%q{lib}]
-  s.rubygems_version = %q{1.8.4}
+  s.rubygems_version = %q{1.8.5}
   s.summary = %q{Ruby interface to 'jpegtran' 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<hash-utils>, [">= 0.15.0"])
-      s.add_runtime_dependency(%q<pipe-run>, [">= 0.2.1"])
-      s.add_runtime_dependency(%q<command-builder>, [">= 0.1.0"])
+      s.add_runtime_dependency(%q<hash-utils>, [">= 0.18.0"])
+      s.add_runtime_dependency(%q<command-builder>, [">= 0.2.0"])
       s.add_runtime_dependency(%q<unix-whereis>, [">= 0.1.0"])
       s.add_runtime_dependency(%q<lookup-hash>, [">= 0.2.0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
+      s.add_development_dependency(%q<jeweler>, [">= 1.5.2"])
     else
-      s.add_dependency(%q<hash-utils>, [">= 0.15.0"])
-      s.add_dependency(%q<pipe-run>, [">= 0.2.1"])
-      s.add_dependency(%q<command-builder>, [">= 0.1.0"])
+      s.add_dependency(%q<hash-utils>, [">= 0.18.0"])
+      s.add_dependency(%q<command-builder>, [">= 0.2.0"])
       s.add_dependency(%q<unix-whereis>, [">= 0.1.0"])
       s.add_dependency(%q<lookup-hash>, [">= 0.2.0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_dependency(%q<bundler>, [">= 1.0.0"])
+      s.add_dependency(%q<jeweler>, [">= 1.5.2"])
     end
   else
-    s.add_dependency(%q<hash-utils>, [">= 0.15.0"])
-    s.add_dependency(%q<pipe-run>, [">= 0.2.1"])
-    s.add_dependency(%q<command-builder>, [">= 0.1.0"])
+    s.add_dependency(%q<hash-utils>, [">= 0.18.0"])
+    s.add_dependency(%q<command-builder>, [">= 0.2.0"])
     s.add_dependency(%q<unix-whereis>, [">= 0.1.0"])
     s.add_dependency(%q<lookup-hash>, [">= 0.2.0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+    s.add_dependency(%q<bundler>, [">= 1.0.0"])
+    s.add_dependency(%q<jeweler>, [">= 1.5.2"])
   end
 end
 

data/lib/jpegtran.rb

@@ -1,11 +1,10 @@
 # encoding: utf-8
 # (c) 2011 Martin Kozák (martinkozak@martinkozak.net)
 
-require "command-builder"
-require "pipe-run"
+require "command-builder"     # >= 0.2.0
 require "unix/whereis"
 require "lookup-hash"
-require "hash-utils/object"   # >= 0.15.0
+require "hash-utils/object"   # >= 0.18.0
 
 ##
 # The +jpegtran+ tool command frontend.
@@ -90,7 +89,7 @@ module Jpegtran
         
         # Turn on/off arguments
         options.each_pair do |k, v|
-            if v.true? and self::BOOLEAN_ARGS.has_key? k
+            if v.true? and k.in? self::BOOLEAN_ARGS
                 cmd << k
             end
         end
@@ -98,35 +97,35 @@ module Jpegtran
         # Rotate
         if options[:rotate].kind_of? Integer
             cmd.arg(:rotate, options[:rotate].to_i)
-        elsif options.has_key? :rotate
+        elsif :rotate.in? options
             raise Exception::new("Invalid value for :rotate option. Integer expected.")
         end
         
         # Rotate
         if options[:restart].kind_of? Integer
             cmd.arg(:restart, options[:restart].to_i)
-        elsif options.has_key? :restart
+        elsif :restart.in? options
             raise Exception::new("Invalid value for :restart option. Integer expected.")
         end
         
         # Crop
-        if options[:crop].kind_of? String
+        if options[:crop].string?
             cmd.arg(:crop, options[:crop].to_s)
-        elsif options.has_key? :crop
+        elsif :crop.in? options
             raise Exception::new("Invalid value for :crop option. Structured string expected. See 'jpegtran' reference.")
         end
         
         # Scans
-        if options[:scans].kind_of? String
+        if options[:scans].string?
             cmd.arg(:scans, options[:scans].to_s)
-        elsif options.has_key? :scans
+        elsif :scans.in? options
             raise Exception::new("Invalid value for :scans option. String expected.")
         end
                 
         # Copy
-        if options.has_key? :copy 
+        if :copy.in? options 
             value = options[:copy].to_sym
-            if self::COPY_OPTIONS.has_key? value
+            if vlaue.in? self::COPY_OPTIONS
                 cmd.arg(:copy, value)
             else
                 raise Exception::new("Invalid value for :copy. Expected " << self::COPY_OPTIONS.to_s)
@@ -134,9 +133,9 @@ module Jpegtran
         end 
         
         # Flip
-        if options.has_key? :flip
+        if :flip.in? options
             value = options[:flip].to_sym
-            if self::FLIP_OPTIONS.has_key? value
+            if value.in? self::FLIP_OPTIONS
                 cmd.arg(:flip, value)
             else
                 raise Exception::new("Invalid value for :flip. Expected " << self::FLIP_OPTIONS.to_s)
@@ -144,8 +143,8 @@ module Jpegtran
         end
         
         # Outfile
-        if options.has_key? :outfile
-            if options[:outfile].kind_of? String
+        if :outfile.in? options
+            if options[:outfile].string?
                 value = options[:outfile].to_s
             else
                 raise Exception::new("Invalid value for :outfile option. String expected.")
@@ -163,22 +162,13 @@ module Jpegtran
             STDERR.write cmd.to_s + "\n"
         end
             
-        cmd = cmd.to_s
-        
         # Blocking
         if block.nil?
-            #output = Pipe.run(cmd)
-            Pipe.run(cmd)
+            cmd.execute!
 
-            # Parses output
-            #errors = __parse_output(output)
-            #return self::Result::new(errors)
-            
         # Non-blocking
         else
-            Pipe.run(cmd) do #|output|
-     #           errors = __parse_output(output)
-     #           block.call(self::Result::new(errors))
+            cmd.execute do |output|
                 block.call()
             end
         end

metadata

@@ -2,7 +2,7 @@
 name: jpegtran
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - "Martin Koz\xC3\xA1k"
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-29 00:00:00 Z
+date: 2011-07-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: hash-utils
@@ -19,23 +19,23 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.15.0
+        version: 0.18.0
   type: :runtime
   prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: pipe-run
+  name: command-builder
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.2.1
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: command-builder
+  name: unix-whereis
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -46,49 +46,38 @@ dependencies:
   prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: unix-whereis
+  name: lookup-hash
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.1.0
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: lookup-hash
+  name: bundler
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: bundler
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
       - !ruby/object:Gem::Version 
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *id006
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *id007
+  version_requirements: *id006
 description: 
 email: martinkozak@martinkozak.net
 executables: []
@@ -100,6 +89,7 @@ extra_rdoc_files:
 - README.md
 files: 
 - .document
+- CHANGES.txt
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -123,7 +113,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1256859169856077807
+      hash: 4556189913197607796
       segments: 
       - 0
       version: "0"
@@ -136,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.4
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Ruby interface to 'jpegtran' tool.