photile 0.1.8 → 0.1.9

data/README.md

@@ -63,8 +63,10 @@ Photile uses the amazing [Imagemagick](http://www.imagemagick.org/script/index.p
 
 - Documentation
 - CLI option to show version
+- Use log4r for logging
 - File validation for infile/outfile
 - More unit tests to ensure that all pipe permutations work
+- Sign gem on deploy
 
 * * *
-Copyright (c) 2013 Nitin Dhar. See [MIT-LICENSE](MIT-LICENSE) for details.
+Copyright (c) 2013 Nitin Dhar. See [MIT-LICENSE](MIT-LICENSE) for details.

data/bin/photile

@@ -11,21 +11,20 @@ end
 
 puts '[photile] Processing...' if verbose
 
-config[:options].each_index do |index|
-  step = index+1
-  config[:options][index].each do |key,val|
+config[:options].each do |opt|
+  opt.each do |key,val|
     case key
     when :quality
-      puts "[photile] #{step}. #{config[:infile]} => quality #{val}% => #{config[:outfile]}" if verbose
+      puts "[photile] * #{config[:infile]} => quality #{val}% => #{config[:outfile]}" if verbose
       `convert #{config[:infile]} -quality #{val} #{config[:outfile]}`
     when :compress
-      puts "[photile] #{step}. #{config[:infile]} => compress => #{config[:outfile]}" if verbose
+      puts "[photile] * #{config[:infile]} => compress => #{config[:outfile]}" if verbose
       `jpegtran -copy none -optimize -perfect -outfile #{config[:outfile]} #{config[:outfile]}`
     when :watermark
-      puts "[photile] #{step}. #{config[:infile]} => watermark #{val} => #{config[:outfile]}" if verbose
+      puts "[photile] * #{config[:infile]} => watermark #{val} => #{config[:outfile]}" if verbose
       `composite -gravity center #{val} #{config[:infile]} #{config[:outfile]}`
     when :tile
-      puts "[photile] #{step}. #{config[:infile]} => tile #{val[:width]}x#{val[:height]} => [#{config[:outfile]}, ...]" if verbose
+      puts "[photile] * #{config[:infile]} => tile #{val[:width]}x#{val[:height]} => [#{config[:outfile]}, ...]" if verbose
       `convert #{config[:infile]} -crop #{val[:width]}x#{val[:height]} +repage +adjoin #{config[:outfile].split('.').join('%03d.')}`
     end
   end

data/lib/photile.rb

@@ -1,5 +1,6 @@
 class Photile
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
+  REQUIREMENTS = "photile requires the following libraries to be installed: imagemagick, imagemagick-common and libjpeg-turbo-progs"
 end
 
 require 'photile/cli'

data/lib/photile/cli.rb

@@ -8,6 +8,7 @@ class Photile::Cli
       opts.banner = "Usage: photile [options] infile outfile"
 
       opts.on('-q', '--quality VALUE', Integer, 'Modify image quality') do |value|
+        validate_percent_value('Quality', value)
         options << {:quality => value}
       end
 
@@ -16,6 +17,7 @@ class Photile::Cli
       end
 
       opts.on('-w', '--watermark FILE', String, 'Watermark with given file') do |file|
+        validate_file_exist file
         options << {:watermark => file}
       end
 
@@ -24,13 +26,13 @@ class Photile::Cli
         options << {:tile => {:width => dim.first.to_i, :height => dim.last.to_i}}
       end
 
-      opts.on('-v', '--[no-]verbose', 'Run verbosely') do |value|
+      opts.on('-v', '--verbose', 'Run verbosely') do |value|
         options << {:verbose => value}
       end
 
       opts.on('-h', '--help', 'Display options help') do
         puts opts
-        puts 'photile requires the following libraries to be installed: imagemagick, imagemagick-common and libjpeg-turbo-progs'
+        puts Photile::REQUIREMENTS
         exit
       end
     end
@@ -40,19 +42,33 @@ class Photile::Cli
 
       if options.empty? || ARGV.size != 2
         puts optparse
-        puts 'photile requires the following libraries to be installed: imagemagick, imagemagick-common and libjpeg-turbo-progs'
+        puts Photile::REQUIREMENTS
         exit
       end
 
+      validate_file_exist ARGV.first
+
       {:options => options, :infile => ARGV.first, :outfile => ARGV.last}
-    rescue OptionParser::InvalidArgument => ia
+    rescue OptionParser::InvalidArgument
       puts 'Invalid argument'
       puts optparse
       exit
-    rescue OptionParser::InvalidOption => io
+    rescue OptionParser::InvalidOption
       puts 'Invalid option'
       puts optparse
       exit
+    rescue Exception => e
+      puts e
+      puts optparse
+      exit
     end
   end
+
+  def self.validate_percent_value(metric, value)
+    raise "Invalid percentage: #{metric} #{value}%. Acceptable range: 0-100" if value < 0 || value > 100
+  end
+
+  def self.validate_file_exist(file)
+    raise "File [#{file}] not found" if !FileTest.exists? file
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: photile
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
   prerelease: 
 platform: ruby
 authors: