optipng-r 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 075430feb1a375aef9a41faec7e6e129946541d4
-  data.tar.gz: 74ae39ce1e97b63b1be4c91f82d2790bd8b9e485
+  metadata.gz: fe66587475756541e77b98e04cece132a115c43a
+  data.tar.gz: def6fb1397bd895f93c6bbc220d1bf8437aef8cc
 SHA512:
-  metadata.gz: c597c0c6046cd3e574ee0edd956cbbb6eaec983cf0b2a997678283d624e582e204a3e0bd5995ad764ec69cc2ca32db174fafdedf077e8e11e5d4d0f7140a5ed8
-  data.tar.gz: bf7cb46d53f543f0eac36d1dce08511e981b7648f4224b40b6094c438f6d08c50908de0a7623b74c90070ff36bcaeef012c1d7fcf90a8f018defffbc01a7e2f1
+  metadata.gz: 36c122227f4755108a73472f0d51bf2b9776ce5e8a62ae535a90afe771f7d62431ee3c9b1c6504802f47e126a611646ef1ec4b11a2773cc1c520192ac605d69c
+  data.tar.gz: 84ec24493accd2bcc10e99f5c95f89e11beb51df090c6adcc0d743a30daefee76ef3324560a3afdd9a3da090260d727f0afdb92a2a591e12c6d8723cf5d00aed

data/Gemfile

@@ -1,11 +1,11 @@
-source "http://rubygems.org"
+source 'http://rubygems.org'
 # Add dependencies required to use your gem here.
 # Example:
-   gem "command-builder", ">= 0.2.0"
+   gem 'command-builder', '>= 0.3.2'
 
 # 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,16 +1,14 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    command-builder (0.2.0)
-      hash-utils (>= 0.18.0)
+    command-builder (0.3.2)
       pipe-run (>= 0.2.1)
     git (1.2.5)
-    hash-utils (0.18.0)
     jeweler (1.6.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    pipe-run (0.2.1)
+    pipe-run (0.3.0)
     rake (0.9.2)
 
 PLATFORMS
@@ -18,5 +16,5 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (>= 1.0.0)
-  command-builder (>= 0.2.0)
+  command-builder (>= 0.3.2)
   jeweler (>= 1.5.2)

data/Rakefile

@@ -15,15 +15,11 @@ 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 = "optipng-i"
-  gem.homepage = "https://github.com/Artie18/optipng"
-  gem.license = "MIT"
+  gem.name = 'optipng-r'
+  gem.homepage = 'https://github.com/Artie18/optipng'
+  gem.license = 'MIT'
   gem.summary = "Ruby interface to 'optipng' tool."
-  gem.email = "artyomfedenko@hotmail.com"
-  gem.authors = ["Artyom Fedenko"]
-  # Include your dependencies below. Runtime dependencies are required when using your gem,
-  # and development dependencies are only needed for development (ie running rake tasks, tests, etc)
-  #  gem.add_runtime_dependency 'jabber4r', '> 0.1'
-  #  gem.add_development_dependency 'rspec', '> 1.2.3'
+  gem.email = 'artyomfedenko@hotmail.com'
+  gem.authors = ['Artyom Fedenko']
 end
 Jeweler::RubygemsDotOrgTasks.new

data/lib/optipng.rb

@@ -12,127 +12,132 @@ require 'mkmf'
 
 module Optipng
 
-    ##
-    # Holds +optipng+ command.
-    #
-
-    COMMAND = :optipng
-
-    ##
-    # Result structure.
-    #
-
-    Result = Struct::new(:succeed, :errors)
-
-    ##
-    # Holds output matchers.
-    #
-
-    MATCHERS = [
-        /^Processing\:\s*(.*)/,
-        /^Error:\s*(.*)/,
-        /(\d+\.\d+)%/,
-        /already optimized\.$/,
-    ]
-
-    ##
-    # Checks if +jpegoptim+ is available.
-    # @return [Boolean] +true+ if it is, +false+ in otherwise
-    #
-
-    def self.available?
-      find_executable(self::COMMAND.to_s).nil? ? false : true
+  ##
+  # Holds +optipng+ command.
+  #
+
+  COMMAND = :optipng
+
+  ##
+  # Result structure.
+  #
+
+  Result = Struct::new(:succeed, :errors)
+
+  ##
+  # Holds output matchers.
+  #
+
+  MATCHERS = [
+    /^Processing\:\s*(.*)/,
+    /^Error:\s*(.*)/,
+    /(\d+\.\d+)%/,
+    /already optimized\.$/,
+  ]
+
+  ##
+  # Checks if +jpegoptim+ is available.
+  # @return [Boolean] +true+ if it is, +false+ in otherwise
+  #
+
+  def self.available?
+    find_executable(self::COMMAND.to_s).nil? ? false : true
+  end
+
+  ##
+  # Performs optimizations above file or set of files.
+  #
+  # If block is given, runs +optipng+ 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 [Integer] :level optimization level (0-7)
+  # @option options [Boolean] :debug turn on debugging mode, so command will be put out to the +STDERR+
+  # @return [Struct] see {Result}
+  #
+
+  def self.optimize(paths, options = {}, &block)
+
+    # Check if optipng available
+    unless options[:is_available] && self.available?
+      throw Exception.new('Optipng is not installed')
     end
 
-    ##
-    # Performs optimizations above file or set of files.
-    #
-    # If block is given, runs +optipng+ 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 [Integer] :level optimization level (0-7)
-    # @option options [Boolean] :debug turn on debugging mode, so command will be put out to the +STDERR+
-    # @return [Struct] see {Result}
-    #
-
-    def self.optimize(paths, options = { }, &block)
-
-        # Command
-        cmd = CommandBuilder::new(self::COMMAND)
-
-        # Max
-        if options[:level].kind_of? Integer
-            cmd.arg(:o, options[:level].to_i)
-        end
+    # Command
+    cmd = CommandBuilder::new(self::COMMAND)
 
-        # Files
-        if paths.kind_of? String
-            paths = [paths]
-        end
+    # Max
+    if options[:level].kind_of? Integer
+      cmd.arg(:o, options[:level].to_i)
+    end
 
-        # Runs the command
-        cmd << paths
+    # Files
+    if paths.kind_of? String
+      paths = [paths]
+    end
 
-        if options[:debug] == true
-            STDERR.write cmd.to_s + "\n"
-        end
+    # Runs the command
+    cmd << paths
 
-            # Blocking
-            if block.nil?
-                output = cmd.execute!
+    if options[:debug]
+      STDERR.write "#{cmd.to_s}\n"
+    end
 
-                # Parses output
-                succeed, errors = __parse_output(output)
-                return self::Result::new(succeed, errors)
+    # Blocking
+    if block.nil?
+      output = cmd.execute!
 
-            # Non-blocking
-            else
-                cmd.execute do |output|
-                    succeed, errors = __parse_output(output)
-                    block.call(self::Result::new(succeed, errors))
-                end
-            end
+      # Parses output
+      succeed, errors = __parse_output(output)
+      return self::Result::new(succeed, errors)
 
+      # Non-blocking
+    else
+      cmd.execute do |output|
+        succeed, errors = __parse_output(output)
+        block.call(self::Result::new(succeed, errors))
+      end
     end
 
+  end
 
-    private
 
-    ##
-    # Parses output.
-    #
+  private
 
-    def self.__parse_output(output)
-        errors = [ ]
-        succeed = { }
+  ##
+  # Parses output.
+  #
 
-        output.split("**").each do |section|
-            section.strip!
-            if section.start_with? "Processing:"
+  def self.__parse_output(output)
+    errors = []
+    succeed = {}
 
-                # Scans each line
-                filename = nil
+    output.split('**').each do |section|
+      section.strip!
+      if section.start_with? 'Processing:'
 
-                section.each_line do |line|
-                    if m = line.match(self::MATCHERS[0])
-                        filename = m[1]
-                    elsif m = line.match(self::MATCHERS[1])
-                        errors << [filename, m[1]]
-                        next
-                    elsif m = line.match(self::MATCHERS[2])
-                        succeed[filename] = -1 * m[1].to_f
-                        next
-                    elsif m = line.match(self::MATCHERS[3])
-                        succeed[filename] = 0.0
-                    end
-                end
+        # Scans each line
+        filename = nil
 
-            end
+        section.each_line do |line|
+          if m = line.match(self::MATCHERS[0])
+            filename = m[1]
+          elsif m = line.match(self::MATCHERS[1])
+            errors << [filename, m[1]]
+            next
+          elsif m = line.match(self::MATCHERS[2])
+            succeed[filename] = -1 * m[1].to_f
+            next
+          elsif line.match(self::MATCHERS[3])
+            succeed[filename] = 0.0
+          end
         end
 
-        return [succeed, errors]
+      end
     end
+
+    return [succeed, errors]
+  end
 end

data/optipng.gemspec

@@ -5,28 +5,14 @@
 
 Gem::Specification.new do |s|
   s.name = %q{optipng-r}
-  s.version = "0.3.1"
+  s.version = '0.4.0'
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new('>= 0') if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Artyom Fedenko}]
-  s.date = %q{2015-09-30}
+  s.date = %q{2015-09-31}
   s.email = %q{artyomfedenko@hotmail.com}
-  s.extra_rdoc_files = [
-    "LICENSE.txt",
-    "README.md"
-  ]
-  s.files = [
-    ".document",
-    "Gemfile",
-    "Gemfile.lock",
-    "LICENSE.txt",
-    "README.md",
-    "Rakefile",
-    "VERSION",
-    "lib/optipng.rb",
-    "optipng.gemspec",
-    "test"
-  ]
+  s.extra_rdoc_files = %w(LICENSE.txt README.md)
+  s.files = %w(.document Gemfile Gemfile.lock LICENSE.txt README.md Rakefile VERSION lib/optipng.rb optipng.gemspec test)
   s.homepage = %q{https://github.com/artie18/optipng}
   s.licenses = [%q{MIT}]
   s.require_paths = [%q{lib}]
@@ -37,17 +23,17 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<command-builder>, [">= 0.2.0"])
-      s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, [">= 1.5.2"])
+      s.add_runtime_dependency(%q<command-builder>, ['>= 0.3.2'])
+      s.add_development_dependency(%q<bundler>, ['>= 1.0.0'])
+      s.add_development_dependency(%q<jeweler>, ['>= 1.5.2'])
     else
-      s.add_dependency(%q<command-builder>, [">= 0.2.0"])
-      s.add_dependency(%q<bundler>, [">= 1.0.0"])
-      s.add_dependency(%q<jeweler>, [">= 1.5.2"])
+      s.add_dependency(%q<command-builder>, ['>= 0.3.2'])
+      s.add_dependency(%q<bundler>, ['>= 1.0.0'])
+      s.add_dependency(%q<jeweler>, ['>= 1.5.2'])
     end
   else
-    s.add_dependency(%q<command-builder>, [">= 0.2.0"])
-    s.add_dependency(%q<bundler>, [">= 1.0.0"])
-    s.add_dependency(%q<jeweler>, [">= 1.5.2"])
+    s.add_dependency(%q<command-builder>, ['>= 0.3.2'])
+    s.add_dependency(%q<bundler>, ['>= 1.0.0'])
+    s.add_dependency(%q<jeweler>, ['>= 1.5.2'])
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: optipng-r
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Artyom Fedenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-30 00:00:00.000000000 Z
+date: 2015-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: command-builder
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement