desoto-photoapp 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce0627b6185d6ade6e13b1a7813614b59c5f0bcd
-  data.tar.gz: f5af3ad97dd19aafa2c2084171ff15f74b6845d6
+  metadata.gz: 8d5955b79b2143eff1ecec4bff7478b6da4049d8
+  data.tar.gz: 5da6fc93e9392a66853fb79749f4fa448a9dd3af
 SHA512:
-  metadata.gz: 56ee8f2c27d9069361b8fbb32ac41b416286e20b633a7752d1d5fd0f2f8ba9cd9c63dccff4fd369e87407d32158126b6dd098d3f22687155b2b656536cb6663e
-  data.tar.gz: c44407c8181f833fbdcb30445cc9ad6d29dd59b322792ac008c2a6fce1d72615a60acd9bb116b0bc2e0a392f3b2aa2c153e9fc76fe63e83d4c99386773c0d5d0
+  metadata.gz: beb2530bdf77c3ddc89979b6cd4f043797382aaa3641a800ac025de2bb14bf90fe530f6db769fc12d16e926e564572793f45a44412cc3b8ca29334a65952521d
+  data.tar.gz: b45e45d136f52745caa107635ac8d2d1f4cb72eca3368e09afd1dc1f0b5e927df3b5fb3cda8cd392bc1a541116d329a49e04716c5e6f066407e2900e19e708ec

data/exe/photoapp

@@ -3,7 +3,7 @@
 $LOAD_PATH.unshift(File.expand_path("../lib", File.dirname(__FILE__)))
 
 require 'optparse'
-require "desoto-photoapp"
+require 'desoto-photoapp'
 
 options = {}
 
@@ -11,10 +11,6 @@ OptionParser.new do |opts|
   opts.on("-c", "--config PATH", String, "Path to config file") do |config|
     options['config'] = config
   end
-
-  opts.on("-s", "--source PATH", String, "Path to photos directory") do |source|
-    options['source'] = source
-  end
 end.parse!
 
 if ARGV.first == 'setup'
@@ -24,16 +20,15 @@ if ARGV.first == 'setup'
   end
   system "open #{Photoapp.gem_dir('assets/photos-action-installer.pkg')}"
 else
-  p = Photoapp::Session.new(options)
 
   if ARGV.first == 'process'
     ARGV.shift
-    p.process
+    options['source'] = ARGV.shift
+    Photoapp::Session.new(options).process
   elsif ARGV.first == 'upload'
+    Photoapp::Session.new(options).upload
+  elsif ARGV.first == 'reprint'
     ARGV.shift
-    p.upload
-  elsif ARGV.first == 'print'
-    ARGV.shift
-    p.print
+    Photoapp.print(ARGV.shift)
   end
 end

data/lib/desoto-photoapp.rb

@@ -11,6 +11,12 @@ module Photoapp
     File.expand_path(File.join(File.dirname(__FILE__), '..', *paths))
   end
 
+  # Handle printing
+  def print(path)
+    system "lpr #{path}"
+  end
+
+
   class Session
     attr_accessor :photos, :print, :upload
 
@@ -65,15 +71,15 @@ module Photoapp
       logo = Magick::Image.read(config['watermark']).first
       photos = []
       tmp = root('.tmp')
-      FileUtils.mkdir_p(tmp)
+      FileUtils.mkdir_p tmp
 
       if empty_print_queue?
         FileUtils.rm_rf(config['print'])
       end
 
       load_photos.each do |f|
-        FileUtils.mv f, tmp
         path = File.join(tmp, File.basename(f))
+        FileUtils.mv f, path
         `automator -i #{path} #{Photoapp.gem_dir("lib/adjust-image.workflow")}`
         photos << Photo.new(path, logo, self)
       end
@@ -81,16 +87,18 @@ module Photoapp
       photos.each do |p|
         p.write
         p.add_to_photos
-        p.print
+        Photoapp.print(p.print_dest)
       end
 
+      upload
+
       FileUtils.rm_rf tmp
     end
 
     def load_photos
       files = ['*.jpg', '*.JPG', '*.JPEG', '*.jpeg'].map! { |f| File.join(config['source'], f) }
 
-      Dir[*files]
+      Dir[*files].uniq
     end
 
     def empty_print_queue?

data/lib/desoto-photoapp/photo.rb

@@ -60,11 +60,6 @@ module Photoapp
       cleanup
     end
 
-    # Handle printing
-    def print
-      system "lpr #{print_dest}"
-    end
-
     def add_to_photos
       `automator -i #{config['print']} #{Photoapp.gem_dir("lib/import-photos.workflow")}`
     end

data/lib/desoto-photoapp/version.rb

@@ -1,3 +1,3 @@
 module Photoapp
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: desoto-photoapp
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-06-05 00:00:00.000000000 Z
+date: 2015-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rmagick