Module: Puppet::Util::Diff

Includes:
Execution
Included in:
DataSync, FileBucketFile::File
Defined in:
lib/puppet/util/diff.rb

Overview

Provide a diff between two strings.

Constant Summary

Constants included from Execution

Execution::NoOptionsSpecified

Class Method Summary collapse

Instance Method Summary collapse

Methods included from Execution

execfail, execpipe, execute, ruby_path

Class Method Details

.diff(old, new) ⇒ Object 



8
9
10
11
12
13
14
15
16
17
18
19
 
# File 'lib/puppet/util/diff.rb', line 8

def diff(old, new)
  return '' unless diff_cmd = Puppet[:diff] and diff_cmd != ""

  command = [diff_cmd]
  if args = Puppet[:diff_args] and args != ""
    args.split(' ').each do|arg|
      command << arg
    end
  end
  command << old << new
  Puppet::Util::Execution.execute(command, :failonfail => false, :combine => false)
end

Instance Method Details

#lcs_diff(data_old, data_new, format = :unified, context_lines = 3) ⇒ Object

return diff string of two input strings format defaults to unified context defaults to 3 lines



26
27
28
29
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
 
# File 'lib/puppet/util/diff.rb', line 26

def lcs_diff(data_old, data_new, format=:unified, context_lines=3)
  unless Puppet.features.diff?
    Puppet.warning _("Cannot provide diff without the diff/lcs Ruby library")
    return ""
  end
  data_old = data_old.split(/\n/).map! { |e| e.chomp }
  data_new = data_new.split(/\n/).map! { |e| e.chomp }

  output = ""

  diffs = ::Diff::LCS.diff(data_old, data_new)
  return output if diffs.empty?

  oldhunk = hunk = nil
  file_length_difference = 0

  diffs.each do |piece|
    begin

      hunk = ::Diff::LCS::Hunk.new(
        data_old, data_new, piece,
          context_lines,

          file_length_difference)
      file_length_difference = hunk.file_length_difference
    next unless oldhunk
    # Hunks may overlap, which is why we need to be careful when our
    # diff includes lines of context. Otherwise, we might print
    # redundant lines.
    if (context_lines > 0) and hunk.overlaps?(oldhunk)
      hunk.unshift(oldhunk)
    else
      output << oldhunk.diff(format)
    end
    ensure
      oldhunk = hunk
      output << "\n"
    end
  end

  # Handle the last remaining hunk
  output << oldhunk.diff(format) << "\n"
end

#string_file_diff(path, string) ⇒ Object 



70
71
72
73
74
75
76
77
 
# File 'lib/puppet/util/diff.rb', line 70

def string_file_diff(path, string)
  tempfile = Tempfile.new("puppet-diffing")
  tempfile.open
  tempfile.print string
  tempfile.close
  notice "\n" + diff(path, tempfile.path)
  tempfile.delete
end