astrails-safe 0.1.6 → 0.1.7

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

@@ -60,8 +60,7 @@ module Astrails
             end
           end
         end
-
       end
     end
   end
-end
+end

data/lib/astrails/safe/gpg.rb

@@ -2,35 +2,38 @@ module Astrails
   module Safe
     class Gpg < Pipe
 
-      def compressed?
-        active? || @parent.compressed?
-      end
-
       protected
 
+      def post_process
+        @backup.compressed = true
+      end
+
       def pipe
         if key
-          rise RuntimeError, "can't use both gpg password and pubkey" if password
-          "|gpg -e -r #{key}"
+          "|gpg #{@config[:options]} -e -r #{key}"
         elsif password
-          "|gpg -c --passphrase-file #{gpg_password_file(password)}"
+          "|gpg #{@config[:options]} -c --passphrase-file #{gpg_password_file(password)}"
         end
       end
 
       def extension
-        ".gpg" if active?
+        ".gpg"
       end
 
       def active?
+        raise RuntimeError, "can't use both gpg password and pubkey" if key && password
+
         password || key
       end
 
+      private
+
       def password
-        @password ||= config[:gpg, :password]
+        @password ||= @config[:gpg, :password]
       end
 
       def key
-        @key ||= config[:gpg, :key]
+        @key ||= @config[:gpg, :key]
       end
 
       def gpg_password_file(pass)
@@ -39,4 +42,4 @@ module Astrails
       end
     end
   end
-end
+end

data/lib/astrails/safe/gzip.rb

@@ -2,24 +2,24 @@ module Astrails
   module Safe
     class Gzip < Pipe
 
-      def compressed?
-        true
-      end
-
       protected
 
+      def post_process
+        @backup.compressed = true
+      end
+
       def pipe
-        "|gzip" if active?
+        "|gzip"
       end
 
       def extension
-        ".gz" if active?
+        ".gz"
       end
 
       def active?
-        !@parent.compressed?
+        !@backup.compressed
       end
 
     end
   end
-end
+end

data/lib/astrails/safe/local.rb

@@ -2,45 +2,37 @@ module Astrails
   module Safe
     class Local < Sink
 
-      def open(&block)
-        return @parent.open(&block) unless active?
-        run
-        File.open(path, &block) unless $DRY_RUN
-      end
-
       protected
 
       def active?
         # S3 can't upload from pipe. it needs to know file size, so we must pass through :local
-        # will change once we add SSH sink
+        # will change once we add SSH/FTP sink
         true
       end
 
       def prefix
-        @prefix ||= File.expand_path(expand(@config[:local, :path] || raise(RuntimeError, "missing :local/:path in configuration")))
-      end
-
-      def command
-        "#{@parent.command} > #{path}"
+        @prefix ||= File.expand_path(expand(@config[:local, :path] || raise(RuntimeError, "missing :local/:path")))
       end
 
       def save
-        puts "command: #{command}" if $_VERBOSE
+        puts "command: #{@backup.command}" if $_VERBOSE
+
         unless $DRY_RUN
           FileUtils.mkdir_p(prefix) unless File.directory?(prefix)
-          system command
+          system "#{@backup.command}>#{@backup.path = path}"
         end
+
       end
 
       def cleanup
         return unless keep = @config[:keep, :local]
 
-        base = File.basename(filename).split(".").first
+        base = File.basename(@backup.filename).split(".").first
 
         pattern = File.join(prefix, "#{base}*")
         puts "listing files #{pattern.inspect}" if $_VERBOSE
         files = Dir[pattern] .
-          select{|f| File.file?(f)} .
+          select{|f| File.file?(f) && File.size(f) > 0} .
           sort
 
         cleanup_with_limit(files, keep) do |f|
@@ -48,7 +40,6 @@ module Astrails
           File.unlink(f) unless $DRY_RUN
         end
       end
-
     end
   end
 end

data/lib/astrails/safe/mysqldump.rb

@@ -3,7 +3,7 @@ module Astrails
     class Mysqldump < Source
 
       def command
-        @commanbd ||= "mysqldump --defaults-extra-file=#{mysql_password_file} #{@config[:options]} #{mysql_skip_tables} #{@id}"
+        "mysqldump --defaults-extra-file=#{mysql_password_file} #{@config[:options]} #{mysql_skip_tables} #{@id}"
       end
 
       def extension; '.sql'; end
@@ -28,4 +28,4 @@ module Astrails
 
     end
   end
-end
+end

data/lib/astrails/safe/pgdump.rb

@@ -0,0 +1,36 @@
+module Astrails
+  module Safe
+    class Pgdump < Source
+
+      def command
+        if @config["password"]
+          ENV['PGPASSWORD'] = @config["password"]
+        else
+          ENV['PGPASSWORD'] = nil
+        end
+        "pg_dump #{postgres_options} #{postgres_username} #{postgres_host} #{postgres_port} #{@id}"
+      end
+
+      def extension; '.sql'; end
+
+      protected
+
+      def postgres_options
+        @config[:options]
+      end
+
+      def postgres_host
+        @config["host"] && "--host='#{@config["host"]}'"
+      end
+
+      def postgres_port
+        @config["port"] && "--port='#{@config["port"]}'"
+      end
+
+      def postgres_username
+        @config["user"] && "--username='#{@config["user"]}'"
+      end
+
+    end
+  end
+end

data/lib/astrails/safe/pipe.rb

@@ -1,15 +1,13 @@
 module Astrails
   module Safe
     class Pipe < Stream
+      def process
+        return unless active?
 
-      def command
-        "#{@parent.command}#{pipe}"
+        @backup.command << pipe
+        @backup.extension << extension
+        post_process
       end
-
-      def filename
-        "#{@parent.filename}#{extension}"
-      end
-
     end
   end
 end

data/lib/astrails/safe/s3.rb

@@ -9,32 +9,30 @@ module Astrails
       end
 
       def prefix
-        @prefix ||= expand(config[:s3, :path] || expand(config[:local, :path] || ":kind/:id"))
+        @prefix ||= expand(config[:s3, :path] || config[:local, :path] || ":kind/:id")
       end
 
       def save
+        raise RuntimeError, "pipe-streaming not supported for S3." unless @backup.path
+
         # needed in cleanup even on dry run
         AWS::S3::Base.establish_connection!(:access_key_id => key, :secret_access_key => secret, :use_ssl => true) unless $LOCAL
 
-        file = @parent.open
         puts "Uploading #{bucket}:#{path}" if $_VERBOSE || $DRY_RUN
         unless $DRY_RUN || $LOCAL
           AWS::S3::Bucket.create(bucket)
-          AWS::S3::S3Object.store(path, file, bucket)
+          File.open(@backup.path) do |file|
+            AWS::S3::S3Object.store(path, file, bucket)
+          end
           puts "...done" if $_VERBOSE
         end
-        file.close if file
-
       end
 
       def cleanup
-
         return if $LOCAL
 
         return unless keep = @config[:keep, :s3]
 
-        bucket = @config[:s3, :bucket]
-
         base = File.basename(filename).split(".").first
 
         puts "listing files in #{bucket}:#{prefix}/#{base}"
@@ -52,15 +50,15 @@ module Astrails
       end
 
       def bucket
-        config[:s3, :bucket]
+        @config[:s3, :bucket]
       end
 
       def key
-        config[:s3, :key]
+        @config[:s3, :key]
       end
 
       def secret
-        config[:s3, :secret]
+        @config[:s3, :secret]
       end
 
     end

data/lib/astrails/safe/sink.rb

@@ -2,20 +2,18 @@ module Astrails
   module Safe
     class Sink < Stream
 
-      def run
-        if active?
-          save
-          cleanup
-        else
-          @parent.run
-        end
+      def process
+        return unless active?
+
+        save
+        cleanup
       end
 
       protected
 
       # prefix is defined in subclass
       def path
-        @path ||= File.join(prefix, filename)
+        @path ||= File.join(prefix, @backup.filename) + @backup.extension
       end
 
       # call block on files to be removed (all except for the LAST 'limit' files
@@ -26,8 +24,6 @@ module Astrails
         # TODO: validate here
         to_remove.each(&block)
       end
-
     end
   end
-end
-
+end

data/lib/astrails/safe/source.rb

@@ -2,27 +2,42 @@ module Astrails
   module Safe
     class Source < Stream
 
+      attr_accessor :id
       def initialize(id, config)
-        @id, @config = id, config
+        @id, @config = id.to_s, config
+      end
+
+      def timestamp
+        Time.now.strftime("%y%m%d-%H%M")
+      end
+
+      def kind
+        self.class.human_name
       end
 
       def filename
-        @filename ||= expand(":kind-:id.:timestamp#{extension}")
+        @filename ||= expand(":kind-:id.:timestamp")
       end
 
-      # process each config key as source (with full pipe)
-      def self.run(config)
-        unless config
-          puts "No configuration found for #{human_name}"
-          return
-        end
-
-        config.each do |key, value|
-          stream = [Gpg, Gzip, Local, S3].inject(new(key, value)) do |res, klass|
-            klass.new(res)
-          end
-          stream.run
-        end
+      def backup
+        return @backup if @backup
+        @backup = Backup.new(
+          :id        => @id,
+          :kind      => kind,
+          :extension => extension,
+          :command   => command,
+          :timestamp => timestamp
+        )
+        # can't do this in the initializer hash above since
+        # filename() calls expand() which requires @backup
+        @backup.filename = filename
+        @backup
+      end
+
+      protected
+
+      def self.human_name
+        name.split('::').last.downcase
       end
 
     end

data/lib/astrails/safe/stream.rb

@@ -2,44 +2,18 @@ module Astrails
   module Safe
     class Stream
 
-      def initialize(parent)
-        @parent = parent
-      end
-
-      def id
-        @id ||= @parent.id
-      end
-
-      def config
-        @config ||= @parent.config
-      end
-
-      def filename
-        @parent.filename
-      end
-
-      def compressed?
-        @parent && @parent.compressed?
-      end
-
-      protected
-
-      def self.human_name
-        name.split('::').last.downcase
-      end
-
-      def kind
-        @parent ? @parent.kind : self.class.human_name
+      attr_accessor :config, :backup
+      def initialize(config, backup)
+        @config, @backup = config, backup
       end
 
       def expand(path)
         path .
-          gsub(/:kind\b/, kind) .
-          gsub(/:id\b/, id) .
-          gsub(/:timestamp\b/, timestamp)
+        gsub(/:kind\b/, @backup.kind.to_s) .
+        gsub(/:id\b/, @backup.id.to_s) .
+        gsub(/:timestamp\b/, @backup.timestamp)
       end
 
     end
   end
-end
-
+end

data/lib/astrails/safe/svndump.rb

@@ -0,0 +1,13 @@
+module Astrails
+  module Safe
+    class Svndump < Source
+
+      def command
+        "svnadmin dump #{@config[:options]} #{@config[:repo_path]}"
+      end
+
+      def extension; '.svn'; end
+
+    end
+  end
+end