Fix Layout/EmptyLineAfterGuardClause cop.

rubyzip · jdleesmiller · Feb 16, 2020 · Sep 14, 2019 · Sep 15, 2019 · Feb 8, 2020
commit cfe4972e712b36d351b6fb7eb189d28e59902ef2
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
@@ -6,11 +6,6 @@
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 76
-# Cop supports --auto-correct.
-Layout/EmptyLineAfterGuardClause:
-  Enabled: false
-
 # Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.

diff --git a/lib/zip/central_directory.rb b/lib/zip/central_directory.rb
@@ -141,6 +141,7 @@ def read_from_stream(io) #:nodoc:
     def get_e_o_c_d(buf) #:nodoc:
       sig_index = buf.rindex([END_OF_CDS].pack('V'))
       raise Error, 'Zip end of central directory signature not found' unless sig_index
+
       buf = buf.slice!((sig_index + 4)..(buf.bytesize))
 
       def buf.read(count)
@@ -166,8 +167,10 @@ def start_buf(io)
     def get_64_e_o_c_d(buf) #:nodoc:
       zip_64_start = buf.rindex([ZIP64_END_OF_CDS].pack('V'))
       raise Error, 'Zip64 end of central directory signature not found' unless zip_64_start
+
       zip_64_locator = buf.rindex([ZIP64_EOCD_LOCATOR].pack('V'))
       raise Error, 'Zip64 end of central directory signature locator not found' unless zip_64_locator
+
       buf = buf.slice!((zip_64_start + 4)..zip_64_locator)
 
       def buf.read(count)
@@ -198,6 +201,7 @@ def self.read_from_stream(io) #:nodoc:
 
     def ==(other) #:nodoc:
       return false unless other.kind_of?(CentralDirectory)
+
       @entry_set.entries.sort == other.entries.sort && comment == other.comment
     end
   end

diff --git a/lib/zip/crypto/decrypted_io.rb b/lib/zip/crypto/decrypted_io.rb
@@ -12,6 +12,7 @@ def read(length = nil, outbuf = +'')
 
       while length.nil? || (buffer.bytesize < length)
         break if input_finished?
+
         buffer << produce_input
       end
 

diff --git a/lib/zip/entry.rb b/lib/zip/entry.rb
@@ -48,6 +48,7 @@ def set_default_vars_values
 
     def check_name(name)
       return unless name.start_with?('/')
+
       raise ::Zip::EntryNameError, "Illegal ZipEntry name '#{name}', name must not start with /"
     end
 
@@ -104,6 +105,7 @@ def time=(value)
 
     def file_type_is?(type)
       raise InternalError, "current filetype is unknown: #{inspect}" unless @ftype
+
       @ftype == type
     end
 
@@ -124,6 +126,7 @@ def name_is_directory? #:nodoc:all
     def name_safe?
       cleanpath = Pathname.new(@name).cleanpath
       return false unless cleanpath.relative?
+
       root = ::File::SEPARATOR
       naive_expanded_path = ::File.join(root, cleanpath.to_s)
       ::File.absolute_path(cleanpath.to_s, root) == naive_expanded_path
@@ -153,6 +156,7 @@ def calculate_local_header_siz
8000
e #:nodoc:all
     # that we didn't change the header size (and thus clobber file data or something)
     def verify_local_header_size!
       return if @local_header_size.nil?
+
       new_size = calculate_local_header_size
       raise Error, "local header size changed (#{@local_header_size} -> #{new_size})" if @local_header_size != new_size
     end
@@ -255,6 +259,7 @@ def read_local_entry(io) #:nodoc:all
       unless @header_signature == ::Zip::LOCAL_ENTRY_SIGNATURE
         raise ::Zip::Error, "Zip local header magic not found at location '#{local_header_offset}'"
       end
+
       set_time(@last_mod_date, @last_mod_time)
 
       @name = io.read(@name_length)
@@ -274,6 +279,7 @@ def read_local_entry(io) #:nodoc:all
           @extra = ::Zip::ExtraField.new(extra)
         end
       end
+
       parse_zip64_extra(true)
       @local_header_size = calculate_local_header_size
     end
@@ -360,16 +366,19 @@ def set_ftype_from_c_dir_entry
 
     def check_c_dir_entry_static_header_length(buf)
       return if buf.bytesize == ::Zip::CDIR_ENTRY_STATIC_HEADER_LENGTH
+
       raise Error, 'Premature end of file. Not enough data for zip cdir entry header'
     end
 
     def check_c_dir_entry_signature
       return if header_signature == ::Zip::CENTRAL_DIRECTORY_ENTRY_SIGNATURE
+
       raise Error, "Zip local header magic not found at location '#{local_header_offset}'"
     end
 
     def check_c_dir_entry_comment_size
       return if @comment && @comment.bytesize == @comment_length
+
       raise ::Zip::Error, 'Truncated cdir zip entry header'
     end
 
@@ -408,6 +417,7 @@ def file_stat(path) # :nodoc:
 
     def get_extra_attributes_from_path(path) # :nodoc:
       return if Zip::RUNNING_ON_WINDOWS
+
       stat        = file_stat(path)
       @unix_uid   = stat.uid
       @unix_gid   = stat.gid
@@ -494,6 +504,7 @@ def write_c_dir_entry(io) #:nodoc:all
 
     def ==(other)
       return false unless other.class == self.class
+
       # Compares contents of local entry and exposed fields
       keys_equal = %w[compression_method crc compressed_size size name extra filepath].all? do |k|
         other.__send__(k.to_sym) == __send__(k.to_sym)
@@ -635,6 +646,7 @@ def create_file(dest_path, _continue_on_exists_proc = proc { Zip.continue_on_exi
 
     def create_directory(dest_path)
       return if ::File.directory?(dest_path)
+
       if ::File.exist?(dest_path)
         if block_given? && yield(self, dest_path)
           ::FileUtils.rm_f dest_path
@@ -659,6 +671,7 @@ def create_symlink(dest_path)
     # (required when file sizes exceed 2**32, but can be used for all files)
     def parse_zip64_extra(for_local_header) #:nodoc:all
       return if @extra['Zip64'].nil?
+
       if for_loca
8000
l_header
         @size, @compressed_size = @extra['Zip64'].parse(@size, @compressed_size)
       else
@@ -673,6 +686,7 @@ def data_descriptor_size
     # create a zip64 extra information field if we need one
     def prep_zip64_extra(for_local_header) #:nodoc:all
       return unless ::Zip.write_zip64_support
+
       need_zip64 = @size >= 0xFFFFFFFF || @compressed_size >= 0xFFFFFFFF
       need_zip64 ||= @local_header_offset >= 0xFFFFFFFF unless for_local_header
       if need_zip64

diff --git a/lib/zip/entry_set.rb b/lib/zip/entry_set.rb
@@ -50,6 +50,7 @@ def dup
 
     def ==(other)
       return false unless other.kind_of?(EntrySet)
+
       @entry_set.values == other.entry_set.values
     end
 
@@ -60,6 +61,7 @@ def parent(entry)
     def glob(pattern, flags = ::File::FNM_PATHNAME | ::File::FNM_DOTMATCH | ::File::FNM_EXTGLOB)
       entries.map do |entry|
         next nil unless ::File.fnmatch(pattern, entry.name.chomp('/'), flags)
+
         yield(entry) if block_given?
         entry
       end.compact

diff --git a/lib/zip/extra_field.rb b/lib/zip/extra_field.rb
@@ -36,6 +36,7 @@ class << s
 
     def merge(binstr)
       return if binstr.empty?
+
       i = 0
       while i < binstr.bytesize
         id  = binstr[i, 2]
@@ -54,6 +55,7 @@ def create(name)
       unless (field_class = ID_MAP.values.find { |k| k.name == name })
         raise Error, "Unknown extra field '#{name}'"
       end
+
       self[name] = field_class.new
     end
 

diff --git a/lib/zip/extra_field/generic.rb b/lib/zip/extra_field/generic.rb
@@ -19,11 +19,13 @@ def initial_parse(binstr)
         warn 'WARNING: weird extra field header ID. Skip parsing it.'
         return false
       end
+
       [binstr[2, 2].unpack('v')[0], binstr[4..-1]]
     end
 
     def ==(other)
       return false if self.class != other.class
+
       each do |k, v|
         return false if v != other[k]
       end

diff --git a/lib/zip/extra_field/ntfs.rb b/lib/zip/extra_field/ntfs.rb
@@ -19,6 +19,7 @@ def initialize(binstr = nil)
 
     def merge(binstr)
       return if binstr.empty?
+
       size, content = initial_parse(binstr)
       (size && content) || return
 
@@ -27,6 +28,7 @@ def merge(binstr)
 
       tag1 = tags[1]
       return unless tag1
+
       ntfs_mtime, ntfs_atime, ntfs_ctime = tag1.unpack('Q<Q<Q<')
       ntfs_mtime && @mtime ||= from_ntfs_time(ntfs_mtime)
       ntfs_atime && @atime ||= from_ntfs_time(ntfs_atime)
@@ -65,12 +67,14 @@ def pack_for_c_dir
 
     def parse_tags(content)
       return {} if content.nil?
+
       tags = {}
       i = 0
       while i < content.bytesize
         tag, size = content[i, 4].unpack('vv')
         i += 4
         break unless tag && size
+
         value = content[i, size]
         i += size
         tags[tag] = value

diff --git a/lib/zip/extra_field/old_unix.rb b/lib/zip/extra_field/old_unix.rb
@@ -16,9 +16,11 @@ def initialize(binstr = nil)
 
     def merge(binstr)
       return if binstr.empty?
+
       size, content = initial_parse(binstr)
       # size: 0 for central directory. 4 for local header
       return if !size || size == 0
+
       atime, mtime, uid, gid = content.unpack('VVvv')
       @uid ||= uid
       @gid ||= gid

diff --git a/lib/zip/extra_field/universal_time.rb b/lib/zip/extra_field/universal_time.rb
@@ -44,10 +44,13 @@ def merge(binstr)
 
       # Parse the timestamps, in order, based on which flags are set.
       return if times[0].nil?
+
       @mtime ||= ::Zip::DOSTime.at(times.shift) unless @flag & MTIME_MASK == 0
       return if times[0].nil?
+
       @atime ||= ::Zip::DOSTime.at(times.shift) unless @flag & ATIME_MASK == 0
       return if times[0].nil?
+
       @ctime ||= ::Zip::DOSTime.at(times.shift) unless @flag & CTIME_MASK == 0
     end
 

diff --git a/lib/zip/extra_field/unix.rb b/lib/zip/extra_field/unix.rb
@@ -14,9 +14,11 @@ def initialize(binstr = nil)
 
     def merge(binstr)
       return if binstr.empty?
+
       size, content = initial_parse(binstr)
       # size: 0 for central directory. 4 for local header
       return if !size || size == 0
+
       uid, gid = content.unpack('vv')
       @uid ||= uid
       @gid ||= gid

diff --git a/lib/zip/extra_field/zip64.rb b/lib/zip/extra_field/zip64.rb
@@ -26,6 +26,7 @@ def ==(other)
 
     def merge(binstr)
       return if binstr.empty?
+
       _, @content = initial_parse(binstr)
     end
 
@@ -52,6 +53,7 @@ def extract(size, format)
     def pack_for_local
      
10000
 # local header entries must contain original size and compressed size; other fields do not apply
       return '' unless @original_size && @compressed_size
+
       [@original_size, @compressed_size].pack('Q<Q<')
     end
 

diff --git a/lib/zip/file.rb b/lib/zip/file.rb
@@ -120,6 +120,7 @@ class << self
       def open(file_name, create = false, options = {})
         zf = ::Zip::File.new(file_name, create, false, options)
         return zf unless block_given?
+
         begin
           yield zf
         ensure
@@ -151,6 +152,7 @@ def open_buffer(io, options = {})
 
         zf = ::Zip::File.new(io, true, true, options)
         return zf unless block_given?
+
         yield zf
 
         begin
@@ -229,9 +231,11 @@ def save_splited_part(zip_file, partial_zip_file_name, zip_file_size, szip_file_
       def split(zip_file_name, segment_size = MAX_SEGMENT_SIZE, delete_zip_file = true, partial_zip_file_name = nil)
         raise Error, "File #{zip_file_name} not found" unless ::File.exist?(zip_file_name)
         raise Errno::ENOENT, zip_file_name unless ::File.readable?(zip_file_name)
+
         zip_file_size = ::File.size(zip_file_name)
         segment_size  = get_segment_size_for_split(segment_size)
         return if zip_file_size <= segment_size
+
         segment_count = get_segment_count_for_split(zip_file_size, segment_size)
         # Checking for correct zip structure
         ::Zip::File.open(zip_file_name) {}
@@ -337,6 +341,7 @@ def extract(entry, dest_path, &block)
     # the zip archive.
     def commit
       return if name.is_a?(StringIO) || !commit_required?
+
       on_success_replace do |tmp_file|
         ::Zip::OutputStream.open(tmp_file) do |zos|
           @entry_set.each do |e|
@@ -402,6 +407,7 @@ def get_entry(entry)
     # Creates a directory
     def mkdir(entryName, permissionInt = 0o755)
       raise Errno::EEXIST, "File exists - #{entryName}" if find_entry(entryName)
+
       entryName = entryName.dup.to_s
       entryName << '/' unless entryName.end_with?('/')
       @entry_set << ::Zip::StreamableDirectory.new(@name, entryName, nil, permissionInt)
@@ -424,6 +430,7 @@ def directory?(newEntry, srcPath)
     def check_entry_exists(entryName, continue_on_exists_proc, procedureName)
       continue_on_exists_proc ||= proc { Zip.continue_on_exists_proc }
       return unless @entry_set.include?(entryName)
+
       if continue_on_exists_proc.call
         remove get_entry(entryName)
       else
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,6 +12,7 @@ def read(length = nil, outbuf = +'') @@
           while length.nil? || (buffer.bytesize < length)
             break if input_finished?
             buffer << produce_input
           end
@@ Expand Down @@