puppet 0.25.5 → 2.6.0

data/lib/puppet/util/reference.rb

@@ -1,213 +1,207 @@
 require 'puppet/util/instance_loader'
+require 'fileutils'
 
 # Manage Reference Documentation.
 class Puppet::Util::Reference
-    include Puppet::Util
-    include Puppet::Util::Docs
-
-    extend Puppet::Util::InstanceLoader
-
-    instance_load(:reference, 'puppet/reference')
-
-    def self.footer
-        "\n\n----------------\n\n*This page autogenerated on %s*\n" % Time.now
-    end
-
-    def self.modes
-        %w{pdf trac text markdown}
-    end
-
-    def self.newreference(name, options = {}, &block)
-        ref = self.new(name, options, &block)
-        instance_hash(:reference)[symbolize(name)] = ref
-
-        ref
-    end
-
-    def self.page(*sections)
-        depth = 4
-        # Use the minimum depth
-        sections.each do |name|
-            section = reference(name) or raise "Could not find section %s" % name
-            depth = section.depth if section.depth < depth
-        end
-        text = ".. contents:: :depth: 2\n\n"
-    end
-
-    def self.pdf(text)
-        puts "creating pdf"
-        Puppet::Util.secure_open("/tmp/puppetdoc.txt", "w") do |f|
-            f.puts text
-        end
-        rst2latex = %x{which rst2latex}
-        if $? != 0 or rst2latex =~ /no /
-            rst2latex = %x{which rst2latex.py}
-        end
-        if $? != 0 or rst2latex =~ /no /
-            raise "Could not find rst2latex"
-        end
-        rst2latex.chomp!
-        cmd = %{#{rst2latex} /tmp/puppetdoc.txt > /tmp/puppetdoc.tex}
-        Puppet::Util.secure_open("/tmp/puppetdoc.tex","w") do |f|
-            # If we get here without an error, /tmp/puppetdoc.tex isn't a tricky cracker's symlink
-        end
-        output = %x{#{cmd}}
-        unless $? == 0
-            $stderr.puts "rst2latex failed"
-            $stderr.puts output
-            exit(1)
-        end
-        $stderr.puts output
+  include Puppet::Util
+  include Puppet::Util::Docs
 
-        # Now convert to pdf
-        Dir.chdir("/tmp") do
-            %x{texi2pdf puppetdoc.tex >/dev/null 2>/dev/null}
-        end
+  extend Puppet::Util::InstanceLoader
 
-    end
+  instance_load(:reference, 'puppet/reference')
 
-    def self.markdown(name, text)
-        puts "Creating markdown for #{name} reference."
-        dir = "/tmp/" + Puppet::PUPPETVERSION
-        FileUtils.mkdir(dir) unless File.directory?(dir) 
-        Puppet::Util.secure_open(dir + "/" + "#{name}.rst", "w") do |f|
-            f.puts text
-        end
-        pandoc = %x{which pandoc}
-        if $? != 0 or pandoc =~ /no /
-            pandoc = %x{which pandoc}
-        end
-        if $? != 0 or pandoc =~ /no /
-            raise "Could not find pandoc"
-        end
-        pandoc.chomp!
-        cmd = %{#{pandoc} -s -r rst -w markdown #{dir}/#{name}.rst -o #{dir}/#{name}.mdwn}
-        output = %x{#{cmd}}
-        unless $? == 0
-            $stderr.puts "Pandoc failed to create #{name} reference."
-            $stderr.puts output
-            exit(1)
-        end
- 
-        File.unlink(dir + "/" + "#{name}.rst")
-    end
+  def self.footer
+    "\n\n----------------\n\n*This page autogenerated on #{Time.now}*\n"
+  end
 
-    def self.references
-        instance_loader(:reference).loadall
-        loaded_instances(:reference).sort { |a,b| a.to_s <=> b.to_s }
-    end
+  def self.modes
+    %w{pdf trac text markdown}
+  end
 
-    HEADER_LEVELS = [nil, "=", "-", "+", "'", "~"]
+  def self.newreference(name, options = {}, &block)
+    ref = self.new(name, options, &block)
+    instance_hash(:reference)[symbolize(name)] = ref
 
-    attr_accessor :page, :depth, :header, :title, :dynamic
-    attr_writer :doc
+    ref
+  end
 
-    def doc
-        if defined?(@doc)
-            return "%s - %s" % [@name, @doc]
-        else
-            return @title
-        end
+  def self.page(*sections)
+    depth = 4
+    # Use the minimum depth
+    sections.each do |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"
+  end
 
-    def dynamic?
-        self.dynamic
+  def self.pdf(text)
+    puts "creating pdf"
+    Puppet::Util.secure_open("/tmp/puppetdoc.txt", "w") do |f|
+      f.puts text
+    end
+    rst2latex = %x{which rst2latex}
+    if $CHILD_STATUS != 0 or rst2latex =~ /no /
+      rst2latex = %x{which rst2latex.py}
+    end
+    if $CHILD_STATUS != 0 or rst2latex =~ /no /
+      raise "Could not find rst2latex"
+    end
+    rst2latex.chomp!
+    cmd = %{#{rst2latex} /tmp/puppetdoc.txt > /tmp/puppetdoc.tex}
+    Puppet::Util.secure_open("/tmp/puppetdoc.tex","w") do |f|
+      # If we get here without an error, /tmp/puppetdoc.tex isn't a tricky cracker's symlink
+    end
+    output = %x{#{cmd}}
+    unless $CHILD_STATUS == 0
+      $stderr.puts "rst2latex failed"
+      $stderr.puts output
+      exit(1)
     end
+    $stderr.puts output
 
-    def h(name, level)
-        return "%s\n%s\n\n" % [name, HEADER_LEVELS[level] * name.to_s.length]
+    # Now convert to pdf
+    Dir.chdir("/tmp") do
+      %x{texi2pdf puppetdoc.tex >/dev/null 2>/dev/null}
     end
 
-    def initialize(name, options = {}, &block)
-        @name = name
-        options.each do |option, value|
-            send(option.to_s + "=", value)
-        end
+  end
 
-        meta_def(:generate, &block)
-
-        # Now handle the defaults
-        @title ||= "%s Reference" % @name.to_s.capitalize
-        @page ||= @title.gsub(/\s+/, '')
-        @depth ||= 2
-        @header ||= ""
+  def self.markdown(name, text)
+    puts "Creating markdown for #{name} reference."
+    dir = "/tmp/#{Puppet::PUPPETVERSION}"
+    FileUtils.mkdir(dir) unless File.directory?(dir)
+    Puppet::Util.secure_open(dir + "/#{name}.rst", "w") do |f|
+      f.puts text
     end
-
-    # Indent every line in the chunk except those which begin with '..'.
-    def indent(text, tab)
-        return text.gsub(/(^|\A)/, tab).gsub(/^ +\.\./, "..")
+    pandoc = %x{which pandoc}
+    if $CHILD_STATUS != 0 or pandoc =~ /no /
+      pandoc = %x{which pandoc}
     end
-
-    def option(name, value)
-        ":%s: %s\n" % [name.to_s.capitalize, value]
+    if $CHILD_STATUS != 0 or pandoc =~ /no /
+      raise "Could not find pandoc"
+    end
+    pandoc.chomp!
+    cmd = %{#{pandoc} -s -r rst -w markdown #{dir}/#{name}.rst -o #{dir}/#{name}.mdwn}
+    output = %x{#{cmd}}
+    unless $CHILD_STATUS == 0
+      $stderr.puts "Pandoc failed to create #{name} reference."
+      $stderr.puts output
+      exit(1)
     end
 
-    def paramwrap(name, text, options = {})
-        options[:level] ||= 5
-        #str = "%s : " % name
-        str = h(name, options[:level])
-        if options[:namevar]
-            str += "- **namevar**\n\n"
-        end
-        str += text
-        #str += text.gsub(/\n/, "\n    ")
+    File.unlink(dir + "/#{name}.rst")
+  end
 
-        str += "\n\n"
-        return str
-    end
+  def self.references
+    instance_loader(:reference).loadall
+    loaded_instances(:reference).sort { |a,b| a.to_s <=> b.to_s }
+  end
 
-    # Remove all trac links.
-    def strip_trac(text)
-        text.gsub(/`\w+\s+([^`]+)`:trac:/) { |m| $1 }
+  HEADER_LEVELS = [nil, "=", "-", "+", "'", "~"]
+
+  attr_accessor :page, :depth, :header, :title, :dynamic
+  attr_writer :doc
+
+  def doc
+    if defined?(@doc)
+      return "#{@name} - #{@doc}"
+    else
+      return @title
     end
+  end
+
+  def dynamic?
+    self.dynamic
+  end
 
-    def text
-        puts output
+  def h(name, level)
+    "#{name}\n#{HEADER_LEVELS[level] * name.to_s.length}\n\n"
+  end
+
+  def initialize(name, options = {}, &block)
+    @name = name
+    options.each do |option, value|
+      send(option.to_s + "=", value)
     end
 
-    def to_rest(withcontents = true)
-        # First the header
-        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
-        end
+    meta_def(:generate, &block)
 
-        text += @header
+    # Now handle the defaults
+    @title ||= "#{@name.to_s.capitalize} Reference"
+    @page ||= @title.gsub(/\s+/, '')
+    @depth ||= 2
+    @header ||= ""
+  end
 
-        text += generate()
+  # Indent every line in the chunk except those which begin with '..'.
+  def indent(text, tab)
+    text.gsub(/(^|\A)/, tab).gsub(/^ +\.\./, "..")
+  end
 
-        if withcontents
-            text += self.class.footer
-        end
+  def option(name, value)
+    ":#{name.to_s.capitalize}: #{value}\n"
+  end
 
-        return text
-    end
+  def paramwrap(name, text, options = {})
+    options[:level] ||= 5
+    #str = "#{name} : "
+    str = h(name, options[:level])
+    str += "- **namevar**\n\n" if options[:namevar]
+    str += text
+    #str += text.gsub(/\n/, "\n    ")
 
-    def to_text(withcontents = true)
-        strip_trac(to_rest(withcontents))
-    end
+    str += "\n\n"
+  end
 
-    def to_trac(with_contents = true)
-        "{{{\n#!rst\n#{self.to_rest(with_contents)}\n}}}"
-    end
+  # Remove all trac links.
+  def strip_trac(text)
+    text.gsub(/`\w+\s+([^`]+)`:trac:/) { |m| $1 }
+  end
+
+  def text
+    puts output
+  end
+
+  def to_rest(withcontents = true)
+    # First the header
+    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"
+    text +=  ".. contents:: :depth: #{@depth}\n\n" if withcontents
+
+    text += @header
 
-    def trac
-        Puppet::Util.secure_open("/tmp/puppetdoc.txt", "w") do |f|
-            f.puts self.to_trac
-        end
+    text += generate
 
-        puts "Writing %s reference to trac as %s" % [@name, @page]
-        cmd = %{sudo trac-admin /opt/rl/trac/puppet wiki import %s /tmp/puppetdoc.txt} % self.page
-        output = %x{#{cmd}}
-        unless $? == 0
-            $stderr.puts "trac-admin failed"
-            $stderr.puts output
-            exit(1)
-        end
-        unless output =~ /^\s+/
-            $stderr.puts output
-        end
+    text += self.class.footer if withcontents
+
+    text
+  end
+
+  def to_text(withcontents = true)
+    strip_trac(to_rest(withcontents))
+  end
+
+  def to_trac(with_contents = true)
+    "{{{\n#!rst\n#{self.to_rest(with_contents)}\n}}}"
+  end
+
+  def trac
+    Puppet::Util.secure_open("/tmp/puppetdoc.txt", "w") do |f|
+      f.puts self.to_trac
+    end
+
+    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
+      $stderr.puts "trac-admin failed"
+      $stderr.puts output
+      exit(1)
+    end
+    unless output =~ /^\s+/
+      $stderr.puts output
     end
+  end
 end
 

data/lib/puppet/util/resource_template.rb

@@ -8,7 +8,7 @@ require 'erb'
 #  This provides functionality essentially equivalent to
 # the language's template() function.  You pass your file
 # path and the resource you want to use into the initialization
-# method, then call result() on the instance, and you get back
+# method, then call result on the instance, and you get back
 # a chunk of text.
 #  The resource's parameters are available as instance variables
 # (as opposed to the language, where we use a method_missing trick).
@@ -36,26 +36,26 @@ require 'erb'
 # parameters, which is generally most useful, since it allows you to configure
 # the generated resource via the generating resource.
 class Puppet::Util::ResourceTemplate
-    include Puppet::Util::Logging
+  include Puppet::Util::Logging
 
-    def evaluate
-        set_resource_variables
-        ERB.new(File.read(@file), 0, "-").result(binding)
-    end
+  def evaluate
+    set_resource_variables
+    ERB.new(File.read(@file), 0, "-").result(binding)
+  end
 
-    def initialize(file, resource)
-        raise ArgumentError, "Template %s does not exist" % file unless FileTest.exist?(file)
-        @file = file
-        @resource = resource
-    end
+  def initialize(file, resource)
+    raise ArgumentError, "Template #{file} does not exist" unless FileTest.exist?(file)
+    @file = file
+    @resource = resource
+  end
 
-    private
+  private
 
-    def set_resource_variables
-        @resource.to_hash.each do |param, value|
-            var = "@#{param.to_s}"
-            instance_variable_set(var, value)
-        end
+  def set_resource_variables
+    @resource.to_hash.each do |param, value|
+      var = "@#{param.to_s}"
+      instance_variable_set(var, value)
     end
+  end
 end
 

data/lib/puppet/util/run_mode.rb

@@ -0,0 +1,81 @@
+module Puppet
+  module Util
+    class RunMode
+      def initialize(name)
+        @name = name.to_sym
+      end
+
+      @@run_modes = Hash.new {|h, k| h[k] = RunMode.new(k)}
+
+      attr :name
+
+      def self.[](name)
+        @@run_modes[name]
+      end
+
+      def master?
+        name == :master
+      end
+
+      def agent?
+        name == :agent
+      end
+
+      def user?
+        name == :user
+      end
+
+      def conf_dir
+        which_dir(
+          (Puppet.features.microsoft_windows? ? File.join(Dir::WINDOWS, "puppet", "etc") : "/etc/puppet"),
+          "~/.puppet"
+        )
+      end
+
+      def var_dir
+        which_dir(
+          (Puppet.features.microsoft_windows? ? File.join(Dir::WINDOWS, "puppet", "var") : "/var/lib/puppet"),
+          "~/.puppet/var"
+        )
+      end
+
+      def run_dir
+        "$vardir/run"
+      end
+
+      def logopts
+        if master?
+          {
+            :default => "$vardir/log",
+            :mode    => 0750,
+            :owner   => "service",
+            :group   => "service",
+            :desc    => "The Puppet log directory."
+          }
+        else
+          ["$vardir/log", "The Puppet log directory."]
+        end
+      end
+
+      private
+
+      def which_dir( global, user )
+        #FIXME: we should test if we're user "puppet"
+        #       there's a comment that suggests that we do that
+        #       and we currently don't.
+        expand_path case
+          when name == :master; global
+          when Puppet.features.root?; global
+          else user
+        end
+      end
+
+      def expand_path( dir )
+        require 'etc'
+        ENV["HOME"] ||= Etc.getpwuid(Process.uid).dir
+        File.expand_path(dir)
+      end
+
+    end
+  end
+end