mys3ql 0.0.5 → 1.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: e54e18bc02f3e450ff0b3bbcf538d110740f7656
+  data.tar.gz: d9a68227ab366c3cfae81f56116c723c0ccb4bb4
+SHA512:
+  metadata.gz: cec4e35514acad343828bfbd6c726db0a0ca3654ce54906e1cb047d242a68d3b4fb7c47bde63287b8fda3a5fe6a0c01ecec19954f92be10a523ea954fce24261
+  data.tar.gz: e62c4784ea4161dd939f659ffa8f80d765976059149185adbf724d9eb4ffce6e2445296051cba0040d6369f9a24a028d8a0185bd12f66d4d16d259b17ac12d31

data/README.md

@@ -1,6 +1,6 @@
 # mys3ql = mysql + s3
 
-Simple backup of your MySql database onto Amazon S3.
+Simple backup of your MySQL database onto Amazon S3.
 
 
 ## Quick start
@@ -19,8 +19,9 @@ To restore from the latest backup (plus binlogs if present):
 
     $ mys3ql restore
 
-By default mys3ql looks for a configuration file at ~/.mys3ql.  You can override this like so:
+By default mys3ql looks for a configuration file at `~/.mys3ql`.  You can override this like so:
 
+    $ mys3ql [command] -c FILE
     $ mys3ql [command] --config=FILE
 
 
@@ -41,7 +42,7 @@ Second, create your config file:
       # Path (with trailing slash) to mysql commands e.g. mysqldump
       bin_path: /usr/local/mysql/bin/
       # If you are using MySql binary logging:
-      # Path to the binary logs, should match the bin_log option in your my.cnf.
+      # Path to the binary logs, should match the log_bin option in your my.cnf.
       # Comment out if you are not using mysql binary logging
       bin_log: /var/lib/mysql/binlog/mysql-bin
 
@@ -51,21 +52,24 @@ Second, create your config file:
       secret_access_key: XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
       # Bucket in which to store your backups
       bucket: db_backups
+      # AWS region your bucket lives in.
+      # (I suspect you only need to specify this when your 'location' is in a different region.)
+      #region: eu-west-1
 
 If you only have one database to back up on your server, you can put the config file at `~/.mys3ql`.  Otherwise, tell the `mys3ql` command where the config file is with the `--config=FILE` switch.
 
 ## Binary logging
 
-To use incremental backups you need to enable binary logging by making sure that the MySQL config file (my.cnf) has the following line in it:
+To use incremental backups you need to enable binary logging by making sure that the MySQL config file (`/etc/my.cnf`) has the following line in it:
 
     log_bin = /var/db/mysql/binlog/mysql-bin
 
-The MySQL user needs to have the RELOAD and the SUPER privileges, these can be granted with the following SQL commands (which need to be executed as the MySQL root user):
+The MySQL user needs to have the RELOAD and the SUPER privileges.  These can be granted with the following SQL commands (which need to be executed as the MySQL root user):
 
     GRANT RELOAD ON *.* TO 'user_name'@'%' IDENTIFIED BY 'password';
     GRANT SUPER ON *.* TO 'user_name'@'%' IDENTIFIED BY 'password';
 
-You may need to run mys3ql's incremental backup with special permissions (sudo), depending on the ownership of the binlogs directory.
+You may need to run mys3ql's incremental backup with special permissions (sudo) depending on the ownership of the binlogs directory.
 
 N.B. the binary logs contain updates to all the databases on the server.  This means you can only switch on incremental backups for one database per server, because the logs will be purged each time a database is dumped.
 
@@ -79,7 +83,7 @@ Marc-André Cournoyer's [mysql_s3_backup](https://github.com/macournoyer/mysql_s
 
 - tests ;)
 - remove old dump files (s3)
-- restore from non-latest dump
+- (restore from non-latest dump)
 
 
 ## Questions, Problems, Feedback

data/lib/mys3ql/config.rb

@@ -63,6 +63,10 @@ module Mys3ql
       s3['bucket']
     end
 
+    def region
+      s3['region']
+    end
+
     private
 
     def mysql

data/lib/mys3ql/mysql.rb

@@ -14,7 +14,7 @@ module Mys3ql
 
     def dump
       cmd  = "#{@config.bin_path}mysqldump"
-      cmd += ' --quick --single-transaction --create-options'
+      cmd += ' --quick --single-transaction --create-options --no-tablespaces'
       cmd += ' --flush-logs --master-data=2 --delete-master-logs' if binary_logging?
       cmd += cli_options
       cmd += " | gzip > #{dump_file}"

data/lib/mys3ql/s3.rb

@@ -23,7 +23,7 @@ module Mys3ql
     def delete_bin_logs
       each_bin_log do |file|
         file.destroy
-        log "s3: destroyed #{file.key}"
+        log "s3: deleted #{file.key}"
       end
     end
 
@@ -50,10 +50,12 @@ module Mys3ql
 
     # returns Fog::Storage::AWS::File if we pushed, nil otherwise.
     def save(local_file_name, s3_key)
+      s3.sync_clock
       unless bucket.files.head(s3_key)
         s3_file = bucket.files.create(
           :key    => s3_key,
           :body   => File.open(local_file_name),
+          :storage_class => 'STANDARD_IA',
           :public => false
         )
         log "s3: pushed #{local_file_name} to #{s3_key}"
@@ -75,7 +77,8 @@ module Mys3ql
         s = Fog::Storage.new(
           :provider              => 'AWS',
           :aws_secret_access_key => @config.secret_access_key,
-          :aws_access_key_id     => @config.access_key_id
+          :aws_access_key_id     => @config.access_key_id,
+          :region                => @config.region
         )
         log 's3: connected'
         s
@@ -85,7 +88,7 @@ module Mys3ql
     def bucket
       @directory ||= begin
         d = s3.directories.get @config.bucket
-        raise "S3 bucket #{@config.bucket} not found" unless d  # create bucket instead?
+        raise "S3 bucket #{@config.bucket} not found" unless d  # create bucket instead (n.b. region/location)?
         log "s3: opened bucket #{@config.bucket}"
         d
       end

data/lib/mys3ql/shell.rb

@@ -5,7 +5,7 @@ module Mys3ql
     def run(command)
       log command
       result = `#{command}`
-      log "==> #{result}"
+      log "==> #{result}" unless result.empty?
       raise ShellCommandError, "error (exit status #{$?.exitstatus}): #{command} ==> #{result}: #{$?}" unless $?.success?
       result
     end

data/lib/mys3ql/version.rb

@@ -1,3 +1,3 @@
 module Mys3ql
-  VERSION = "0.0.5"
+  VERSION = '1.1.0'
 end

data/mys3ql.gemspec

@@ -19,6 +19,6 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency 'main', '~> 4.8.0'
-  s.add_dependency 'fog', '~> 1.0.0'
+  s.add_dependency 'fog', '~> 1.19.0'
   s.add_development_dependency 'rake'
 end

metadata

@@ -1,80 +1,66 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: mys3ql
-version: !ruby/object:Gem::Version 
-  hash: 21
-  prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 5
-  version: 0.0.5
+version: !ruby/object:Gem::Version
+  version: 1.1.0
 platform: ruby
-authors: 
+authors:
 - Andy Stewart
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-
-date: 2011-11-04 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2020-12-22 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: main
-  prerelease: false
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 4
-        - 8
-        - 0
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
         version: 4.8.0
   type: :runtime
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
-  name: fog
   prerelease: false
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.8.0
+- !ruby/object:Gem::Dependency
+  name: fog
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.19.0
   type: :runtime
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.19.0
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id003
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Simple backup of your MySql database onto Amazon S3.
-email: 
+email:
 - boss@airbladesoftware.com
-executables: 
+executables:
 - mys3ql
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- .gitignore
+files:
+- ".gitignore"
 - CHANGELOG.md
 - Gemfile
 - README.md
@@ -88,39 +74,27 @@ files:
 - lib/mys3ql/shell.rb
 - lib/mys3ql/version.rb
 - mys3ql.gemspec
-has_rdoc: true
 homepage: https://github.com/airblade/mys3ql
 licenses: []
-
-post_install_message: 
+metadata: {}
+post_install_message:
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: mys3ql
-rubygems_version: 1.6.2
-signing_key: 
-specification_version: 3
+rubygems_version: 2.5.2.3
+signing_key:
+specification_version: 4
 summary: Simple backup of your MySql database onto Amazon S3.
 test_files: []
-