Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ignore missing files when cleaning old assets #2384

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions lib/webpacker/commands.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,21 @@ def clean(count_to_keep = 2)
files_in_manifest = process_manifest_hash(manifest.refresh)
files_to_be_removed = files_in_manifest.flat_map do |file_in_manifest|
file_prefix, file_ext = file_in_manifest.scan(/(.*)[0-9a-f]{20}(.*)/).first
versions_of_file = Dir.glob("#{file_prefix}*#{file_ext}").grep(/#{file_prefix}[0-9a-f]{20}#{file_ext}/)
versions_of_file.map do |version_of_file|

versions_of_file(file_prefix, file_ext).map do |version_of_file|
next if version_of_file == file_in_manifest

[version_of_file, File.mtime(version_of_file).utc.to_i]
end.compact.sort_by(&:last).reverse.drop(count_to_keep).map(&:first)
end

files_to_be_removed.each { |f| File.delete f }
files_to_be_removed.each do |f|
begin
File.delete f
rescue Errno::ENOENT
nil
end
end
end
end

Expand All @@ -45,4 +51,8 @@ def process_manifest_hash(manifest_hash)
File.join(config.root_path, "public", value)
end.flatten
end

def versions_of_file(file_prefix, file_ext)
Dir.glob("#{file_prefix}*#{file_ext}").grep(/#{file_prefix}[0-9a-f]{20}#{file_ext}/)
end
end
10 changes: 10 additions & 0 deletions test/command_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,14 @@ def test_clean_command_works_with_nested_hashes_and_without_any_compiled_files
assert Webpacker.commands.clean
end
end

def test_clean_command_does_not_fail_on_missing_files
Webpacker.commands.stub(:versions_of_file, %w[v1 v2 v3]) do
File.stub(:mtime, OpenStruct.new(utc: 0)) do
File.stub :delete, lambda { |n| raise Errno::ENOENT } do
Webpacker.clean
end
end
end
end
end