diff options
| author | Daniel Pittman <daniel@puppetlabs.com> | 2011-05-03 15:51:02 -0700 |
|---|---|---|
| committer | Daniel Pittman <daniel@puppetlabs.com> | 2011-05-03 15:51:02 -0700 |
| commit | 8f81f56e8315a62e6c8ff8943c64df7594855359 (patch) | |
| tree | bc004c81a8e03ab19cd5d49e559fd5284ed63c4e /lib/puppet/interface | |
| parent | b17b49c97380cd64e75ac5e2ef12fb939ae953bb (diff) | |
| download | puppet-8f81f56e8315a62e6c8ff8943c64df7594855359.tar.gz puppet-8f81f56e8315a62e6c8ff8943c64df7594855359.tar.xz puppet-8f81f56e8315a62e6c8ff8943c64df7594855359.zip | |
(#7326) Fix faces on Ruby 1.8.5
Turns out that String#each_line on Ruby 1.8.5 only takes a block, and will not
return an enumerable. Rewrite to use split(/\n/) which has the same effect
but works on all our platforms.
Diffstat (limited to 'lib/puppet/interface')
| -rw-r--r-- | lib/puppet/interface/documentation.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/puppet/interface/documentation.rb b/lib/puppet/interface/documentation.rb index 91db0e074..48e9a8b1a 100644 --- a/lib/puppet/interface/documentation.rb +++ b/lib/puppet/interface/documentation.rb @@ -6,7 +6,10 @@ class Puppet::Interface # We need to identify an indent: the minimum number of whitespace # characters at the start of any line in the text. - indent = text.each_line.map {|x| x.index(/[^\s]/) }.compact.min + # + # Using split rather than each_line is because the later only takes a + # block on Ruby 1.8.5 / Centos, and we support that. --daniel 2011-05-03 + indent = text.split(/\n/).map {|x| x.index(/[^\s]/) }.compact.min if indent > 0 then text.gsub!(/^[ \t\f]{0,#{indent}}/, '') |