mys3ql 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86d0a66ce7dab918b298c22eb4d667df2cb9ac7c
-  data.tar.gz: cd9527db20ae5a07349b3456e544a0aa3552f9bd
+  metadata.gz: a48a2b78903816b36dda8e140c0a437d7321b9de
+  data.tar.gz: 698c6f810ec61c7b66313e4d0c6831c2ee62576a
 SHA512:
-  metadata.gz: 25abe9f3cc7daee801c8402dbd07b8827608d139ed4a2ca95ec089ed1a7d4335dfbfaa8fd30f10ea06118159d3513fa90c866ac9fa09976b48dc8d05645ac105
-  data.tar.gz: 340d29d1230eda51d4408b8f5fb3597ed7da31276171608469092c10fbe04ceb5f3e0640f3758cbdbe14c2af99804bc5ebb81dd27e6097c661c492d4339d56f4
+  metadata.gz: 652a2869f4a3f54b2a7c63f8ec16aa0d26c59550cf27de8f2a7eca34202f746f53d9ac332000c4a79dac59307bdca42ad809cb5f613ab4a19eb43899dc1f04e9
+  data.tar.gz: c71c414fb1431c41899e5ccb438bb3e62fcef18e8f33fcb5580312a0f322bb4fce09ad560df66f3f6dec7893ae9cf3ff5042d11e148001ad2b5a3cdb9eae4bd2

data/lib/mys3ql/mysql.rb

@@ -45,9 +45,10 @@ module Mys3ql
       #               https://dev.mysql.com/doc/refman/5.7/en/flush.html#flush-logs
       #               https://dev.mysql.com/doc/refman/5.7/en/flush.html#flush-binary-logs
       execute 'flush logs'
-      logs = Dir.glob("#{@config.bin_log}.[0-9]*").sort_by { |f| f[/\d+/].to_i }
-      logs_to_backup = logs[0..-2]  # all logs except the last, which is newly created
-      logs_to_backup.each do |log_file|
+      Dir.glob("#{@config.bin_log}.[0-9]*")
+         .sort_by { |f| f[/\d+/].to_i }
+         .slice(0..-2)  # all logs except the last, which is newly created
+         .each do |log_file|
         yield log_file
       end
     end

data/lib/mys3ql/s3.rb

@@ -14,7 +14,7 @@ module Mys3ql
       s3_file = save file, key
       if dump && s3_file
         copy_key = key_for :latest
-        s3_file.copy_to key: copy_key
+        s3_file.copy_to bucket: bucket_name, key: copy_key
         log "s3: copied #{key} to #{copy_key}"
       end
     end
@@ -50,7 +50,7 @@ module Mys3ql
     def get(s3_key, local_file_name)
       s3.get_object(
         response_target: local_file_name,
-        bucket:          @config.bucket,
+        bucket:          bucket_name,
         key:             s3_key
       )
       log "s3: pulled #{s3_key} to #{local_file_name}"
@@ -88,20 +88,22 @@ module Mys3ql
           access_key_id:     @config.access_key_id,
           region:            @config.region
         )
-        log 's3: connected'
         client
       end
     end
 
     def bucket
       @bucket ||= begin
-        b = Aws::S3::Bucket.new @config.bucket, client: s3
-        raise "S3 bucket #{@config.bucket} not found" unless b.exists?
-        log "s3: opened bucket #{@config.bucket}"
+        b = Aws::S3::Bucket.new bucket_name, client: s3
+        raise "S3 bucket #{bucket_name} not found" unless b.exists?
         b
       end
     end
 
+    def bucket_name
+      @config.bucket
+    end
+
     def dumps_prefix
       "#{@config.database}/dumps"
     end
@@ -109,9 +111,5 @@ module Mys3ql
     def bin_logs_prefix
       "#{@config.database}/bin_logs"
     end
-
-    def bin_logs_exist?
-      @config.bin_log && @config.bin_log.length > 0 && File.exist?(@config.bin_log)
-    end
   end
 end

data/lib/mys3ql/version.rb

@@ -1,3 +1,3 @@
 module Mys3ql
-  VERSION = '1.3.0'
+  VERSION = '1.3.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mys3ql
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Andy Stewart
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-08 00:00:00.000000000 Z
+date: 2021-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3