s3-mysql-backup 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68c808d94c4006434ae710b9602b4511c6833cea
-  data.tar.gz: 98040176bbab5f6e59c41471511bdb90994cfd64
+  metadata.gz: 696c4cb78b7a521ed337aeb7348712d338f0c407
+  data.tar.gz: 95743351851fda6539bacb44c259116407e68e3f
 SHA512:
-  metadata.gz: ed796d0c791bc6a3a3ea3ba25b87c426038c68f651c2a822a7e6e63b7d37b6853ec63dc3a552ab45a29e2c7930695f7d846682676fee60dfa44cf903de31822d
-  data.tar.gz: 803ee3265a805312d43d28405b68f2f6129bbe4eaea1c5997d43cea715d1fed6b4f5eafdb7fac963b6382dee4c29561394b2531c0b64aead8af3f5ac3779c61c
+  metadata.gz: 7bab2531ddb39cc3edbb98b2a57c311c91689750e19d5e40ab567ea563eb62260d4708eeaec78c84eba14c6e914d353c1df32587f1736942a7a7f48994f833cf
+  data.tar.gz: cf6fa294ad8877d7c9081ac78e33c159004930030626663cbf84134d63b7b5e99a68005b3127441f2011c6e64697a41995e176e5982a63fe9289684e2c0adb3c

data/lib/s3_mysql_backup.rb

@@ -89,7 +89,12 @@ class S3MysqlBackup
 
     smtp = Net::SMTP.new(config["mail_domain"], config["mail_port"])
     smtp.enable_starttls unless config["mail_start_tls"] == false
-    smtp.start(config["mail_domain"], config['mail_user'], config['mail_pass'], config['mail_authentication']) do
+    smtp.start(
+               config["mail_domain"].to_s, 
+               config['mail_user'].to_s, 
+               config['mail_pass'].to_s, 
+               config['mail_authentication'].to_s
+               ) do
       smtp.send_message(content, mail_from, config['mail_to'])
     end
   end

data/spec/s3_mysql_backup_spec.rb

@@ -2,52 +2,104 @@ 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 }
+  context "with smtp stubbed" 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 }
+      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 }
+      @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_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 }
+      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
+      stub.instance_of(Net::SMTP).enable_starttls.times(any_times)
+      stub.instance_of(Net::SMTP).start.with_any_args.times(any_times){ true }
     end
 
-    it "should call connect_to_s3" do
-      stub.instance_of(S3MysqlBackup).connect_to_s3.times(1)
-      S3MysqlBackup.new('test', @config_path).run
-    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
+      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
+
+  context "without smtp stubbed" do
+    before :each do
+      # @config = YAML::load_file(File.dirname(__FILE__) + '/s3_mysql_backup.yml')
+      # stub.instance_of(S3MysqlBackup).config.times(any_times){ @config }
 
-    it "should call dump_db" do
-      stub.instance_of(S3MysqlBackup).dump_db.times(1){ @dump_file_name }
-      S3MysqlBackup.new('test', @config_path).run
+      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).send_message.with_any_args.times(any_times)
     end
 
-    it "should call mail_notification" do
-      stub.instance_of(S3MysqlBackup).mail_notification.times(1)
-      S3MysqlBackup.new('test', @config_path).run
+    describe "#mail_notification" do
+      it "should not raise with integer password" do
+        expect{
+
+          begin
+            S3MysqlBackup.new('test', {
+                                        backup_dir: "/tmp/s3_mysql_backups",
+                                        s3_access_key_id: "my-key",
+                                        s3_secret_access_key: "my-secret",
+                                        s3_bucket: "my-bucket",
+                                        dump_user: "my-user",
+                                        dump_pass: "my-pass",
+                                        mail_to: "recipient@example.com",
+                                        mail_user: "me@gmail.com",
+                                        mail_pass: 12345,
+                                        mail_start_tls: true,
+                                      }
+              ).send :mail_notification, "some_file_name"
+
+          rescue Exception => e
+            raise e if e.is_a?(TypeError)
+          end
+
+          }.not_to raise_error
+      end
     end
+
   end
 
 end

data/spec/spec_helper.rb

@@ -1,9 +1,6 @@
 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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: s3-mysql-backup
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Jeff Emminger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-27 00:00:00.000000000 Z
+date: 2015-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -88,7 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: Simple mysql backup to S3