lib/webtranslateit/safe/cloudfiles.rb in webtranslateit-safe-0.4.3 vs lib/webtranslateit/safe/cloudfiles.rb in webtranslateit-safe-0.4.4

@@ -1,10 +1,13 @@
 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
       end
 
       protected
@@ -19,39 +22,39 @@
       def get_file_size(path)
         File.stat(path).size
       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
         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
+        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
@@ -70,8 +73,11 @@
       end
 
       def service_net
         config[:cloudfiles, :service_net] || false
       end
+
     end
+
   end
+
 end