geordi 0.15.0 → 0.15.1

data/bin/optimize-png

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+require "ruby-debug"
+require 'fileutils'
 
 # pngcrush -rem allb -reduce -brute original.png optimized.png
 # pngcrush -d target-dir/ *.png
@@ -17,6 +19,11 @@
 # An article explaining why removing gamma correction
 # http://hsivonen.iki.fi/png-gamma/
 
+# Rails: file activesupport/lib/active_support/core_ext/string/starts_ends_with.rb, line 27
+def ends_with?(string, suffix)
+  string[-suffix.length, suffix.length] == suffix
+end
+
 def indented_puts(str="")
   puts "  #{str}"
 end
@@ -27,15 +34,15 @@ def print_manual
   indented_puts
   indented_puts script_name
   indented_puts "=" *script_name.size
-  indented_puts "- May reduce PNG file size lossless"
   indented_puts "- Removes color profiles: cHRM, sRGB, gAMA, ICC, etc."
   indented_puts "- Eliminates unused colors and reduce bit-depth (If possible)"
+  indented_puts "- May reduce PNG file size lossless"
   indented_puts
   indented_puts "Batch optimize all *.png in current directory:"
-  indented_puts "  #{script_name} output_directory"
+  indented_puts "  #{script_name} directory"
   indented_puts
   indented_puts "Optimize single file:"
-  indented_puts "  #{script_name} input.png output.png"
+  indented_puts "  #{script_name} input.png"
   indented_puts
 end
 
@@ -47,29 +54,59 @@ def optimization_default_args
   args
 end
 
-def batch_optimize(script_args)
-  output_directory = script_args[0]
-  match_pattern = "*.*" # be aware of case sensitivty: *.png wouldn't match IMAGE.PNG # pngcrush does nothing with other files than png
-  exec "pngcrush -d #{output_directory} #{optimization_default_args} #{match_pattern}"
+def optimize_file(input_file, output_file)
+  system "pngcrush #{optimization_default_args} '#{input_file}' '#{output_file}'"
 end
 
-def single_file_optimize(script_args)
-  input_file = script_args[0]
-  output_file = script_args[1]
-  exec "pngcrush #{optimization_default_args} #{input_file} #{output_file}"
+def unused_tempfile_path(original)
+  dirname = File.dirname(original)
+  basename = File.basename(original)
+  count = 0
+  begin
+    tmp_name = "#{dirname}/#{basename}_temp_#{count += 1}.png"
+  end while File.exists?(tmp_name)
+  tmp_name
+end
+
+def optimize_inplace(input_file)
+  temp_file = unused_tempfile_path(input_file)
+  result = optimize_file(input_file, temp_file)
+  if result.nil?
+    puts "Error was #{$?}"
+  else
+    FileUtils.rm(input_file)
+    FileUtils.mv("#{temp_file}", "#{input_file}")
+  end
+end
+
+def batch_optimize_inplace(path)
+  # Dir[".png"] works case sensitive, so to catch all funky .png extensions we have to go the following way:
+  png_relative_paths = []
+  Dir["#{path}/*.*"].each do |file_name|
+    png_relative_paths << file_name if ends_with?(File.basename(file_name.downcase), ".png")
+  end
+  png_relative_paths.each do |png_relative_path|
+    optimize_inplace(png_relative_path)
+  end
 end
 
 def main
   if ARGV.size == 1
-    batch_optimize(ARGV)
-  elsif ARGV.size == 2
-    single_file_optimize(ARGV)
+    path = ARGV[0]
+    if File.directory?(path)
+      batch_optimize_inplace(path)
+    elsif File.file?(path)
+      optimize_inplace(path)
+    end
+    print_manual
+    indented_puts "*** Error: '#{path}' is neither a directory nor a file ***"
+    indented_puts
   else
     print_manual
   end
 end
 
-main
+main()
 
 
 

data/lib/geordi/version.rb

@@ -1,3 +1,3 @@
 module Geordi
-  VERSION = '0.15.0'
+  VERSION = '0.15.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geordi
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.15.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-19 00:00:00.000000000 Z
+date: 2013-04-22 00:00:00.000000000 Z
 dependencies: []
 description: Collection of command line tools we use in our daily work with Ruby,
   Rails and Linux at makandra.