sweety_backy 0.0.5 → 0.0.7

data/lib/sweety_backy.rb

@@ -1,5 +1,6 @@
 require 'rubygems'
 require "s3"
+require 'digest/md5'
 
 require "#{File.dirname(__FILE__)}/sweety_backy/version"
 require "#{File.dirname(__FILE__)}/sweety_backy/runner"

data/lib/sweety_backy/commander.rb

@@ -1,6 +1,6 @@
 module SweetyBacky
   module Commander    
-    def self.do_files_backup( path, backup_path, opts )
+    def self.do_files_backup( path, backup_path )
       SweetyBacky::Utils.log "doing files backup of #{path} to #{backup_path}"
     
       FileUtils.mkdir_p( File.dirname( backup_path ) )
@@ -14,19 +14,19 @@ module SweetyBacky
       tmp_sql_file_path = File.join( Dir::tmpdir, "#{File.basename( backup_path, '.tar.gz' )}" )
       
       database_pass = opts[:database_pass].empty? ? '' : "-p#{opts[:database_pass]}"
-      
+
       SweetyBacky::Utils::command( "mysqldump -u#{opts[:database_user]} #{database_pass} #{database_name} > #{tmp_sql_file_path}" )
       SweetyBacky::Utils::command( "tar -cz --same-permissions --file #{backup_path} --directory #{File.dirname(tmp_sql_file_path)} #{File.basename(tmp_sql_file_path)}" )
       
       File.delete( tmp_sql_file_path )
     end
 
-    def self.clear( opts )
-      clear_files( opts )
-      clear_databases( opts )
+    def self.clean( opts )
+      clean_files( opts )
+      clean_databases( opts )
     end
   
-    def self.clear_files( opts )
+    def self.clean_files( opts )
       SweetyBacky::Utils.log "cleaning files on #{opts[:working_path]}/files/"
       
       opts[:paths].each do |path|
@@ -44,7 +44,7 @@ module SweetyBacky
       end
     end
     
-    def self.clear_databases( opts )
+    def self.clean_databases( opts )
       SweetyBacky::Utils.log "cleaning databases on #{opts[:working_path]}/databases/"
       
       opts[:databases].each do |database_name|
@@ -78,5 +78,11 @@ module SweetyBacky
       end
     end
     
+    def self.do_md5( path, md5_path )
+      digest = Digest::MD5.hexdigest( File.read( path ) )
+      File.open( md5_path, 'w' ) { |f| f.write digest }
+      
+      return digest
+    end
   end
 end

data/lib/sweety_backy/runner.rb

@@ -6,12 +6,14 @@ require File.dirname(__FILE__) + "/utils.rb"
 
 module SweetyBacky
   class Runner
-    attr_reader :opts
+    attr_reader :opts, :results
     
     def initialize( path = nil )
       if( !path.nil? )
         config( SweetyBacky::OptsReader.read_opts( path ) )
       end
+      
+      @results = []
     end
   
     def config( opts )
@@ -39,42 +41,80 @@ module SweetyBacky
     
     def do_files_backup
       @opts[:paths].each do |path|
+        success     = nil
         backup_path = "#{@opts[:working_path]}/files/#{SweetyBacky::Utils.namerize( path )}.#{Date.today.strftime('%Y%m%d')}.#{SweetyBacky::Utils.period}.tar.gz"
-        SweetyBacky::Commander.do_files_backup( path, backup_path, @opts )
+        md5_path    = "#{backup_path}.md5"
+        
+        begin
+
+          SweetyBacky::Commander.do_files_backup( path, backup_path )
+          SweetyBacky::Commander.do_md5( backup_path, md5_path )
         
-        if( @opts[:storage_system].to_sym == :s3 )
-          SweetyBacky::S3.upload(
-            backup_path,
-            "#{@opts[:s3_opts][:path]}/files/#{File.basename( backup_path )}",
-            @opts[:s3_opts]
-          )
+          if( @opts[:storage_system].to_sym == :s3 )
+            upload_databases_backup_to_s3( backup_path, md5_path )
+          end
+          
+          success = true
           
-          FileUtils.rm_rf backup_path
+        rescue Exception => e
+          Utils.log( "ERROR: backing up file: '#{path}', e: #{e.message}" )
+          Utils.log( e.backtrace.join("\n") )
+          
+          success = false
         end
+        
+        @results << { :name => "file: #{path}", :success => success }
       end
     end
     
     def do_databases_backup
       @opts[:databases].each do |database_name|
+        
+        success     = nil
         backup_path = "#{@opts[:working_path]}/databases/#{database_name}.#{Date.today.strftime('%Y%m%d')}.#{SweetyBacky::Utils.period}.sql.tar.gz"
-        SweetyBacky::Commander.do_database_backup( database_name, backup_path, @opts)
+        md5_path    = "#{backup_path}.md5"
         
-        if( @opts[:storage_system].to_sym == :s3 )
-          SweetyBacky::S3.upload(
-            backup_path,
-            "#{@opts[:s3_opts][:path]}/databases/#{File.basename( backup_path )}",
-            @opts[:s3_opts]
-          )
+        begin
+          SweetyBacky::Commander.do_database_backup( database_name, backup_path, @opts)
+          SweetyBacky::Commander.do_md5( backup_path, md5_path )
+        
+          if( @opts[:storage_system].to_sym == :s3 )
+            upload_databases_backup_to_s3( backup_path, md5_path )
+          end
+          
+          success = true
           
-          FileUtils.rm_rf backup_path
+        rescue Exception => e
+          Utils.log( "ERROR: backing up database: '#{database_name}', e: #{e.message}" )
+          Utils.log( e.backtrace.join("\n") )
+          
+          success = false
         end
+        
+        @results << { :name => "database: #{database_name}", :success => success }
+      end
+    end
+    
+
+    
+    def clean
+      SweetyBacky::Commander.clean( @opts )
+    end
+    
+    def print_results
+      Utils.log( "RESULTS:" )
+      Utils.log( "--------" )
+      
+      @results.each do |result|
+        Utils.log( "#{result[:name]} -> #{result[:success] ? 'OK' : 'ERROR'}" )
       end
     end
     
     def run
       begin
         do_backup
-        SweetyBacky::Commander.clear( @opts )
+        clean
+        print_results
       rescue => e
         SweetyBacky::Utils.log "ERROR: #{e}"
         SweetyBacky::Utils.log "BACKTRACE: #{e.backtrace.join("\n")}"
@@ -82,6 +122,41 @@ module SweetyBacky
       end
     end
   
+    private
+    
+    def upload_databases_backup_to_s3( backup_path, md5_path )
+      SweetyBacky::S3.upload(
+        backup_path,
+        "#{@opts[:s3_opts][:path]}/databases/#{File.basename( backup_path )}",
+        @opts[:s3_opts]
+      )
+    
+      SweetyBacky::S3.upload(
+        backup_path,
+        "#{@opts[:s3_opts][:path]}/databases/#{File.basename( md5_path )}",
+        @opts[:s3_opts]
+      )
+    
+      FileUtils.rm backup_path
+      FileUtils.rm md5_path
+    end
+    
+    def upload_files_backup_to_s3( backup_path, md5_path )
+      SweetyBacky::S3.upload(
+        backup_path,
+        "#{@opts[:s3_opts][:path]}/files/#{File.basename( backup_path )}",
+        @opts[:s3_opts]
+      )
+    
+      SweetyBacky::S3.upload(
+        md5_path,
+        "#{@opts[:s3_opts][:path]}/files/#{File.basename( md5_path )}",
+        @opts[:s3_opts]
+      )
+    
+      FileUtils.rm backup_path
+      FileUtils.rm md5_path
+    end
 
   end
 end

data/lib/sweety_backy/utils.rb

@@ -23,7 +23,7 @@ module SweetyBacky
     def self.command( _command )
       Utils.log "command: #{_command}"
       
-      result = %x( #{_command} 2>&1 )
+      result = %x( #{_command} )
     
       raise "ERROR: on command: '#{_command}', result: '#{result}'"  if $?.exitstatus != 0
     

data/lib/sweety_backy/version.rb

@@ -1,3 +1,3 @@
 module SweetyBacky
-  VERSION = "0.0.5"
+  VERSION = "0.0.7"
 end

data/test/commander_test.rb

@@ -17,8 +17,7 @@ class CommanderTest < Test::Unit::TestCase
   def test_do_files_backup
     SweetyBacky::Commander.do_files_backup( 
       "#{FIXTURES_PATH}/path", 
-      "#{@tmp_dir}/back.tar.gz",
-      {}
+      "#{@tmp_dir}/back.tar.gz"
     )
     
     result = %x(tar -tzvf #{@tmp_dir}/back.tar.gz)
@@ -45,7 +44,7 @@ class CommanderTest < Test::Unit::TestCase
   end
 
   
-  def test_clear
+  def test_clean
     opts = {
       :paths        => [ 'name1', 'name2' ],
       :databases    => [ 'name1', 'name2' ],
@@ -91,7 +90,7 @@ class CommanderTest < Test::Unit::TestCase
     # puts @tmp_dir
     # exit 1
     
-    SweetyBacky::Commander.clear( opts )
+    SweetyBacky::Commander.clean( opts )
     
     files_keeped = Dir.glob( "#{@tmp_dir}/files/*" ).join( "\n" )
     databases_keeped = Dir.glob( "#{@tmp_dir}/databases/*" ).join( "\n" )
@@ -128,7 +127,15 @@ class CommanderTest < Test::Unit::TestCase
       assert_no_match( /#{file_part}.sql.tar.gz/, databases_keeped )
     end
   end
-
+  
+  def test_do_md5
+    md5_path = "#{@tmp_dir}/#{Time.now.to_i}.md5"
+    fixture_file_path = "#{FIXTURES_PATH}/file_for_md5.txt"
     
+    md5 = SweetyBacky::Commander.do_md5( fixture_file_path, md5_path )
+    
+    assert_equal( '75fca8d37b0f7d75d11ccc8d255debe5', md5 )
+    assert_equal( '75fca8d37b0f7d75d11ccc8d255debe5', File.read( md5_path ) )
+  end
 end
 

data/test/fixtures/file_for_md5.txt

@@ -0,0 +1 @@
+This is the content

data/test/runner_test.rb

@@ -38,8 +38,11 @@ class RunnerTest < Test::Unit::TestCase
       @runner.do_backup
     end
     
-    assert( File.exists?( "#{@tmp_dir}/files/#{SweetyBacky::Utils.namerize( @opts[:paths][0] )}.20091231.yearly.tar.gz") )
-    assert( File.exists?( "#{@tmp_dir}/databases/test.20091231.yearly.sql.tar.gz") )
+    assert( File.exists?( "#{@tmp_dir}/files/#{SweetyBacky::Utils.namerize( @opts[:paths][0] )}.20091231.yearly.tar.gz" ) )
+    assert( File.exists?( "#{@tmp_dir}/databases/test.20091231.yearly.sql.tar.gz" ) )
+
+    assert( File.exists?( "#{@tmp_dir}/files/#{SweetyBacky::Utils.namerize( @opts[:paths][0] )}.20091231.yearly.tar.gz.md5" ) )
+    assert( File.exists?( "#{@tmp_dir}/databases/test.20091231.yearly.sql.tar.gz.md5" ) )
   end
   
   def test_do_backup_monthly    
@@ -71,7 +74,8 @@ class RunnerTest < Test::Unit::TestCase
 
   def test_run
     @runner.expects(:do_backup)
-    SweetyBacky::Commander.expects(:clear)
+    @runner.expects(:print_results)
+    SweetyBacky::Commander.expects(:clean)
     
     @runner.run
   end

data/test/s3/commander_s3_test.rb

@@ -31,7 +31,7 @@ class CommanderS3Test < Test::Unit::TestCase
     @bucket.destroy( true )
   end
 
-  def test_clear    
+  def test_clean    
     [
       'name1.20081231.yearly',
       'name1.20081232.yearly',
@@ -57,7 +57,7 @@ class CommanderS3Test < Test::Unit::TestCase
       SweetyBacky::S3.upload( "#{FIXTURES_PATH}/file.txt", "#{@opts[:s3_opts][:path]}/databases/#{file_part}.sql.tar.gz", @opts[:s3_opts] )
     end
     
-    SweetyBacky::Commander.clear( @opts )
+    SweetyBacky::Commander.clean( @opts )
     
     files_keeped = SweetyBacky::S3.paths_in( "#{@opts[:s3_opts][:path]}/files/*", @opts[:s3_opts] ).join( "\n" )
     databases_keeped = SweetyBacky::S3.paths_in( "#{@opts[:s3_opts][:path]}/databases/*", @opts[:s3_opts] ).join( "\n" )

data/test/s3/runner_s3_test.rb

@@ -53,6 +53,20 @@ class RunnerS3Test < Test::Unit::TestCase
           "test/path/databases/test.#{Date.today.strftime('%Y%m%d')}.daily.sql.tar.gz"
         ).exists? 
     )
+    
+    assert( 
+      @bucket.
+        object( 
+          "test/path/files/#{SweetyBacky::Utils.namerize( @opts[:paths][0] )}.#{Date.today.strftime('%Y%m%d')}.daily.tar.gz.md5"
+        ).exists? 
+    )
+    
+    assert( 
+      @bucket.
+        object( 
+          "test/path/databases/test.#{Date.today.strftime('%Y%m%d')}.daily.sql.tar.gz.md5"
+        ).exists? 
+    )
   end
     
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sweety_backy
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Fernando Guillen
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-05 00:00:00 +02:00
+date: 2011-07-18 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -105,6 +105,7 @@ files:
 - test/commander_test.rb
 - test/fixtures/config_s3.yml
 - test/fixtures/file.txt
+- test/fixtures/file_for_md5.txt
 - test/fixtures/path/a/file2.txt
 - test/fixtures/path/b/file3.txt
 - test/fixtures/path/file1.txt
@@ -154,6 +155,7 @@ test_files:
 - test/commander_test.rb
 - test/fixtures/config_s3.yml
 - test/fixtures/file.txt
+- test/fixtures/file_for_md5.txt
 - test/fixtures/path/a/file2.txt
 - test/fixtures/path/b/file3.txt
 - test/fixtures/path/file1.txt