webtranslateit-safe 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43afe3f6fffb6bb4178cfd6c6181767f67f7995f2e836d35c9d5c66556b567fb
-  data.tar.gz: 3fe840117d0c799b65edcafc92b57f73e7ba928297fe53bc1f8262059404e5fe
+  metadata.gz: 1d56d9c1814184138e0ac2f4c7c1c62d977db103d6aecebd441ae6c861a4f85e
+  data.tar.gz: 818c66a0f9307e18add81ef25fd29822a77ae1980cbbbdeafbcfdd5684ae65b7
 SHA512:
-  metadata.gz: 1ad57b335c7585cea8621bbd6007fcd1f2d10e6fe7ba9fa0b1381ce00ce96eb38eb11925912185e06ab3ba2e69ebec165b2fa9a268c0cbeeb0b765e43b166b6f
-  data.tar.gz: c51e5399dc02aa3fe4b0d0bfb99ed6397c9abdbc16ebf5dc8994d056151fcee9d340f0b8085d52f333d00b3eb8d1c0bbbd5b60c28afdde36b7065ed0a821492d
+  metadata.gz: 10a974ca460fdfd6ccf52f19a55466b70f74ea2f7e929084935453cf04bc67f0c9618c44f7b9d70bca2fd23f7af84ee54e77d2161a0a7219df3800c73e466e77
+  data.tar.gz: 6975cc66f99b3220b69556a20e5646c51ace16c7544380a1459f61cd9ce2781b8f5923dd942088676390cb50701daed4b964898562bf001edb4b9da590874ebd

data/CHANGELOG

@@ -1,36 +1,44 @@
-0.4.3
+## 0.4.4 - 2023-06-30
+
+* Remove `default_executable` line and simplify executables definition.
+* Autocorrect rubocop offences.
+* Convert rspec syntax from `should` to `expect`.
+* Remove unused extension `Dir.mktmpdir`.
+* Upload retry logic for SFTP.
+
+## 0.4.3 - 2023-06-29
 
 * Bug fix on builder.
 * Move version number to gemspec file.
 
-0.4.2
+## 0.4.2 - 2023-05-22
 
 * Bug fix on executable
 
-0.4.1
+## 0.4.1 - 2023-05-20
 
 * Add ruby 3.2 compantibility
 * Modernize gem
 * Rename astrails-safe to webtranslateit-safe
 
-0.3.1
+## 0.3.1
 
 * plain ftp support from seroy
 * mongodump support from Matt Berther
 
-0.3.0
+## 0.3.0
 
 * switch to bundler
 * fixed the rspec
 
-0.2.8
+## 0.2.8
 
 * ruby 1.9.2 compatibility (tests mostly)
 * code review, and tons of small fixes
 * check file size before attempting to upload to cloudfiles
 * testing framework changed from micronaut to rspec
 
-0.2.7
+## 0.2.7
 
 * default options for gpg now include '--no-use-agent'
 * support for 'command' option for gpg
@@ -38,13 +46,13 @@
 * add 'lib' to $:
 * [EXPERIMENTAL] Rackspace Cloud Files support
 
-0.2.6
+## 0.2.6
 
 * fix typo in the template config file. (change option to options in pgdump)
 * add example 'options' for tar in the template config file.
 * do not try to upload more then 5G of data to S3. print error instead
 
-0.2.5
+## 0.2.5
 
 * Safety mesure: Disable overwrite of existing configuration keys except for multi-value keys
   supported multi-value keys: skip_tables, exclude, files

data/bin/webtranslateit-safe

@@ -12,16 +12,16 @@ def die(msg)
 end
 
 def usage
-  puts <<-END
-Usage: webtranslateit-safe [OPTIONS] CONFIG_FILE
-Options:
-  -h, --help           This help screen
-  -v, --verbose        be verbose, duh!
-  -n, --dry-run        just pretend, don't do anything.
-  -L, --local          skip S3 and Cloud Files
-
-Note: config file will be created from template if missing
-END
+  puts <<~END
+    Usage: webtranslateit-safe [OPTIONS] CONFIG_FILE
+    Options:
+      -h, --help           This help screen
+      -v, --verbose        be verbose, duh!
+      -n, --dry-run        just pretend, don't do anything.
+      -L, --local          skip S3 and Cloud Files
+
+    Note: config file will be created from template if missing
+  END
   exit 1
 end
 
@@ -30,7 +30,7 @@ OPTS = [
   '-v', '--verbose', '--not-verbose',
   '-n', '--dry-run', '--not-dry-run',
   '-L', '--local', '--not-local'
-]
+].freeze
 def main
   opts = ARGV & OPTS
   args = ARGV - OPTS
@@ -40,7 +40,7 @@ def main
 
   config_file = File.expand_path(args.first)
 
-  is_dry = (opts.delete('-n') || opts.delete('--dry-run')) && ! opts.delete('--not-dry-run')
+  is_dry = (opts.delete('-n') || opts.delete('--dry-run')) && !opts.delete('--not-dry-run')
   is_verbose = (opts.delete('-v') || opts.delete('--verbose')) && !opts.delete('--not-verbose')
   is_local_only = (opts.delete('-L') || opts.delete('--local')) && !opts.delete('--not-local')
 
@@ -61,4 +61,4 @@ def main
   process config
 end
 
-main
+main

data/lib/webtranslateit/safe/archive.rb

@@ -1,24 +1,29 @@
 module WebTranslateIt
+
   module Safe
+
     class Archive < Source
 
       def command
         "tar -cf - #{config[:options]} #{tar_exclude_files} #{tar_files}"
       end
 
-      def extension; '.tar'; end
+      def extension = '.tar'
 
       protected
 
       def tar_exclude_files
-        [*config[:exclude]].compact.map{|x| "--exclude=#{x}"}.join(' ')
+        [*config[:exclude]].compact.map { |x| "--exclude=#{x}" }.join(' ')
       end
 
       def tar_files
-        raise RuntimeError, 'missing files for tar' unless config[:files]
-        [*config[:files]].map{|s| s.strip}.join(' ')
+        raise 'missing files for tar' unless config[:files]
+
+        [*config[:files]].map(&:strip).join(' ')
       end
 
     end
+
   end
+
 end

data/lib/webtranslateit/safe/backup.rb

@@ -1,10 +1,14 @@
 module WebTranslateIt
+
   module Safe
+
     class Backup
+
       attr_accessor :id, :kind, :filename, :extension, :command, :compressed, :timestamp, :path
+
       def initialize(opts = {})
         opts.each do |k, v|
-          self.send("#{k}=", v)
+          send("#{k}=", v)
         end
       end
 
@@ -15,6 +19,9 @@ module WebTranslateIt
           WebTranslateIt::Safe.const_get(mod).new(config, self).process
         end
       end
+
     end
+
   end
-end
+
+end

data/lib/webtranslateit/safe/cloudfiles.rb

@@ -1,7 +1,10 @@
 module WebTranslateIt
+
   module Safe
+
     class Cloudfiles < Sink
-      MAX_CLOUDFILES_FILE_SIZE = 5368709120
+
+      MAX_CLOUDFILES_FILE_SIZE = 5_368_709_120
 
       def active?
         container && user && api_key
@@ -21,24 +24,24 @@ module WebTranslateIt
       end
 
       def save
-        raise RuntimeError, 'pipe-streaming not supported for S3.' unless @backup.path
+        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?
-        unless dry_run? || local_only?
-          if get_file_size(@backup.path) > MAX_CLOUDFILES_FILE_SIZE
-            STDERR.puts "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 ' + sprintf('%.2f', benchmark) + ' second(s).') if verbose?
+        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
@@ -49,7 +52,7 @@ module WebTranslateIt
         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
+        files = cf_container.objects(prefix: base).sort
 
         cleanup_with_limit(files, keep) do |f|
           puts "removing Cloud File #{container}:#{f}" if dry_run? || verbose?
@@ -72,6 +75,9 @@ module WebTranslateIt
       def service_net
         config[:cloudfiles, :service_net] || false
       end
+
     end
+
   end
+
 end

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

@@ -1,15 +1,19 @@
 module WebTranslateIt
+
   module Safe
+
     module Config
+
       class Builder
 
         def initialize(node, data = {})
           @node = node
-          data.each { |k, v| self.send k, v }
+          data.each { |k, v| send k, v }
         end
 
 
         class << self
+
           def simple_value(*names)
             names.each do |m|
               define_method(m) do |value|
@@ -40,7 +44,7 @@ module WebTranslateIt
 
           def mixed_value(*names)
             names.each do |m|
-              define_method(m) do |data={}, &block|
+              define_method(m) do |data = {}, &block|
                 ensure_uniq(m)
                 if data.is_a?(Hash) || block
                   ensure_hash(m, data) if block
@@ -54,8 +58,9 @@ module WebTranslateIt
 
           def collection(*names)
             names.each do |m|
-              define_method(m) do |id, data={}, &block|
+              define_method(m) do |id, data = {}, &block|
                 raise "bad collection id: #{id.inspect}" unless id
+
                 ensure_hash(m, data)
 
                 name = "#{m}s"
@@ -64,14 +69,15 @@ module WebTranslateIt
               end
             end
           end
+
         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
+                     :options, :user, :host, :port, :password, :key, :secret, :bucket,
+                     :api_key, :container, :socket, :service_net, :repo_path
         multi_value :skip_tables, :exclude, :files
         mixed_value :s3, :local, :cloudfiles, :sftp, :mysqldump, :tar, :gpg, :keep, :pgdump, :tar, :svndump,
-          :ftp, :mongodump
+                    :ftp, :mongodump
         collection :database, :archive, :repo
 
         private
@@ -83,7 +89,11 @@ module WebTranslateIt
         def ensure_hash(k, v)
           raise "#{k}: hash expected: #{v.inspect}" unless v.is_a?(Hash)
         end
+
       end
+
     end
+
   end
+
 end

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

@@ -1,8 +1,12 @@
 require 'webtranslateit/safe/config/builder'
 module WebTranslateIt
+
   module Safe
+
     module Config
+
       class Node
+
         attr_reader :parent, :data
 
         def initialize(parent = nil, data = {}, &block)
@@ -11,7 +15,7 @@ module WebTranslateIt
           merge data, &block
         end
 
-        def merge data = {}, &block
+        def merge(data = {}, &block)
           builder = Builder.new(self, data)
           builder.instance_eval(&block) if block
           self
@@ -21,27 +25,27 @@ module WebTranslateIt
         def get(*path)
           key = path.shift
           value = @data[key.to_s]
-          return value if (nil != value) && path.empty?
+          return value if !value.nil? && path.empty?
 
-          value && value.get(*path)
+          value&.get(*path)
         end
 
         # recursive find
         # starts at the node and continues to the parent
         def find(*path)
-          get(*path) || @parent && @parent.find(*path)
+          get(*path) || @parent&.find(*path)
         end
-        alias :[] :find
+        alias [] find
 
         def set_multi(key, value)
           @data[key.to_s] ||= []
-          @data[key.to_s].concat [*value]
+          @data[key.to_s].push(*value)
         end
 
         def set(key, value)
           @data[key.to_s] = value
         end
-        alias :[]= :set
+        alias []= set
 
         def each(&block)
           @data.each(&block)
@@ -49,10 +53,9 @@ module WebTranslateIt
         include Enumerable
 
         def to_hash
-          @data.keys.inject({}) do |res, key|
+          @data.keys.each_with_object({}) do |key, res|
             value = @data[key]
             res[key] = value.is_a?(Node) ? value.to_hash : value
-            res
           end
         end
 
@@ -60,13 +63,17 @@ module WebTranslateIt
           @data.each do |key, value|
             if value.is_a?(Node)
               puts "#{indent}#{key}:"
-              value.dump(indent + '    ')
+              value.dump("#{indent}    ")
             else
               puts "#{indent}#{key}: #{value.inspect}"
             end
           end
         end
+
       end
+
     end
+
   end
+
 end

data/lib/webtranslateit/safe/ftp.rb

@@ -1,5 +1,7 @@
 module WebTranslateIt
+
   module Safe
+
     class Ftp < Sink
 
       protected
@@ -13,26 +15,24 @@ module WebTranslateIt
       end
 
       def save
-        raise RuntimeError, 'pipe-streaming not supported for FTP.' unless @backup.path
+        raise 'pipe-streaming not supported for FTP.' unless @backup.path
 
         puts "Uploading #{host}:#{full_path} via FTP" if verbose? || dry_run?
 
-        unless dry_run? || local_only?
-          if !port
-            port = 21
-          end
-          Net::FTP.open(host) do |ftp|
-            ftp.connect(host, port)
-            ftp.login(user, password)
-            puts "Sending #{@backup.path} to #{full_path}" if verbose?
-            begin
-              ftp.put(@backup.path, full_path)
-            rescue Net::FTPPermError
-              puts "Ensuring remote path (#{path}) exists" if verbose?
-            end
+        return if dry_run? || local_only?
+
+        port ||= 21
+        Net::FTP.open(host) do |ftp|
+          ftp.connect(host, port)
+          ftp.login(user, password)
+          puts "Sending #{@backup.path} to #{full_path}" if verbose?
+          begin
+            ftp.put(@backup.path, full_path)
+          rescue Net::FTPPermError
+            puts "Ensuring remote path (#{path}) exists" if verbose?
           end
-          puts '...done' if verbose?
         end
+        puts '...done' if verbose?
       end
 
       def cleanup
@@ -41,20 +41,18 @@ module WebTranslateIt
         return unless keep = config[:keep, :ftp]
 
         puts "listing files: #{host}:#{base}*" if verbose?
-        if !port
-           port = 21
-        end
+        port ||= 21
         Net::FTP.open(host) do |ftp|
           ftp.connect(host, port)
           ftp.login(user, password)
           files = ftp.nlst(path)
-          pattern = File.basename("#{base}")
-          files = files.reject{ |x| !x.start_with?(pattern)}
-          puts files.collect {|x| x} if verbose?
+          pattern = File.basename(base.to_s)
+          files = files.select { |x| x.start_with?(pattern) }
+          puts files.collect { |x| x } if verbose?
 
-          files = files.
-            collect {|x| x }.
-            sort
+          files = files
+                  .collect { |x| x }
+                  .sort
 
           cleanup_with_limit(files, keep) do |f|
             file = File.join(path, f)
@@ -81,5 +79,7 @@ module WebTranslateIt
       end
 
     end
+
   end
-end
+
+end

data/lib/webtranslateit/safe/gpg.rb

@@ -1,9 +1,11 @@
 module WebTranslateIt
+
   module Safe
+
     class Gpg < Pipe
 
       def active?
-        raise RuntimeError, "can't use both gpg password and pubkey" if key && password
+        raise "can't use both gpg password and pubkey" if key && password
 
         !!(password || key)
       end
@@ -39,8 +41,12 @@ module WebTranslateIt
 
       def gpg_password_file(pass)
         return 'TEMP_GENERATED_FILENAME' if dry_run?
+
         WebTranslateIt::Safe::TmpFile.create('gpg-pass') { |file| file.write(pass) }
       end
+
     end
+
   end
-end
+
+end

data/lib/webtranslateit/safe/gzip.rb

@@ -1,5 +1,7 @@
 module WebTranslateIt
+
   module Safe
+
     class Gzip < Pipe
 
       protected
@@ -21,5 +23,7 @@ module WebTranslateIt
       end
 
     end
+
   end
-end
+
+end

data/lib/webtranslateit/safe/local.rb

@@ -1,5 +1,7 @@
 module WebTranslateIt
+
   module Safe
+
     class Local < Sink
 
       def active?
@@ -11,7 +13,7 @@ module WebTranslateIt
       protected
 
       def path
-        @path ||= File.expand_path(expand(config[:local, :path] || raise(RuntimeError, 'missing :local/:path')))
+        @path ||= File.expand_path(expand(config[:local, :path] || raise('missing :local/:path')))
       end
 
       def save
@@ -20,14 +22,13 @@ module WebTranslateIt
         # FIXME: probably need to change this to smth like @backup.finalize!
         @backup.path = full_path # need to do it outside DRY_RUN so that it will be avialable for S3 DRY_RUN
 
-        unless dry_run?
-          FileUtils.mkdir_p(path) unless File.directory?(path)
-          benchmark = Benchmark.realtime do
-            system "#{@backup.command}>#{@backup.path}"
-          end
-          puts('command took ' + sprintf('%.2f', benchmark) + ' second(s).') if verbose?
-        end
+        return if dry_run?
 
+        FileUtils.mkdir_p(path) unless File.directory?(path)
+        benchmark = Benchmark.realtime do
+          system "#{@backup.command}>#{@backup.path}"
+        end
+        puts("command took #{format('%.2f', benchmark)} second(s).") if verbose?
       end
 
       def cleanup
@@ -37,15 +38,18 @@ module WebTranslateIt
 
         # TODO: cleanup ALL zero-length files
 
-        files = Dir["#{base}*"] .
-          select{|f| File.file?(f) && File.size(f) > 0} .
-          sort
+        files = Dir["#{base}*"]
+                .select { |f| File.file?(f) && File.size(f).positive? }
+                .sort
 
         cleanup_with_limit(files, keep) do |f|
           puts "removing local file #{f}" if dry_run? || verbose?
           File.unlink(f) unless dry_run?
         end
       end
+
     end
+
   end
+
 end

data/lib/webtranslateit/safe/mongodump.rb

@@ -1,23 +1,29 @@
 module WebTranslateIt
+
   module Safe
+
     class Mongodump < Source
-      
+
       def command
         opts = []
         opts << "--host #{config[:host]}" if config[:host]
         opts << "-u #{config[:user]}" if config[:user]
         opts << "-p #{config[:password]}" if config[:password]
         opts << "--out #{output_directory}"
-      
-        "mongodump -q \"{xxxx : { \\$ne : 0 } }\" --db #{@id} #{opts.join(" ")} && cd #{output_directory} && tar cf - ."
+
+        "mongodump -q \"{xxxx : { \\$ne : 0 } }\" --db #{@id} #{opts.join(' ')} && cd #{output_directory} && tar cf - ."
       end
-    
-      def extension; '.tar'; end
-      
+
+      def extension = '.tar'
+
       protected
+
       def output_directory
         File.join(TmpFile.tmproot, 'mongodump')
       end
+
     end
+
   end
+
 end

data/lib/webtranslateit/safe/mysqldump.rb

@@ -1,12 +1,14 @@
 module WebTranslateIt
+
   module Safe
+
     class Mysqldump < Source
 
       def command
         "mysqldump --defaults-extra-file=#{mysql_password_file} #{config[:options]} #{mysql_skip_tables} #{@id}"
       end
 
-      def extension; '.sql'; end
+      def extension = '.sql'
 
       protected
 
@@ -22,11 +24,13 @@ module WebTranslateIt
       end
 
       def mysql_skip_tables
-        if skip_tables = config[:skip_tables]
-          [*skip_tables].map{ |t| "--ignore-table=#{@id}.#{t}" }.join(' ')
-        end
+        return unless skip_tables = config[:skip_tables]
+
+        [*skip_tables].map { |t| "--ignore-table=#{@id}.#{t}" }.join(' ')
       end
 
     end
+
   end
-end
+
+end

data/lib/webtranslateit/safe/pgdump.rb

@@ -1,17 +1,15 @@
 module WebTranslateIt
+
   module Safe
+
     class Pgdump < Source
 
       def command
-        if config['password']
-          ENV['PGPASSWORD'] = config['password']
-        else
-          ENV['PGPASSWORD'] = nil
-        end
+        ENV['PGPASSWORD'] = (config['password'] || nil)
         "pg_dump #{postgres_options} #{postgres_username} #{postgres_host} #{postgres_port} #{@id}"
       end
 
-      def extension; '.sql'; end
+      def extension = '.sql'
 
       protected
 
@@ -20,17 +18,19 @@ module WebTranslateIt
       end
 
       def postgres_host
-        config['host'] && "--host='#{config["host"]}'"
+        config['host'] && "--host='#{config['host']}'"
       end
 
       def postgres_port
-        config['port'] && "--port='#{config["port"]}'"
+        config['port'] && "--port='#{config['port']}'"
       end
 
       def postgres_username
-        config['user'] && "--username='#{config["user"]}'"
+        config['user'] && "--username='#{config['user']}'"
       end
 
     end
+
   end
+
 end

data/lib/webtranslateit/safe/pipe.rb

@@ -1,6 +1,9 @@
 module WebTranslateIt
+
   module Safe
+
     class Pipe < Stream
+
       # process adds required commands to the current
       # shell command string
       # :active?, :pipe, :extension and :post_process are
@@ -12,6 +15,9 @@ module WebTranslateIt
         @backup.extension << extension
         post_process
       end
+
     end
+
   end
+
 end

data/lib/webtranslateit/safe/s3.rb

@@ -1,7 +1,10 @@
 module WebTranslateIt
+
   module Safe
+
     class S3 < Sink
-      MAX_S3_FILE_SIZE = 5368709120
+
+      MAX_S3_FILE_SIZE = 5_368_709_120
 
       def active?
         bucket && key && secret
@@ -15,26 +18,26 @@ module WebTranslateIt
 
       def save
         # FIXME: user friendly error here :)
-        raise RuntimeError, 'pipe-streaming not supported for S3.' unless @backup.path
+        raise 'pipe-streaming not supported for S3.' unless @backup.path
 
         # needed in cleanup even on dry run
-        AWS::S3::Base.establish_connection!(:access_key_id => key, :secret_access_key => secret, :use_ssl => true) unless local_only?
+        AWS::S3::Base.establish_connection!(access_key_id: key, secret_access_key: secret, use_ssl: true) unless local_only?
 
         puts "Uploading #{bucket}:#{full_path}" if verbose? || dry_run?
-        unless dry_run? || local_only?
-          if File.stat(@backup.path).size > MAX_S3_FILE_SIZE
-            STDERR.puts "ERROR: File size exceeds maximum allowed for upload to S3 (#{MAX_S3_FILE_SIZE}): #{@backup.path}"
-            return
-          end
-          benchmark = Benchmark.realtime do
-            AWS::S3::Bucket.create(bucket) unless bucket_exists?(bucket)
-            File.open(@backup.path) do |file|
-              AWS::S3::S3Object.store(full_path, file, bucket)
-            end
+        return if dry_run? || local_only?
+
+        if File.stat(@backup.path).size > MAX_S3_FILE_SIZE
+          warn "ERROR: File size exceeds maximum allowed for upload to S3 (#{MAX_S3_FILE_SIZE}): #{@backup.path}"
+          return
+        end
+        benchmark = Benchmark.realtime do
+          AWS::S3::Bucket.create(bucket) unless bucket_exists?(bucket)
+          File.open(@backup.path) do |file|
+            AWS::S3::S3Object.store(full_path, file, bucket)
           end
-          puts '...done' if verbose?
-          puts('Upload took ' + sprintf('%.2f', benchmark) + ' second(s).') if verbose?
         end
+        puts '...done' if verbose?
+        puts("Upload took #{format('%.2f', benchmark)} second(s).") if verbose?
       end
 
       def cleanup
@@ -43,16 +46,16 @@ module WebTranslateIt
         return unless keep = config[:keep, :s3]
 
         puts "listing files: #{bucket}:#{base}*" if verbose?
-        files = AWS::S3::Bucket.objects(bucket, :prefix => base, :max_keys => keep * 2)
-        puts files.collect {|x| x.key} if verbose?
+        files = AWS::S3::Bucket.objects(bucket, prefix: base, max_keys: keep * 2)
+        puts files.collect(&:key) if verbose?
 
-        files = files.
-          collect {|x| x.key}.
-          sort
+        files = files
+                .collect(&:key)
+                .sort
 
         cleanup_with_limit(files, keep) do |f|
           puts "removing s3 file #{bucket}:#{f}" if dry_run? || verbose?
-          AWS::S3::Bucket.objects(bucket, :prefix => f)[0].delete unless dry_run? || local_only?
+          AWS::S3::Bucket.objects(bucket, prefix: f)[0].delete unless dry_run? || local_only?
         end
       end
 
@@ -69,12 +72,15 @@ module WebTranslateIt
       end
 
       private
-      
+
       def bucket_exists?(bucket)
         true if AWS::S3::Bucket.find(bucket)
       rescue AWS::S3::NoSuchBucket
         false
       end
+
     end
+
   end
+
 end

data/lib/webtranslateit/safe/sftp.rb

@@ -1,7 +1,11 @@
 module WebTranslateIt
+
   module Safe
+
     class Sftp < Sink
 
+      MAX_RETRIES = 5
+
       protected
 
       def active?
@@ -12,33 +16,46 @@ module WebTranslateIt
         @path ||= expand(config[:sftp, :path] || config[:local, :path] || ':kind/:id')
       end
 
-      def save
-        raise RuntimeError, 'pipe-streaming not supported for SFTP.' unless @backup.path
+      def save # rubocop:todo Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+        raise 'pipe-streaming not supported for SFTP.' unless @backup.path
 
         puts "Uploading #{host}:#{full_path} via SFTP" if verbose? || dry_run?
 
-        unless dry_run? || local_only?
-          opts = {}
-          opts[:password] = password if password
-          opts[:port] = port if port
-          Net::SFTP.start(host, user, opts) do |sftp|
-            puts "Sending #{@backup.path} to #{full_path}" if verbose?
-            begin
-              sftp.upload! @backup.path, full_path
-            rescue Net::SFTP::StatusException
-              puts "Ensuring remote path (#{path}) exists" if verbose?
-              # mkdir -p
-              folders = path.split('/')
-              folders.each_index do |i|
-                folder = folders[0..i].join('/')
-                puts "Creating #{folder} on remote" if verbose?
-                sftp.mkdir!(folder) rescue Net::SFTP::StatusException
+        return if dry_run? || local_only?
+
+        retries = 0
+        opts = {}
+        opts[:password] = password if password
+        opts[:port] = port if port
+        Net::SFTP.start(host, user, opts) do |sftp|
+          puts "Sending #{@backup.path} to #{full_path}" if verbose?
+          begin
+            sftp.upload! @backup.path, full_path
+          rescue IO::TimeoutError
+            puts 'Upload timed out, retrying'
+            retries += 1
+            if retries >= MAX_RETRIES
+              puts "Tried #{retries} times. Giving up."
+            else
+              retry unless retries >= MAX_RETRIES
+            end
+          rescue Net::SFTP::StatusException
+            puts "Ensuring remote path (#{path}) exists" if verbose?
+            # mkdir -p
+            folders = path.split('/')
+            folders.each_index do |i|
+              folder = folders[0..i].join('/')
+              puts "Creating #{folder} on remote" if verbose?
+              begin
+                sftp.mkdir!(folder)
+              rescue StandardError
+                Net::SFTP::StatusException
               end
-              retry
             end
+            retry
           end
-          puts '...done' if verbose?
         end
+        puts '...done' if verbose?
       end
 
       def cleanup
@@ -53,11 +70,9 @@ module WebTranslateIt
         Net::SFTP.start(host, user, opts) do |sftp|
           files = sftp.dir.glob(path, File.basename("#{base}*"))
 
-          puts files.collect {|x| x.name } if verbose?
+          puts files.collect(&:name) if verbose?
 
-          files = files.
-            collect {|x| x.name }.
-            sort
+          files = files.collect(&:name).sort
 
           cleanup_with_limit(files, keep) do |f|
             file = File.join(path, f)
@@ -84,5 +99,7 @@ module WebTranslateIt
       end
 
     end
+
   end
-end
+
+end

data/lib/webtranslateit/safe/sink.rb

@@ -1,5 +1,7 @@
 module WebTranslateIt
+
   module Safe
+
     class Sink < Stream
 
       def process
@@ -15,7 +17,7 @@ module WebTranslateIt
       # base is used in 'cleanup' to find all files that begin with base. the '.'
       # at the end is essential to distinguish b/w foo.* and foobar.* archives for example
       def base
-        @base ||= File.join(path, File.basename(@backup.filename).split('.').first + '.')
+        @base ||= File.join(path, "#{File.basename(@backup.filename).split('.').first}.")
       end
 
       def full_path
@@ -30,6 +32,9 @@ module WebTranslateIt
         # TODO: validate here
         to_remove.each(&block)
       end
+
     end
+
   end
-end
+
+end

data/lib/webtranslateit/safe/source.rb

@@ -1,10 +1,14 @@
 module WebTranslateIt
+
   module Safe
+
     class Source < Stream
 
       attr_accessor :id
+
       def initialize(id, config)
-        @id, @config = id.to_s, config
+        @id = id.to_s
+        @config = config
       end
 
       def timestamp
@@ -21,12 +25,13 @@ module WebTranslateIt
 
       def backup
         return @backup if @backup
+
         @backup = Backup.new(
-          :id        => @id,
-          :kind      => kind,
-          :extension => extension,
-          :command   => command,
-          :timestamp => timestamp
+          id: @id,
+          kind: kind,
+          extension: extension,
+          command: command,
+          timestamp: timestamp
         )
         # can't do this in the initializer hash above since
         # filename() calls expand() which requires @backup
@@ -35,13 +40,12 @@ module WebTranslateIt
         @backup
       end
 
-      protected
-
       def self.human_name
         name.split('::').last.downcase
       end
 
     end
+
   end
-end
 
+end

data/lib/webtranslateit/safe/stream.rb

@@ -1,17 +1,22 @@
 module WebTranslateIt
+
   module Safe
+
     class Stream
 
       attr_accessor :config, :backup
+
       def initialize(config, backup)
-        @config, @backup = config, backup
+        @config = config
+        @backup = backup
       end
+
       # FIXME: move to Backup
       def expand(path)
-        path .
-        gsub(/:kind\b/, @backup.kind.to_s) .
-        gsub(/:id\b/, @backup.id.to_s) .
-        gsub(/:timestamp\b/, @backup.timestamp)
+        path
+          .gsub(/:kind\b/, @backup.kind.to_s)
+          .gsub(/:id\b/, @backup.id.to_s)
+          .gsub(/:timestamp\b/, @backup.timestamp)
       end
 
       private
@@ -27,6 +32,9 @@ module WebTranslateIt
       def dry_run?
         config[:dry_run]
       end
+
     end
+
   end
-end
+
+end

data/lib/webtranslateit/safe/svndump.rb

@@ -1,13 +1,17 @@
 module WebTranslateIt
+
   module Safe
+
     class Svndump < Source
 
       def command
         "svnadmin dump #{config[:options]} #{config[:repo_path]}"
       end
 
-      def extension; '.svn'; end
+      def extension = '.svn'
 
     end
+
   end
+
 end

data/lib/webtranslateit/safe/tmp_file.rb

@@ -1,7 +1,10 @@
 require 'tmpdir'
 module WebTranslateIt
+
   module Safe
+
     module TmpFile
+
       @keep_files = []
 
       def self.tmproot
@@ -12,22 +15,21 @@ module WebTranslateIt
         begin
           FileUtils.remove_entry_secure tmproot
         rescue ArgumentError => e
-          if e.message =~ /parent directory is world writable/
-            puts <<-ERR
+          raise unless e.message.include?('parent directory is world writable')
+
+          puts <<~ERR
 
 
-********************************************************************************
-It looks like you have wrong permissions on your TEMP directory.  The usual
-case is when you have world writable TEMP directory withOUT the sticky bit.
+            ********************************************************************************
+            It looks like you have wrong permissions on your TEMP directory.  The usual
+            case is when you have world writable TEMP directory withOUT the sticky bit.
 
-Try "chmod +t" on it.
+            Try "chmod +t" on it.
 
-********************************************************************************
+            ********************************************************************************
 
-ERR
-          else
-            raise
-          end
+          ERR
+          raise
         end
         @tmproot = nil
       end
@@ -43,6 +45,9 @@ ERR
         @keep_files << file # so that it will not get gcollected and removed from filesystem until the end
         file.path
       end
+
     end
+
   end
+
 end

data/lib/webtranslateit/safe.rb

@@ -6,7 +6,6 @@ require 'fileutils'
 require 'benchmark'
 
 require 'tempfile'
-require 'extensions/mktmpdir'
 
 require 'webtranslateit/safe/tmp_file'
 
@@ -36,7 +35,9 @@ require 'webtranslateit/safe/sftp'
 require 'webtranslateit/safe/ftp'
 
 module WebTranslateIt
+
   module Safe
+
     ROOT = File.join(File.dirname(__FILE__), '..', '..')
 
     def safe(&block)
@@ -44,17 +45,15 @@ module WebTranslateIt
     end
 
     def process(config)
+      [[Mysqldump, %i[mysqldump databases]],
+       [Pgdump,    %i[pgdump databases]],
+       [Mongodump, %i[mongodump databases]],
+       [Archive,   %i[tar archives]],
+       [Svndump,   %i[svndump repos]]].each do |klass, path|
+        next unless collection = config[*path]
 
-      [[Mysqldump, [:mysqldump, :databases]],
-       [Pgdump,    [:pgdump,    :databases]],
-       [Mongodump, [:mongodump, :databases]],
-       [Archive,   [:tar,       :archives]],
-       [Svndump,   [:svndump,   :repos]]
-      ].each do |klass, path|
-        if collection = config[*path]
-          collection.each do |name, c|
-            klass.new(name, c).backup.run(c, :gpg, :gzip, :local, :s3, :cloudfiles, :sftp, :ftp)
-          end
+        collection.each do |name, c|
+          klass.new(name, c).backup.run(c, :gpg, :gzip, :local, :s3, :cloudfiles, :sftp, :ftp)
         end
       end
 
@@ -62,5 +61,7 @@ module WebTranslateIt
     end
     module_function :safe
     module_function :process
+
   end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: webtranslateit-safe
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Edouard Briere
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-29 00:00:00.000000000 Z
+date: 2023-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-s3
@@ -67,7 +67,6 @@ files:
 - CHANGELOG
 - README.markdown
 - bin/webtranslateit-safe
-- lib/extensions/mktmpdir.rb
 - lib/webtranslateit/safe.rb
 - lib/webtranslateit/safe/archive.rb
 - lib/webtranslateit/safe/backup.rb

data/lib/extensions/mktmpdir.rb

@@ -1,45 +0,0 @@
-require 'tmpdir'
-
-unless Dir.respond_to?(:mktmpdir)
-  # backward compat for 1.8.6
-  class Dir
-    def Dir.mktmpdir(prefix_suffix=nil, tmpdir=nil)
-      case prefix_suffix
-      when nil
-        prefix = 'd'
-        suffix = ''
-      when String
-        prefix = prefix_suffix
-        suffix = ''
-      when Array
-        prefix = prefix_suffix[0]
-        suffix = prefix_suffix[1]
-      else
-        raise ArgumentError, "unexpected prefix_suffix: #{prefix_suffix.inspect}"
-      end
-      tmpdir ||= Dir.tmpdir
-      t = Time.now.strftime('%Y%m%d')
-      n = nil
-      begin
-        path = "#{tmpdir}/#{prefix}#{t}-#{$$}-#{rand(0x100000000).to_s(36)}"
-        path << "-#{n}" if n
-        path << suffix
-        Dir.mkdir(path, 0700)
-      rescue Errno::EEXIST
-        n ||= 0
-        n += 1
-        retry
-      end
-
-      if block_given?
-        begin
-          yield path
-        ensure
-          FileUtils.remove_entry_secure path
-        end
-      else
-        path
-      end
-    end
-  end
-end