Use block parameters instead of using 'yield'

Author: joeyates

lib/imap/backup/account/folder_mapper.rb

@@ -32,15 +32,15 @@ def initialize(
     # @yieldparam serializer [Serializer] the folder's serializer
     # @yieldparam folder [Account::Folder] the online folder
     # @return [Enumerator, void]
-    def each
+    def each(&block)
       return enum_for(:each) if !block_given?
 
       glob = File.join(source_local_path, "**", "*.imap")
       Pathname.glob(glob) do |path|
         name = source_folder_name(path)
         serializer = Serializer.new(source_local_path, name)
         folder = destination_folder_for_path(name)
-        yield serializer, folder
+        block.call(serializer, folder)
       end
     end
 

lib/imap/backup/logger.rb

@@ -51,11 +51,11 @@ def self.setup_logging(options = {})
     # Wraps a block, filtering output to standard error,
     # hidng passwords and outputs the results to standard out
     # @return [void]
-    def self.sanitize_stderr
+    def self.sanitize_stderr(&block)
       sanitizer = Text::Sanitizer.new($stdout)
       previous_stderr = $stderr
       $stderr = sanitizer
-      yield
+      block.call
     ensure
       sanitizer.flush
       $stderr = previous_stderr

lib/imap/backup/retry_on_error.rb

@@ -13,9 +13,9 @@ module RetryOnError
     # @param on_error [Proc] a block to call when an error occurs
     # @raise any error ocurring more than `limit` times
     # @return the result of any successful completion of the block
-    def retry_on_error(errors:, limit: 10, on_error: nil)
+    def retry_on_error(errors:, limit: 10, on_error: nil, &block)
       tries ||= 1
-      yield
+      block.call
     rescue *errors => e
       if tries < limit
         message = "#{e}, attempt #{tries} of #{limit}"

lib/imap/backup/serializer/message_enumerator.rb

@@ -14,14 +14,14 @@ def initialize(imap:)
     # @param uids [Array<Integer>] the message UIDs of the messages to iterate over
     # @yieldparam message [Serializer::Message]
     # @return [void]
-    def run(uids:)
+    def run(uids:, &block)
       uids.each do |uid_maybe_string|
         uid = uid_maybe_string.to_i
         message = imap.get(uid)
 
         next if !message
 
-        yield message
+        block.call(message)
       end
     end
 

spec/unit/uploader_spec.rb

@@ -37,8 +37,8 @@ module Imap::Backup
       instance_double(Imap::Backup::Serializer::Message, uid: 1, body: "body", flags: [:MyFlag])
     end
 
-    def message_enumerator
-      yield missing_message
+    def message_enumerator(&block)
+      block.call(missing_message)
     end
 
     it "creates the folder" do