s3-mysql-backup 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 696c4cb78b7a521ed337aeb7348712d338f0c407
-  data.tar.gz: 95743351851fda6539bacb44c259116407e68e3f
+  metadata.gz: 327d3200cef39203bdb710f10de493c3c7c2fcfe
+  data.tar.gz: e2e26bacf36acc92a065512dbd7c3e0224428e39
 SHA512:
-  metadata.gz: 7bab2531ddb39cc3edbb98b2a57c311c91689750e19d5e40ab567ea563eb62260d4708eeaec78c84eba14c6e914d353c1df32587f1736942a7a7f48994f833cf
-  data.tar.gz: cf6fa294ad8877d7c9081ac78e33c159004930030626663cbf84134d63b7b5e99a68005b3127441f2011c6e64697a41995e176e5982a63fe9289684e2c0adb3c
+  metadata.gz: 10ba28fda0abf41d7f9ec511a49831073df818a60b44fe707dd74aa816878636508ba0360831d1a200e2fd4cc6372d1007eac93eb964e3cd329c926971a91648
+  data.tar.gz: 050f63437e15a69f5687f991ab7e91685c1411f526c26a9839b16d9f48605bd3980ff1c748751878917d98680a427b32e0cba1b835b1b62efa7b9cdb387556cf

data/README.md

@@ -40,6 +40,7 @@ remote_dir: /path/to/remote/backups
 # s3_secret_access_key  your Amazon S3 secret_access_key
 # s3_bucket             your Amazon S3 bucket for the backups
 # s3_server             OPTIONAL, your non-Amazon S3-compatible server
+# s3_region: us-west-2  OPTIONAL, your aws region when not using the default
 s3_access_key_id: my-key
 s3_secret_access_key: my-secret
 s3_bucket: my-bucket

data/lib/s3_mysql_backup.rb

@@ -47,7 +47,7 @@ class S3MysqlBackup
   end
 
   def connect_to_s3
-    @s3utils ||= S3Utils.new(config['s3_access_key_id'], config['s3_secret_access_key'], config['s3_bucket'], config['s3_server'])
+    @s3utils ||= S3Utils.new(config['s3_access_key_id'], config['s3_secret_access_key'], config['s3_bucket'], config['s3_server'], config['s3_region'])
   end
 
   # make the DB backup file
@@ -90,11 +90,11 @@ 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"].to_s, 
-               config['mail_user'].to_s, 
-               config['mail_pass'].to_s, 
-               config['mail_authentication'].to_s
-               ) do
+      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/lib/s3utils.rb

@@ -4,9 +4,9 @@ require 'aws-sdk'
 #
 class S3Utils
 
-  def initialize(access_key_id, secret_access_key, bucket_name, server=nil)
+  def initialize(access_key_id, secret_access_key, bucket_name, server,region)
     @bucket_name   = bucket_name
-    @s3_connection = connect(access_key_id, secret_access_key, server)
+    @s3_connection = connect(access_key_id, secret_access_key,server, region)
     @s3_bucket     = get_or_create_bucket
     self
   end
@@ -28,19 +28,15 @@ class S3Utils
 
   protected
 
-  def connect(access_key_id, secret_access_key, server=nil)
-    if server == nil
-      AWS::S3::new(
-        :access_key_id     => access_key_id,
-        :secret_access_key => secret_access_key
-      )
-    else
-      AWS::S3::new(
-        :access_key_id     => access_key_id,
-        :secret_access_key => secret_access_key,
-        :server            => server
-      )
-    end
+  def connect(access_key_id, secret_access_key, server=nil, region=nil)
+    options={}
+    options[:access_key_id]=access_key_id
+    options[:secret_access_key]= secret_access_key
+    options[:server]= server unless server.nil?
+    options[:region]= region unless region.nil?
+     
+    AWS::S3::new(options)
+    
   end
 
   def get_or_create_bucket

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: s3-mysql-backup
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors:
 - Jeff Emminger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-09 00:00:00.000000000 Z
+date: 2015-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk