diff options
Diffstat (limited to 'lib/puppet/util')
| -rw-r--r-- | lib/puppet/util/constant_inflector.rb | 3 | ||||
| -rw-r--r-- | lib/puppet/util/diff.rb | 4 | ||||
| -rw-r--r-- | lib/puppet/util/fileparsing.rb | 3 | ||||
| -rw-r--r-- | lib/puppet/util/tagging.rb | 3 |
4 files changed, 8 insertions, 5 deletions
diff --git a/lib/puppet/util/constant_inflector.rb b/lib/puppet/util/constant_inflector.rb index 8b083951f..eeeaa0632 100644 --- a/lib/puppet/util/constant_inflector.rb +++ b/lib/puppet/util/constant_inflector.rb @@ -5,7 +5,8 @@ # file names. module Puppet::Util::ConstantInflector def file2constant(file) - file.split("/").collect { |name| name.capitalize }.join("::").gsub(/_+(.)/) { |term| $1.capitalize } + # LAK:NOTE See http://snurl.com/21zf8 [groups_google_com] + x = file.split("/").collect { |name| name.capitalize }.join("::").gsub(/_+(.)/) { |term| $1.capitalize } end def constant2file(constant) diff --git a/lib/puppet/util/diff.rb b/lib/puppet/util/diff.rb index e6ff57108..f37ea0850 100644 --- a/lib/puppet/util/diff.rb +++ b/lib/puppet/util/diff.rb @@ -27,7 +27,7 @@ module Puppet::Util::Diff output = "" - diffs = Diff::LCS.diff(data_old, data_new) + diffs = ::Diff::LCS.diff(data_old, data_new) return output if diffs.empty? oldhunk = hunk = nil @@ -35,7 +35,7 @@ module Puppet::Util::Diff diffs.each do |piece| begin - hunk = Diff::LCS::Hunk.new(data_old, data_new, piece, + hunk = ::Diff::LCS::Hunk.new(data_old, data_new, piece, context_lines, file_length_difference) file_length_difference = hunk.file_length_difference diff --git a/lib/puppet/util/fileparsing.rb b/lib/puppet/util/fileparsing.rb index 8e39719c8..23d02ea60 100644 --- a/lib/puppet/util/fileparsing.rb +++ b/lib/puppet/util/fileparsing.rb @@ -223,7 +223,8 @@ module Puppet::Util::FileParsing # Split text into separate lines using the record separator. def lines(text) # Remove any trailing separators, and then split based on them - text.sub(/#{self.line_separator}\Q/,'').split(self.line_separator) + # LAK:NOTE See http://snurl.com/21zf8 [groups_google_com] + x = text.sub(/#{self.line_separator}\Q/,'').split(self.line_separator) end # Split a bunch of text into lines and then parse them individually. diff --git a/lib/puppet/util/tagging.rb b/lib/puppet/util/tagging.rb index 8a50f3458..e06e13a2c 100644 --- a/lib/puppet/util/tagging.rb +++ b/lib/puppet/util/tagging.rb @@ -16,7 +16,8 @@ module Puppet::Util::Tagging @tags << tag unless @tags.include?(tag) end - qualified.collect { |name| name.split("::") }.flatten.each { |tag| @tags << tag unless @tags.include?(tag) } + # LAK:NOTE See http://snurl.com/21zf8 [groups_google_com] + qualified.collect { |name| x = name.split("::") }.flatten.each { |tag| @tags << tag unless @tags.include?(tag) } end # Are we tagged with the provided tag? |