paparazzi 0.1.0 → 0.1.1

data/README.md

@@ -30,8 +30,8 @@ Create a ruby script that you'll run hourly from a cron.
     settings = {
       :source => '/full/path/to/source/directory/',           # note the trailing '/'
       :destination => '/mnt/external_drive/backup_folder',
-      :rsync_flags => '-L'                                    # see 'man rsync' for available options.
-    }    
+      :rsync_flags => '-L  --exclude lost+found'              # see 'man rsync' for available options.
+    }                                                         # Paparazzi sends '-aq --delete', plus whatever you add.
 
     Paparazzi::Camera.trigger(settings)
     

data/lib/paparazzi/camera.rb

@@ -29,6 +29,9 @@ module Paparazzi
           if REQUIRED_SETTINGS.include?(setting_name) and settings[setting_name].nil?
             raise MissingSettingError, "#{setting_name} is required"
           else
+            if setting_name == :rsync_flags
+              settings[setting_name] = settings[setting_name].split(/\s/)
+            end
             self.send("#{setting_name}=",settings[setting_name])
           end
         end
@@ -80,10 +83,10 @@ module Paparazzi
         FREQUENCIES.each do |frequency|
           Dir.mkdir(current_snapshot(frequency)) unless File.exists?(current_snapshot(frequency))
           if frequency == :hourly and previous_snapshot_name(frequency) == ''
-            system 'rsync', *(['-aq', '--delete'] + [rsync_flags] + [source, current_snapshot(frequency)])
+            system 'rsync', *(['-aq', '--delete'] + rsync_flags + [source, current_snapshot(frequency)])
             self.last_successful_hourly_snapshot = current_snapshot_name(:hourly)
           elsif previous_snapshot_name(frequency) != current_snapshot_name(frequency)
-            system 'rsync', *(['-aq', '--delete', "--link-dest=#{link_destination(frequency)}"] + [rsync_flags] + [source, current_snapshot(frequency)])
+            system 'rsync', *(['-aq', '--delete', "--link-dest=#{link_destination(frequency)}"] + rsync_flags + [source, current_snapshot(frequency)])
             self.last_successful_hourly_snapshot = current_snapshot_name(:hourly)
           end
         end

data/lib/paparazzi/version.rb

@@ -1,3 +1,3 @@
 module Paparazzi
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/test/source/test.exclude

@@ -0,0 +1 @@
+exclude me

data/test/unit/camera_test.rb

@@ -17,7 +17,7 @@ class CameraTest < Test::Unit::TestCase
   
   def test_should_store_valid_settings_in_attr_accessors
     Paparazzi::Camera.trigger(default_test_settings)
-    [:source,:destination,:rsync_flags].each do |setting_name|
+    [:source,:destination].each do |setting_name|
       assert_equal(default_test_settings[setting_name],Paparazzi::Camera.send(setting_name),setting_name)
     end
   end
@@ -93,6 +93,11 @@ class CameraTest < Test::Unit::TestCase
     assert_equal(5,File.stat("#{destination}/hourly/#{Paparazzi::Camera.send(:current_snapshot_name,:hourly)}/test.txt").nlink)   
   end
   
+  def test_excluded_files_are_not_backed_up
+    Paparazzi::Camera.trigger(default_test_settings)
+    assert(!File.exists?("#{destination}/hourly/#{Paparazzi::Camera.send(:current_snapshot_name,:hourly)}/test.exclude"))
+  end
+  
   #######
   private
   #######
@@ -102,10 +107,10 @@ class CameraTest < Test::Unit::TestCase
   end
   
   def default_test_settings
-    @default_test_settings ||= {
+    {
       :source => "#{File.expand_path('../../source',  __FILE__)}/",
       :destination => destination,
-      :rsync_flags => '-L'
+      :rsync_flags => '-L --exclude test.exclude'
     }
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Jonathan S. Garvin
@@ -51,6 +51,7 @@ files:
 - lib/paparazzi/version.rb
 - paparazzi.gemspec
 - test/destination/.gitignore
+- test/source/test.exclude
 - test/source/test.txt
 - test/unit/camera_test.rb
 has_rdoc: true
@@ -87,5 +88,6 @@ specification_version: 3
 summary: Rsync backup library with incremental snapshots.
 test_files: 
 - test/destination/.gitignore
+- test/source/test.exclude
 - test/source/test.txt
 - test/unit/camera_test.rb