From fcadea61e2f9dd0aadf9c83c0b817d01a8ed8ee6 Mon Sep 17 00:00:00 2001 From: Robert Haines Date: Mon, 17 Feb 2020 22:51:53 +0000 Subject: [PATCH] Fix Naming/MethodParameterName cop in the samples. --- .rubocop_todo.yml | 4 +++- samples/qtzip.rb | 8 ++++---- samples/zipfind.rb | 14 +++++++------- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 6c8d32e..1043278 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -42,7 +42,9 @@ Naming/AccessorMethodName: # Configuration parameters: MinNameLength, AllowNamesEndingInNumbers, AllowedNames, ForbiddenNames. # AllowedNames: io, id, to, by, on, in, at, ip, db, os Naming/MethodParameterName: - Enabled: false + Exclude: + - 'lib/**/*.rb' + - 'test/**/*.rb' # Offense count: 721 # Configuration parameters: EnforcedStyle. diff --git a/samples/qtzip.rb b/samples/qtzip.rb index f76f57a..2c189ed 100755 --- a/samples/qtzip.rb +++ b/samples/qtzip.rb @@ -20,12 +20,12 @@ class ZipDialog < ZipDialogUI self, SLOT('extract_files()')) end - def zipfile(&proc) - Zip::File.open(@zip_filename, &proc) + def zipfile(&a_proc) + Zip::File.open(@zip_filename, &a_proc) end - def each(&proc) - Zip::File.foreach(@zip_filename, &proc) + def each(&a_proc) + Zip::File.foreach(@zip_filename, &a_proc) end def refresh diff --git a/samples/zipfind.rb b/samples/zipfind.rb index 1524f4f..8f0dbf2 100755 --- a/samples/zipfind.rb +++ b/samples/zipfind.rb @@ -9,10 +9,10 @@ require 'find' module Zip module ZipFind - def self.find(path, zipFilePattern = /\.zip$/i) + def self.find(path, zip_file_pattern = /\.zip$/i) Find.find(path) do |filename| yield(filename) - next unless zipFilePattern.match(filename) && File.file?(filename) + next unless zip_file_pattern.match(filename) && File.file?(filename) begin Zip::File.foreach(filename) do |entry| @@ -24,9 +24,9 @@ module Zip end end - def self.find_file(path, fileNamePattern, zipFilePattern = /\.zip$/i) - find(path, zipFilePattern) do |filename| - yield(filename) if fileNamePattern.match(filename) + def self.find_file(path, filename_pattern, zip_file_pattern = /\.zip$/i) + find(path, zip_file_pattern) do |filename| + yield(filename) if filename_pattern.match(filename) end end end @@ -58,8 +58,8 @@ if $PROGRAM_NAME == __FILE__ puts "Usage: #{$PROGRAM_NAME} PATH ZIPFILENAME_PATTERN FILNAME_PATTERN" end - def self.report_entry_found(fileName) - puts fileName + def self.report_entry_found(filename) + puts filename end end