s3-mysql-backup 1.0.4 → 1.0.5

data/lib/s3_mysql_backup.rb

@@ -18,16 +18,24 @@ class S3MysqlBackup
   def run
     ensure_backup_dir_exists
 
-    @s3utils = S3Utils.new(config['s3_access_key_id'], config['s3_secret_access_key'], config['s3_bucket'])
+    connect_to_s3
 
-    @dumpfile = dump_db
     remove_old_backups
-    mail_notification(@dumpfile)
+    
+    mail_notification(dump_db)
   end
   
   
   protected
   
+  def config
+    @s3config ||= YAML::load_file(@path_to_config)
+  end
+
+  def connect_to_s3
+    @s3utils ||= S3Utils.new(config['s3_access_key_id'], config['s3_secret_access_key'], config['s3_bucket'])
+  end
+
   # make the DB backup file
   def dump_db
     filename  = Time.now.strftime("#{@backup_dir}/#{@db_name}.%Y%m%d.%H%M%S.sql.gz")
@@ -70,10 +78,6 @@ class S3MysqlBackup
     end
   end
 
-  def config
-    @s3config ||= YAML::load_file(@path_to_config)
-  end
-
   # remove old backups
   #   - keep 30 days complete
   #   - keep 90 days weekly beyond that

data/lib/s3utils.rb

@@ -1,8 +1,5 @@
 require 'aws/s3'
 
-include AWS::S3
-
-
 # wrapper for S3 operations
 #
 class S3Utils
@@ -15,19 +12,19 @@ class S3Utils
   end
 
   def copy(from, to)
-    S3Object.copy(File.basename(from), File.basename(to), @bucket)
+    AWS::S3::S3Object.copy(File.basename(from), File.basename(to), @bucket)
   end
 
   def store(file_path)
-    S3Object.store(File.basename(file_path), open(file_path), @bucket)
+    AWS::S3::S3Object.store(File.basename(file_path), open(file_path), @bucket)
   end
 
   def delete(file_path)
-    S3Object.delete(File.basename(file_path), @bucket)
+    AWS::S3::S3Object.delete(File.basename(file_path), @bucket)
   end
 
   def list
-    Bucket.find(@bucket).objects.each do |obj|
+    AWS::S3::Bucket.find(@bucket).objects.each do |obj|
       puts "#{obj.bucket.name}/#{obj.key}"
     end
   end
@@ -42,10 +39,10 @@ class S3Utils
   end
 
   def ensure_bucket_exists
-    Bucket.find(@bucket)
+    AWS::S3::Bucket.find(@bucket)
 
   rescue AWS::S3::NoSuchBucket
-    Bucket.create(@bucket)
+    AWS::S3::Bucket.create(@bucket)
   end
 
 end

data/spec/s3_mysql_backup_spec.rb

@@ -0,0 +1,53 @@
+require "spec_helper"
+
+describe S3MysqlBackup do
+
+  before :each do
+    @config = YAML::load_file(File.dirname(__FILE__) + '/s3_mysql_backup.yml')
+    stub.instance_of(S3MysqlBackup).config.times(any_times){ @config }
+
+    stub.instance_of(S3MysqlBackup).ensure_backup_dir_exists.times(any_times){ true }
+
+    @dump_file_name = "/tmp/test.20130101.010101.sql.gz"
+    stub.instance_of(S3MysqlBackup).dump_db.times(any_times){ @dump_file_name }
+
+    mock_stats = Object.new
+    stub(File).stat.with_any_args.times(any_times){ mock_stats }
+    stub(mock_stats).size{ 1024 }
+
+    mock_utils = Object.new
+    stub(S3Utils).new.with_any_args.times(any_times){ mock_utils }
+    stub.instance_of(S3MysqlBackup).connect_to_s3.times(any_times){ mock_utils }
+
+    stub.instance_of(Net::SMTP).enable_starttls.times(any_times)
+    stub.instance_of(Net::SMTP).start.with_any_args.times(any_times){ true }
+  end
+
+  describe "#run" do
+    it "should call ensure_backup_dir_exists" do
+      stub.instance_of(S3MysqlBackup).ensure_backup_dir_exists.times(1)
+      S3MysqlBackup.new('test', @config_path).run
+    end
+
+    it "should call connect_to_s3" do
+      stub.instance_of(S3MysqlBackup).connect_to_s3.times(1)
+      S3MysqlBackup.new('test', @config_path).run
+    end
+
+    it "should call remove_old_backups" do
+      stub.instance_of(S3MysqlBackup).remove_old_backups.times(1)
+      S3MysqlBackup.new('test', @config_path).run
+    end
+
+    it "should call dump_db" do
+      stub.instance_of(S3MysqlBackup).dump_db.times(1){ @dump_file_name }
+      S3MysqlBackup.new('test', @config_path).run
+    end
+
+    it "should call mail_notification" do
+      stub.instance_of(S3MysqlBackup).mail_notification.times(1)
+      S3MysqlBackup.new('test', @config_path).run
+    end
+  end
+
+end

data/spec/s3utils_spec.rb

@@ -0,0 +1,7 @@
+require "spec_helper"
+
+describe S3Utils do
+
+  # TODO 
+
+end

data/spec/spec_helper.rb

@@ -0,0 +1,9 @@
+require "s3_mysql_backup"
+require "rr"
+require 'fakefs/spec_helpers'
+
+RSpec.configure do |config|
+  config.color_enabled = true
+  config.formatter     = 'documentation'
+  config.mock_framework = :rr
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: s3-mysql-backup
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -27,6 +27,54 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.12'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.12'
+- !ruby/object:Gem::Dependency
+  name: rr
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.5
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.5
+- !ruby/object:Gem::Dependency
+  name: fakefs
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.2
 description: A simple mysql backup to Amazon S3
 email: jeff@7compass.com
 executables:
@@ -38,6 +86,9 @@ files:
 - lib/s3_mysql_backup.rb
 - lib/s3utils.rb
 - README.md
+- spec/s3_mysql_backup_spec.rb
+- spec/s3utils_spec.rb
+- spec/spec_helper.rb
 - bin/s3-mysql-backup
 homepage: https://github.com/7compass/s3-mysql-backup
 licenses: []
@@ -64,4 +115,7 @@ rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Simple mysql backup to S3
-test_files: []
+test_files:
+- spec/s3_mysql_backup_spec.rb
+- spec/s3utils_spec.rb
+- spec/spec_helper.rb