image_optim_rake 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84728f800392a61350da662ec41f49e6bec4da69
-  data.tar.gz: df42c824ced1eac1184341b0fcb432161d990403
+  metadata.gz: 3a9b21d065cdb780de237dcc5a4dda19a3c0adaf
+  data.tar.gz: d7ef6c39ef75a910f72b501771335fba5e2538ff
 SHA512:
-  metadata.gz: 0519fa8492aa4732c0f617379ec510dfb9704a9af91b060e75ecc950e553cdf8c5fae6d831e425ecd9ef0b55292695f549354916a6810519c7e73ba712232d3f
-  data.tar.gz: 3681ca06e36be77f62905249b047183b20aed6c46aa921fa4105b4780ee849f82fa3e8d8bb7cc8019ffa80ddfc22e27da20d8f6c3647e89d5c616ccf0145259c
+  metadata.gz: 91388b26e77d3b334772d5121247eded2598d597fa2f65eab149afa5ff2bd5042e85bc5b3d25ace622a4868a797a54f07a2378a7895aa3d154f1e3291e14562e
+  data.tar.gz: dc4f4158adef2aa910bc562d69112e7e3aaa17a5cec4691f35b3ccb0d631e13ae49cd7801a3035bdb10d8be998868010a8dee35052b4a0c7caf68ee700a6754a

data/.travis.yml

@@ -2,5 +2,8 @@ language: ruby
 rvm:
   - "1.9.3"
   - "2.0.0"
-  - jruby-19mode
   - rbx-19mode
+
+before_install:
+  - sudo apt-get update -qq
+  - sudo apt-get install -qq -y advancecomp gifsicle jpegoptim libjpeg-progs optipng pngcrush

data/Gemfile.lock

@@ -0,0 +1,37 @@
+PATH
+  remote: .
+  specs:
+    image_optim_rake (0.0.3)
+      image_optim (~> 0.7.3)
+      powerbar (~> 1.0.11)
+      rake
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    ansi (1.4.3)
+    fspath (2.0.4)
+    hashie (2.0.5)
+    image_optim (0.7.3)
+      fspath (~> 2.0.3)
+      image_size (~> 1.1.2)
+      in_threads (~> 1.1.1)
+      progress (~> 2.4.0)
+    image_size (1.1.2)
+    in_threads (1.1.1)
+    minitest (4.6.2)
+    powerbar (1.0.11)
+      ansi (~> 1.4.0)
+      hashie (>= 1.1.0)
+    progress (2.4.0)
+    rake (10.1.0)
+    testem (0.1.0)
+      minitest (>= 3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  image_optim_rake!
+  minitest
+  testem

data/image_optim_rake.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency "image_optim", "~> 0.7.3"
   gem.add_dependency "rake"
-  gem.add_dependency "progressbar", "~> 0.20.0"
+  gem.add_dependency "powerbar", "~> 1.0.11"
 
   gem.add_development_dependency "minitest"
   gem.add_development_dependency "testem"

data/lib/image_optim_rake/image_optim_task.rb

@@ -19,7 +19,7 @@ module ImageOptimRake
     def define
       namespace name do
         desc "Minify all images found under /app/assets/images and /public/images"
-        task :minify do
+        task :minify => :environment do
           dirs = ENV["dirs"] ? ENV["dirs"].split(",") : self.class.dirs
           Minifier.new(dirs, self.class.config).process!
         end

data/lib/image_optim_rake/minifier.rb

@@ -1,6 +1,6 @@
 require "image_optim_rake/image"
+require "image_optim_rake/progress"
 require "image_optim"
-require "progressbar"
 
 module ImageOptimRake
   class Minifier
@@ -34,14 +34,15 @@ module ImageOptimRake
     end
 
     def process_images!
-      progress = ::ProgressBar.new("Miniying", total_size)
+      progress = Progress.new(:msg => "0/#{total_count}")
       processor = ::ImageOptim.new(config)
-      dirs.values.flatten.each do |image_file|
+      dirs.values.flatten.each_with_index do |image_file, index|
+        number = index + 1
         processor.optimize_image!(image_file.path)
         image_file.reload_size!
-        progress.inc
+        progress.show :msg => "#{number}/#{total_count}", :done => number, :total => total_count
       end
-      progress.finish
+      progress.close
     end
 
     def log_images

data/lib/image_optim_rake/progress.rb

@@ -0,0 +1,25 @@
+require "powerbar"
+
+module ImageOptimRake
+  class Progress < PowerBar
+    PROGRESS_TEMPLATE = "${<msg>} ${[<bar>] } \e[33;1m${<percent>%} \e[36;1m${<elapsed>}"
+
+    def initialize(options = {})
+      super(options).tap do |progress|
+        finite = progress.settings.tty.finite
+
+        finite.template.main    = PROGRESS_TEMPLATE
+        finite.template.padchar = " "
+        finite.template.barchar = "="
+        finite.template.exit    = "\e[?25h\e[0m"
+        finite.template.close   = "\e[?25h\e[0m\n"
+        finite.output           = lambda { |s| $stderr.print(s) }
+      end
+    end
+
+    def show(options, force = true)
+      super(options, force)
+    end
+
+  end
+end

data/lib/image_optim_rake/version.rb

@@ -1,3 +1,3 @@
 module ImageOptimRake
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/test/units/minifier_test.rb

@@ -23,7 +23,7 @@ class MinifierTest < Testem
         sizes[file] = open(file, "rb").size
       end
 
-      minifier = ImageOptimRake::Minifier.new([dir], :threads => true)
+      minifier = ImageOptimRake::Minifier.new([dir], minify_options)
       minifier.process!
 
       Dir.glob(File.join(dir, "**/*.{jpg,png}")).each do |file|
@@ -31,4 +31,15 @@ class MinifierTest < Testem
       end
     end
   end
+
+  private
+
+  def minify_options
+    # we cannot use pngout on travis CI as this is a binary
+    # which cannot be included in the build process
+    {
+      :threads => true,
+      :pngout  => !ENV['CI']
+    }
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: image_optim_rake
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Jonas Thiel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-04 00:00:00.000000000 Z
+date: 2013-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: image_optim
@@ -39,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: progressbar
+  name: powerbar
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 1.0.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 1.0.11
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -90,6 +90,7 @@ files:
 - .gitignore
 - .travis.yml
 - Gemfile
+- Gemfile.lock
 - README.md
 - Rakefile
 - image_optim_rake.gemspec
@@ -97,6 +98,7 @@ files:
 - lib/image_optim_rake/image.rb
 - lib/image_optim_rake/image_optim_task.rb
 - lib/image_optim_rake/minifier.rb
+- lib/image_optim_rake/progress.rb
 - lib/image_optim_rake/railtie.rb
 - lib/image_optim_rake/version.rb
 - test/fixtures/unprocessed.jpg
@@ -123,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Provide a little helper command to minify images