iphoto_backup 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 44c4fce9fadb69fc79509c4e8985821fd195f200
-  data.tar.gz: 138043130b9820d45a1f5c8825b4c6e0ca43b20a
+  metadata.gz: 9dc6333b0ff52d5877e21a81cc783da8c1425a1a
+  data.tar.gz: d40cfb52061a847c085d444e7bd5aec1a6db2323
 SHA512:
-  metadata.gz: 3e29cf915394e78d8ebaa78b9608512a5a398b690d621f93ddac8d486a45cf779649f31525a783e8f04ca6ad5d12337cd7b999103d8e888eb3c5b077d44c1041
-  data.tar.gz: 1a83b334c6cf959d7a0dd4b5fbba0f3a1c6bc06a2e509ac28ac7ad8a9147f61b1ddf5d155f17d9da74f81d765b15b5b7dcf9ff3b1f5f00308cefcebc09a20b56
+  metadata.gz: a2a91715481008c95ae63674149c22503ba73464fe1ecec5da343128a9b5673ba47681c2ac4bab5e7503dfb0fb743f761f807a3e87eb7a2489ebae61bf0482ac
+  data.tar.gz: 33649f5162aeec4b51ad59e191e5aba8938c403d07f432d1b3337eb8cabd82febc76b3b962ed095d28197747f5c55d56f9b6e5f6d4121f6b894dae9f6d4e789c

data/.ruby-version

@@ -1 +1 @@
-2.0.0-p353
+2.1.2

data/lib/iphoto_backup/cli.rb

@@ -13,6 +13,7 @@ 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
     def export
       each_album do |folder_name, album_info|
         say "\n\nProcessing Roll: #{folder_name}..."
@@ -38,7 +39,7 @@ module IphotoBackup
     private
 
     def each_album(&block)
-      albums = value_for_dictionary_key("List of Rolls").children.select {|n| n.name == 'dict' }
+      albums = value_for_dictionary_key(album_type).children.select {|n| n.name == 'dict' }
       albums.each do |album_info|
         folder_name = album_name album_info
 
@@ -50,6 +51,10 @@ module IphotoBackup
       end
     end
 
+    def album_type
+      options[:album] ? 'List of Albums' : 'List of Rolls'
+    end
+
     def album_name(album_info)
       folder_name = value_for_dictionary_key('RollName', album_info).content
 

data/lib/iphoto_backup/version.rb

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

data/spec/fixtures/AlbumData.xml.erb

@@ -1,6 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plist version="1.0">
 <dict>
+  <key>List of Albums</key>
+  <array>
+    <dict>
+      <key>RollID</key>
+      <integer>640</integer>
+      <key>RollName</key>
+      <string>Summer Party</string>
+      <key>RollDateAsTimerInterval</key>
+      <real>21600.000000</real>
+      <key>KeyPhotoKey</key>
+      <string>1001</string>
+      <key>PhotoCount</key>
+      <integer>4</integer>
+      <key>KeyList</key>
+      <array>
+      <string>1001</string>
+      <string>1002</string>
+      </array>
+    </dict>
+  </array>
   <key>List of Rolls</key>
   <array>
     <dict>

data/spec/lib/iphoto_backup/cli_spec.rb

@@ -37,10 +37,10 @@ describe IphotoBackup::CLI do
     end
     context 'with basic options' do
       it 'creates folder for first event' do
-        expect(File.exists?('tmp/backup/Summer Party')).to be_true
+        expect(File.exists?('tmp/backup/Summer Party')).to eq true
       end
       it 'creates folder for second event' do
-        expect(File.exists?('tmp/backup/2013-10-10 Fall Supper')).to be_true
+        expect(File.exists?('tmp/backup/2013-10-10 Fall Supper')).to eq true
       end
       it 'copies images for first event' do
         expect(Dir.glob('tmp/backup/Summer Party/*.jpg').length).to eq 2
@@ -58,13 +58,26 @@ describe IphotoBackup::CLI do
         }
       }
       it 'creates folder for first event' do
-        expect(File.exists?('tmp/backup/Summer Party')).to be_true
+        expect(File.exists?('tmp/backup/Summer Party')).to eq true
       end
       it 'does not createfolder for second event' do
-        expect(File.exists?('tmp/backup/2013-10-10 Fall Supper')).to be_false
+        expect(File.exists?('tmp/backup/2013-10-10 Fall Supper')).to eq false
       end
     end
-    context 'with --include-date-prefix option', focus: true do
+    context 'with --albums option' do
+      let(:options) {
+        {
+          config: 'tmp/AlbumData.xml',
+          output: TMP_OUTPUT_DIRECTORY,
+          filter: '.*',
+          albums: true
+        }
+      }
+      it 'creates folder for album' do
+        expect(File.exists?('tmp/backup/Summer Party')).to eq true
+      end
+    end
+    context 'with --include-date-prefix option' do
       let(:options) {
         {
           config: 'tmp/AlbumData.xml',
@@ -74,10 +87,10 @@ describe IphotoBackup::CLI do
         }
       }
       it 'creates folder for first event and adds date prefix' do
-        expect(File.exists?('tmp/backup/2013-10-02 Summer Party')).to be_true
+        expect(File.exists?('tmp/backup/2013-10-02 Summer Party')).to eq true
       end
       it 'creates folder for second event and uses existing date prefix' do
-        expect(File.exists?('tmp/backup/2013-10-10 Fall Supper')).to be_true
+        expect(File.exists?('tmp/backup/2013-10-10 Fall Supper')).to eq true
       end
     end
   end

metadata

@@ -1,97 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: iphoto_backup
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Ryan Sonnek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-02 00:00:00.000000000 Z
+date: 2014-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   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'
 - !ruby/object:Gem::Dependency
   name: rspec
   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'
 - !ruby/object:Gem::Dependency
   name: pry
   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
@@ -102,10 +102,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .ruby-version
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".ruby-version"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -131,17 +131,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: copy files out of iPhoto into a backup directory