backupgem 0.0.7 → 0.0.8

data/lib/backup/rotator.rb

@@ -18,11 +18,33 @@ module Backup
       # verify that each of the directories exist, grandfathers, fathers, sons
       hierarchy.each { |m| verify_local_backup_directory_exists(m) }
 
+      where = place_in
+
       # place todays backup into the specified directory with a timestamp. 
       newname = timestamped_prefix(last_result)
-      sh "mv #{last_result} #{place_in}/#{newname}"
+      mv last_result, "#{where}/#{newname}"
+
+      cleanup_via_mv(where, how_many_to_keep_today)
+      update_state
+    end
 
-      cleanup_via_mv(place_in, how_many_to_keep_today)
+    def update_state
+      return unless :numeric == c[:rotation_mode] 
+      where = find_goes_in_by_state
+
+      previous_sons     = $state.system.sons_since_last_promotion    || 0
+      previous_fathers  = $state.system.fathers_since_last_promotion || 0
+
+      case where
+        when "sons"
+         $state.system.sons_since_last_promotion = previous_sons + 1
+        when "fathers"
+         $state.system.sons_since_last_promotion = 0
+         $state.system.fathers_since_last_promotion = previous_fathers + 1
+        when "grandfathers"
+         $state.system.sons_since_last_promotion = 0
+         $state.system.fathers_since_last_promotion = 0
+      end
     end
     
     def rotate_via_ssh(last_result)
@@ -35,10 +57,12 @@ module Backup
         ssh.verify_directory_exists(dir) 
       end  
 
+      where = place_in
+
       newname = timestamped_prefix(last_result)
-      ssh.run "mv #{last_result} #{place_in}/#{newname}"
+      ssh.run "mv #{last_result} #{where}/#{newname}"
 
-      ssh.cleanup_directory(place_in, how_many_to_keep_today)
+      ssh.cleanup_directory(where, how_many_to_keep_today)
       ssh.close
     end
 
@@ -86,7 +110,7 @@ module Backup
         path = c[:backup_path]
         full = path + "/" + dir
         unless File.exists?(full) 
-          sh "mkdir -p #{full}"  
+          mkdir_p full  
         end
       end
 
@@ -104,7 +128,7 @@ module Backup
 
         1.upto( diff ) do 
           extra = files.shift
-          sh "rm #{extra}"
+          rm extra
         end
       end
 
@@ -119,20 +143,48 @@ module Backup
                   promote_sons_today?    ? "fathers"      : "sons"
       end
 
-      def self.timestamped_prefix(name)
-        newname = Time.now.strftime("%Y-%m-%d-%H-%M-%S_") + File.basename(name)
+      def self.timestamped_prefix(name,time="%Y-%m-%d-%H-%M-%S")
+        time ||= "%Y-%m-%d-%H-%M-%S"  # there has to be a better way to do this
+                                      # but it works.
+        newname = Time.now.strftime(time) + "_" + File.basename(name)
       end
       
       # Given +name+ returns a timestamped version of name. 
       def timestamped_prefix(name)
-        Backup::Rotator.timestamped_prefix(name)
+        Backup::Rotator.timestamped_prefix(name,c[:timestamp])
       end
 
       private
+
+      # Decide where to place the next backup. g,f,or s. See the standard
+      # config for a description of the difference between numeric and temporal
+      # rotation mode
       def place_in
-        goes_in = todays_generation
+        if :numeric == c[:rotation_mode]
+          goes_in = find_goes_in_by_state       
+        else
+          goes_in = todays_generation
+        end
+
         place_in = c[:backup_path] + "/" + goes_in
       end
+
+      def find_goes_in_by_state
+        previous_sons     = $state.system.sons_since_last_promotion    || 0
+        previous_fathers  = $state.system.fathers_since_last_promotion || 0
+
+        #puts "in find goes in"
+        #puts "sons since last: " + $state.system.sons_since_last_promotion.to_s
+        #puts "fathers since last: " + $state.system.fathers_since_last_promotion.to_s
+
+        if previous_sons >= c[:sons_promoted_after] 
+          if previous_fathers >= c[:fathers_promoted_after]
+            return "grandfathers"
+          end
+          return "fathers"
+        end
+        "sons"
+      end
  
       # Returns the number of sons to keep. Looks for config values +:sons_to_keep+, 
       # +:son_promoted_on+. Default +14+.

data/lib/backup/state_recorder.rb

@@ -0,0 +1,21 @@
+require 'fileutils'
+
+class StateRecorder
+  attr_accessor :sons_since_last_promotion
+  attr_accessor :fathers_since_last_promotion
+  attr_accessor :saved_state_folder
+
+  def initialize
+    @sons_since_last_promotion     = 0
+    @fathers_since_last_promotion  = 0
+  end
+
+  # cleanup all the snapshots created by madeline
+  def cleanup_snapshots
+    files = Dir[saved_state_folder + "/*.snapshot"] 
+    files.pop
+    files.sort.each do |f|
+      FileUtils.rm(f, :verbose => false)
+    end
+  end
+end

data/tests/s3_test.rb

@@ -0,0 +1,40 @@
+require File.dirname(__FILE__) + "/tests_helper"
+
+class S3Test < Test::Unit::TestCase
+
+  # These tests require actual S3 access keys set as environment variables
+
+  def setup
+    @config = Backup::Configuration.new
+    @config.load "standard"
+    @config.set :backup_path, 'test_backup'
+    @config.action :deliver, :method => :s3 
+    @actor = Backup::S3Actor.new(@config) 
+  end
+
+  def test_exists
+    assert @config
+    assert @actor
+  end
+
+  def test_on_s3
+    dir = create_tmp_files
+    config = <<-END
+      action :content, :is_folder => "#{dir}"
+      action :rotate,  :method  => :via_s3
+    END
+    @config.load :string => config
+    assert result = @config.actor.content
+    assert File.exists?(result)
+    @config.actor.start_process!
+  end
+  
+  private
+  
+    def create_tmp_files
+      newtmp = @config[:tmp_dir] + "/test_#{rand}_" + Time.now.strftime("%Y%m%d%H%M%S")
+      sh "mkdir #{newtmp}"
+      0.upto(5) { |i| sh "touch #{newtmp}/#{i}" }
+      newtmp
+    end
+end

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
+rubygems_version: 0.9.4
 specification_version: 1
 name: backupgem
 version: !ruby/object:Gem::Version 
-  version: 0.0.7
-date: 2007-01-30 00:00:00 -08:00
+  version: 0.0.8
+date: 2007-08-03 00:00:00 -07:00
 summary: Beginning-to-end solution for backups and rotation.
 require_paths: 
 - lib
 email: nate@natemurray.com
 homepage: http://tech.natemurray.com/backup
-rubyforge_project: 
+rubyforge_project: backupgem
 description: 
 autorequire: backupgem
-default_executable: 
+default_executable: backup
 bindir: bin
 has_rdoc: true
 required_ruby_version: !ruby/object:Gem::Version::Requirement 
@@ -32,27 +32,86 @@ files:
 - bin/backup
 - bin/commands.sh
 - lib/backup
-- lib/backup.rb
 - lib/backup/actor.rb
+- lib/backup/actor.rb.orig
 - lib/backup/cli.rb
 - lib/backup/configuration.rb
 - lib/backup/date_parser.rb
 - lib/backup/extensions.rb
 - lib/backup/recipes
+- lib/backup/recipes/standard.rb
 - lib/backup/rotator.rb
 - lib/backup/s3_helpers.rb
 - lib/backup/ssh_helpers.rb
-- lib/backup/recipes/standard.rb
+- lib/backup/state_recorder.rb
+- lib/backup.rb
 - tests/actor_test.rb
 - tests/cleanup.sh
 - tests/optional
+- tests/optional/s3_test.rb
 - tests/rotation_test.rb
+- tests/s3_test.rb
 - tests/ssh_test.rb
 - tests/tests_helper.rb
-- tests/optional/s3_test.rb
 - examples/global.rb
 - examples/mediawiki.rb
+- examples/mediawiki_numeric.rb
 - examples/s3.rb
+- doc/Backup of backupgem.key
+- doc/Backup of backupgem.key/Contents
+- doc/Backup of backupgem.key/Contents/PkgInfo
+- doc/Backup of backupgem.key/droppedImage-2.pdf
+- doc/Backup of backupgem.key/droppedImage-3.pdf
+- doc/Backup of backupgem.key/droppedImage-5.pdf
+- doc/Backup of backupgem.key/droppedImage-6.pdf
+- doc/Backup of backupgem.key/index.apxl.gz
+- doc/Backup of backupgem.key/thumbs
+- doc/Backup of backupgem.key/thumbs/st0.tiff
+- doc/Backup of backupgem.key/thumbs/st1.tiff
+- doc/Backup of backupgem.key/thumbs/st15.tiff
+- doc/Backup of backupgem.key/thumbs/st2.tiff
+- doc/Backup of backupgem.key/thumbs/st3-1.tiff
+- doc/Backup of backupgem.key/thumbs/st3-2.tiff
+- doc/Backup of backupgem.key/thumbs/st3-3.tiff
+- doc/Backup of backupgem.key/thumbs/st3-4.tiff
+- doc/Backup of backupgem.key/thumbs/st3-5.tiff
+- doc/Backup of backupgem.key/thumbs/st3-6.tiff
+- doc/Backup of backupgem.key/thumbs/st3-7.tiff
+- doc/Backup of backupgem.key/thumbs/st3.tiff
+- doc/Backup of backupgem.key/thumbs/st4.tiff
+- doc/Backup of backupgem.key/thumbs/st5.tiff
+- doc/Backup of backupgem.key/thumbs/st6-1.tiff
+- doc/Backup of backupgem.key/thumbs/st6.tiff
+- doc/backup_flow.graffle
+- doc/backup_flow.graffle/data.plist
+- doc/backup_flow.graffle/Icon
+- doc/backup_flow.graffle/image1.ai
+- doc/backup_flow.graffle/image2.pict
+- doc/backupgem.key
+- doc/backupgem.key/Contents
+- doc/backupgem.key/Contents/PkgInfo
+- doc/backupgem.key/droppedImage-2.pdf
+- doc/backupgem.key/droppedImage-3.pdf
+- doc/backupgem.key/droppedImage-5.pdf
+- doc/backupgem.key/droppedImage-6.pdf
+- doc/backupgem.key/index.apxl.gz
+- doc/backupgem.key/thumbs
+- doc/backupgem.key/thumbs/st0.tiff
+- doc/backupgem.key/thumbs/st1.tiff
+- doc/backupgem.key/thumbs/st15.tiff
+- doc/backupgem.key/thumbs/st2.tiff
+- doc/backupgem.key/thumbs/st3-1.tiff
+- doc/backupgem.key/thumbs/st3-2.tiff
+- doc/backupgem.key/thumbs/st3-3.tiff
+- doc/backupgem.key/thumbs/st3-4.tiff
+- doc/backupgem.key/thumbs/st3-5.tiff
+- doc/backupgem.key/thumbs/st3-6.tiff
+- doc/backupgem.key/thumbs/st3-7.tiff
+- doc/backupgem.key/thumbs/st3.tiff
+- doc/backupgem.key/thumbs/st4.tiff
+- doc/backupgem.key/thumbs/st5.tiff
+- doc/backupgem.key/thumbs/st6-1.tiff
+- doc/backupgem.key/thumbs/st6.tiff
 - doc/index.html
 - doc/LICENSE-GPL
 - doc/styles.css
@@ -62,9 +121,10 @@ files:
 - Rakefile
 test_files: 
 - tests/actor_test.rb
+- tests/optional/s3_test.rb
 - tests/rotation_test.rb
+- tests/s3_test.rb
 - tests/ssh_test.rb
-- tests/optional/s3_test.rb
 rdoc_options: []
 
 extra_rdoc_files: 
@@ -72,8 +132,8 @@ extra_rdoc_files:
 - CHANGELOG
 - TODO
 - Rakefile
-executables: []
-
+executables: 
+- backup
 extensions: []
 
 requirements: []
@@ -106,3 +166,12 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.0.9
     version: 
+- !ruby/object:Gem::Dependency 
+  name: madeleine
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.7.3
+    version: