Merge branch 'master' of github.com:wr0ngway/rubber

wr0ngway · Mar 22, 2011 · ea26d35 · ea26d35
2 parents 21a41d5 + add1ef6
commit ea26d35
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/lib/rubber/tasks/rubber.rb b/lib/rubber/tasks/rubber.rb
@@ -171,15 +171,16 @@ def init_s3()
     dir = get_env('BACKUP_DIR', true)
     age = (get_env('BACKUP_AGE') || 3).to_i
     time_stamp = Time.now.strftime("%Y-%m-%d_%H-%M")
-    backup_file = "#{dir}/#{RUBBER_ENV}_dump_#{time_stamp}.sql.gz"
-    FileUtils.mkdir_p(File.dirname(backup_file))
 
     user = get_env('DBUSER', true)
     pass = get_env('DBPASS')
     pass = nil if (pass.nil? || pass.strip.size == 0)
     host = get_env('DBHOST', true)
     name = get_env('DBNAME', true)
 
+    backup_file = "#{dir}/#{RUBBER_ENV}_#{name}_dump_#{time_stamp}.sql.gz"
+    FileUtils.mkdir_p(File.dirname(backup_file))
+
     raise "No db_backup_cmd defined in rubber.yml, cannot backup!" unless rubber_env.db_backup_cmd
     db_backup_cmd = rubber_env.db_backup_cmd.gsub(/%([^%]+)%/, '#{\1}')
     db_backup_cmd = eval('%Q{' + db_backup_cmd + '}')
@@ -256,7 +257,8 @@ def init_s3()
         data = s3objects.detect { |o| file == o.key }
       else
         puts "trying to fetch last modified s3 backup"
-        data = s3objects.max {|a,b| a.about["last-modified"] <=> b.about["last-modified"] }
+        filtered = s3objects.select { |f| f.path =~ /#{RUBBER_ENV}_#{name}/ }
+        data = filtered.max {|a,b| a.about["last-modified"] <=> b.about["last-modified"] }
       end
     end
     raise "could not access backup file via s3" unless data