desoto-photoapp 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea864eef77503bf442e8bd98f1f39c747160f7d7
-  data.tar.gz: f229d1c688ad987b5cf927f49f8517154f63979f
+  metadata.gz: b1b0bdce6fc0d6e202abe911c3feac6cc4631114
+  data.tar.gz: e20cb715c15c457f66ce747f2d97cfb153bcc932
 SHA512:
-  metadata.gz: 1df805b211d6b8467777906c46c47c570004dadc3176679519c5d909d4f860b40dcc4f6e5e300c0c9cb5f1c9b7e6ef2a3aa3d509ee63386e65817c1fe3b67e4f
-  data.tar.gz: 20062e3f73ce322f442c00955940ad2bbcee4904b741cc8cc6fba050290ae03feadca50a55f2ac30e15dd22dbdefc3862cd3aba1e0a26e0ca5bd9f1815e19d94
+  metadata.gz: 9024adee824beda68814252095335f19cfb57bbe301763a75885576c577ae2eeeb4563cb5ad960a2a8ba3a58df35a26e69a29eadbb45aa09e93ab580fdd4e5de
+  data.tar.gz: ca59ea931d384ebcd92b27f670694fe47b6f1fc3c72d70282be49f32e2c909889b03b5f5bdcc7578ebbbff86820e17a4d4541e81b4a370d601421e1ab0f1922c

data/assets/Update.app/Contents/Info.plist

@@ -7,7 +7,9 @@
 	<key>AMStayOpen</key>
 	<false/>
 	<key>BuildMachineOSBuild</key>
-	<string>14D49</string>
+	<string>16B2657</string>
+	<key>CFBundleAllowMixedLocalizations</key>
+	<true/>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleDocumentTypes</key>
@@ -40,27 +42,31 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2</string>
+	<string>1.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
+	<key>CFBundleSupportedPlatforms</key>
+	<array>
+		<string>MacOSX</string>
+	</array>
 	<key>CFBundleURLTypes</key>
 	<array/>
 	<key>CFBundleVersion</key>
-	<string>409.2</string>
+	<string>444.4</string>
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>6D97u</string>
+	<string>9A229</string>
 	<key>DTPlatformVersion</key>
 	<string>GM</string>
 	<key>DTSDKBuild</key>
-	<string>14D42</string>
+	<string>17C53</string>
 	<key>DTSDKName</key>
-	<string>macosx10.10internal</string>
+	<string>macosx10.13internal</string>
 	<key>DTXcode</key>
-	<string>0630</string>
+	<string>0900</string>
 	<key>DTXcodeBuild</key>
-	<string>6D97u</string>
+	<string>9A229</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>10.5</string>
 	<key>LSMinimumSystemVersionByArchitecture</key>
@@ -72,8 +78,6 @@
 	<true/>
 	<key>NSAppleScriptEnabled</key>
 	<string>YES</string>
-	<key>NSMainNibFile</key>
-	<string>ApplicationStub</string>
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
 	<key>NSServices</key>

data/assets/Update.app/Contents/document.wflow

@@ -3,9 +3,9 @@
 <plist version="1.0">
 <dict>
 	<key>AMApplicationBuild</key>
-	<string>409.2</string>
+	<string>444.4</string>
 	<key>AMApplicationVersion</key>
-	<string>2.5</string>
+	<string>2.8</string>
 	<key>AMDocumentVersion</key>
 	<string>2</string>
 	<key>actions</key>
@@ -177,7 +177,7 @@ photoapp -v | say</string>
 				<key>isViewVisible</key>
 				<true/>
 				<key>location</key>
-				<string>369.000000:253.000000</string>
+				<string>313.500000:253.000000</string>
 				<key>nibPath</key>
 				<string>/System/Library/Automator/Run Shell Script.action/Contents/Resources/English.lproj/main.nib</string>
 			</dict>

data/assets/Upload.app/Contents/Info.plist

@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>AMIsApplet</key>
+	<true/>
+	<key>AMStayOpen</key>
+	<false/>
+	<key>BuildMachineOSBuild</key>
+	<string>16B2657</string>
+	<key>CFBundleAllowMixedLocalizations</key>
+	<true/>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleDocumentTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>*</string>
+			</array>
+			<key>CFBundleTypeName</key>
+			<string>Automator workflow file</string>
+			<key>CFBundleTypeOSTypes</key>
+			<array>
+				<string>****</string>
+			</array>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+		</dict>
+	</array>
+	<key>CFBundleExecutable</key>
+	<string>Application Stub</string>
+	<key>CFBundleIconFile</key>
+	<string>AutomatorApplet</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.apple.automator.Upload</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>Upload</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.3</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleSupportedPlatforms</key>
+	<array>
+		<string>MacOSX</string>
+	</array>
+	<key>CFBundleURLTypes</key>
+	<array/>
+	<key>CFBundleVersion</key>
+	<string>444.4</string>
+	<key>DTCompiler</key>
+	<string>com.apple.compilers.llvm.clang.1_0</string>
+	<key>DTPlatformBuild</key>
+	<string>9A229</string>
+	<key>DTPlatformVersion</key>
+	<string>GM</string>
+	<key>DTSDKBuild</key>
+	<string>17C53</string>
+	<key>DTSDKName</key>
+	<string>macosx10.13internal</string>
+	<key>DTXcode</key>
+	<string>0900</string>
+	<key>DTXcodeBuild</key>
+	<string>9A229</string>
+	<key>LSMinimumSystemVersion</key>
+	<string>10.5</string>
+	<key>LSMinimumSystemVersionByArchitecture</key>
+	<dict>
+		<key>x86_64</key>
+		<string>10.6</string>
+	</dict>
+	<key>LSUIElement</key>
+	<true/>
+	<key>NSAppleScriptEnabled</key>
+	<string>YES</string>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
+	<key>NSServices</key>
+	<array/>
+	<key>UTExportedTypeDeclarations</key>
+	<array/>
+	<key>UTImportedTypeDeclarations</key>
+	<array/>
+</dict>
+</plist>

data/assets/Upload.app/Contents/document.wflow

@@ -0,0 +1,193 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>AMApplicationBuild</key>
+	<string>444.4</string>
+	<key>AMApplicationVersion</key>
+	<string>2.8</string>
+	<key>AMDocumentVersion</key>
+	<string>2</string>
+	<key>actions</key>
+	<array>
+		<dict>
+			<key>action</key>
+			<dict>
+				<key>AMAccepts</key>
+				<dict>
+					<key>Container</key>
+					<string>List</string>
+					<key>Optional</key>
+					<true/>
+					<key>Types</key>
+					<array>
+						<string>com.apple.cocoa.string</string>
+					</array>
+				</dict>
+				<key>AMActionVersion</key>
+				<string>2.0.3</string>
+				<key>AMApplication</key>
+				<array>
+					<string>Automator</string>
+				</array>
+				<key>AMParameterProperties</key>
+				<dict>
+					<key>COMMAND_STRING</key>
+					<dict/>
+					<key>CheckedForUserDefaultShell</key>
+					<dict/>
+					<key>inputMethod</key>
+					<dict/>
+					<key>shell</key>
+					<dict/>
+					<key>source</key>
+					<dict/>
+				</dict>
+				<key>AMProvides</key>
+				<dict>
+					<key>Container</key>
+					<string>List</string>
+					<key>Types</key>
+					<array>
+						<string>com.apple.cocoa.string</string>
+					</array>
+				</dict>
+				<key>ActionBundlePath</key>
+				<string>/System/Library/Automator/Run Shell Script.action</string>
+				<key>ActionName</key>
+				<string>Run Shell Script</string>
+				<key>ActionParameters</key>
+				<dict>
+					<key>COMMAND_STRING</key>
+					<string>source ~/.bash_profile
+puts "Uploading photos"
+photoapp upload | say</string>
+					<key>CheckedForUserDefaultShell</key>
+					<true/>
+					<key>inputMethod</key>
+					<integer>0</integer>
+					<key>shell</key>
+					<string>/bin/bash</string>
+					<key>source</key>
+					<string></string>
+				</dict>
+				<key>BundleIdentifier</key>
+				<string>com.apple.RunShellScript</string>
+				<key>CFBundleVersion</key>
+				<string>2.0.3</string>
+				<key>CanShowSelectedItemsWhenRun</key>
+				<false/>
+				<key>CanShowWhenRun</key>
+				<true/>
+				<key>Category</key>
+				<array>
+					<string>AMCategoryUtilities</string>
+				</array>
+				<key>Class Name</key>
+				<string>RunShellScriptAction</string>
+				<key>InputUUID</key>
+				<string>779A74B5-DAD3-4231-9018-06560E903822</string>
+				<key>Keywords</key>
+				<array>
+					<string>Shell</string>
+					<string>Script</string>
+					<string>Command</string>
+					<string>Run</string>
+					<string>Unix</string>
+				</array>
+				<key>OutputUUID</key>
+				<string>7FB77A99-8295-4395-AC00-6B106BDB61C7</string>
+				<key>UUID</key>
+				<string>A2174CF7-1CEC-4585-9615-32D9D53A0CD7</string>
+				<key>UnlocalizedApplications</key>
+				<array>
+					<string>Automator</string>
+				</array>
+				<key>arguments</key>
+				<dict>
+					<key>0</key>
+					<dict>
+						<key>default value</key>
+						<integer>0</integer>
+						<key>name</key>
+						<string>inputMethod</string>
+						<key>required</key>
+						<string>0</string>
+						<key>type</key>
+						<string>0</string>
+						<key>uuid</key>
+						<string>0</string>
+					</dict>
+					<key>1</key>
+					<dict>
+						<key>default value</key>
+						<string></string>
+						<key>name</key>
+						<string>source</string>
+						<key>required</key>
+						<string>0</string>
+						<key>type</key>
+						<string>0</string>
+						<key>uuid</key>
+						<string>1</string>
+					</dict>
+					<key>2</key>
+					<dict>
+						<key>default value</key>
+						<false/>
+						<key>name</key>
+						<string>CheckedForUserDefaultShell</string>
+						<key>required</key>
+						<string>0</string>
+						<key>type</key>
+						<string>0</string>
+						<key>uuid</key>
+						<string>2</string>
+					</dict>
+					<key>3</key>
+					<dict>
+						<key>default value</key>
+						<string></string>
+						<key>name</key>
+						<string>COMMAND_STRING</string>
+						<key>required</key>
+						<string>0</string>
+						<key>type</key>
+						<string>0</string>
+						<key>uuid</key>
+						<string>3</string>
+					</dict>
+					<key>4</key>
+					<dict>
+						<key>default value</key>
+						<string>/bin/sh</string>
+						<key>name</key>
+						<string>shell</string>
+						<key>required</key>
+						<string>0</string>
+						<key>type</key>
+						<string>0</string>
+						<key>uuid</key>
+						<string>4</string>
+					</dict>
+				</dict>
+				<key>isViewVisible</key>
+				<true/>
+				<key>location</key>
+				<string>529.000000:253.000000</string>
+				<key>nibPath</key>
+				<string>/System/Library/Automator/Run Shell Script.action/Contents/Resources/English.lproj/main.nib</string>
+			</dict>
+			<key>isViewVisible</key>
+			<true/>
+		</dict>
+	</array>
+	<key>connectors</key>
+	<dict/>
+	<key>workflowMetaData</key>
+	<dict>
+		<key>workflowTypeIdentifier</key>
+		<string>com.apple.Automator.application</string>
+	</dict>
+</dict>
+</plist>

data/lib/photoapp.rb

@@ -49,6 +49,7 @@ module Photoapp
           'config' => 'photoapp.yml',
           'upload' => 'upload',
           'print' => 'print',
+          'import' => 'import',
           'reprint' => 'reprint'
         }
  
@@ -60,8 +61,9 @@ module Photoapp
           config.merge!(YAML.load(File.read(config_file)) || {})
         end
 
-        config['upload'] = root(config['upload'])
-        config['print'] = root(config['print'])
+        config['upload']  = root(config['upload'])
+        config['print']   = root(config['print'])
+        config['import']  = root(config['import'])
         config['reprint'] = root(config['reprint'])
 
         config
@@ -76,9 +78,7 @@ module Photoapp
     def process
       photos = load_photos
       tmp = root('.tmp')
-      import = root('temp_import')
       FileUtils.mkdir_p tmp
-      FileUtils.mkdir_p import
 
       photos.map! do |f|
         p = process_image(f, tmp)
@@ -86,17 +86,21 @@ module Photoapp
         p
       end
 
-      photos.each do |p|
-        FileUtils.cp(p.print_dest, import)
-        system "lpr #{p.print_dest}"
-      end
+      import
+      print
 
-      `automator -i #{import} #{Photoapp.gem_dir("lib/import-photos.workflow")}`
+      FileUtils.rm_rf tmp
+    end
 
-      upload
+    def import
+      `automator -i #{config['import']} #{Photoapp.gem_dir("lib/import-photos.workflow")}`
+      FileUtils.rm_rf config['import']
+    end
 
-      FileUtils.rm_rf tmp
-      FileUtils.rm_rf import
+    def print
+      load_photos(config['print']).each do |p|
+        system "lpr #{p}"
+      end
       FileUtils.rm_rf config['print']
     end
 
@@ -108,12 +112,15 @@ module Photoapp
     end
 
 
-    def load_photos
-      files = ['*.jpg', '*.JPG', '*.JPEG', '*.jpeg'].map! { |f| File.join(config['source'], f) }
+    # grab all photos from config source
+    def load_photos(path)
+      path ||= config['source']
+      files = ['*.jpg', '*.JPG', '*.JPEG', '*.jpeg'].map! { |f| File.join(path, f) }
 
       Dir[*files].uniq
     end
 
+    # Check to see if the print queue is empty
     def empty_print_queue?
       if printer = `lpstat -d`
         if printer = printer.scan(/:\s*(.+)/).flatten.first
@@ -123,8 +130,16 @@ module Photoapp
     end
 
     def upload
-      S3.new(@config).push
-      FileUtils.rm_rf config['upload']
+      photos = load_photos(config['upload'])
+
+      if photos.size > 0
+        status = S3.new(@config).push
+        FileUtils.rm photos
+        many = photos.size != 1 ? "photos" : "photo"
+        puts "Uploaded #{photos.size} #{many}."
+      else
+        puts "There are no photos to upload."
+      end
     end
 
     def reprint

data/lib/photoapp/photo.rb

@@ -82,12 +82,19 @@ module Photoapp
         with_url.write path
         cleanup
       else
-        puts "writing #{upload_dest}"
-        puts "writing #{print_dest}"
         FileUtils.mkdir_p(File.dirname(upload_dest))
         FileUtils.mkdir_p(File.dirname(print_dest))
+        FileUtils.mkdir_p(File.dirname(import_dest))
+
+        puts "writing #{upload_dest}"
         watermark.write upload_dest
+
+        puts "writing #{print_dest}"
         with_url.write print_dest
+
+        puts "writing #{import_dest}"
+        with_url.write import_dest
+
         cleanup
       end
     end
@@ -105,6 +112,10 @@ module Photoapp
       File.join(config['print'], short + '.jpg')
     end
 
+    def import_dest
+      File.join(config['import'], short + '.jpg')
+    end
+    
     def short
       @short ||= begin
         now = Time.now

data/lib/photoapp/s3.rb

@@ -33,10 +33,10 @@ module Photoapp
       if !@bucket.exists?
         abort "Bucket not found: '#{@bucket_name}'. Check your configuration or create a bucket using: `octopress deploy add-bucket`"
       else
-        puts "Syncing #{@local} files to #{@bucket_name} on S3."
+        puts "Syncing #{@local} files to #{@bucket_name} on S3." if @verbose
         write_files
         delete_files if delete_files?
-        status_message
+        status_message if @verbose
       end
     end
 
@@ -247,7 +247,7 @@ module Photoapp
 
     # Print consecutive characters
     def progress(str)
-      print str
+      print str if @verbose
       $stdout.flush
     end
 

data/lib/photoapp/version.rb

@@ -1,3 +1,3 @@
 module Photoapp
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: desoto-photoapp
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-30 00:00:00.000000000 Z
+date: 2018-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rmagick
@@ -151,41 +151,13 @@ files:
 - assets/Update.app/Contents/Info.plist
 - assets/Update.app/Contents/MacOS/Application Stub
 - assets/Update.app/Contents/Resources/AutomatorApplet.icns
-- assets/Update.app/Contents/Resources/Dutch.lproj/ApplicationStub.nib
-- assets/Update.app/Contents/Resources/English.lproj/ApplicationStub.nib
-- assets/Update.app/Contents/Resources/French.lproj/ApplicationStub.nib
-- assets/Update.app/Contents/Resources/German.lproj/ApplicationStub.nib
-- assets/Update.app/Contents/Resources/Italian.lproj/ApplicationStub.nib
-- assets/Update.app/Contents/Resources/Japanese.lproj/ApplicationStub.nib
-- assets/Update.app/Contents/Resources/Spanish.lproj/ApplicationStub.nib
-- assets/Update.app/Contents/Resources/ar.lproj/ApplicationStub.nib
-- assets/Update.app/Contents/Resources/ca.lproj/ApplicationStub.nib
-- assets/Update.app/Contents/Resources/cs.lproj/ApplicationStub.nib
-- assets/Update.app/Contents/Resources/da.lproj/ApplicationStub.nib
-- assets/Update.app/Contents/Resources/el.lproj/ApplicationStub.nib
-- assets/Update.app/Contents/Resources/es_MX.lproj/ApplicationStub.nib
-- assets/Update.app/Contents/Resources/fi.lproj/ApplicationStub.nib
-- assets/Update.app/Contents/Resources/he.lproj/ApplicationStub.nib
-- assets/Update.app/Contents/Resources/hr.lproj/ApplicationStub.nib
-- assets/Update.app/Contents/Resources/hu.lproj/ApplicationStub.nib
-- assets/Update.app/Contents/Resources/id.lproj/ApplicationStub.nib
-- assets/Update.app/Contents/Resources/ko.lproj/ApplicationStub.nib
-- assets/Update.app/Contents/Resources/ms.lproj/ApplicationStub.nib
-- assets/Update.app/Contents/Resources/no.lproj/ApplicationStub.nib
-- assets/Update.app/Contents/Resources/pl.lproj/ApplicationStub.nib
-- assets/Update.app/Contents/Resources/pt.lproj/ApplicationStub.nib
-- assets/Update.app/Contents/Resources/pt_PT.lproj/ApplicationStub.nib
-- assets/Update.app/Contents/Resources/ro.lproj/ApplicationStub.nib
-- assets/Update.app/Contents/Resources/ru.lproj/ApplicationStub.nib
-- assets/Update.app/Contents/Resources/sk.lproj/ApplicationStub.nib
-- assets/Update.app/Contents/Resources/sv.lproj/ApplicationStub.nib
-- assets/Update.app/Contents/Resources/th.lproj/ApplicationStub.nib
-- assets/Update.app/Contents/Resources/tr.lproj/ApplicationStub.nib
-- assets/Update.app/Contents/Resources/uk.lproj/ApplicationStub.nib
-- assets/Update.app/Contents/Resources/vi.lproj/ApplicationStub.nib
-- assets/Update.app/Contents/Resources/zh_CN.lproj/ApplicationStub.nib
-- assets/Update.app/Contents/Resources/zh_TW.lproj/ApplicationStub.nib
 - assets/Update.app/Contents/document.wflow
+- "assets/Update.app/Icon\r"
+- assets/Upload.app/Contents/Info.plist
+- assets/Upload.app/Contents/MacOS/Application Stub
+- assets/Upload.app/Contents/Resources/AutomatorApplet.icns
+- assets/Upload.app/Contents/document.wflow
+- "assets/Upload.app/Icon\r"
 - assets/logo-source.afdesign
 - assets/photoapp-process.workflow/Contents/Info.plist
 - assets/photoapp-process.workflow/Contents/QuickLook/Thumbnail.png
@@ -226,7 +198,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: A tool for processing cave photos for DeSoto Caverns.