webtranslateit-safe 0.4.8 → 0.4.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 622f6f352864fc8dc4b3938346a25a46a47874e3b439938ed3d9b177218f2564
-  data.tar.gz: fa08df6cdc398f48a2bb5f8c7fd2289bf50b9cf6c3f6aaa39b542f8143363357
+  metadata.gz: 1a8304cc611880266f79c56c9be3a4e5cea6275073c93889a4dfd599ad6cf851
+  data.tar.gz: 46a96b97260f9458625e433681562dd0997e4b7d79e19082dd52add75a9712f5
 SHA512:
-  metadata.gz: 458c754bea2197d46e29e9405705af3961a03b1fec4f2f72e994c022c5549412ff4f1baa00cbd868d36df07a0d94a2cda7007b6fb447b739ed36df0efefd63e5
-  data.tar.gz: e70216d1c71e82b4d980a264e50f411b1c392a9d0f26f60605e71a8dc633199a4e195bed14786e858ff84aa415e90a69204f45869c8ea1a7850583b781591349
+  metadata.gz: 670a84fa71b7b52132670219d064e816bd68475c3a40bbc96fc9fcce9471ef073c8aea272800490c97517e1e8c01536f1db7c35badbe193169530fca32b01946
+  data.tar.gz: 75b72ba9cb7ef01b6e327187479e379db60feb60a0eceac7e96d34f9637206f01fed991c6e8f84f5ee0bfe376eb72d3165337be62dc14c417cde8fb8c92c4580

data/CHANGELOG

@@ -1,3 +1,9 @@
+## 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. 
 ## 0.4.8 - 2023-07-05
 
 * Remove svndump feature.

data/README.markdown

@@ -152,7 +152,6 @@ safe do
     s3 100
     cloudfiles 100
     sftp 100
-    scp 100
   end
 
   mysqldump do

data/lib/web_translate_it/safe/pigz.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module WebTranslateIt
+
+  module Safe
+
+    class Pigz < Pipe
+
+      protected
+
+      def post_process
+        @backup.compressed = true
+      end
+
+      def pipe
+        '|pigz'
+      end
+
+      def extension
+        '.gz'
+      end
+
+      def active?
+        !@backup.compressed && !(find_executable 'pigz').nil?
+      end
+
+    end
+
+  end
+
+end

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

@@ -5,8 +5,8 @@ require 'net/scp'
 require 'tmpdir'
 require 'fileutils'
 require 'benchmark'
-
 require 'tempfile'
+require 'mkmf'
 
 require 'web_translate_it/safe/tmp_file'
 
@@ -26,6 +26,7 @@ require 'web_translate_it/safe/mongodump'
 require 'web_translate_it/safe/pipe'
 require 'web_translate_it/safe/gpg'
 require 'web_translate_it/safe/gzip'
+require 'web_translate_it/safe/pigz'
 
 require 'web_translate_it/safe/sink'
 require 'web_translate_it/safe/local'
@@ -33,6 +34,11 @@ require 'web_translate_it/safe/s3'
 require 'web_translate_it/safe/cloudfiles'
 require 'web_translate_it/safe/sftp'
 
+# Keeps mkmf from littering STDOUT
+MakeMakefile::Logging.quiet = true
+# Keeps mkmf from creating a mkmf.log file on current path
+MakeMakefile::Logging.logfile(File::NULL)
+
 module WebTranslateIt
 
   module Safe
@@ -51,7 +57,7 @@ module WebTranslateIt
         next unless collection = config[*path]
 
         collection.each do |name, c|
-          klass.new(name, c).backup.run(c, :gpg, :gzip, :local, :s3, :cloudfiles, :sftp)
+          klass.new(name, c).backup.run(c, :gpg, :pigz, :gzip, :local, :s3, :cloudfiles, :sftp)
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: webtranslateit-safe
 version: !ruby/object:Gem::Version
-  version: 0.4.8
+  version: 0.4.10
 platform: ruby
 authors:
 - Edouard Briere
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-05 00:00:00.000000000 Z
+date: 2023-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-s3
@@ -68,9 +68,9 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: |
-  WebTranslateIt-Safe is a simple tool to backup databases (MySQL and PostgreSQL) and just files.
-  Backups can be stored locally or remotely and can be enctypted.
-  Remote storage is supported on Amazon S3, Rackspace Cloud Files, or just plain SFTP.
+  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.
 email:
 - support@webtranslateit.com
 executables:
@@ -93,6 +93,7 @@ files:
 - lib/web_translate_it/safe/mongodump.rb
 - lib/web_translate_it/safe/mysqldump.rb
 - lib/web_translate_it/safe/pgdump.rb
+- lib/web_translate_it/safe/pigz.rb
 - lib/web_translate_it/safe/pipe.rb
 - lib/web_translate_it/safe/s3.rb
 - lib/web_translate_it/safe/sftp.rb