Fixing rubocop offenses in lib/jekyll/cleaner.rb

This commit is contained in:
Derek Gottlieb 2016-05-13 12:34:11 -05:00
parent 6a2ffbac62
commit 83f8df49ab
2 changed files with 10 additions and 9 deletions

View File

@ -4,7 +4,6 @@ AllCops:
Include: Include:
- lib/**/*.rb - lib/**/*.rb
Exclude: Exclude:
- lib/jekyll/cleaner.rb
- lib/jekyll/collection.rb - lib/jekyll/collection.rb
- lib/jekyll/command.rb - lib/jekyll/command.rb
- lib/jekyll/commands/build.rb - lib/jekyll/commands/build.rb

View File

@ -1,9 +1,9 @@
require 'set' require "set"
module Jekyll module Jekyll
# Handles the cleanup of a site's destination before it is built. # Handles the cleanup of a site's destination before it is built.
class Cleaner class Cleaner
HIDDEN_FILE_REGEX = /\/\.{1,2}$/ HIDDEN_FILE_REGEX = %r!\/\.{1,2}$!
attr_reader :site attr_reader :site
def initialize(site) def initialize(site)
@ -32,7 +32,8 @@ module Jekyll
[site.regenerator.metadata_file] [site.regenerator.metadata_file]
end end
# Private: The list of existing files, apart from those included in keep_files and hidden files. # Private: The list of existing files, apart from those included in
# keep_files and hidden files.
# #
# Returns a Set with the file paths # Returns a Set with the file paths
def existing_files def existing_files
@ -77,15 +78,16 @@ module Jekyll
end end
end end
# Private: The list of existing files that will be replaced by a directory during build # Private: The list of existing files that will be replaced by a directory
# during build
# #
# Returns a Set with the file paths # Returns a Set with the file paths
def replaced_files def replaced_files
new_dirs.select { |dir| File.file?(dir) }.to_set new_dirs.select { |dir| File.file?(dir) }.to_set
end end
# Private: The list of directories that need to be kept because they are parent directories # Private: The list of directories that need to be kept because they are
# of files specified in keep_files # parent directories of files specified in keep_files
# #
# Returns a Set with the directory paths # Returns a Set with the directory paths
def keep_dirs def keep_dirs
@ -95,12 +97,12 @@ module Jekyll
# Private: Creates a regular expression from the config's keep_files array # Private: Creates a regular expression from the config's keep_files array
# #
# Examples # Examples
# ['.git','.svn'] with site.dest "/myblog/_site" creates # ['.git','.svn'] with site.dest "/myblog/_site" creates
# the following regex: /\A\/myblog\/_site\/(\.git|\/.svn)/ # the following regex: /\A\/myblog\/_site\/(\.git|\/.svn)/
# #
# Returns the regular expression # Returns the regular expression
def keep_file_regex def keep_file_regex
/\A#{Regexp.quote(site.dest)}\/(#{Regexp.union(site.keep_files).source})/ %r!\A#{Regexp.quote(site.dest)}\/(#{Regexp.union(site.keep_files).source})!
end end
end end
end end