astrails-safe 0.0.8 → 0.0.9

data/lib/astrails/safe.rb

@@ -1,3 +1,4 @@
+require 'extensions/mktmpdir'
 require 'astrails/safe/tmp_file'
 require 'astrails/safe/config/node'
 require 'astrails/safe/config/builder'
@@ -20,6 +21,7 @@ module Astrails
 
       Astrails::Safe::Mysqldump.run(config[:mysqldump, :databases], timestamp)
       Astrails::Safe::Archive.run(config[:tar, :archives], timestamp)
+      Astrails::Safe::TmpFile.cleanup
     end
   end
 end

data/lib/astrails/safe/archive.rb

@@ -6,6 +6,8 @@ module Astrails
         "tar -cf - #{@config[:options]} #{tar_exclude_files} #{tar_files}"
       end
 
+      def extension; 'tar'; end
+
       protected
 
       def tar_exclude_files

data/lib/astrails/safe/config/builder.rb

@@ -3,7 +3,7 @@ module Astrails
     module Config
       class Builder
         COLLECTIONS = %w/database archive/
-        ITEMS = %w/s3 key secret bucket path gpg password keep local mysqldump options
+        ITEMS = %w/s3 key secret bucket path prefix gpg password keep local mysqldump options
         user socket tar files exclude/
         NAMES = COLLECTIONS + ITEMS
         def initialize(node)

data/lib/astrails/safe/engine.rb

@@ -21,7 +21,7 @@ module Astrails
       def run
         puts "#{kind}: #{@id}" if $_VERBOSE
 
-        stream = Stream.new(@config, command, File.join(path, backup_filename))
+        stream = Stream.new(@config, command, backup_filepath)
         stream.run # execute backup comand. result is file stream.filename
 
         # UPLOAD
@@ -34,24 +34,26 @@ module Astrails
 
       protected
 
-      def kind
-        self.class.name.split('::').last.downcase
+      def self.kind
+        name.split('::').last.downcase
       end
-
-      def backup_filename
-        @backup_filename ||= "#{kind}-#{id}.#{timestamp}.tar"
+      def kind
+        self.class.kind
       end
 
       def expand(path)
-        path.gsub(/:kind\b/, kind).gsub(/:id\b/, id)
+        path .
+          gsub(/:kind\b/, kind) .
+          gsub(/:id\b/, id) .
+          gsub(/:timestamp\b/, timestamp)
       end
 
-      def s3_path
-        @s3_path ||= expand(@config[:s3, :path] || ":kind/:id")
+      def s3_prefix
+        @s3_prefix ||= expand(@config[:s3, :prefix] || ":kind/:id")
       end
 
-      def path
-        @path ||= File.expand_path(expand(@config[:path] || raise(RuntimeError, "missing :path in configuration")))
+      def backup_filepath
+        @backup_filepath ||= File.expand_path(expand(@config[:path] || raise(RuntimeError, "missing :path in configuration"))) << "." << extension
       end
 
 
@@ -63,7 +65,7 @@ module Astrails
 
         return unless bucket && key && secret
 
-        upload_path = File.join(s3_path, File.basename(filename))
+        upload_path = File.join(s3_prefix, File.basename(filename))
 
         puts "Uploading file #{filename} to #{bucket}/#{upload_path}" if $_VERBOSE || $DRY_RUN
         if $LOCAL
@@ -74,7 +76,7 @@ module Astrails
 
           unless $DRY_RUN
             AWS::S3::Bucket.create(bucket)
-            AWS::S3::S3Object.store(s3_path, open(filename), bucket)
+            AWS::S3::S3Object.store(upload_path, open(filename), bucket)
           end
         end
         puts "...done" if $_VERBOSE
@@ -112,12 +114,12 @@ module Astrails
 
         base = File.basename(filename).split(".").first
 
-        puts "listing files in #{bucket}:#{s3_path}"
-        files = AWS::S3::Bucket.objects(bucket, :prefix => s3_path, :max_keys => keep * 2)
-        puts files.collect(&:key) if $_VERBOSE
+        puts "listing files in #{bucket}:#{s3_prefix}"
+        files = AWS::S3::Bucket.objects(bucket, :prefix => s3_prefix, :max_keys => keep * 2)
+        puts files.collect {|x| x.key} if $_VERBOSE
 
         files = files.
-          collect(&:key).
+          collect {|x| x.key}.
           select{|f| File.basename(f)[0..(base.length - 1)] == base}.
           sort
 

data/lib/astrails/safe/mysqldump.rb

@@ -6,6 +6,8 @@ module Astrails
         "mysqldump  --defaults-extra-file=#{password_file} #{@config[:options]} #{mysql_skip_tables} #{@id}"
       end
 
+      def extension; 'sql'; end
+
       protected
 
       def password_file

data/lib/astrails/safe/tmp_file.rb

@@ -5,6 +5,10 @@ module Astrails
       @KEEP_FILES = []
       TMPDIR = Dir.mktmpdir
 
+      def self.cleanup
+        FileUtils.remove_entry_secure TMPDIR
+      end
+
       def self.create(name)
         # create temp directory
 

data/lib/extensions/mktmpdir.rb

@@ -0,0 +1,45 @@
+require 'tmpdir'
+
+unless Dir.respond_to?(:mktmpdir)
+  # backward compat for 1.8.6
+  class Dir
+    def Dir.mktmpdir(prefix_suffix=nil, tmpdir=nil)
+      case prefix_suffix
+      when nil
+        prefix = "d"
+        suffix = ""
+      when String
+        prefix = prefix_suffix
+        suffix = ""
+      when Array
+        prefix = prefix_suffix[0]
+        suffix = prefix_suffix[1]
+      else
+        raise ArgumentError, "unexpected prefix_suffix: #{prefix_suffix.inspect}"
+      end
+      tmpdir ||= Dir.tmpdir
+      t = Time.now.strftime("%Y%m%d")
+      n = nil
+      begin
+        path = "#{tmpdir}/#{prefix}#{t}-#{$$}-#{rand(0x100000000).to_s(36)}"
+        path << "-#{n}" if n
+        path << suffix
+        Dir.mkdir(path, 0700)
+      rescue Errno::EEXIST
+        n ||= 0
+        n += 1
+        retry
+      end
+
+      if block_given?
+        begin
+          yield path
+        ensure
+          FileUtils.remove_entry_secure path
+        end
+      else
+        path
+      end
+    end
+  end
+end

data/safe.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name     = "safe"
-  s.version  = "0.0.8"
+  s.version  = "0.0.9"
   s.date     = "2009-03-15"
   s.summary  = "Astrails Safe"
   s.email    = "we@astrails.com"
@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
   lib/astrails/safe/engine.rb
   lib/astrails/safe/archive.rb
   lib/astrails/safe/tmp_file.rb
+  lib/extensions/mktmpdir.rb
   templates/script.rb
   safe.gemspec
   )

data/templates/script.rb

@@ -1,10 +1,12 @@
 safe do
-  # global path
+  # backup file path (full, including filename)
+  # Note: do not include .tar, .sql, .gz or .pgp, it will be added automatically
   # supported substitutions:
   #   :kind -> backup 'engine' kind, e.g. "mysqldump" or "archive"
   #   :id -> backup 'id', e.g. "blog", "production", etc.
+  #   :timestamp -> current run timestamp (same for all the backups in the same 'run')
   # you can set separate :path for all backups (or once globally here)
-  path "/backup/:kind/:id"
+  path "/backup/:kind/:id-:timestamp"
 
   ## uncomment to enable uploads to Amazon S3
   ## Amazon S3 auth (optional)
@@ -12,6 +14,8 @@ safe do
   #   key YOUR_S3_KEY
   #   secret YOUR_S3_SECRET
   #   bucket S3_BUCKET
+  #   # prefix for uploads to S3. supports same substitution like :path
+  #   prefix ":kind/:id" # this is default
   # end
 
   ## alternative style:
@@ -34,8 +38,6 @@ safe do
   # backup mysql databases with mysqldump
   mysqldump do
     # you can override any setting from parent in a child:
-    path "/backup/mysql/:id"
-
     options "-ceKq --single-transaction --create-options"
 
     user "astrails"
@@ -69,8 +71,6 @@ safe do
 
 
   tar do
-    path "/backup/archives"
-
     # 'archive' is a collection item, just like 'database'
     # archive "git-repositories" do
     #   # files and directories to backup

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: astrails-safe
 version: !ruby/object:Gem::Version 
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors: 
 - Astrails Ltd.
@@ -40,6 +40,7 @@ files:
 - lib/astrails/safe/engine.rb
 - lib/astrails/safe/archive.rb
 - lib/astrails/safe/tmp_file.rb
+- lib/extensions/mktmpdir.rb
 - templates/script.rb
 - safe.gemspec
 has_rdoc: false