liquid_backup 0.1.4 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.2.0

data/lib/liquid_backup/job/modules/database_module.rb

@@ -0,0 +1,45 @@
+module LiquidBackup
+  class Job
+      module Database  
+        def Database.included(parent)
+          parent.class_eval <<-CALLBACK
+            include Database::StepCallbacks
+            set_callback :upload, :before do |object|
+              compress_database
+            end
+            
+            set_callback :backup, :before do |object|
+              FileUtils.mkdir_p File.join(current_backup_path,'databases')
+            end
+            
+            set_callback :upload, :after do 
+              FileUtils.rm_rf(File.join(current_backup_path,'databases'))
+            end
+          CALLBACK
+        end
+        
+        module StepCallbacks
+          def compress_database
+            return unless @_fire_database_callbacks
+            source        = File.join(current_backup_path,'databases')
+            destination   = File.join(current_backup_path,'databases.tar.gz')
+            
+            compress(source, destination)
+          end
+        end
+        
+        def database(name, options = {})
+          @_fire_database_callbacks = true
+          
+          destination    = File.join(current_backup_path,'databases', name + '_' + Date.today.strftime("%Y%m%d%H%M%S") + '.sql')
+          
+          `/usr/local/pgsql/bin/pg_dump -U postgres #{name} > #{destination}`
+        end
+      end
+    
+    include LiquidBackup::Job::Database
+  end
+end
+
+
+

data/lib/liquid_backup/job/modules/folder_module.rb

@@ -0,0 +1,44 @@
+module LiquidBackup
+  class Job
+      module Folder  
+        def Folder.included(parent)
+          parent.class_eval <<-CALLBACK
+            include Folder::StepCallbacks
+            set_callback :upload, :before do |object|
+              compress_folder
+            end
+            
+            set_callback :backup, :before do |object|
+              FileUtils.mkdir_p File.join(current_backup_path,'folders')
+            end
+
+            set_callback :upload, :after do 
+              FileUtils.rm_rf(File.join(current_backup_path,'folders'))
+            end
+          CALLBACK
+        end
+        
+        module StepCallbacks
+          def compress_folder
+            return unless @_fire_database_callbacks
+            
+            source        = File.join(current_backup_path,'folders')
+            destination   = File.join(current_backup_path,'folders.tar.gz')
+                          
+            compress(source, destination)
+          end
+        end
+        
+        def folder(path, options = {})
+          @_fire_database_callbacks = true
+          
+          source        = File.join(application_directory,'current',path)
+          destination   = File.join(current_backup_path,'folders',path.gsub('/','_') + '.tar.gz')
+          
+          compress(source, destination)
+        end
+      end
+    
+    include LiquidBackup::Job::Folder
+  end
+end

data/lib/liquid_backup/job.rb

@@ -1,4 +1,9 @@
+require 'active_support/concern'
+require 'active_support/callbacks'
+
 class LiquidBackup::Job
+  include ActiveSupport::Callbacks
+  
   attr_accessor :script_path
   attr_accessor :application_directory
   attr_accessor :backups_path
@@ -8,51 +13,50 @@ class LiquidBackup::Job
   attr_accessor :destination_handler
   attr_accessor :destination_location
   
+  define_callbacks :upload, :backup
+  
   def initialize(script_path)
     @script_path            = script_path
     @application_directory  = script_path.gsub('/current/config/backup.rb','')
     @backups_path           = File.join(application_directory,'backups')
     @current_backup_path    = File.join(backups_path,'current')
     @previous_backups_path  = File.join(backups_path,'previous')
-    
+  end
+  
+  set_callback :backup, :before do
     create_backup_folders
+    archive
   end
   
   def perform
-    archive
-    
     eval(File.read(script_path), binding)
-    
-    finalize
-    upload
   end
   
   def backup
-    yield
+    run_callbacks :backup do
+      yield
+    end
+    
+    run_callbacks :upload do
+      upload
+    end
+  end
+
+  set_callback :upload, :after do
+    cleanup
   end
   
   private 
-  
     def archive
       archive_files         = Dir.glob(File.join(current_backup_path,'*.tar.gz'))
       last_run              = File.mtime(current_backup_path).strftime("%Y%m%d%H%M%S")
       last_run_destination  = File.join(previous_backups_path,last_run)
       
-      FileUtils.mkdir_p last_run_destination
+      create_folder last_run_destination
       FileUtils.mv archive_files, last_run_destination
     end
     
-    def finalize
-      finalize_folders
-      finalize_databases
-
-      cleanup
-    end
-    
     def cleanup
-      FileUtils.rm_rf File.join(current_backup_path,'folders')      
-      FileUtils.rm_rf File.join(current_backup_path,'databases') 
-      
       previous_backups = Dir.glob(File.join(previous_backups_path,'*')).sort
       
       if previous_backups.length > LiquidBackup::KEEP
@@ -61,20 +65,6 @@ class LiquidBackup::Job
         FileUtils.rm_rf backups_to_prune
       end
     end
-  
-    def finalize_folders
-      source        = File.join(current_backup_path,'folders')
-      destination   = File.join(current_backup_path,'folders.tar.gz')
-      
-      compress(source, destination)
-    end
-    
-    def finalize_databases
-      source        = File.join(current_backup_path,'databases')
-      destination   = File.join(current_backup_path,'databases.tar.gz')
-      
-      compress(source, destination)
-    end
     
     def upload
       files_to_backup = Dir.glob(File.join(current_backup_path,'*.tar.gz'))
@@ -86,28 +76,17 @@ class LiquidBackup::Job
     end
   
     def create_backup_folders
-      FileUtils.mkdir_p backups_path
-      FileUtils.mkdir_p current_backup_path
-      FileUtils.mkdir_p File.join(current_backup_path,'folders')
-      FileUtils.mkdir_p File.join(current_backup_path,'databases')
-      FileUtils.mkdir_p previous_backups_path
+      create_folder backups_path, current_backup_path, previous_backups_path
+    end
+    
+    def create_folder(*name)
+      name.each{|f| FileUtils.mkdir_p f}
     end
     
     def destination(name, location)
       @destination_handler   = name
       @destination_location  = location
     end
-  
-    def folder(path, options = {})
-      source        = File.join(application_directory,'current',path)
-      destination   = File.join(current_backup_path,'folders',path.gsub('/','_') + '.tar.gz')
-      
-      compress(source, destination)
-    end
-    
-    def database(name, options = {})
-      destination    = File.join(current_backup_path,'databases', name + '_' + Date.today.strftime("%Y%m%d%H%M%S") + '.sql')
-      
-      `/usr/local/pgsql/bin/pg_dump -U postgres #{name} > #{destination}`
-    end
-end
+end
+
+Dir.glob(File.join(File.dirname(__FILE__),'job','modules','*_module.rb')).each {|s| require s}

data/lib/liquid_backup/manager.rb

@@ -3,17 +3,23 @@ class LiquidBackup::Manager
   include Singleton
   
   attr_accessor :backup_handler
+  attr_reader :backup_jobs
   
   def initialize
     @backup_handler = {}
+     @backup_jobs = []
   end
   
   def collect_jobs(pattern)
-    @backup_jobs = []
     Dir.glob(pattern).each do |backupjob|
       @backup_jobs << LiquidBackup::Job.new(backupjob)
     end
-    @backup_jobs
+    self
+  end
+  
+  def perform_all
+    @backup_jobs.each {|j| j.perform}
+    self
   end
   
   def use(name, handler)

data/spec/backup_spec.rb

@@ -3,11 +3,20 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 describe LiquidBackup do
   
   describe LiquidBackup::Manager do
-    it "should return a list of backup jobs" do
-      jobs = LiquidBackup::Manager.collect_jobs(File.join(File.dirname(__FILE__),'fs_root/home/**/current/config/backup.rb'))
-      jobs.should be_an(Array)
+    before(:all) do
+      @jobs_path = File.join(File.dirname(__FILE__),'fs_root/home/**/current/config/backup.rb')
+      LiquidBackup::Manager.collect_jobs(@jobs_path)
       
-      jobs.first.should be_an(LiquidBackup::Job)
+    end
+    
+    it "should store the list of jobs" do
+      LiquidBackup::Manager.collect_jobs(@jobs_path)
+      LiquidBackup::Manager.backup_jobs.should be_an(Array)
+    end
+    
+    it "should return itself to allow chaining" do
+      lbm = LiquidBackup::Manager.collect_jobs(@jobs_path)
+      lbm.should eql LiquidBackup::Manager.instance()
     end
   end
   

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 4
-  version: 0.1.4
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Dan Williams
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-04 00:00:00 -04:00
+date: 2010-03-05 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -62,6 +62,8 @@ files:
 - lib/liquid_backup.rb
 - lib/liquid_backup/handler/s3.rb
 - lib/liquid_backup/job.rb
+- lib/liquid_backup/job/modules/database_module.rb
+- lib/liquid_backup/job/modules/folder_module.rb
 - lib/liquid_backup/manager.rb
 - spec/backup_spec.rb
 - spec/fs_root/home/user1/app1/production/current/public/system/important_files/file1.txt