lib/s3_website/uploader.rb in s3_website-1.6.2 vs lib/s3_website/uploader.rb in s3_website-1.6.3

- old
+ new

@@ -16,11 +16,11 @@ ) redirects = config['redirects'] || {} changed_redirects = setup_redirects redirects, config, s3 - deleted_files_count = remove_superfluous_files( + deleted_files = remove_superfluous_files( s3, config, { :s3_bucket => config['s3_bucket'], :site_dir => site_dir, @@ -30,11 +30,11 @@ } ) print_done_report config - [new_files_count, changed_files_count, deleted_files_count, changed_files, changed_redirects] + [new_files_count, changed_files_count, deleted_files, changed_files, changed_redirects, deleted_files] end private def self.print_done_report(config) @@ -130,22 +130,22 @@ remote_files = s3.buckets[s3_bucket_name].objects.map { |f| f.key } local_files = load_all_local_files(site_dir) + options.fetch(:redirects).keys files_to_delete = build_list_of_files_to_delete(remote_files, local_files, options[:ignore_on_server]) - deleted_files_count = 0 + deleted_files = [] if in_headless_mode files_to_delete.each { |s3_object_key| delete_s3_object s3, s3_bucket_name, s3_object_key - deleted_files_count += 1 + deleted_files << s3_object_key } else Keyboard.if_user_confirms_delete(files_to_delete, config) { |s3_object_key| delete_s3_object s3, s3_bucket_name, s3_object_key - deleted_files_count += 1 + deleted_files << s3_object_key } end - deleted_files_count + deleted_files end def self.build_list_of_files_to_delete(remote_files, local_files, ignore_on_server = nil) files_to_delete = remote_files - local_files files_to_delete.reject { |file|