iphoto_backup 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9dc6333b0ff52d5877e21a81cc783da8c1425a1a
-  data.tar.gz: d40cfb52061a847c085d444e7bd5aec1a6db2323
+  metadata.gz: 90efaf9d3f334df3de1db5ea6bb0c8985cd5ec36
+  data.tar.gz: 27004da2e2ba4e5caeb4fd0513baea2be8482833
 SHA512:
-  metadata.gz: a2a91715481008c95ae63674149c22503ba73464fe1ecec5da343128a9b5673ba47681c2ac4bab5e7503dfb0fb743f761f807a3e87eb7a2489ebae61bf0482ac
-  data.tar.gz: 33649f5162aeec4b51ad59e191e5aba8938c403d07f432d1b3337eb8cabd82febc76b3b962ed095d28197747f5c55d56f9b6e5f6d4121f6b894dae9f6d4e789c
+  metadata.gz: 8c94711c88fe9750fb0827d9f958365d9f5f8ae8202634f460ab09841d5035b40038bb9fa7607b1dc9baf2e4519e9dd4b48859a1f905480a47dabb37d980547f
+  data.tar.gz: 5f788f673ad402d14c08ebf49f6be4c6f8776b926ea466047808ae0eda34e1feb0f94393e9fc147d0c617bc45a3604b051808460ba50f5e2a3facdb730f22535

data/.travis.yml

@@ -1,3 +1 @@
 language: ruby
-rvm:
-  - '2.0.0'

data/README.md

@@ -1,13 +1,13 @@
 [![Build Status](https://travis-ci.org/wireframe/iphoto_backup.png?branch=master)](https://travis-ci.org/wireframe/iphoto_backup)
+[![Coverage Status](https://coveralls.io/repos/wireframe/iphoto_backup/badge.png)](https://coveralls.io/r/wireframe/iphoto_backup)
+[![Code Climate](https://codeclimate.com/github/wireframe/iphoto_backup/badges/gpa.svg)](https://codeclimate.com/github/wireframe/iphoto_backup)
 
 # iphoto_backup
 
 > Every photo deserves to live in a folder on the filesystem and not
 > to be locked up in some cryptic and proprietary iPhoto metadata XML file.
 
-iphoto_backup is a tool to simplify backups and archiving of your iPhoto images.
-
-[Originally implemented as a Python script](https://github.com/wireframe/dotfiles/blob/628b982d9fc4e7b4cc9e6ca806cae81b541f9bbd/home/bin/iphoto_export.py)
+iphoto_backup is a tool that simplifies backups and archiving of your iPhoto images.
 
 ## Installation
 
@@ -43,6 +43,12 @@ Processing Roll: Summer Pics...
 Winter Pics does not match the filter: /Summer/
 ```
 
+#### --albums
+
+*aliased to -a*
+
+Export iPhoto albums instead of events.
+
 #### --output [/path/to/directory]
 
 *aliased to -o*
@@ -57,3 +63,5 @@ Customize the path for archiving photos.
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
+
+[Originally implemented as a Python script](https://github.com/wireframe/dotfiles/blob/628b982d9fc4e7b4cc9e6ca806cae81b541f9bbd/home/bin/iphoto_export.py)

data/iphoto_backup.gemspec

@@ -25,4 +25,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'pry'
+  spec.add_development_dependency 'coveralls'
 end

data/lib/iphoto_backup/cli.rb

@@ -13,24 +13,13 @@ module IphotoBackup
     option :output, desc: 'directory to export albums to', aliases: '-o', default: DEFAULT_OUTPUT_DIRECTORY
     option :config, desc: 'iPhoto AlbumData.xml file to process', aliases: '-c', default: IPHOTO_ALBUM_PATH
     option :'include-date-prefix', desc: 'automatically include ISO8601 date prefix to exported events', aliases: '-d', default: false, type: :boolean
-    option :albums, desc: 'export albums instead of events', aliases: '-a', default: false, type: :boolean
+    option :albums, desc: 'use albums for the export instead of events', aliases: '-a', default: false, type: :boolean
     def export
-      each_album do |folder_name, album_info|
-        say "\n\nProcessing Roll: #{folder_name}..."
+      each_photoset do |folder_name, album_info|
+        say "\n\nProcessing photos: #{folder_name}..."
 
         each_image(album_info) do |image_info|
-          source_path = value_for_dictionary_key('ImagePath', image_info).content
-
-          target_path = File.join(File.expand_path(options[:output]), folder_name, File.basename(source_path))
-          target_dir = File.dirname target_path
-          FileUtils.mkdir_p(target_dir) unless Dir.exists?(target_dir)
-
-          if FileUtils.uptodate?(source_path, [ target_path ])
-            say "  copying #{source_path} to #{target_path}"
-            FileUtils.copy source_path, target_path, preserve: true
-          else
-            print '.'
-          end
+          export_image(folder_name, image_info)
         end
       end
     end
@@ -38,37 +27,71 @@ module IphotoBackup
 
     private
 
+    def export_image(folder_name, image_info)
+      source_path = value_for_dictionary_key('ImagePath', image_info).content
+
+      target_path = File.join(File.expand_path(options[:output]), folder_name, File.basename(source_path))
+      target_dir = File.dirname target_path
+      FileUtils.mkdir_p(target_dir) unless Dir.exists?(target_dir)
+
+      if FileUtils.uptodate?(source_path, [target_path])
+        say "  copying #{source_path} to #{target_path}"
+        FileUtils.copy source_path, target_path, preserve: true
+      else
+        print '.'
+      end
+    end
+
+    def each_photoset(&block)
+      if options[:albums]
+        each_album(&block)
+      else
+        each_event(&block)
+      end
+    end
+
+    def each_event(&block)
+      events = value_for_dictionary_key('List of Rolls').children.select {|n| n.name == 'dict' }
+      events.each do |album_info|
+        event_name = value_for_dictionary_key('RollName', album_info).content
+        process_folder(event_name, album_info, &block)
+      end
+    end
+
     def each_album(&block)
-      albums = value_for_dictionary_key(album_type).children.select {|n| n.name == 'dict' }
+      albums = value_for_dictionary_key('List of Albums').children.select {|n| n.name == 'dict' }
       albums.each do |album_info|
-        folder_name = album_name album_info
-
-        if folder_name.match(album_filter)
-          yield folder_name, album_info
-        else
-          say "\n\n#{folder_name} does not match the filter: #{album_filter.inspect}"
-        end
+        album_name = value_for_dictionary_key('AlbumName', album_info).content
+        next if album_name == 'Photos'
+        process_folder(album_name, album_info, &block)
       end
     end
 
-    def album_type
-      options[:album] ? 'List of Albums' : 'List of Rolls'
+    def process_folder(folder, album_info, &block)
+      folder_name = add_date_to_folder_name(folder, album_info)
+
+      if folder_name.match(album_filter)
+        yield folder_name, album_info
+      else
+        say "\n\n#{folder_name} does not match the filter: #{album_filter.inspect}"
+      end
     end
 
-    def album_name(album_info)
-      folder_name = value_for_dictionary_key('RollName', album_info).content
+    def add_date_to_folder_name(folder_name, album_info)
+      return folder_name unless options[:'include-date-prefix']
+      return folder_name if folder_name =~ /^\d{4}-\d{2}-\d{2} /
+      [album_date(album_info), folder_name].compact.join(' ')
+    end
 
-      if options[:'include-date-prefix'] && folder_name !~ /^\d{4}-\d{2}-\d{2} /
-        album_date = nil
-        each_image album_info do |image_info|
-          next if album_date
-          photo_interval = value_for_dictionary_key('DateAsTimerInterval', image_info).content.to_i
-          album_date = (IPHOTO_EPOCH + photo_interval).strftime('%Y-%m-%d')
-        end
-        say "Automatically adding #{album_date} prefix to folder: #{folder_name}"
-        folder_name = "#{album_date} #{folder_name}"
+    # infer the date from the first image within the album
+    def album_date(album_info)
+      album_date = nil
+      each_image album_info do |image_info|
+        next if album_date
+        photo_interval = value_for_dictionary_key('DateAsTimerInterval', image_info).content.to_i
+        album_date = (IPHOTO_EPOCH + photo_interval).strftime('%Y-%m-%d')
       end
-      folder_name
+      album_date
     end
 
     def each_image(album_info, &block)

data/lib/iphoto_backup/version.rb

@@ -1,3 +1,3 @@
 module IphotoBackup
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

data/spec/fixtures/AlbumData.xml.erb

@@ -4,10 +4,25 @@
   <key>List of Albums</key>
   <array>
     <dict>
-      <key>RollID</key>
+      <key>AlbumId</key>
+      <integer>4</integer>
+      <key>AlbumName</key>
+      <string>Photos</string>
+      <key>Album Type</key>
+      <string>99</string>
+      <key>GUID</key>
+      <string>allPhotosAlbum</string>
+      <key>Master</key><true/>
+      <key>TransitionSpeed</key>
+      <real>1.000000</real>
+      <key>ShuffleSlides</key><false/>
+      <key>KeyList</key>
+    </dict>
+    <dict>
+      <key>AlbumID</key>
       <integer>640</integer>
-      <key>RollName</key>
-      <string>Summer Party</string>
+      <key>AlbumName</key>
+      <string>My Vacation</string>
       <key>RollDateAsTimerInterval</key>
       <real>21600.000000</real>
       <key>KeyPhotoKey</key>

data/spec/lib/iphoto_backup/cli_spec.rb

@@ -60,7 +60,7 @@ describe IphotoBackup::CLI do
       it 'creates folder for first event' do
         expect(File.exists?('tmp/backup/Summer Party')).to eq true
       end
-      it 'does not createfolder for second event' do
+      it 'does not create folder for second event' do
         expect(File.exists?('tmp/backup/2013-10-10 Fall Supper')).to eq false
       end
     end
@@ -74,7 +74,19 @@ describe IphotoBackup::CLI do
         }
       }
       it 'creates folder for album' do
-        expect(File.exists?('tmp/backup/Summer Party')).to eq true
+        expect(File.exists?('tmp/backup/My Vacation')).to eq true
+      end
+      it 'copies images for album' do
+        expect(Dir.glob('tmp/backup/My Vacation/*.jpg').length).to eq 2
+      end
+      it 'does not create folder for Photos album' do
+        expect(File.exists?('tmp/backup/Photos')).to eq false
+      end
+      it 'does not create folder for first event' do
+        expect(File.exists?('tmp/backup/Summer Party')).to eq false
+      end
+      it 'does not create folder for second event' do
+        expect(File.exists?('tmp/backup/2013-10-10 Fall Supper')).to eq false
       end
     end
     context 'with --include-date-prefix option' do

data/spec/spec_helper.rb

@@ -1,3 +1,6 @@
+require 'coveralls'
+Coveralls.wear!
+
 require 'rubygems'
 require 'bundler/setup'
 require 'pry'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iphoto_backup
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Ryan Sonnek
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: tool for backing up iPhoto files
 email:
 - ryan@codecrate.com
@@ -120,7 +134,6 @@ files:
 - spec/fixtures/image2.jpg
 - spec/lib/iphoto_backup/cli_spec.rb
 - spec/spec_helper.rb
-- spec/support/meet_expectations_matcher.rb
 homepage: ''
 licenses:
 - MIT
@@ -151,4 +164,3 @@ test_files:
 - spec/fixtures/image2.jpg
 - spec/lib/iphoto_backup/cli_spec.rb
 - spec/spec_helper.rb
-- spec/support/meet_expectations_matcher.rb

data/spec/support/meet_expectations_matcher.rb

@@ -1,7 +0,0 @@
-# empty matcher to allow for mock expectations to fire
-RSpec::Matchers.define :meet_expectations do |expected|
-  match do |actual|
-    # do nothing
-    expect(true).to be_true
-  end
-end