photile 0.1.0.pre → 0.1.2.pre

data/Rakefile

@@ -12,6 +12,11 @@ task :build do
   system 'gem build photile.gemspec && gem install ./*.gem --pre && rm *.gem'
 end
 
+desc "Deploy gem to Rubygems repo"
+task :deploy
+  #`gem build photile.gemspec && gem push hola-0.0.0.gem && rm *.gem`
+end
+
 desc "Build docs"
 task :docs do
   `rdoc`
@@ -21,3 +26,8 @@ desc "Uninstalls the gem"
 task :uninstall do
   system 'gem uninstall photile'
 end
+
+desc "Cleans generated files"
+task :clean do
+  `rm tmp/test*.jpeg 2>&1`
+end

data/bin/photile

@@ -1,46 +1,21 @@
 #!/usr/bin/env ruby
 
 require 'photile'
-require 'optparse'
 
-options = []
-
-optparse = OptionParser.new do|opts|
-  opts.banner = "Usage: photile [options] infile outfile"
-
-  opts.on('-q', '--quality VALUE', Integer, 'Modify image quality') do |value|
-    options << {:quality => value}
-  end
-
-  opts.on('-c', '--compress', 'Loss-less compress image') do
-    options << {:compress => true}
-  end
-
-  opts.on('-w', '--watermark FILE', String, 'Watermark with given file') do |file|
-    options << {:watermark => file}
-  end
-
-  opts.on('-t', '--tile WIDTHxHEIGHT', Regexp.new(/\d+x\d+/), 'Tile to the given dimensions') do |dimensions|
-    dim = dimensions.split('x')
-    options << {:tile => {:width => dim.first.to_i, :height => dim.last.to_i}}
+config = Photile::Cli.parse
+
+config[:options].each do |opt|
+  opt.each do |key,val|
+    case key
+    when :quality
+      `convert #{config[:infile]} -quality #{val} #{config[:outfile]}`
+    when :compress
+      `cp #{config[:infile]} #{config[:outfile]} && jpegtran -copy none -optimize -perfect -outfile #{config[:outfile]} #{config[:outfile]}`
+    when :watermark
+      `composite -gravity center #{val} #{config[:infile]} #{config[:outfile]}`
+    when :tile
+      `convert #{config[:infile]} -crop #{val[:width]}x#{val[:height]} +repage +adjoin #{config[:outfile].split('.').join('%03d.')}`
+    end
+    config[:infile] = config[:outfile]
   end
-
-  opts.on('-h', '--help', 'Display options help') do
-    puts opts
-    exit
-  end
-end
-
-begin
-  optparse.parse!
-
-  if options.empty?
-    puts optparse
-    exit
-  end
-
-  puts options
-rescue OptionParser::InvalidArgument => ia
-  puts ia
-  exit
 end

data/lib/photile.rb

@@ -1,63 +1,4 @@
-=begin
-namespace :image do
-
-  desc "Displays the size of an image"
-  task :size do
-    size = `identify tmp/original.jpeg`.split(" ")[6]
-    puts "Image size: #{size}"
-  end
-
-  desc "Changes the quality of an image"
-  task :quality do
-    `convert tmp/original.jpeg -quality 70 tmp/quality70.jpeg`
-    size = `identify tmp/quality70.jpeg`.split(" ")[6]
-    puts "Image size: #{size}"
-  end
-
-  desc "Changes the quality of an image with 2 compressions"
-  task :quality_advanced do
-    `convert tmp/original.jpeg -quality 70 tmp/quality70.jpeg`
-    `jpegtran -copy none -optimize -perfect -outfile tmp/quality70.jpeg tmp/quality70.jpeg`
-    size = `identify tmp/quality70.jpeg`.split(" ")[6]
-    puts "Image size: #{size}"
-  end
-
-  desc "Applies a watermark to an image"
-  task :watermark do
-    `composite -gravity center tmp/watermark.png tmp/original.jpeg tmp/watermarked.jpeg`
-    size = `identify tmp/watermarked.jpeg`.split(" ")[6]
-    puts "Watermarked image. Image size: #{size}"
-  end
-
-  desc "Tiles an image by chopping it up into fragments"
-  task :tile do
-    `convert tmp/original.jpeg -crop 300x300 +repage +adjoin tmp/tile_%02d.jpeg`
-  end
-
-  desc "Cleans up temporary files generated"
-  task :clean do
-    `rm tmp/quality70.jpeg 2>&1`
-    `rm tmp/watermarked.jpeg 2>&1`
-    `rm tmp/tile_*.jpeg 2>&1`
-  end
-
-end
-=end
-# The main Photile driver
 class Photile
-
-  # Say hi to the world!
-  #
-  # Example:
-  #   >> Photile.hi("spanish")
-  #   => hola mundo
-  #
-  # Arguments:
-  #   language: (String)
-  def self.hi(language = "english")
-    translator = Translator.new(language)
-    puts translator.hi
-  end
 end
 
-require 'photile/translator'
+require 'photile/cli'

data/lib/photile/cli.rb

@@ -0,0 +1,48 @@
+require 'optparse'
+
+class Photile::Cli
+  def self.parse
+    options = []
+
+    optparse = OptionParser.new do|opts|
+      opts.banner = "Usage: photile [options] infile outfile"
+
+      opts.on('-q', '--quality VALUE', Integer, 'Modify image quality') do |value|
+        options << {:quality => value}
+      end
+
+      opts.on('-c', '--compress', 'Loss-less compress image') do
+        options << {:compress => true}
+      end
+
+      opts.on('-w', '--watermark FILE', String, 'Watermark with given file') do |file|
+        options << {:watermark => file}
+      end
+
+      opts.on('-t', '--tile WIDTHxHEIGHT', Regexp.new(/\d+x\d+/), 'Tile to the given dimensions') do |dimensions|
+        dim = dimensions.split('x')
+        options << {:tile => {:width => dim.first.to_i, :height => dim.last.to_i}}
+      end
+
+      opts.on('-h', '--help', 'Display options help') do
+        puts opts
+        exit
+      end
+    end
+
+    begin
+      optparse.parse!
+
+      if options.empty? || ARGV.size != 2
+        puts optparse
+        exit
+      end
+
+      {:options => options, :infile => ARGV.first, :outfile => ARGV.last}
+    rescue OptionParser::InvalidArgument => ia
+      puts ia
+      puts optparse
+      exit
+    end
+  end
+end

data/photile.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name                        = 'photile'
-  s.version                     = '0.1.0.pre'
+  s.version                     = '0.1.2.pre'
   s.date                        = '2012-11-02'
   s.summary                     = 'A ruby gem to chop a photo into tiles, watermark them, etc.'
   s.description                 = 'Photile is just a layer on top of Imagemagick and Jpegtran to make certain image processing tasks dead simple.'

data/test/test_photile.rb

@@ -2,8 +2,7 @@ require 'test/unit'
 require 'photile'
 
 class PhotileTest < Test::Unit::TestCase
-  def test_english_hello
-    assert_equal "hello world", Photile.hi("english")
+  def test_stub
+    assert true
   end
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: photile
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre
+  version: 0.1.2.pre
   prerelease: 6
 platform: ruby
 authors:
@@ -41,7 +41,7 @@ files:
 - Rakefile
 - bin/photile
 - lib/photile.rb
-- lib/photile/translator.rb
+- lib/photile/cli.rb
 - photile.gemspec
 - test/test_photile.rb
 homepage: https://github.com/nitindhar7/photile

data/lib/photile/translator.rb

@@ -1,14 +0,0 @@
-class Photile::Translator
-  def initialize(language)
-    @language = language
-  end
-
-  def hi
-    case @language
-    when "spanish"
-      "hola mundo"
-    else
-      "hello world"
-    end
-  end
-end