s3archive 1.3.0 → 1.4.1

data/lib/s3archive/compress_and_upload.rb

@@ -20,7 +20,7 @@ module S3Archive
     def initialize(path)
       @path = path
     end
-    
+
     def run
       unless File.exists?(path)
         logger.error("COULD NOT FIND '#{path}'")
@@ -36,14 +36,15 @@ module S3Archive
 
     private
     def compress?
-      @do_compress ||= begin
-        if path.end_with?('.gz')
+      unless defined? @compression_needed
+        if path.end_with?('.gz') || path.end_with?('.tgz')
           logger.info("** #{path} already compressed, skipping compression")
-          false
+          @compression_needed = false
         else
-          true
+          @compression_needed = true
         end
       end
+      @compression_needed
     end
 
     def compress!
@@ -76,7 +77,11 @@ module S3Archive
 
     def key
       year, month, day = Time.now.strftime("%Y-%m-%d").split('-')
-      [hostname, year, month, day, "#{filename}.gz"].join('/')
+      [hostname, year, month, day, basename_gz].join('/')
+    end
+
+    def basename_gz
+      compress? ? "#{filename}.gz" : filename
     end
 
     def filename

data/lib/s3archive/db_dump.rb

@@ -0,0 +1,40 @@
+require 'thor'
+$:.unshift File.join(File.dirname(__FILE__), '..')
+require 's3archive/compress_and_upload'
+require 's3archive/logging'
+
+module S3Archive
+  class DbDump
+    include Logging
+
+    attr_reader :db_config, :dump_path, :name
+
+    def initialize(db_config, name = 'dbdump')
+      @db_config = db_config
+      @name = name.gsub(/\s+/, '_')
+    end
+
+    def run
+      backup_filename = "#{name}-#{Time.now.utc.strftime("%Y%m%dT%H%M%S")}.sql.gz"
+      backup_path = "/tmp/#{backup_filename}"
+      logger.info "* Dumping and compressing data to #{backup_path}."
+      case db_config['adapter']
+      when /^mysql/
+        db_host = db_config['host']
+        db_name = db_config['database']
+        password = "-p#{db_config['password']}" if db_config['password']
+        backup_options = "--opt --skip-lock-tables --single-transaction --skip-extended-insert"
+        dump_options = "-u #{db_config['username']} #{password} #{backup_options} -h #{db_host} #{db_name}"
+        logger.info "** Backing up mysql db #{db_name}@#{db_host}"
+        system "mysqldump #{dump_options} | gzip -c > #{backup_path}"
+      else
+        db_config.delete 'password'
+        msg = "Don't know how to dump #{db_config['adapter']} database: #{db_config.inspect}'"
+        logger.fatal msg
+        raise msg
+      end
+
+      @dump_path = backup_path
+    end
+  end
+end

data/lib/tasks/s3archive.thor

@@ -2,6 +2,7 @@ require 'thor'
 $:.unshift File.join(File.dirname(__FILE__), '..')
 require 's3archive/postrotate'
 require 's3archive/compress_and_upload'
+require 's3archive/db_dump'
 require 's3archive/logging'
 
 module S3Archive
@@ -59,6 +60,36 @@ EOF
       puts ::S3Archive::Config.sample_yaml
     end
 
+    desc "dbdump [options] CONFIG_PATH", "Dump database for ENV (default production) and upload"
+    method_option :environment,
+    :aliases => '-e',
+    :type => :string,
+    :default => 'production',
+    :banner => 'ENV',
+    :desc => "Use db configuration from this environment."
+    method_option :name,
+    :aliases => '-n',
+    :type => :string,
+    :default => 'dbdump',
+    :desc => 'Basename for the dump file. Timestamp and sql.gz will be added.'
+    long_desc <<-EOT
+Dump and archive a database specified in the rails-style YAML file at CONFIG_PATH.
+By default the production database will be dumped.
+EOT
+    def dbdump(yaml_path)
+      db_config = YAML.load_file(yaml_path)[options[:environment]]
+      dumper = ::S3Archive::DbDump.new(db_config, options[:name])
+      begin
+        dumper.run
+        set_config
+        ::S3Archive::CompressAndUpload.run(dumper.dump_path)
+      rescue Exception => e
+        logger.error(e)
+      ensure
+        File.unlink(dumper.dump_path) if dumper.dump_path && File.exists?(dumper.dump_path)
+      end
+    end
+
     no_tasks do
       def set_config
         unless File.exists?(options[:config])

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: s3archive
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.1
   prerelease: 
 platform: ruby
 authors:
 - Petter Remen
+- David Vrensk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-31 00:00:00.000000000 Z
+date: 2012-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -70,6 +71,7 @@ files:
 - bin/s3archive
 - lib/s3archive/compress_and_upload.rb
 - lib/s3archive/config.rb
+- lib/s3archive/db_dump.rb
 - lib/s3archive/logging.rb
 - lib/s3archive/postrotate.rb
 - lib/s3archive/s3_file_synchronizer.rb