Module: Chef::ChefFS::CommandLine
- Defined in:
- lib/chef/chef_fs/command_line.rb
Class Method Summary collapse
- .diff(pattern, old_root, new_root, recurse_depth, get_content) ⇒ Object
-
.diff_entries(old_entry, new_entry, recurse_depth, get_content) ⇒ Object
Diff two known entries (could be files or dirs).
- .diff_print(pattern, a_root, b_root, recurse_depth, output_mode, format_path = nil, diff_filter = nil, ui = nil) ⇒ Object
Class Method Details
.diff(pattern, old_root, new_root, recurse_depth, get_content) ⇒ Object
145 146 147 148 149 |
# File 'lib/chef/chef_fs/command_line.rb', line 145 def self.diff(pattern, old_root, new_root, recurse_depth, get_content) Chef::ChefFS::FileSystem.list_pairs(pattern, old_root, new_root).parallel_map do |old_entry, new_entry| diff_entries(old_entry, new_entry, recurse_depth, get_content) end.flatten(1) end |
.diff_entries(old_entry, new_entry, recurse_depth, get_content) ⇒ Object
Diff two known entries (could be files or dirs)
152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 |
# File 'lib/chef/chef_fs/command_line.rb', line 152 def self.diff_entries(old_entry, new_entry, recurse_depth, get_content) # If both are directories if old_entry.dir? if new_entry.dir? if recurse_depth == 0 [ [ :common_subdirectories, old_entry, new_entry ] ] else Chef::ChefFS::FileSystem.child_pairs(old_entry, new_entry).parallel_map do |old_child, new_child| Chef::ChefFS::CommandLine.diff_entries(old_child, new_child, recurse_depth ? recurse_depth - 1 : nil, get_content) end.flatten(1) end # If old is a directory and new is a file elsif new_entry.exists? [ [ :directory_to_file, old_entry, new_entry ] ] # If old is a directory and new does not exist elsif new_entry.parent.can_have_child?(old_entry.name, old_entry.dir?) [ [ :deleted, old_entry, new_entry ] ] # If the new entry does not and *cannot* exist, report that. else [ [ :new_cannot_upload, old_entry, new_entry ] ] end # If new is a directory and old is a file elsif new_entry.dir? if old_entry.exists? [ [ :file_to_directory, old_entry, new_entry ] ] # If new is a directory and old does not exist elsif old_entry.parent.can_have_child?(new_entry.name, new_entry.dir?) [ [ :added, old_entry, new_entry ] ] # If the new entry does not and *cannot* exist, report that. else [ [ :old_cannot_upload, old_entry, new_entry ] ] end # Neither is a directory, so they are diffable with file diff else are_same, old_value, new_value = Chef::ChefFS::FileSystem.compare(old_entry, new_entry) if are_same if old_value == :none [ [ :both_nonexistent, old_entry, new_entry ] ] else [ [ :same, old_entry, new_entry ] ] end else if old_value == :none old_exists = false elsif old_value.nil? old_exists = old_entry.exists? else old_exists = true end if new_value == :none new_exists = false elsif new_value.nil? new_exists = new_entry.exists? else new_exists = true end # If one of the files doesn't exist, we only want to print the diff if the # other file *could be uploaded/downloaded*. if !old_exists && !old_entry.parent.can_have_child?(new_entry.name, new_entry.dir?) return [ [ :old_cannot_upload, old_entry, new_entry ] ] end if !new_exists && !new_entry.parent.can_have_child?(old_entry.name, old_entry.dir?) return [ [ :new_cannot_upload, old_entry, new_entry ] ] end if get_content # If we haven't read the values yet, get them now so that they can be diffed begin old_value = old_entry.read if old_value.nil? rescue Chef::ChefFS::FileSystem::NotFoundError old_value = :none end begin new_value = new_entry.read if new_value.nil? rescue Chef::ChefFS::FileSystem::NotFoundError new_value = :none end end if old_value == :none || (old_value.nil? && !old_entry.exists?) [ [ :added, old_entry, new_entry, old_value, new_value ] ] elsif new_value == :none [ [ :deleted, old_entry, new_entry, old_value, new_value ] ] else [ [ :modified, old_entry, new_entry, old_value, new_value ] ] end end end rescue Chef::ChefFS::FileSystem::FileSystemError => e [ [ :error, old_entry, new_entry, nil, nil, e ] ] end |
.diff_print(pattern, a_root, b_root, recurse_depth, output_mode, format_path = nil, diff_filter = nil, ui = nil) ⇒ Object
30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 |
# File 'lib/chef/chef_fs/command_line.rb', line 30 def self.diff_print(pattern, a_root, b_root, recurse_depth, output_mode, format_path = nil, diff_filter = nil, ui = nil) if format_path.nil? format_path = proc { |entry| entry.path_for_printing } end get_content = (output_mode != :name_only && output_mode != :name_status) found_match = false diff(pattern, a_root, b_root, recurse_depth, get_content).each do |type, old_entry, new_entry, old_value, new_value, error| found_match = true unless type == :both_nonexistent old_path = format_path.call(old_entry) new_path = format_path.call(new_entry) case type when :common_subdirectories if output_mode != :name_only && output_mode != :name_status yield "Common subdirectories: #{new_path}\n" end when :directory_to_file next if diff_filter && diff_filter !~ /T/ if output_mode == :name_only yield "#{new_path}\n" elsif output_mode == :name_status yield "T\t#{new_path}\n" else yield "File #{old_path} is a directory while file #{new_path} is a regular file\n" end when :file_to_directory next if diff_filter && diff_filter !~ /T/ if output_mode == :name_only yield "#{new_path}\n" elsif output_mode == :name_status yield "T\t#{new_path}\n" else yield "File #{old_path} is a regular file while file #{new_path} is a directory\n" end when :deleted # This is kind of a kludge - because the "new" entry isn't there, we can't predict # it's true file name, because we've not got enough information. So because we know # the two entries really ought to have the same extension, we'll just grab the old one # and use it. (This doesn't affect cookbook files, since they'll always have extensions) if File.extname(old_path) != File.extname(new_path) new_path += File.extname(old_path) end next if diff_filter && diff_filter !~ /D/ if output_mode == :name_only yield "#{new_path}\n" elsif output_mode == :name_status yield "D\t#{new_path}\n" elsif old_value result = "diff --knife #{old_path} #{new_path}\n" result << "deleted file\n" result << diff_text(old_path, "/dev/null", old_value, "") yield result else yield "Only in #{format_path.call(old_entry.parent)}: #{old_entry.name}\n" end when :added next if diff_filter && diff_filter !~ /A/ if output_mode == :name_only yield "#{new_path}\n" elsif output_mode == :name_status yield "A\t#{new_path}\n" elsif new_value result = "diff --knife #{old_path} #{new_path}\n" result << "new file\n" result << diff_text("/dev/null", new_path, "", new_value) yield result else yield "Only in #{format_path.call(new_entry.parent)}: #{new_entry.name}\n" end when :modified next if diff_filter && diff_filter !~ /M/ if output_mode == :name_only yield "#{new_path}\n" elsif output_mode == :name_status yield "M\t#{new_path}\n" else result = "diff --knife #{old_path} #{new_path}\n" result << diff_text(old_path, new_path, old_value, new_value) yield result end when :both_nonexistent when :added_cannot_upload when :deleted_cannot_download when :same # Skip these silently when :error if error.is_a?(Chef::ChefFS::FileSystem::OperationFailedError) ui.error "#{format_path.call(error.entry)} failed to #{error.operation}: #{error.}" if ui error = true elsif error.is_a?(Chef::ChefFS::FileSystem::OperationNotAllowedError) ui.error "#{format_path.call(error.entry)} #{error.reason}." if ui else raise error end end end unless found_match ui.error "#{pattern}: No such file or directory on remote or local" if ui error = true end error end |