webtranslateit-safe 0.4.9 → 0.4.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12f0e6be06240bcba9f44a010c0885c9d29459ae7299e91de82c62f13f2d37ec
-  data.tar.gz: aa10fc13934f1ccfa3680a786998973152c317d411227efe9107b7dea0ec8312
+  metadata.gz: 9ecdf78b8c44bcbf64d9096a3dc20d434867719635c1104f14423aacd40172d6
+  data.tar.gz: ce5f71e6ddcbe3e335084ce700a2749ebf936b86b7a02786ee534ed2480b5edd
 SHA512:
-  metadata.gz: 4c18458f0b32bc78fe6b98cc2fcbae409419da81d1dde870b8aae32a17256523a0f86d667ea5a714b5834cfbbd8653b71576e6b96d6976ae17197c17245609ad
-  data.tar.gz: 36bd512b2581664fadbb55712936ee4b106f59d4daa93873306be81cbe925744c83f780eec0e224da283987cec779837620869158834407dd247fb7f27e08347
+  metadata.gz: d27bffcae503f8a8725a42dec46c8b09ce313f1bd45aa0a6df25aa8e18e33816fb39b83d2215b489b3c517850e874b6393c073a0029e43d2310abf15b3e88d1c
+  data.tar.gz: 950b3366db7917bc402cc3d0986f03c012b706fe604cfd275d5e42e3241cf449b5309a83352aa6a2903f2ffca48ef5f9e4b6154fc166e49c659f6ec65a2ac87c

data/CHANGELOG

@@ -1,3 +1,11 @@
+## 0.4.11 - 2023-07-27
+
+* Remove Rackspace Cloudfiles feature.
+* Code refactoring.
+
+## 0.4.10 - 2023-07-06
+
+* Fix retry strategy when using SCP.
 ## 0.4.9 - 2023-07-06
 
 * Use pigz instead of gzip when available on system to speed up compression time. 

data/README.markdown

@@ -1,6 +1,6 @@
 # webtranslateit-safe
 
-Simple database and filesystem backups with S3 and Rackspace Cloud Files support (with optional encryption).
+Simple database and filesystem backups with Amazon S3 support (with optional encryption).
 
 This is a fork of now abandonned [astrails-safe](https://github.com/astrails/safe) that we’ve been using since 2010. It is now unmaintained and not compatible with ruby 3.2, so we forked it.
 
@@ -121,14 +121,6 @@ safe do
     path "servers/alpha/:kind/:id"
   end
 
-  cloudfiles do
-    user "..........."
-    api_key "................................."
-    container "safe_backup"
-    path ":kind/" # this is default
-    service_net false
-  end
-
   sftp do
     host "sftp.astrails.com"
     user "astrails"
@@ -150,7 +142,6 @@ safe do
   keep do
     local 20
     s3 100
-    cloudfiles 100
     sftp 100
   end
 

data/lib/web_translate_it/safe/config/builder.rb

@@ -72,12 +72,10 @@ module WebTranslateIt
 
         end
 
-        simple_value :verbose, :dry_run, :local_only, :path, :command,
-                     :options, :user, :host, :port, :password, :key, :secret, :bucket,
-                     :api_key, :container, :socket, :service_net, :repo_path, :use_scp
+        simple_value :verbose, :dry_run, :local_only, :path, :command, :options, :user, :host, :port,
+                     :password, :key, :secret, :bucket, :socket, :service_net, :repo_path, :use_scp
         multi_value :skip_tables, :exclude, :files
-        mixed_value :s3, :local, :cloudfiles, :sftp, :mysqldump, :tar, :gpg, :keep, :pgdump, :tar,
-                    :mongodump
+        mixed_value :s3, :local, :sftp, :mysqldump, :tar, :gpg, :keep, :pgdump, :tar, :mongodump
         collection :database, :archive, :repo
 
         private

data/lib/web_translate_it/safe/config/node.rb

@@ -31,8 +31,8 @@ module WebTranslateIt
 
         # recursive find
         # starts at the node and continues to the parent
-        def find(*path)
-          get(*path) || @parent&.find(*path)
+        def find(*)
+          get(*) || @parent&.find(*)
         end
         alias [] find
 

data/lib/web_translate_it/safe/sftp.rb

@@ -32,7 +32,7 @@ module WebTranslateIt
           puts "Sending #{@backup.path} to #{full_path}" if verbose?
           begin
             connexion.upload! @backup.path, full_path
-          rescue IO::TimeoutError
+          rescue IO::TimeoutError, Net::SCP::Error
             puts 'Upload timed out, retrying'
             retries += 1
             if retries >= MAX_RETRIES
@@ -40,7 +40,7 @@ module WebTranslateIt
             else
               retry unless retries >= MAX_RETRIES
             end
-          rescue Net::SFTP::StatusException, Net::SCP::Error
+          rescue Net::SFTP::StatusException
             Net::SFTP.start(host, user, opts) do |sftp|
               puts "Ensuring remote path (#{path}) exists" if verbose?
               # mkdir -p

data/lib/web_translate_it/safe.rb

@@ -1,5 +1,4 @@
 require 'aws/s3'
-require 'cloudfiles'
 require 'net/sftp'
 require 'net/scp'
 require 'tmpdir'
@@ -31,7 +30,6 @@ require 'web_translate_it/safe/pigz'
 require 'web_translate_it/safe/sink'
 require 'web_translate_it/safe/local'
 require 'web_translate_it/safe/s3'
-require 'web_translate_it/safe/cloudfiles'
 require 'web_translate_it/safe/sftp'
 
 # Keeps mkmf from littering STDOUT
@@ -57,7 +55,7 @@ module WebTranslateIt
         next unless collection = config[*path]
 
         collection.each do |name, c|
-          klass.new(name, c).backup.run(c, :gpg, :pigz, :gzip, :local, :s3, :cloudfiles, :sftp)
+          klass.new(name, c).backup.run(c, :gpg, :pigz, :gzip, :local, :s3, :sftp)
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: webtranslateit-safe
 version: !ruby/object:Gem::Version
-  version: 0.4.9
+  version: 0.4.11
 platform: ruby
 authors:
 - Edouard Briere
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-06 00:00:00.000000000 Z
+date: 2023-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-s3
@@ -25,20 +25,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: cloudfiles
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: net-scp
   requirement: !ruby/object:Gem::Requirement
@@ -70,7 +56,7 @@ dependencies:
 description: |
   WebTranslateIt-Safe is a simple tool to backup databases (MySQL and PostgreSQL) and files.
   Backups can be stored locally or remotely and can be encrypted.
-  Remote storage is supported on Amazon S3, Rackspace Cloud Files, or just plain SFTP/SCP.
+  Remote storage is supported on Amazon S3 or just plain SFTP/SCP.
 email:
 - support@webtranslateit.com
 executables:
@@ -84,7 +70,6 @@ files:
 - lib/web_translate_it/safe.rb
 - lib/web_translate_it/safe/archive.rb
 - lib/web_translate_it/safe/backup.rb
-- lib/web_translate_it/safe/cloudfiles.rb
 - lib/web_translate_it/safe/config/builder.rb
 - lib/web_translate_it/safe/config/node.rb
 - lib/web_translate_it/safe/gpg.rb

data/lib/web_translate_it/safe/cloudfiles.rb

@@ -1,83 +0,0 @@
-module WebTranslateIt
-
-  module Safe
-
-    class Cloudfiles < Sink
-
-      MAX_CLOUDFILES_FILE_SIZE = 5_368_709_120
-
-      def active?
-        container && user && api_key
-      end
-
-      protected
-
-      def path
-        @path ||= expand(config[:cloudfiles, :path] || config[:local, :path] || ':kind/:id')
-      end
-
-      # UGLY: we need this function for the reason that
-      # we can't double mock on ruby 1.9.2, duh!
-      # so we created this func to mock it all together
-      def get_file_size(path)
-        File.stat(path).size
-      end
-
-      def save # rubocop:todo Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/MethodLength, Metrics/PerceivedComplexity
-        raise 'pipe-streaming not supported for S3.' unless @backup.path
-
-        # needed in cleanup even on dry run
-        cf = CloudFiles::Connection.new(user, api_key, true, service_net) unless local_only?
-        puts "Uploading #{container}:#{full_path} from #{@backup.path}" if verbose? || dry_run?
-        return if dry_run? || local_only?
-
-        if get_file_size(@backup.path) > MAX_CLOUDFILES_FILE_SIZE
-          warn "ERROR: File size exceeds maximum allowed for upload to Cloud Files (#{MAX_CLOUDFILES_FILE_SIZE}): #{@backup.path}"
-          return
-        end
-        benchmark = Benchmark.realtime do
-          cf_container = cf.create_container(container)
-          o = cf_container.create_object(full_path, true)
-          o.write(File.open(@backup.path))
-        end
-        puts '...done' if verbose?
-        puts("Upload took #{format('%.2f', benchmark)} second(s).") if verbose?
-      end
-
-      def cleanup # rubocop:todo Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity
-        return if local_only?
-
-        return unless keep = config[:keep, :cloudfiles]
-
-        puts "listing files: #{container}:#{base}*" if verbose?
-        cf = CloudFiles::Connection.new(user, api_key, true, service_net) unless local_only?
-        cf_container = cf.container(container)
-        files = cf_container.objects(prefix: base).sort
-
-        cleanup_with_limit(files, keep) do |f|
-          puts "removing Cloud File #{container}:#{f}" if dry_run? || verbose?
-          cf_container.delete_object(f) unless dry_run? || local_only?
-        end
-      end
-
-      def container
-        config[:cloudfiles, :container]
-      end
-
-      def user
-        config[:cloudfiles, :user]
-      end
-
-      def api_key
-        config[:cloudfiles, :api_key]
-      end
-
-      def service_net
-        config[:cloudfiles, :service_net] || false
-      end
-
-    end
-
-  end
-
-end