stratocumulus 0.0.4 → 0.0.5

data/.travis.yml

@@ -3,3 +3,13 @@ rvm:
   - 2.1.2
   - 2.0.0
   - 1.9.3
+before_install:
+  - source /etc/lsb-release && echo "deb http://download.rethinkdb.com/apt $DISTRIB_CODENAME main" | sudo tee /etc/apt/sources.list.d/rethinkdb.list
+  - wget -O- http://download.rethinkdb.com/apt/pubkey.gpg | sudo apt-key add -
+  - sudo apt-get update -qq
+install:
+  - sudo apt-get install -y rethinkdb
+  - sudo pip install rethinkdb
+  - sudo cp /etc/rethinkdb/default.conf.sample /etc/rethinkdb/instances.d/instance1.conf
+  - sudo /etc/init.d/rethinkdb restart
+  - bundle install

data/lib/stratocumulus/database.rb

@@ -1,19 +1,42 @@
 # encoding: UTF-8
-require 'stratocumulus/database/mysql'
 require 'stratocumulus/database/pipe_io'
+require 'stratocumulus/database/mysql'
+require 'stratocumulus/database/postgresql'
+require 'stratocumulus/database/rethinkdb'
 require 'English'
 
 module Stratocumulus
   class Database
-    def initialize(options = {}, backend_class = nil)
+    def self.build(options = {})
+      backend_class = backends[options['type']]
+      fail "#{options['type']} is not a supported database" unless backend_class
+      backend_class.new(options)
+    end
+
+    def self.backends
+      {
+        'psql' => PostgreSQL,
+        'mysql' => MySQL,
+        'rethinkdb' => RethinkDB
+      }
+    end
+
+    def initialize(options = {})
+      check_dependencies
+      @username = options['username']
+      @password = options['password']
       @name = options['name']
       fail 'database name not specified' unless @name
-      setup_backend(backend_class, options)
-      check_dependencies
+      @host = options['host']
+      @port = options['port']
     end
 
     def dump
-      @dump ||= PipeIO.popen("bash -c '#{pipefail} #{@backend.command} | gzip'")
+      @dump ||= PipeIO.popen("bash -c '#{pipefail} #{command} | gzip'")
+    end
+
+    def filename
+      @name + '/' + file
     end
 
     def success?
@@ -22,31 +45,32 @@ module Stratocumulus
       $CHILD_STATUS.success?
     end
 
-    def filename
-      @filename ||= Time.now.utc.strftime("#{@name}/#{@name}.%Y%m%d%H%M.sql.gz")
+    def dependencies
+      ['gzip']
     end
 
     private
 
-    def pipefail
-      'set -o pipefail;'
-    end
-
     def check_dependencies
       dependencies.each do |cmd|
         fail "#{cmd} not available" unless system("which #{cmd} >/dev/null")
       end
     end
 
-    def dependencies
-      ['gzip'] + @backend.dependencies
+    def file
+      @file ||= Time.now.utc.strftime("#{@name}.%Y%m%d%H%M#{suffix}")
+    end
+
+    def suffix
+      '.sql.gz'
+    end
+
+    def pipefail
+      'set -o pipefail;'
     end
 
-    def setup_backend(backend_class, options)
-      backend_class ||= MySQL
-      type = options['type']
-      fail "#{type} is not a supported database" unless type == 'mysql'
-      @backend = backend_class.new(options)
+    def socket?
+      !@host && !@port
     end
   end
 end

data/lib/stratocumulus/database/mysql.rb

@@ -1,44 +1,34 @@
 # encoding: UTF-8
+require 'stratocumulus/database'
 
 module Stratocumulus
-  class Database
-    class MySQL
-      def initialize(options = {})
-        @username = options['username'] || 'root'
-        @password = options['password']
-        @name = options['name']
-
-        @host = options['host']
-        @port = options['port']
-      end
-
-      def command
-        command = 'mysqldump '
-        command << '--single-transaction '
-        command << "-u#{@username} "
-        command << "-h#{host} " unless socket?
-        command << "-P#{port} " unless socket?
-        command << "-p#{@password} " if @password
-        command << @name
-      end
+  class MySQL < Database
+    def command
+      command = 'mysqldump '
+      command << '--single-transaction '
+      command << "-u#{username} "
+      command << "-h#{host} " unless socket?
+      command << "-P#{port} " unless socket?
+      command << "-p#{@password} " if @password
+      command << @name
+    end
 
-      def dependencies
-        ['mysqldump']
-      end
+    def dependencies
+      super + ['mysqldump']
+    end
 
-      private
+    private
 
-      def host
-        @host || 'localhost'
-      end
+    def username
+      @username || 'root'
+    end
 
-      def port
-        @port || 3306
-      end
+    def host
+      @host || 'localhost'
+    end
 
-      def socket?
-        !@host && !@port
-      end
+    def port
+      @port || 3306
     end
   end
 end

data/lib/stratocumulus/database/postgresql.rb

@@ -0,0 +1,34 @@
+# encoding: UTF-8
+require 'stratocumulus/database'
+
+module Stratocumulus
+  class PostgreSQL < Database
+    def command
+      command = ''
+      command << %Q(PGPASSWORD="#{@password}" ) if @password
+      command << 'pg_dump '
+      command << "-U#{username} "
+      command << "-h#{host} " unless socket?
+      command << "-p#{port} " unless socket?
+      command << @name
+    end
+
+    def dependencies
+      super + ['pg_dump']
+    end
+
+    private
+
+    def username
+      @username || 'postgres'
+    end
+
+    def host
+      @host || 'localhost'
+    end
+
+    def port
+      @port || 5432
+    end
+  end
+end

data/lib/stratocumulus/database/rethinkdb.rb

@@ -0,0 +1,39 @@
+# encoding: UTF-8
+require 'stratocumulus/database'
+require 'tmpdir'
+
+module Stratocumulus
+  class RethinkDB < Database
+    def dump
+      `#{command}`
+      @success = $CHILD_STATUS.success?
+      File.open(path)
+    end
+
+    def command
+      command = 'rethinkdb dump '
+      command << "-c #{host}:#{port} " unless socket?
+      command << "-f #{path} "
+      command << "-e #{@name}"
+    end
+
+    def success?
+      File.delete(path)
+      @success
+    end
+
+    def dependencies
+      ['rethinkdb-dump']
+    end
+
+    private
+
+    def path
+      Dir.tmpdir + '/' + file
+    end
+
+    def suffix
+      '.tar.gz'
+    end
+  end
+end

data/lib/stratocumulus/runner.rb

@@ -8,7 +8,7 @@ module Stratocumulus
 
     def run
       @config['databases'].each do |database_config|
-        database = Database.new(database_config)
+        database = Database.build(database_config)
         upload(database, database_config['storage'])
       end
     end

data/lib/stratocumulus/storage.rb

@@ -73,7 +73,7 @@ module Stratocumulus
     end
 
     def log
-      Logger.new(STDERR)
+      Logger.new($stderr)
     end
   end
 end

data/lib/stratocumulus/version.rb

@@ -1,4 +1,4 @@
 # encoding: UTF-8
 module Stratocumulus
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

data/spec/intergration/database_spec.rb

@@ -1,30 +1,95 @@
 # encoding: UTF-8
 require 'spec_helper'
+require 'zlib'
+require 'rubygems/package'
 
 describe Stratocumulus::Database do
 
   subject do
-    described_class.new(config)
+    described_class.build(config)
   end
 
   let('config') do
     {
       'name' => 'stratocumulus_test',
-      'type' => 'mysql'
+      'type' => type
     }
   end
 
+  let(:dump) { Zlib::GzipReader.new(subject.dump).read }
+
   describe '#dump' do
-    before do
-      system('mysql -u root < spec/support/test.sql')
+    context 'MySQL' do
+      before do
+        `mysql -u root < spec/support/mysql.sql`
+      end
+
+      let(:type) { 'mysql' }
+
+      it 'sucessfully dumps a gziped copy of the database' do
+        expect(dump).to include('CREATE TABLE `widgets`')
+        expect(dump).to include("INSERT INTO `widgets` VALUES (1,'Foo',3,1,2)")
+        expect(subject).to be_success
+      end
     end
 
-    let(:dump) { Zlib::GzipReader.new(subject.dump).read }
+    context 'PostgreSQL' do
+      before do
+        `psql -U postgres < spec/support/psql.sql`
+      end
+
+      let(:type) { 'psql' }
+
+      it 'sucessfully dumps a gziped copy of the database' do
+        expect(dump).to include('CREATE TABLE widgets')
+        expect(dump).to include(
+          'COPY widgets (id, name, leavers, pivots, fulcrums) FROM stdin;'
+        )
+        expect(dump).to include('1	Foo	3	1	2')
+        expect(subject).to be_success
+      end
+    end
+
+    context 'RethinkDB' do
+      before do
+        `rethinkdb restore --force spec/support/rethinkdb.tar.gz`
+      end
+
+      let(:type) { 'rethinkdb' }
+
+      let(:tarball) { Zlib::GzipReader.new(subject.dump) }
+
+      let(:dump) do
+        Gem::Package::TarReader.new(tarball).each do |tarfile|
+          next unless tarfile.full_name =~ /widgets.json/
+          return JSON.load(tarfile.read)
+        end
+      end
+
+      let(:expected_data) do
+        [
+          # rubocop:disable Style/LineLength
+          { 'pivots' => 5, 'fulcrums' => 3, 'leavers' => 8, 'id' => '1c66308d-492e-48ee-bfc5-83de96a15236', 'name' => 'Plugh' },
+          { 'pivots' => 2, 'fulcrums' => 3, 'leavers' => 1, 'id' => '224ba4b1-2184-4905-b81b-ac6368480f43', 'name' => 'Thud' },
+          { 'pivots' => 2, 'fulcrums' => 3, 'leavers' => 1, 'id' => '25b68062-7e9f-4fca-92bf-672287961096', 'name' => 'Garply' },
+          { 'pivots' => 1, 'fulcrums' => 2, 'leavers' => 3, 'id' => '380c2a12-62d8-4faa-968e-79b2919bf9ad', 'name' => 'Foo' },
+          { 'pivots' => 5, 'fulcrums' => 4, 'leavers' => 8, 'id' => '46cd4d4a-2cca-4ae2-835e-19c94c53ce02', 'name' => 'Quux' },
+          { 'pivots' => 2, 'fulcrums' => 7, 'leavers' => 8, 'id' => '63441f79-cfe4-4460-8fc7-bda802e93646', 'name' => 'Corge' },
+          { 'pivots' => 3, 'fulcrums' => 4, 'leavers' => 7, 'id' => '7d83f209-b4b1-4463-9eec-42dbf9217a39', 'name' => 'Grault' },
+          { 'pivots' => 5, 'fulcrums' => 6, 'leavers' => 4, 'id' => '8e1623c8-e28d-48f9-8d74-dc5bf459cff5', 'name' => 'Qux' },
+          { 'pivots' => 2, 'fulcrums' => 0, 'leavers' => 2, 'id' => 'a59c4505-c078-4186-a1d5-b0120dba4aa1', 'name' => 'Bar' },
+          { 'pivots' => 3, 'fulcrums' => 3, 'leavers' => 3, 'id' => 'b535529c-c822-4c08-af65-f3662d981046', 'name' => 'Xyzzy' },
+          { 'pivots' => 0, 'fulcrums' => 0, 'leavers' => 0, 'id' => 'f47bcc2a-ae2a-4d5f-9bbf-df71c8d81a7a', 'name' => 'Waldo' },
+          { 'pivots' => 6, 'fulcrums' => 4, 'leavers' => 5, 'id' => 'f6745b27-b0c8-40ca-a472-dbe45310ee19', 'name' => 'Baz' },
+          { 'pivots' => 1, 'fulcrums' => 1, 'leavers' => 1, 'id' => 'f88a0196-faaa-4695-88f1-808555a68ffa', 'name' => 'Fred' }
+          # rubocop:enable Style/LineLength
+        ]
+      end
 
-    it 'sucessfully dumps a gziped copy of the database' do
-      expect(dump).to include('CREATE TABLE `widgets`')
-      expect(dump).to include("INSERT INTO `widgets` VALUES (1,'Foo',3,1,2)")
-      expect(subject).to be_success
+      it 'sucessfully dumps a gziped copy of the database' do
+        expect(dump).to eq expected_data
+        expect(subject).to be_success
+      end
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,6 +1,7 @@
 # encoding: UTF-8
 require 'simplecov'
 require 'coveralls'
+require 'stringio'
 
 SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
   SimpleCov::Formatter::HTMLFormatter,
@@ -32,3 +33,13 @@ RSpec.configure do |config|
     mocks.syntax = :expect
   end
 end
+
+def capture_stderr
+  old_stderr = $stderr
+  fake_stderr = StringIO.new
+  $stderr = fake_stderr
+  yield
+  fake_stderr.string
+ensure
+  $stdout = old_stderr
+end

data/spec/support/psql.sql

@@ -0,0 +1,52 @@
+DROP DATABASE stratocumulus_test;
+CREATE DATABASE stratocumulus_test
+  WITH OWNER = postgres
+       ENCODING = 'UTF8'
+       TABLESPACE = pg_default
+       CONNECTION LIMIT = -1;
+\c stratocumulus_test
+SET statement_timeout = 0;
+SET lock_timeout = 0;
+SET client_encoding = 'UTF8';
+SET standard_conforming_strings = on;
+SET check_function_bodies = false;
+SET client_min_messages = warning;
+CREATE EXTENSION IF NOT EXISTS plpgsql WITH SCHEMA pg_catalog;
+COMMENT ON EXTENSION plpgsql IS 'PL/pgSQL procedural language';
+SET search_path = public, pg_catalog;
+SET default_tablespace = '';
+SET default_with_oids = false;
+CREATE TABLE widgets (
+    id integer NOT NULL,
+    name text,
+    leavers integer,
+    pivots integer,
+    fulcrums integer
+);
+ALTER TABLE public.widgets OWNER TO postgres;
+CREATE SEQUENCE widgets_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+ALTER TABLE public.widgets_id_seq OWNER TO postgres;
+ALTER SEQUENCE widgets_id_seq OWNED BY widgets.id;
+ALTER TABLE ONLY widgets ALTER COLUMN id SET DEFAULT nextval('widgets_id_seq'::regclass);
+COPY widgets (id, name, leavers, pivots, fulcrums) FROM stdin;
+1	Foo	3	1	2
+2	Bar	2	2	0
+3	Baz	5	6	4
+4	Qux	4	5	6
+5	Quux	8	5	4
+6	Corge	8	2	7
+7	Grault	7	3	4
+8	Garply	1	2	3
+9	Waldo	0	0	0
+10	Fred	1	1	1
+11	Xyzzy	3	3	3
+12	Thud	1	2	3
+\.
+SELECT pg_catalog.setval('widgets_id_seq', 12, true);
+ALTER TABLE ONLY widgets
+    ADD CONSTRAINT widgets_pkey PRIMARY KEY (id);

data/spec/unit/database_spec.rb

@@ -4,7 +4,7 @@ require 'spec_helper'
 describe Stratocumulus::Database do
 
   subject do
-    described_class.new(config)
+    described_class.build(config)
   end
 
   let(:config) { base_config }
@@ -12,19 +12,23 @@ describe Stratocumulus::Database do
   let(:base_config) do
     {
       'name' => 'stratocumulus_test',
-      'type' => 'mysql'
+      'type' => type
     }
   end
 
+  let(:type) { 'mysql' }
+
   before do
-    allow_any_instance_of(described_class).to receive(:system).and_return(true)
+    allow_any_instance_of(Stratocumulus::Database).to(
+      receive(:system).and_return(true)
+    )
   end
 
   describe '.new' do
-    context 'the database type is not mysql' do
+    context 'the database type is not supported' do
       let(:config) { base_config.merge('type' => 'nosqlioid') }
 
-      it 'thows an error unless the type is mysql' do
+      it 'thows an error unless the type is supported' do
         expect { subject }.to raise_error(
           RuntimeError,
           'nosqlioid is not a supported database'
@@ -32,18 +36,35 @@ describe Stratocumulus::Database do
       end
     end
 
-    it 'throws an error if mysqldump is not installed' do
-      allow_any_instance_of(described_class)
-        .to  receive(:system).with(/which mysqldump/)
+    context 'mysql' do
+      it 'throws an error if mysqldump is not installed' do
+        allow_any_instance_of(Stratocumulus::Database).to(
+          receive(:system).with(/which mysqldump/)
+        )
 
-      expect { subject }.to raise_error(
-        RuntimeError,
-        'mysqldump not available'
-      )
+        expect { subject }.to raise_error(
+          RuntimeError,
+          'mysqldump not available'
+        )
+      end
+    end
+
+    context 'postgresql' do
+      let(:type) { 'psql' }
+
+      it 'throws an error if pg_dump is not installed' do
+        allow_any_instance_of(Stratocumulus::Database)
+        .to  receive(:system).with(/which pg_dump/)
+
+        expect { subject }.to raise_error(
+          RuntimeError,
+          'pg_dump not available'
+        )
+      end
     end
 
     it 'throws an error if gzip is not installed' do
-      allow_any_instance_of(described_class)
+      allow_any_instance_of(Stratocumulus::Database)
         .to receive(:system).with(/which gzip/)
 
       expect { subject }.to raise_error(
@@ -68,133 +89,6 @@ describe Stratocumulus::Database do
     end
   end
 
-  describe 'dump' do
-
-    after do
-      subject.dump
-    end
-
-    describe 'username' do
-      context 'default' do
-        it 'uses root' do
-          expect(IO).to receive(:popen) do |command|
-            expect(command).to include(' -uroot ')
-          end
-        end
-      end
-
-      context 'setting the username' do
-        let(:config) { base_config.merge('username' => 'susan') }
-
-        it 'uses the correct username' do
-          expect(IO).to receive(:popen) do |command|
-            expect(command).to include(' -ususan ')
-          end
-        end
-      end
-    end
-
-    describe 'password' do
-      context 'default' do
-        it 'uses no password' do
-          expect(IO).to receive(:popen) do |command|
-            expect(command).to_not include('-p')
-          end
-        end
-      end
-
-      context 'setting the passsword' do
-        let(:config) { base_config.merge('password' => 'sekret') }
-
-        it 'uses the correct password' do
-          expect(IO).to receive(:popen) do |command|
-            expect(command).to include(' -psekret ')
-          end
-        end
-      end
-    end
-
-    describe 'host' do
-      context 'default with the port set' do
-        let(:config) { base_config.merge('port' => '3306') }
-
-        it 'uses localhost' do
-          expect(IO).to receive(:popen) do |command|
-            expect(command).to include(' -hlocalhost ')
-          end
-        end
-      end
-
-      context 'default' do
-        it 'uses the default socket' do
-          expect(IO).to receive(:popen) do |command|
-            expect(command).to_not include(' -hlocalhost ')
-          end
-        end
-      end
-
-      context 'setting the host' do
-        let(:config) { base_config.merge('host' => 'db.awesome-server.net') }
-
-        it 'uses the correct hostname' do
-          expect(IO).to receive(:popen) do |command|
-            expect(command).to include(' -hdb.awesome-server.net ')
-          end
-        end
-      end
-    end
-
-    describe 'port' do
-      context 'default with the host set' do
-        let(:config) { base_config.merge('host' => 'db.awesome-server.net') }
-
-        it 'uses 3306' do
-          expect(IO).to receive(:popen) do |command|
-            expect(command).to include(' -P3306 ')
-          end
-        end
-      end
-
-      context 'default' do
-        it 'uses the default socket' do
-          expect(IO).to receive(:popen) do |command|
-            expect(command).to_not include(' -P3306 ')
-          end
-        end
-      end
-
-      context 'setting the port' do
-        let(:config) { base_config.merge('port' => '4306') }
-
-        it 'uses the correct port' do
-          expect(IO).to receive(:popen) do |command|
-            expect(command).to include(' -P4306 ')
-          end
-        end
-      end
-    end
-
-    describe 'the dump command' do
-      it 'sets pipefail' do
-        expect(IO).to receive(:popen) do |command|
-          expect(command).to include("bash -c 'set -o pipefail;")
-        end
-      end
-
-      it 'uses mysqldump --single-transaction option to not lock tables' do
-        expect(IO).to receive(:popen) do |command|
-          expect(command).to include(' mysqldump --single-transaction ')
-        end
-      end
-
-      it 'pipes the output of mysql to gzip' do
-        expect(IO).to receive(:popen) do |command|
-          expect(command).to match(/.*mysqldump.*\| gzip/)
-        end
-      end
-    end
-  end
-
   describe '#filename' do
     it 'calculates a filename based on the name and timestamp' do
       timestamp = Time.now.utc.strftime('%Y%m%d%H%M')
@@ -210,50 +104,32 @@ describe Stratocumulus::Database do
   end
 
   describe '#success?' do
-    subject  do
-      described_class.new(
-        { 'name' => 'foo', 'type' => 'mysql' },
-        backend
-      )
-    end
-
-    context 'the backend fails' do
-      let(:backend) { FailingBackend }
+    describe 'the dump fails' do
+      subject { FailingDatabase.new('name' => 'test_database') }
 
       it 'returns false' do
         expect(subject).to_not be_success
       end
-
     end
 
-    context 'the backend is sucessfull' do
-      let(:backend) { SucessBackend }
+    describe 'the dump is sucessfull' do
+      subject { SucessDatabase.new('name' => 'test_database') }
 
-      it 'returns true' do
+      it 'returns false' do
         expect(subject).to be_success
       end
-
-    end
-
-    class FakeBackend
-      def initialize(*)
-      end
-
-      def dependencies
-        []
-      end
     end
+  end
 
-    class FailingBackend < FakeBackend
-      def command
-        'exit 127'
-      end
+  class SucessDatabase < described_class
+    def command
+      'echo boo'
     end
+  end
 
-    class SucessBackend < FakeBackend
-      def command
-        'exit 0'
-      end
+  class FailingDatabase < described_class
+    def command
+      'exit 127'
     end
   end
 end

data/spec/unit/mysql_spec.rb

@@ -0,0 +1,104 @@
+# encoding: UTF-8
+require 'spec_helper'
+
+describe Stratocumulus::MySQL do
+  subject do
+    described_class.new(config)
+  end
+
+  let(:config) do
+    { 'name' => 'stratocumulus_test' }
+  end
+
+  describe '#dependencies' do
+    specify do
+      expect(subject.dependencies).to eq %w(gzip mysqldump)
+    end
+  end
+
+  describe '#command' do
+    context 'default' do
+      it 'generates the dump command with sensible defaults' do
+        expect(subject.command).to eq(
+          'mysqldump --single-transaction -uroot stratocumulus_test'
+        )
+      end
+    end
+
+    context 'with the password set' do
+      let(:config) do
+        {
+          'name' => 'stratocumulus_test',
+          'password' => 'seecrit'
+        }
+      end
+
+      it 'generates the dump command with a default host' do
+        expect(subject.command).to eq(
+          'mysqldump --single-transaction -uroot -pseecrit stratocumulus_test'
+        )
+      end
+    end
+
+    context 'with the port set' do
+      let(:config) do
+        {
+          'name' => 'stratocumulus_test',
+          'port' => 13_306
+        }
+      end
+
+      it 'generates the dump command with a default host' do
+        expect(subject.command).to eq(
+          'mysqldump --single-transaction -uroot -hlocalhost -P13306 stratocumulus_test' # rubocop:disable Style/LineLength
+        )
+      end
+    end
+
+    context 'with the host set' do
+      let(:config) do
+        {
+          'name' => 'stratocumulus_test',
+          'host' => 'db.example.com'
+        }
+      end
+
+      it 'generates the dump command with a default port' do
+        expect(subject.command).to eq(
+          'mysqldump --single-transaction -uroot -hdb.example.com -P3306 stratocumulus_test' # rubocop:disable Style/LineLength
+        )
+      end
+    end
+
+    context 'with the port and host set' do
+      let(:config) do
+        {
+          'name' => 'stratocumulus_test',
+          'port' => 33_306,
+          'host' => 'db.example.com'
+        }
+      end
+
+      it 'generates the dump command with the port and host' do
+        expect(subject.command).to eq(
+          'mysqldump --single-transaction -uroot -hdb.example.com -P33306 stratocumulus_test' # rubocop:disable Style/LineLength
+        )
+      end
+    end
+
+    context 'with the username set' do
+      let(:config) do
+        {
+          'name' => 'stratocumulus_test',
+          'username' => 'susan'
+        }
+      end
+
+      it 'generates the dump command with the username' do
+        expect(subject.command).to eq(
+          'mysqldump --single-transaction -ususan stratocumulus_test'
+        )
+      end
+    end
+  end
+end

data/spec/unit/postgresql_spec.rb

@@ -0,0 +1,104 @@
+# encoding: UTF-8
+require 'spec_helper'
+
+describe Stratocumulus::PostgreSQL do
+  subject do
+    described_class.new(config)
+  end
+
+  let(:config) do
+    { 'name' => 'stratocumulus_test' }
+  end
+
+  describe '#dependencies' do
+    specify do
+      expect(subject.dependencies).to eq %w(gzip pg_dump)
+    end
+  end
+
+  describe '#command' do
+    context 'default' do
+      it 'generates the dump command with sensible defaults' do
+        expect(subject.command).to eq(
+          'pg_dump -Upostgres stratocumulus_test'
+        )
+      end
+    end
+
+    context 'with the password set' do
+      let(:config) do
+        {
+          'name' => 'stratocumulus_test',
+          'password' => 'sekret'
+        }
+      end
+
+      it 'sets the password env var' do
+        expect(subject.command).to eq(
+          'PGPASSWORD="sekret" pg_dump -Upostgres stratocumulus_test'
+        )
+      end
+    end
+
+    context 'with the port set' do
+      let(:config) do
+        {
+          'name' => 'stratocumulus_test',
+          'port' => 15_432
+        }
+      end
+
+      it 'generates the dump command with a default host' do
+        expect(subject.command).to eq(
+          'pg_dump -Upostgres -hlocalhost -p15432 stratocumulus_test'
+        )
+      end
+    end
+
+    context 'with the host set' do
+      let(:config) do
+        {
+          'name' => 'stratocumulus_test',
+          'host' => 'db.example.com'
+        }
+      end
+
+      it 'generates the dump command with a default port' do
+        expect(subject.command).to eq(
+          'pg_dump -Upostgres -hdb.example.com -p5432 stratocumulus_test'
+        )
+      end
+    end
+
+    context 'with the port and host set' do
+      let(:config) do
+        {
+          'name' => 'stratocumulus_test',
+          'port' => 15_432,
+          'host' => 'db.example.com'
+        }
+      end
+
+      it 'generates the dump command with port and host set' do
+        expect(subject.command).to eq(
+          'pg_dump -Upostgres -hdb.example.com -p15432 stratocumulus_test'
+        )
+      end
+    end
+
+    context 'with the username set' do
+      let(:config) do
+        {
+          'name' => 'stratocumulus_test',
+          'username' => 'susan'
+        }
+      end
+
+      it 'generates the dump command with the username' do
+        expect(subject.command).to eq(
+          'pg_dump -Ususan stratocumulus_test'
+        )
+      end
+    end
+  end
+end

data/spec/unit/storage_spec.rb

@@ -30,12 +30,18 @@ describe Stratocumulus::Storage do
       )
     end
 
+    let(:stderr) do
+      capture_stderr do
+        subject.upload(database)
+      end
+    end
+
     before do
       allow(Fog::Storage).to receive(:new).and_return(connection)
     end
 
     after do
-      subject.upload(database)
+      stderr
     end
 
     it 'uploads the dump to s3' do
@@ -122,6 +128,12 @@ describe Stratocumulus::Storage do
         it 'does not create a expiry rule' do
           expect(service).to_not receive(:put_bucket_lifecycle)
         end
+
+        it 'logs the error to stderr' do
+          expect(stderr).to include(
+            'ERROR -- : there was an error generating foo.sql.gz'
+          )
+        end
       end
 
       context 'rules allready set on the bucket' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stratocumulus
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-18 00:00:00.000000000 Z
+date: 2014-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -162,17 +162,23 @@ files:
 - lib/stratocumulus/database.rb
 - lib/stratocumulus/database/mysql.rb
 - lib/stratocumulus/database/pipe_io.rb
+- lib/stratocumulus/database/postgresql.rb
+- lib/stratocumulus/database/rethinkdb.rb
 - lib/stratocumulus/retention.rb
 - lib/stratocumulus/runner.rb
 - lib/stratocumulus/storage.rb
 - lib/stratocumulus/version.rb
 - spec/intergration/database_spec.rb
 - spec/spec_helper.rb
-- spec/support/test.sql
+- spec/support/mysql.sql
+- spec/support/psql.sql
+- spec/support/rethinkdb.tar.gz
 - spec/support/test_config_file.yml
 - spec/unit/cli_spec.rb
 - spec/unit/database_spec.rb
+- spec/unit/mysql_spec.rb
 - spec/unit/pipe_io_spec.rb
+- spec/unit/postgresql_spec.rb
 - spec/unit/retention_spec.rb
 - spec/unit/runner_spec.rb
 - spec/unit/storage_spec.rb
@@ -192,7 +198,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 815129825214945472
+      hash: 646644050683609050
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -201,7 +207,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 815129825214945472
+      hash: 646644050683609050
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
@@ -211,11 +217,15 @@ summary: Backup Databases to Cloud Storage
 test_files:
 - spec/intergration/database_spec.rb
 - spec/spec_helper.rb
-- spec/support/test.sql
+- spec/support/mysql.sql
+- spec/support/psql.sql
+- spec/support/rethinkdb.tar.gz
 - spec/support/test_config_file.yml
 - spec/unit/cli_spec.rb
 - spec/unit/database_spec.rb
+- spec/unit/mysql_spec.rb
 - spec/unit/pipe_io_spec.rb
+- spec/unit/postgresql_spec.rb
 - spec/unit/retention_spec.rb
 - spec/unit/runner_spec.rb
 - spec/unit/storage_spec.rb