backup-agent 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 30d19db4d2b7b5ccd2d5b22ba4984b12cbf2d91b
-  data.tar.gz: eca7fd9183ba78f8b1bee805167ffcb30c967548
+  metadata.gz: 1689395dfc68dc2a53506dc5f7d450b0b3fbdceb
+  data.tar.gz: d68b183bcec4115436be20223d4aa91e4f4c3686
 SHA512:
-  metadata.gz: 580cb22de5ecfdeb372e1b2fa163d979123f2099da0f4dd4b0d17105f8acd739627e5b6645db613fdae6d3a5ec8e624897a377edde1421924a1999506e09f293
-  data.tar.gz: 5656f4668372fff2b3d1be5dedeb644aa97a26d672a9d90c52d21e5897512125ac2ef36ac077883a212ea138b5590d5a09d54b0f381f0c9f7e960c660c81df56
+  metadata.gz: 23ba26f5c0737f829ed774c6c1044333198c1bc2a74e90fc9c9fda504be0c53ea8158fef5d8a84b326c99ff9748a1670ca24841f3315288fe9241eda7a48e8b5
+  data.tar.gz: a246424a65914411b5f555a5d05afd5e614d7c6cd7c984c8e88ff2117fd1482ebd5983d1ff004b1416add2436559e59d7b12db073650cda7c74125a7a95853bf

data/backup-agent.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name            = 'backup-agent'
-  s.version         = '1.0.0'
+  s.version         = '1.0.1'
   s.authors         = ['Yaroslav Konoplov']
   s.email           = ['yaroslav@inbox.com']
   s.summary         = 'Easy AWS S3 backup'

data/lib/backup-agent.rb

@@ -1,19 +1,19 @@
 puts "Ruby version #{RUBY_VERSION}-p#{RUBY_PATCHLEVEL}"
 
-%w(rubygems aws-sdk fileutils confo-config shellwords).each { |lib| require lib }
+%w(rubygems aws-sdk fileutils confo-config shellwords pry).each { |el| require(el) }
 
-require_relative 'backup-agent/s3_config'
-require_relative 'backup-agent/task_config'
-require_relative 'backup-agent/service'
-require_relative 'backup-agent/features'
-require_relative 'backup-agent/s3'
+%w( abstract_storage abstract_storage_config abstract_storage_object
+   s3_storage s3_config s3_object
+   features task performer ).each { |el| require_relative("backup-agent/#{el}") }
 
-module BackupAgent
+module Backup
   class << self
-    def perform_backup(&block)
-      task_config = TaskConfig.new
-      task_config.configure(&block) if block
-      Service.new(task_config).perform_backup
+    def perform(storage, &block)
+      Performer.new.perform_backup(storage, Task.new(&block))
+    end
+
+    def features
+      @features ||= Features.new
     end
   end
 end

data/lib/backup-agent/abstract_storage.rb

@@ -0,0 +1,32 @@
+module Backup
+  class AbstractStorage
+    include Enumerable
+
+    attr_reader :config, :env
+
+    def initialize(config, env = {})
+      @config = config
+      @env    = env
+    end
+
+    def open
+
+    end
+
+    def close
+
+    end
+
+    def upload(key, path)
+
+    end
+
+    def delete(key)
+
+    end
+
+    def each
+
+    end
+  end
+end

data/lib/backup-agent/abstract_storage_config.rb

@@ -0,0 +1,5 @@
+module Backup
+  class AbstractStorageConfig < Confo::Config
+
+  end
+end

data/lib/backup-agent/abstract_storage_object.rb

@@ -0,0 +1,19 @@
+module Backup
+  class AbstractStorageObject
+    attr_reader :storage, :key, :env
+
+    def initialize(storage, key, env = {})
+      @storage = storage
+      @key     = key
+      @env     = env
+    end
+
+    def last_modified
+
+    end
+
+    def delete
+
+    end
+  end
+end

data/lib/backup-agent/features.rb

@@ -1,5 +1,10 @@
-module BackupAgent
-  class << self
+module Backup
+  class Features
+    def initialize
+      check_mysql
+      check_mongodb
+    end
+
     def check_mysql
       if @mysql_check.nil?
         @mysql_check = system('/usr/bin/env mysql --version') ? true : (puts('MySQL is not installed'); false)
@@ -14,18 +19,11 @@ module BackupAgent
       @mongodb_check
     end
 
-    def check_features
-      check_mysql
-      check_mongodb
-    end
-
     def mysql_installed?
-      check_features
       !!@mysql_check
     end
 
     def mongodb_installed?
-      check_features
       !!@mongodb_check
     end
   end

data/lib/backup-agent/{service.rb → performer.rb}

@@ -1,22 +1,22 @@
-module BackupAgent
-  class Service
-    attr_reader :config
+module Backup
+  class Performer
+    attr_reader :storage, :config
 
-    def initialize(config)
+    def perform_backup(storage, config)
+      @storage = storage
       @config = config
-    end
-
-    def perform_backup
       @started_at = Time.now.utc
       @timestamp = @started_at.strftime('%s - %A %d %B %Y %H:%M')
+      storage.open
       make_tmp_dir
-      backup_mysql if BackupAgent.mysql_installed?
-      backup_mongodb if BackupAgent.mongodb_installed?
+      backup_mysql if Backup.features.mysql_installed?
+      backup_mongodb if Backup.features.mongodb_installed?
       backup_directories
       backup_files
       cleanup_old_backups
     ensure
       remove_tmp_dir
+      storage.close
     end
 
   protected
@@ -27,9 +27,7 @@ module BackupAgent
         cmd = "cd #{dir} && /usr/bin/env tar -czf #{tmp_path}/#{dir_filename} ."
         puts "Exec #{cmd}"
         system(cmd)
-
-        obj = BackupAgent.s3.bucket(config.s3_bucket).object("#{@timestamp}/#{dir_filename}")
-        obj.upload_file("#{tmp_path}/#{dir_filename}")
+        storage.upload("#{@timestamp}/#{dir_filename}", "#{tmp_path}/#{dir_filename}")
       end
     end
 
@@ -45,8 +43,7 @@ module BackupAgent
           cmd = "cd #{files_tmp_path} && /usr/bin/env tar -czf #{tmp_path}/#{file_bunch_name} ."
           system(cmd)
 
-          obj = BackupAgent.s3.bucket(config.s3_bucket).object("#{@timestamp}/#{file_bunch_name}")
-          obj.upload_file("#{tmp_path}/#{file_bunch_name}")
+          storage.upload("#{@timestamp}/#{file_bunch_name}", "#{tmp_path}/#{file_bunch_name}")
         ensure
           FileUtils.remove_dir(files_tmp_path)
         end
@@ -56,14 +53,13 @@ module BackupAgent
     def backup_mysql
       config.get(:mysql_databases).each do |db|
         db_filename = "mysql-#{db}.gz"
-        dump = "/usr/bin/env mysqldump #{config.get(:mysql_connect)} #{config.get(:mysqldump_options).join(' ')} #{db}"
-        gzip = "/usr/bin/env gzip -5 -c > #{tmp_path}/#{db_filename}"
+        dump = with_env "mysqldump #{config.get(:mysql_connect)} #{config.get(:mysqldump_options).join(' ')} #{db}"
+        gzip = with_env "gzip -5 -c > #{tmp_path}/#{db_filename}"
 
         puts "Exec #{dump} | #{gzip}"
         system "#{dump} | #{gzip}"
 
-        obj = BackupAgent.s3.bucket(config.s3_bucket).object("#{@timestamp}/#{db_filename}")
-        obj.upload_file("#{tmp_path}/#{db_filename}")
+        storage.upload("#{@timestamp}/#{db_filename}", "#{tmp_path}/#{db_filename}")
       end
     end
 
@@ -72,16 +68,15 @@ module BackupAgent
       FileUtils.mkdir_p(mongo_dump_dir)
 
       config.get(:mongo_databases).each do |db|
-        db_filename = "mongo-#{db}.tgz"
-        dump = "/usr/bin/env mongodump #{config.get(:mongo_connect)} -d #{db} -o #{mongo_dump_dir}"
+        db_filename = "mongo-#{db}.tar.gz"
+        dump = with_env "mongodump #{config.get(:mongo_connect)} -d #{db} -o #{mongo_dump_dir}"
         cd   = "cd #{mongo_dump_dir}/#{db}"
-        tar  = "/usr/bin/env tar -czf #{tmp_path}/#{db_filename} ."
+        tar  = with_env "tar -czf #{tmp_path}/#{db_filename} ."
 
         puts "Exec #{dump} && #{cd} && #{tar}"
         system "#{dump} && #{cd} && #{tar}"
 
-        obj = BackupAgent.s3.bucket(config.s3_bucket).object("#{@timestamp}/#{db_filename}")
-        obj.upload_file("#{tmp_path}/#{db_filename}")
+        storage.upload("#{@timestamp}/#{db_filename}", "#{tmp_path}/#{db_filename}")
       end
     ensure
       FileUtils.remove_dir(mongo_dump_dir)
@@ -89,8 +84,8 @@ module BackupAgent
 
     def cleanup_old_backups
       cutoff_date = Time.now.utc.to_i - (config.get(:days_to_keep_backups) * 86400)
-      BackupAgent.s3.bucket(config.s3_bucket).objects.each do |o|
-        o.delete if o.last_modified.to_i < cutoff_date
+      storage.each do |obj|
+        obj.delete if obj.last_modified.to_i < cutoff_date
       end
     end
 
@@ -105,5 +100,9 @@ module BackupAgent
     def tmp_path
       "/tmp/backup-agent-#{@started_at.strftime('%d-%m-%Y-%H:%M')}"
     end
+
+    def with_env(cmd)
+      "/usr/bin/env #{cmd}"
+    end
   end
 end

data/lib/backup-agent/s3_config.rb

@@ -1,10 +1,11 @@
-module BackupAgent
-  class S3Config < Confo::Config
+module Backup
+  class S3Config < AbstractStorageConfig
     def initialize(*)
-      super
       set :access_key_id, nil
       set :secret_access_key, nil
       set :region, nil
+      set :bucket, nil
+      super
     end
   end
 end

data/lib/backup-agent/s3_object.rb

@@ -0,0 +1,17 @@
+module Backup
+  class S3Object < AbstractStorageObject
+    def initialize(*)
+      super
+      @object = env.fetch(:object)
+      @bucket = env.fetch(:bucket)
+    end
+
+    def last_modified
+      @object.last_modified
+    end
+
+    def delete
+      storage.delete(key)
+    end
+  end
+end

data/lib/backup-agent/s3_storage.rb

@@ -0,0 +1,45 @@
+module Backup
+  class S3Storage < AbstractStorage
+
+    def initialize(*)
+      super
+      @bucket_name = env.fetch(:bucket)
+    end
+
+    def s3
+      @s3 ||= begin
+        Aws.config.update(
+          region: config.region,
+          credentials: Aws::Credentials.new(config.access_key_id, config.secret_access_key)
+        )
+        Aws::S3::Resource.new
+      end
+    end
+
+    def bucket
+      s3.bucket(@bucket_name)
+    end
+
+    def open
+      s3
+    end
+
+    def upload(key, path)
+      bucket.object(key).upload_file(path)
+    end
+
+    def delete(key)
+      bucket.object(key).delete
+    end
+
+    def object(key)
+      S3Object.new(self, key, object: bucket.object(key), bucket: bucket)
+    end
+
+    def each
+      bucket.objects.each do |s3_obj|
+        yield S3Object.new(self, s3_obj.key, object: s3_obj, bucket: bucket)
+      end
+    end
+  end
+end

data/lib/backup-agent/{task_config.rb → task.rb}

@@ -1,5 +1,5 @@
-module BackupAgent
-  class TaskConfig < Confo::Config
+module Backup
+  class Task < Confo::Config
     def initialize(*)
       super
       set :mysql_user, 'root'
@@ -47,8 +47,6 @@ module BackupAgent
 
       set :files, {}
 
-      set :s3_bucket, nil
-
       set :days_to_keep_backups, 30
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: backup-agent
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Yaroslav Konoplov
@@ -66,11 +66,15 @@ files:
 - Rakefile
 - backup-agent.gemspec
 - lib/backup-agent.rb
+- lib/backup-agent/abstract_storage.rb
+- lib/backup-agent/abstract_storage_config.rb
+- lib/backup-agent/abstract_storage_object.rb
 - lib/backup-agent/features.rb
-- lib/backup-agent/s3.rb
+- lib/backup-agent/performer.rb
 - lib/backup-agent/s3_config.rb
-- lib/backup-agent/service.rb
-- lib/backup-agent/task_config.rb
+- lib/backup-agent/s3_object.rb
+- lib/backup-agent/s3_storage.rb
+- lib/backup-agent/task.rb
 homepage: http://github.com/yivo/backup-agent
 licenses:
 - MIT

data/lib/backup-agent/s3.rb

@@ -1,22 +0,0 @@
-module BackupAgent
-  class << self
-    def s3_config
-      @s3_config ||= S3Config.new
-    end
-
-    def configure_s3(&block)
-      @s3 = nil
-      s3_config.configure(&block)
-    end
-
-    def s3
-      @s3 ||= begin
-        Aws.config.update(
-          region: s3_config.region,
-          credentials: Aws::Credentials.new(s3_config.access_key_id, s3_config.secret_access_key)
-        )
-        Aws::S3::Resource.new
-      end
-    end
-  end
-end