sweety_backy 0.0.9 → 0.0.11

data/lib/sweety_backy/commander.rb

@@ -13,7 +13,7 @@ module SweetyBacky
       FileUtils.mkdir_p( File.dirname( backup_path ) )
       tmp_sql_file_path = File.join( Dir::tmpdir, "#{File.basename( backup_path, '.tar.gz' )}" )
       
-      database_pass = opts[:database_pass].empty? ? '' : "-p#{opts[:database_pass]}"
+      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)}" )
@@ -34,10 +34,9 @@ module SweetyBacky
         
         [:yearly, :monthly, :weekly, :daily].each do |period|
           paths_in( 
-            "#{opts[:working_path]}/files/#{SweetyBacky::Utils.namerize( path )}.*.#{period.to_s}.*",
+            "#{opts[:working_path]}/files/#{SweetyBacky::Utils.namerize( path )}.*.#{period.to_s}.tar.gz",
             opts
           ).sort[0..(-1*(opts[period]+1))].each do |file_path|
-            SweetyBacky::Utils.log "removing: #{file_path}"
             remove_path( file_path, opts )
           end      
         end
@@ -52,10 +51,9 @@ module SweetyBacky
         
         [:yearly, :monthly, :weekly, :daily].each do |period|
           paths_in( 
-            "#{opts[:working_path]}/databases/#{database_name}.*.#{period.to_s}.*",
+            "#{opts[:working_path]}/databases/#{database_name}.*.#{period.to_s}.sql.tar.gz",
             opts
           ).sort[0..(-1*(opts[period]+1))].each do |file_path|
-            SweetyBacky::Utils.log "removing: #{file_path}"
             remove_path( file_path, opts )
           end      
         end
@@ -72,8 +70,10 @@ module SweetyBacky
     
     def self.remove_path( path, opts )
       if( opts[:storage_system].to_sym == :s3 )
+        SweetyBacky::Utils.log "cleaning: removing #{opts[:s3_opts][:bucket]}/#{path}"
         SweetyBacky::S3.delete( path, opts[:s3_opts] )
       else
+        SweetyBacky::Utils.log "cleaning: removing #{path}"
         File.delete( path )
       end
     end

data/lib/sweety_backy/version.rb

@@ -1,3 +1,3 @@
 module SweetyBacky
-  VERSION = "0.0.9"
+  VERSION = "0.0.11"
 end

data/test/s3/commander_s3_test.rb

@@ -12,7 +12,7 @@ class CommanderS3Test < Test::Unit::TestCase
       :monthly      => 2,
       :weekly       => 3,
       :daily        => 4,
-      :storage_system => :s3,
+      :storage_system => 's3',
       :s3_opts => {
         :bucket       => 'sweety_backy_test',
         :path         => 'test/path',

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sweety_backy
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 9
   prerelease: false
   segments: 
   - 0
   - 0
-  - 9
-  version: 0.0.9
+  - 11
+  version: 0.0.11
 platform: ruby
 authors: 
 - Fernando Guillen
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-19 00:00:00 +02:00
+date: 2011-07-20 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency