stratocumulus 0.0.5 → 0.0.6

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 9965a838bed237de0515bd6dbaed0a4009e5ff24
+  data.tar.gz: 5f34c3f98ca10c2dd5c335cd94cc25905df29095
+SHA512:
+  metadata.gz: b0c6d21032652a73f2719328eef431173ee94b5bfffc43d6b2ef49f793b2235659fba797e6faaf4126cb3908cc4b17fe7f923777b5876d90c9e0af6385416f97
+  data.tar.gz: 4bd5f54807f63d56a86ef91d531b7fdfc7f576e8698d33dab36e2fba65df7e571c7bf9692db30c4da3b97337a1a9fed6fddba139ae56e30d65b01268d23c024a

data/.travis.yml

@@ -1,15 +1,10 @@
 language: ruby
 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
+  - 2.3.0
+  - 2.2.4
+  - 2.1.8
+env: CODECLIMATE_REPO_TOKEN=650676b7530bf62fce4284e263272a8dcab015f4f34fe6dab251ead2ea6b4813
+sudo: false
+services:
+  - mysql
+  - postgresql

data/Gemfile

@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in stratocumulus.gemspec
 gemspec

data/README.md

@@ -1,7 +1,7 @@
 # Stratocumulus
 [![Build Status](https://travis-ci.org/reevoo/stratocumulus.svg?branch=master)](https://travis-ci.org/reevoo/stratocumulus)
-[![Coverage Status](https://coveralls.io/repos/reevoo/stratocumulus/badge.png)](https://coveralls.io/r/reevoo/stratocumulus)
-[![Code Climate](https://codeclimate.com/github/reevoo/stratocumulus.png)](https://codeclimate.com/github/reevoo/stratocumulus)
+[![Test Coverage](https://codeclimate.com/github/reevoo/stratocumulus/badges/coverage.svg)](https://codeclimate.com/github/reevoo/stratocumulus)
+[![Code Climate](https://codeclimate.com/github/reevoo/stratocumulus/badges/gpa.svg)](https://codeclimate.com/github/reevoo/stratocumulus)
 [![Gem Version](https://badge.fury.io/rb/stratocumulus.svg)](http://badge.fury.io/rb/stratocumulus)
 
 
@@ -20,6 +20,7 @@ s3:
   access_key_id: KEY_ID
   secret_access_key: SECRET_KEY
   bucket: database-backups
+  folder: staging # optional
   region: eu-west-1 # defaults to us-east-1
 databases:
   -

data/Rakefile

@@ -1,9 +1,9 @@
 # encoding: UTF-8
-require 'bundler/gem_tasks'
-require 'rubocop/rake_task'
-require 'rspec/core/rake_task'
+require "bundler/gem_tasks"
+require "reevoocop/rake_task"
+require "rspec/core/rake_task"
 
-RuboCop::RakeTask.new
+ReevooCop::RakeTask.new(:reevoocop)
 RSpec::Core::RakeTask.new(:spec)
 
-task default: [:spec, :rubocop]
+task default: [:spec, :reevoocop]

data/bin/stratocumulus

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 # encoding: UTF-8
-require 'stratocumulus'
+require "stratocumulus"
 
 Stratocumulus::Cli.start

data/lib/stratocumulus.rb

@@ -1,7 +1,7 @@
 # encoding: UTF-8
-require 'stratocumulus/version'
-require 'stratocumulus/database'
-require 'stratocumulus/storage'
-require 'stratocumulus/runner'
-require 'stratocumulus/retention'
-require 'stratocumulus/cli'
+require "stratocumulus/version"
+require "stratocumulus/database"
+require "stratocumulus/storage"
+require "stratocumulus/runner"
+require "stratocumulus/retention"
+require "stratocumulus/cli"

data/lib/stratocumulus/cli.rb

@@ -1,10 +1,10 @@
 # encoding: UTF-8
-require 'thor'
+require "thor"
 
 module Stratocumulus
   class Cli < Thor
-    desc 'backup CONFIG',
-         'runs a stratocumulus backup as specified in the config file'
+    desc "backup CONFIG",
+      "runs a stratocumulus backup as specified in the config file"
     def backup(config)
       Stratocumulus::Runner.new(config).run
     end

data/lib/stratocumulus/database.rb

@@ -1,34 +1,32 @@
 # encoding: UTF-8
-require 'stratocumulus/database/pipe_io'
-require 'stratocumulus/database/mysql'
-require 'stratocumulus/database/postgresql'
-require 'stratocumulus/database/rethinkdb'
-require 'English'
+require "stratocumulus/database/pipe_io"
+require "stratocumulus/database/mysql"
+require "stratocumulus/database/postgresql"
+require "English"
 
 module Stratocumulus
   class Database
     def self.build(options = {})
-      backend_class = backends[options['type']]
-      fail "#{options['type']} is not a supported database" unless backend_class
+      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
+        "psql" => PostgreSQL,
+        "mysql" => MySQL,
       }
     end
 
     def initialize(options = {})
       check_dependencies
-      @username = options['username']
-      @password = options['password']
-      @name = options['name']
-      fail 'database name not specified' unless @name
-      @host = options['host']
-      @port = options['port']
+      @username = options["username"]
+      @password = options["password"]
+      @name = options["name"]
+      fail "database name not specified" unless @name
+      @host = options["host"]
+      @port = options["port"]
     end
 
     def dump
@@ -36,7 +34,7 @@ module Stratocumulus
     end
 
     def filename
-      @name + '/' + file
+      @name + "/" + file
     end
 
     def success?
@@ -46,7 +44,7 @@ module Stratocumulus
     end
 
     def dependencies
-      ['gzip']
+      ["gzip"]
     end
 
     private
@@ -62,11 +60,11 @@ module Stratocumulus
     end
 
     def suffix
-      '.sql.gz'
+      ".sql.gz"
     end
 
     def pipefail
-      'set -o pipefail;'
+      "set -o pipefail;"
     end
 
     def socket?

data/lib/stratocumulus/database/mysql.rb

@@ -1,11 +1,11 @@
 # encoding: UTF-8
-require 'stratocumulus/database'
+require "stratocumulus/database"
 
 module Stratocumulus
   class MySQL < Database
     def command
-      command = 'mysqldump '
-      command << '--single-transaction '
+      command = "mysqldump "
+      command << "--single-transaction "
       command << "-u#{username} "
       command << "-h#{host} " unless socket?
       command << "-P#{port} " unless socket?
@@ -14,17 +14,17 @@ module Stratocumulus
     end
 
     def dependencies
-      super + ['mysqldump']
+      super + ["mysqldump"]
     end
 
     private
 
     def username
-      @username || 'root'
+      @username || "root"
     end
 
     def host
-      @host || 'localhost'
+      @host || "localhost"
     end
 
     def port

data/lib/stratocumulus/database/pipe_io.rb

@@ -1,9 +1,9 @@
 # encoding: UTF-8
 
-# Rewind is undefined so fog won't try to call rewind on a pipe
 
 module Stratocumulus
   class Database
+    # #rewind is undefined so fog won't try to call rewind on a pipe
     class PipeIO < IO
       undef rewind
     end

data/lib/stratocumulus/database/postgresql.rb

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

data/lib/stratocumulus/retention.rb

@@ -10,10 +10,10 @@ module Stratocumulus
       return unless expires_in_days
 
       {
-        'ID' => key,
-        'Prefix' => key,
-        'Enabled' => true,
-        'Days' => expires_in_days
+        "ID" => key,
+        "Prefix" => key,
+        "Enabled" => true,
+        "Days" => expires_in_days,
       }
     end
 

data/lib/stratocumulus/runner.rb

@@ -7,21 +7,21 @@ module Stratocumulus
     end
 
     def run
-      @config['databases'].each do |database_config|
+      @config["databases"].each do |database_config|
         database = Database.build(database_config)
-        upload(database, database_config['storage'])
+        upload(database, database_config["storage"])
       end
     end
 
     private
 
     def upload(database, storage_type)
-      fail "#{storage_type} is not supported" unless storage_type == 's3'
+      fail "#{storage_type} is not supported" unless storage_type == "s3"
       storage.upload(database)
     end
 
     def storage
-      Storage.new(@config['s3'])
+      Storage.new(@config["s3"])
     end
   end
 end

data/lib/stratocumulus/storage.rb

@@ -1,22 +1,23 @@
 # encoding: UTF-8
-require 'fog'
-require 'logger'
+require "fog/aws"
+require "logger"
 
 module Stratocumulus
   class Storage
     def initialize(options = {})
-      @access_key_id = options.fetch('access_key_id')
-      @secret_access_key = options.fetch('secret_access_key')
-      @region = options['region']
-      @bucket = options.fetch('bucket')
-      @retention = Retention.new(options['retention'])
+      @access_key_id = options.fetch("access_key_id")
+      @secret_access_key = options.fetch("secret_access_key")
+      @region = options["region"]
+      @bucket = options.fetch("bucket")
+      @folder = options["folder"]
+      @retention = Retention.new(options["retention"])
     end
 
     def upload(database)
       return unless @retention.upload_today?
       file = store_file(database)
       if database.success?
-        add_expiry_rule(database.filename)
+        add_expiry_rule(destination_path(database.filename))
       else
         log.error("there was an error generating #{database.filename}")
         file.destroy
@@ -27,19 +28,23 @@ module Stratocumulus
 
     def store_file(database)
       files.create(
-        key: database.filename,
+        key: destination_path(database.filename),
         body: database.dump,
         multipart_chunk_size: 104_857_600, # 100MB
-        public: false
+        public: false,
       )
     end
 
+    def destination_path(filename)
+      @folder.nil? ? filename : @folder + "/" + filename
+    end
+
     def connection
       Fog::Storage.new(
-        provider: 'AWS',
+        provider: "AWS",
         aws_access_key_id: @access_key_id,
         aws_secret_access_key: @secret_access_key,
-        region: @region
+        region: @region,
       )
     end
 
@@ -56,18 +61,18 @@ module Stratocumulus
       return unless new_rule
       directories.service.put_bucket_lifecycle(
         @bucket,
-        'Rules' => current_rules << new_rule
+        "Rules" => current_rules << new_rule,
       )
     end
 
     def current_rules
       existing_rules.select do |rule|
-        files.find { |file| file.key == rule['ID'] }
+        files.find { |file| file.key == rule["ID"] }
       end
     end
 
     def existing_rules
-      directories.service.get_bucket_lifecycle(@bucket).data[:body]['Rules']
+      directories.service.get_bucket_lifecycle(@bucket).data[:body]["Rules"]
     rescue Excon::Errors::NotFound
       []
     end

data/lib/stratocumulus/version.rb

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

data/spec/intergration/database_spec.rb

@@ -1,93 +1,50 @@
 # encoding: UTF-8
-require 'spec_helper'
-require 'zlib'
-require 'rubygems/package'
+require "spec_helper"
+require "zlib"
+require "rubygems/package"
 
 describe Stratocumulus::Database do
-
   subject do
     described_class.build(config)
   end
 
-  let('config') do
+  let("config") do
     {
-      'name' => 'stratocumulus_test',
-      'type' => type
+      "name" => "stratocumulus_test",
+      "type" => type,
     }
   end
 
   let(:dump) { Zlib::GzipReader.new(subject.dump).read }
 
-  describe '#dump' do
-    context 'MySQL' do
+  describe "#dump" do
+    context "MySQL" do
       before do
         `mysql -u root < spec/support/mysql.sql`
       end
 
-      let(:type) { 'mysql' }
+      let(:type) { "mysql" }
 
-      it 'sucessfully dumps a gziped copy of the database' do
-        expect(dump).to include('CREATE TABLE `widgets`')
+      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
 
-    context 'PostgreSQL' do
+    context "PostgreSQL" do
       before do
         `psql -U postgres < spec/support/psql.sql`
       end
 
-      let(:type) { 'psql' }
+      let(:type) { "psql" }
 
-      it 'sucessfully dumps a gziped copy of the database' do
-        expect(dump).to include('CREATE TABLE widgets')
+      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;'
+          "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 eq expected_data
+        expect(dump).to include("1	Foo	3	1	2")
         expect(subject).to be_success
       end
     end