stratocumulus 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9965a838bed237de0515bd6dbaed0a4009e5ff24
-  data.tar.gz: 5f34c3f98ca10c2dd5c335cd94cc25905df29095
+  metadata.gz: f977577efc1b17518ff6bb4c33e5d21fa99055f8
+  data.tar.gz: 4c802f4f3a257a2d084d0a6a862f2fc0532d027f
 SHA512:
-  metadata.gz: b0c6d21032652a73f2719328eef431173ee94b5bfffc43d6b2ef49f793b2235659fba797e6faaf4126cb3908cc4b17fe7f923777b5876d90c9e0af6385416f97
-  data.tar.gz: 4bd5f54807f63d56a86ef91d531b7fdfc7f576e8698d33dab36e2fba65df7e571c7bf9692db30c4da3b97337a1a9fed6fddba139ae56e30d65b01268d23c024a
+  metadata.gz: a18a403c0bb9d85621ae87457e700adf057afeaae3bd80b4f9e5815efaf588ea6137e57b4cdc15d1789686784f20b1d928a38aeb471233e93473d6acadeb799e
+  data.tar.gz: 893881db830455f0bce0d563faa1775a2887ebb929c5a4c24ee59d9fc7344c05c72d1f8d0a81200adb2d14e2d2e32f031179a32f8b340beb559312ad6e5434ea

data/.travis.yml

@@ -5,6 +5,10 @@ rvm:
   - 2.1.8
 env: CODECLIMATE_REPO_TOKEN=650676b7530bf62fce4284e263272a8dcab015f4f34fe6dab251ead2ea6b4813
 sudo: false
+before_install:
+ - curl -L  https://github.com/coreos/etcd/releases/download/v2.3.0/etcd-v2.3.0-linux-amd64.tar.gz -o etcd-v2.3.0-linux-amd64.tar.gz
+ - tar xzvf etcd-v2.3.0-linux-amd64.tar.gz
+ - export PATH=$PWD/etcd-v2.3.0-linux-amd64:$PATH
 services:
   - mysql
   - postgresql

data/lib/stratocumulus/database.rb

@@ -2,6 +2,7 @@
 require "stratocumulus/database/pipe_io"
 require "stratocumulus/database/mysql"
 require "stratocumulus/database/postgresql"
+require "stratocumulus/database/etcd"
 require "English"
 
 module Stratocumulus
@@ -16,6 +17,7 @@ module Stratocumulus
       {
         "psql" => PostgreSQL,
         "mysql" => MySQL,
+        "etcd" => ETCD,
       }
     end
 
@@ -47,6 +49,10 @@ module Stratocumulus
       ["gzip"]
     end
 
+    def cleanup
+      # NOOP
+    end
+
     private
 
     def check_dependencies

data/lib/stratocumulus/database/etcd.rb

@@ -0,0 +1,44 @@
+# encoding: UTF-8
+require "stratocumulus/database"
+require "tmpdir"
+require "fileutils"
+
+module Stratocumulus
+  class ETCD < Database
+    def initialize(options = {})
+      @data_dir = options["data_dir"]
+      super(options)
+    end
+
+    def command
+      command = "etcdctl "
+      command << "backup "
+      command << "--data-dir #{data_dir} "
+      command << "--backup-dir #{backup_dir} "
+      command << "&& tar -cf - -C #{backup_dir} . "
+    end
+
+    def dependencies
+      super + %w(etcdctl tar)
+    end
+
+    def cleanup
+      FileUtils.rm_rf(backup_dir)
+      @_backup_dir = nil
+    end
+
+    private
+
+    def suffix
+      ".tar.gz"
+    end
+
+    def data_dir
+      @data_dir || "/var/lib/etcd"
+    end
+
+    def backup_dir
+      @_backup_dir ||= Dir.tmpdir
+    end
+  end
+end

data/lib/stratocumulus/database/mysql.rb

@@ -6,6 +6,7 @@ module Stratocumulus
     def command
       command = "mysqldump "
       command << "--single-transaction "
+      command << "--quick "
       command << "-u#{username} "
       command << "-h#{host} " unless socket?
       command << "-P#{port} " unless socket?

data/lib/stratocumulus/runner.rb

@@ -8,8 +8,14 @@ module Stratocumulus
 
     def run
       @config["databases"].each do |database_config|
-        database = Database.build(database_config)
-        upload(database, database_config["storage"])
+        begin
+          database = Database.build(database_config)
+          upload(database, database_config["storage"])
+        rescue => e
+          $stderr.puts "warning: #{e.message}"
+        ensure
+          database.cleanup
+        end
       end
     end
 

data/lib/stratocumulus/version.rb

@@ -1,4 +1,4 @@
 # encoding: UTF-8
 module Stratocumulus
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/spec/unit/etcd_spec.rb

@@ -0,0 +1,59 @@
+# encoding: UTF-8
+require "spec_helper"
+
+describe Stratocumulus::ETCD do
+  subject do
+    described_class.new(config)
+  end
+
+  let(:config) do
+    { "name" => "etcd_test" }
+  end
+
+  describe "#dependencies" do
+    specify do
+      expect(subject.dependencies).to eq %w(gzip etcdctl tar)
+    end
+  end
+
+  describe "#command" do
+    context "default" do
+      it "generates the dump command with sensible defaults" do
+        match = %r{etcdctl backup --data-dir /var/lib/etcd --backup-dir (.*) && tar -cf - -C (.*) \.}
+                .match(subject.command)
+        # We expect the backup dir passed to etcd to be the same as the one we pass to tar
+        expect(match).to be_truthy
+        expect(match[1]).to eq(match[2])
+      end
+    end
+
+    context "when the datadir is set" do
+      let(:config) do
+        {
+          "data_dir" => "/bar/foo/etcd",
+          "name"     => "etcd_test",
+        }
+      end
+
+      it "uses the given data dir" do
+        expect(subject.command).to include "/bar/foo/etcd"
+        expect(subject.command).to_not include "/var/lib/etcd"
+      end
+    end
+  end
+
+  describe "filename" do
+    it "uses the correct suffix" do
+      expect(subject.filename).to match(/.*\.tar\.gz$/)
+    end
+  end
+
+  describe "#cleanup" do
+    it "removes the backup dir" do
+      match = %r{etcdctl backup --data-dir /var/lib/etcd --backup-dir (.*) && tar -cf - -C (.*) \.}
+              .match(subject.command)
+      expect(FileUtils).to receive(:rm_rf).with(match[1])
+      subject.cleanup
+    end
+  end
+end

data/spec/unit/mysql_spec.rb

@@ -20,7 +20,7 @@ describe Stratocumulus::MySQL do
     context "default" do
       it "generates the dump command with sensible defaults" do
         expect(subject.command).to eq(
-          "mysqldump --single-transaction -uroot stratocumulus_test",
+          "mysqldump --single-transaction --quick -uroot stratocumulus_test",
         )
       end
     end
@@ -35,7 +35,7 @@ describe Stratocumulus::MySQL do
 
       it "generates the dump command with a default host" do
         expect(subject.command).to eq(
-          "mysqldump --single-transaction -uroot -pseecrit stratocumulus_test",
+          "mysqldump --single-transaction --quick -uroot -pseecrit stratocumulus_test",
         )
       end
     end
@@ -50,7 +50,7 @@ describe Stratocumulus::MySQL do
 
       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 Metrics/LineLength
+          "mysqldump --single-transaction --quick -uroot -hlocalhost -P13306 stratocumulus_test" # rubocop:disable Metrics/LineLength
         )
       end
     end
@@ -65,7 +65,7 @@ describe Stratocumulus::MySQL do
 
       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 Metrics/LineLength
+          "mysqldump --single-transaction --quick -uroot -hdb.example.com -P3306 stratocumulus_test" # rubocop:disable Metrics/LineLength
         )
       end
     end
@@ -81,7 +81,7 @@ describe Stratocumulus::MySQL do
 
       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 Metrics/LineLength
+          "mysqldump --single-transaction --quick -uroot -hdb.example.com -P33306 stratocumulus_test" # rubocop:disable Metrics/LineLength
         )
       end
     end
@@ -96,7 +96,7 @@ describe Stratocumulus::MySQL do
 
       it "generates the dump command with the username" do
         expect(subject.command).to eq(
-          "mysqldump --single-transaction -ususan stratocumulus_test",
+          "mysqldump --single-transaction --quick -ususan stratocumulus_test",
         )
       end
     end

data/spec/unit/runner_spec.rb

@@ -4,8 +4,8 @@ require "spec_helper"
 describe Stratocumulus::Runner do
   subject { described_class.new("spec/support/test_config_file.yml") }
   let(:storage) { double(upload: true) }
-  let(:database) { double }
-  let(:database2) { double }
+  let(:database) { double(cleanup: nil) }
+  let(:database2) { double(cleanup: nil) }
 
   before do
     allow(Stratocumulus::Storage).to receive(:new).and_return(storage)
@@ -34,13 +34,13 @@ describe Stratocumulus::Runner do
       "password" => "sekret",
       "host" => "db1.example.com",
       "port" => 3307,
-    )
+    ).and_return(database)
 
     expect(Stratocumulus::Database).to receive(:new).once.with(
       "type" => "mysql",
       "name" => "stratocumulus_test_2",
       "storage" => "s3",
-    )
+    ).and_return(database2)
   end
 
   it "uploads each database to storage" do
@@ -55,4 +55,47 @@ describe Stratocumulus::Runner do
     expect(storage).to receive(:upload).once.with(database)
     expect(storage).to receive(:upload).once.with(database2)
   end
+
+  it "calls cleanup on the database after each upload" do
+    allow(Stratocumulus::Database).to receive(:new).once.with(
+      hash_including("name" => "stratocumulus_test"),
+    ).and_return(database)
+
+    allow(Stratocumulus::Database).to receive(:new).once.with(
+      hash_including("name" => "stratocumulus_test_2"),
+    ).and_return(database2)
+
+
+    expect(database).to receive(:cleanup)
+    expect(database2).to receive(:cleanup)
+  end
+
+  it "calls cleanup on the database after each upload" do
+    allow(Stratocumulus::Database).to receive(:new).once.with(
+      hash_including("name" => "stratocumulus_test"),
+    ).and_return(database)
+
+    allow(Stratocumulus::Database).to receive(:new).once.with(
+      hash_including("name" => "stratocumulus_test_2"),
+    ).and_return(database2)
+
+
+    expect(database).to receive(:cleanup)
+    expect(database2).to receive(:cleanup)
+  end
+
+  it "calls cleanup even if there was an error" do
+    allow(Stratocumulus::Database).to receive(:new).once.with(
+      hash_including("name" => "stratocumulus_test"),
+    ).and_return(database)
+
+    allow(Stratocumulus::Database).to receive(:new).once.with(
+      hash_including("name" => "stratocumulus_test_2"),
+    ).and_return(database2)
+
+    allow(storage).to receive(:upload).and_raise "Storage Is Broken Sorry"
+
+    expect(database).to receive(:cleanup)
+    expect(database2).to receive(:cleanup)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stratocumulus
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Ed Robinson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-04 00:00:00.000000000 Z
+date: 2016-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-aws
@@ -132,7 +132,6 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
-- ".rubocop.yml"
 - ".travis.yml"
 - Gemfile
 - LICENSE.txt
@@ -142,6 +141,7 @@ files:
 - lib/stratocumulus.rb
 - lib/stratocumulus/cli.rb
 - lib/stratocumulus/database.rb
+- lib/stratocumulus/database/etcd.rb
 - lib/stratocumulus/database/mysql.rb
 - lib/stratocumulus/database/pipe_io.rb
 - lib/stratocumulus/database/postgresql.rb
@@ -157,6 +157,7 @@ files:
 - spec/support/test_config_file.yml
 - spec/unit/cli_spec.rb
 - spec/unit/database_spec.rb
+- spec/unit/etcd_spec.rb
 - spec/unit/mysql_spec.rb
 - spec/unit/pipe_io_spec.rb
 - spec/unit/postgresql_spec.rb
@@ -184,7 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Backup Databases to Cloud Storage
@@ -197,6 +198,7 @@ test_files:
 - spec/support/test_config_file.yml
 - spec/unit/cli_spec.rb
 - spec/unit/database_spec.rb
+- spec/unit/etcd_spec.rb
 - spec/unit/mysql_spec.rb
 - spec/unit/pipe_io_spec.rb
 - spec/unit/postgresql_spec.rb

data/.rubocop.yml

@@ -1,6 +0,0 @@
-StringLiterals:
-  EnforcedStyle: "single_quotes"
-Documentation:
-  Enabled: false
-ModuleFunction:
-  Enabled: false