diff options
Diffstat (limited to 'lib/puppet/util/reference.rb')
| -rw-r--r-- | lib/puppet/util/reference.rb | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/lib/puppet/util/reference.rb b/lib/puppet/util/reference.rb index 74d75bb3f..c5bfe4722 100644 --- a/lib/puppet/util/reference.rb +++ b/lib/puppet/util/reference.rb @@ -11,7 +11,7 @@ class Puppet::Util::Reference instance_load(:reference, 'puppet/reference') def self.footer - "\n\n----------------\n\n*This page autogenerated on %s*\n" % Time.now + "\n\n----------------\n\n*This page autogenerated on #{Time.now}*\n" end def self.modes @@ -29,7 +29,7 @@ class Puppet::Util::Reference depth = 4 # Use the minimum depth sections.each do |name| - section = reference(name) or raise "Could not find section %s" % name + section = reference(name) or raise "Could not find section #{name}" depth = section.depth if section.depth < depth end text = ".. contents:: :depth: 2\n\n" @@ -69,9 +69,9 @@ class Puppet::Util::Reference def self.markdown(name, text) puts "Creating markdown for #{name} reference." - dir = "/tmp/" + Puppet::PUPPETVERSION + dir = "/tmp/#{Puppet::PUPPETVERSION}" FileUtils.mkdir(dir) unless File.directory?(dir) - Puppet::Util.secure_open(dir + "/" + "#{name}.rst", "w") do |f| + Puppet::Util.secure_open(dir + "/#{name}.rst", "w") do |f| f.puts text end pandoc = %x{which pandoc} @@ -90,7 +90,7 @@ class Puppet::Util::Reference exit(1) end - File.unlink(dir + "/" + "#{name}.rst") + File.unlink(dir + "/#{name}.rst") end def self.references @@ -105,7 +105,7 @@ class Puppet::Util::Reference def doc if defined?(@doc) - return "%s - %s" % [@name, @doc] + return "#{@name} - #{@doc}" else return @title end @@ -116,7 +116,7 @@ class Puppet::Util::Reference end def h(name, level) - return "%s\n%s\n\n" % [name, HEADER_LEVELS[level] * name.to_s.length] + return "#{name}\n#{HEADER_LEVELS[level] * name.to_s.length}\n\n" end def initialize(name, options = {}, &block) @@ -128,7 +128,7 @@ class Puppet::Util::Reference meta_def(:generate, &block) # Now handle the defaults - @title ||= "%s Reference" % @name.to_s.capitalize + @title ||= "#{@name.to_s.capitalize} Reference" @page ||= @title.gsub(/\s+/, '') @depth ||= 2 @header ||= "" @@ -140,12 +140,12 @@ class Puppet::Util::Reference end def option(name, value) - ":%s: %s\n" % [name.to_s.capitalize, value] + ":#{name.to_s.capitalize}: #{value}\n" end def paramwrap(name, text, options = {}) options[:level] ||= 5 - #str = "%s : " % name + #str = "#{name} : " str = h(name, options[:level]) if options[:namevar] str += "- **namevar**\n\n" @@ -171,7 +171,7 @@ class Puppet::Util::Reference text = h(@title, 1) text += "\n\n**This page is autogenerated; any changes will get overwritten** *(last generated on #{Time.now.to_s})*\n\n" if withcontents - text += ".. contents:: :depth: %s\n\n" % @depth + text += ".. contents:: :depth: #{@depth}\n\n" end text += @header @@ -198,7 +198,7 @@ class Puppet::Util::Reference f.puts self.to_trac end - puts "Writing %s reference to trac as %s" % [@name, @page] + puts "Writing #{@name} reference to trac as #{@page}" cmd = %{sudo trac-admin /opt/rl/trac/puppet wiki import %s /tmp/puppetdoc.txt} % self.page output = %x{#{cmd}} unless $CHILD_STATUS == 0 |