sunny-crush 0.1 → 0.1.1

data/bin/crush

@@ -1,33 +1,17 @@
 #!/usr/bin/env ruby -W0
 
-require 'fileutils'
 require File.dirname(__FILE__) + '/../lib/crush'
 
-include FileUtils
-include Crush
-
-# handle args
 dir = ARGV[0]
-abort "Usage: #{File.basename($0)} dir" if dir.nil?
+abort "Usage: #{File.basename($0)} dir" if dir.nil? or !File.directory?(dir)
 
-# find files
-files = []
-cd(dir) do
-  search = File.join('**', '*')
-  files = Dir[search]
-  files.reject! { |f| File.directory?(f) }
-end
-files.map! { |f| File.expand_path(File.join(dir, f)) }
+files = Crush.find_files(dir)
 abort "No files found in #{dir}" if files.empty?
 
-# loop and transform
+counter = 0
 files.each do |file|
-  case file
-    when /\.png$/
-      pngcrush(file) or optipng(file)
-    when /\.jpe?g$/
-      jpegtran(file)
-  end
+  ok = Crush.crush(file)
+  counter += 1 if ok
 end
-
+puts "Crushed #{counter} files!"
 

data/lib/crush.rb

@@ -1,25 +1,54 @@
 #!/usr/bin/env ruby
+# See http://yuiblog.com/blog/2008/11/14/imageopt-3/
 
 require 'tempfile'
 require 'fileutils'
 
-module Crush
-  def pngcrush(old_file)
-    tmp_file = Tempfile.new('crush_pngcrush').path
-    `pngcrush '#{old_file}' '#{tmp_file}'`
-    return false if $?.exitstatus != 0
-    FileUtils::cp tmp_file, old_file
+class Crush
+  def self.crush(file, verbose = false)
+    case file
+      when /^\._|^\.DS_Store$/
+        FileUtils::rm(file)
+      when /\.png$/
+        pngcrush(file) or optipng(file)
+      when /\.jpe?g$/
+        jpegtran(file)
+      else
+        false
+    end
+  end
+
+  def self.find_files(dir)
+    files = []
+    FileUtils::cd(dir) do
+      search = File.join('**', '*')
+      files = Dir[search]
+    end
+    files.map! { |f| File.expand_path(File.join(dir, f)) }
+    files.reject! { |f| File.directory?(f) }
   end
 
-  def optipng(old_file)
-    `optipng '#{old_file}'`
+  def self.exec(cmd)
+    #puts cmd
+    `#{cmd}`
     $?.exitstatus == 0
   end
 
-  def jpegtran(old_file)
+  def self.pngcrush(old_file)
+    tmp_file = Tempfile.new('crush_pngcrush').path
+    ok = exec "pngcrush -rem alla -reduce -brute '#{old_file}' '#{tmp_file}'"
+    FileUtils::cp tmp_file, old_file if ok
+    ok
+  end
+
+  def self.optipng(old_file)
+    exec "optipng '#{old_file}'"
+  end
+
+  def self.jpegtran(old_file)
     tmp_file = Tempfile.new('crush_jpegtran').path
-    `jpegtran -copy none -optimize '#{old_file}' > '#{tmp_file}'`
-    return false if $?.exitstatus != 0
-    FileUtils::cp tmp_file, old_file
+    ok = exec "jpegtran -copy none -optimize '#{old_file}' > '#{tmp_file}'"
+    FileUtils::cp tmp_file, old_file if ok
+    ok
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sunny-crush
 version: !ruby/object:Gem::Version 
-  version: "0.1"
+  version: 0.1.1
 platform: ruby
 authors: 
 - Sunny Ripert