puppet 2.6.6 → 2.6.7

data/lib/puppet/type/package.rb

@@ -15,7 +15,11 @@ module Puppet
       using based on the platform you are on, but you can override it
       using the `provider` parameter; each provider defines what it
       requires in order to function, and you must meet those requirements
-      to use a given provider."
+      to use a given provider.
+      
+      **Autorequires:** If Puppet is managing the files specified as a package's
+      `adminfile`, `responsefile`, or `source`, the package resource will autorequire
+      those files."
 
     feature :installable, "The provider can install packages.",
       :methods => [:install]

data/lib/puppet/type/schedule.rb

@@ -18,11 +18,11 @@ module Puppet
       wanted to restrict certain resources to only running once, between
       the hours of two and 4 AM, then you would use this schedule:
 
-        schedule { maint:
-          range => \"2 - 4\",
-          period => daily,
-          repeat => 1
-        }
+          schedule { maint:
+            range => \"2 - 4\",
+            period => daily,
+            repeat => 1
+          }
 
       With this schedule, the first time that Puppet runs between 2 and 4 AM,
       all resources with this schedule will get applied, but they won't
@@ -35,10 +35,10 @@ module Puppet
       a schedule named *puppet* is created and used as the default,
       with the following attributes:
 
-        schedule { puppet:
-          period => hourly,
-          repeat => 2
-        }
+          schedule { puppet:
+            period => hourly,
+            repeat => 2
+          }
 
       This will cause resources to be applied every 30 minutes by default.
       "
@@ -47,14 +47,14 @@ module Puppet
       desc "The name of the schedule.  This name is used to retrieve the
         schedule when assigning it to an object:
 
-          schedule { daily:
-            period => daily,
-            range => \"2 - 4\",
-          }
-
-          exec { \"/usr/bin/apt-get update\":
-            schedule => daily
-          }
+            schedule { daily:
+              period => daily,
+              range => \"2 - 4\",
+            }
+  
+            exec { \"/usr/bin/apt-get update\":
+              schedule => daily
+            }
 
         "
       isnamevar
@@ -67,9 +67,9 @@ module Puppet
         seconds can be provided, using the normal colon as a separator.
         For instance:
 
-          schedule { maintenance:
-            range => \"1:30 - 4:30\"
-          }
+            schedule { maintenance:
+              range => \"1:30 - 4:30\"
+            }
 
         This is mostly useful for restricting certain resources to being
         applied in maintenance windows or during off-peak hours."

data/lib/puppet/type/selmodule.rb

@@ -5,7 +5,9 @@
 Puppet::Type.newtype(:selmodule) do
   @doc = "Manages loading and unloading of SELinux policy modules
     on the system.  Requires SELinux support.  See man semodule(8)
-    for more information on SELinux policy modules."
+    for more information on SELinux policy modules.
+    
+    **Autorequires:** If Puppet is managing the file containing this SELinux policy module (which is either explicitly specified in the `selmodulepath` attribute or will be found at {`selmoduledir`}/{`name`}.pp), the selmodule resource will autorequire that file."
 
   ensurable
 

data/lib/puppet/type/ssh_authorized_key.rb

@@ -1,7 +1,11 @@
 module Puppet
   newtype(:ssh_authorized_key) do
     @doc = "Manages SSH authorized keys. Currently only type 2 keys are
-    supported."
+    supported.
+    
+    **Autorequires:** If Puppet is managing the user account in which this 
+    SSH key should be installed, the `ssh_authorized_key` resource will autorequire
+    that user."
 
     ensurable
 

data/lib/puppet/type/user.rb

@@ -12,7 +12,9 @@ module Puppet
 
       This resource type uses the prescribed native tools for creating
       groups and generally uses POSIX APIs for retrieving information
-      about them.  It does not directly modify `/etc/passwd` or anything."
+      about them.  It does not directly modify `/etc/passwd` or anything.
+      
+      **Autorequires:** If Puppet is managing the user's primary group (as provided in the `gid` attribute), the user resource will autorequire that group. If Puppet is managing any role accounts corresponding to the user's roles, the user resource will autorequire those role accounts."
 
     feature :allows_duplicates,
       "The provider supports duplicate users with the same UID."
@@ -34,6 +36,9 @@ module Puppet
     feature :manages_expiry,
       "The provider can manage the expiry date for a user."
 
+   feature :system_users,
+     "The provider allows you to create system users with lower UIDs."
+
     newproperty(:ensure, :parent => Puppet::Property::Ensure) do
       newvalue(:present, :event => :user_created) do
         provider.create
@@ -230,6 +235,14 @@ module Puppet
       defaultto :minimum
     end
 
+    newparam(:system, :boolean => true) do
+      desc "Whether the user is a system user with lower UID."
+
+      newvalues(:true, :false)
+
+      defaultto false
+    end
+
     newparam(:allowdupe, :boolean => true) do
       desc "Whether to allow duplicate UIDs."
 

data/lib/puppet/type/zfs.rb

@@ -1,6 +1,8 @@
 module Puppet
   newtype(:zfs) do
-    @doc = "Manage zfs. Create destroy and set properties on zfs instances."
+    @doc = "Manage zfs. Create destroy and set properties on zfs instances.
+
+**Autorequires:** If Puppet is managing the zpool at the root of this zfs instance, the zfs resource will autorequire it. If Puppet is managing any parent zfs instances, the zfs resource will autorequire them."
 
     ensurable
 

data/lib/puppet/type/zone.rb

@@ -1,5 +1,7 @@
 Puppet::Type.newtype(:zone) do
-  @doc = "Solaris zones."
+  @doc = "Solaris zones.
+
+**Autorequires:** If Puppet is managing the directory specified as the root of the zone's filesystem (with the `path` attribute), the zone resource will autorequire that directory."
 
   # These properties modify the zone configuration, and they need to provide
   # the text separately from syncing it, so all config statements can be rolled

data/lib/puppet/type/zpool.rb

@@ -40,9 +40,10 @@ module Puppet
     end
 
     newproperty(:mirror, :array_matching => :all, :parent => Puppet::Property::MultiVDev) do
-      desc "List of all the devices to mirror for this pool. Each mirror should be a space separated string:
+      desc "List of all the devices to mirror for this pool. Each mirror should be a
+      space separated string:
 
-    mirror => [\"disk1 disk2\", \"disk3 disk4\"]
+          mirror => [\"disk1 disk2\", \"disk3 disk4\"],
 
       "
 
@@ -52,9 +53,10 @@ module Puppet
     end
 
     newproperty(:raidz, :array_matching => :all, :parent => Puppet::Property::MultiVDev) do
-      desc "List of all the devices to raid for this pool. Should be an array of space separated strings:
-      
-          raidz => [\"disk1 disk2\", \"disk3 disk4\"]
+      desc "List of all the devices to raid for this pool. Should be an array of
+      space separated strings:
+
+          raidz => [\"disk1 disk2\", \"disk3 disk4\"],
 
       "
 

data/lib/puppet/util.rb

@@ -4,6 +4,7 @@ require 'puppet/util/monkey_patches'
 require 'sync'
 require 'puppet/external/lock'
 require 'monitor'
+require 'puppet/util/execution_stub'
 
 module Puppet
   # A command failed to execute.
@@ -264,6 +265,10 @@ module Util
     arguments[:uid] = Puppet::Util::SUIDManager.convert_xid(:uid, arguments[:uid]) if arguments[:uid]
     arguments[:gid] = Puppet::Util::SUIDManager.convert_xid(:gid, arguments[:gid]) if arguments[:gid]
 
+    if execution_stub = Puppet::Util::ExecutionStub.current_value
+      return execution_stub.call(command, arguments)
+    end
+
     @@os ||= Facter.value(:operatingsystem)
     output = nil
     child_pid, child_status = nil

data/lib/puppet/util/command_line.rb

@@ -85,7 +85,7 @@ module Puppet
         if zero == 'puppet'
           case argv.first
           when nil;              [ stdin.tty? ? nil : "apply", argv] # ttys get usage info
-          when "--help";         [nil,     argv] # help should give you usage, not the help for `puppet apply`
+          when "--help", "-h";         [nil,     argv] # help should give you usage, not the help for `puppet apply`
           when /^-|\.pp$|\.rb$/; ["apply", argv]
           else [ argv.first, argv[1..-1] ]
           end

data/lib/puppet/util/execution.rb

@@ -4,16 +4,15 @@ module Puppet::Util::Execution
   # Run some code with a specific environment.  Resets the environment back to
   # what it was at the end of the code.
   def withenv(hash)
-    oldvals = {}
+    saved = ENV.to_hash
     hash.each do |name, val|
-      name = name.to_s
-      oldvals[name] = ENV[name]
-      ENV[name] = val
+      ENV[name.to_s] = val
     end
 
     yield
   ensure
-    oldvals.each do |name, val|
+    ENV.clear
+    saved.each do |name, val|
       ENV[name] = val
     end
   end

data/lib/puppet/util/execution_stub.rb

@@ -0,0 +1,26 @@
+module Puppet::Util
+  class ExecutionStub
+    class << self
+      # Set a stub block that Puppet::Util.execute() should invoke instead
+      # of actually executing commands on the target machine.  Intended
+      # for spec testing.
+      #
+      # The arguments passed to the block are |command, options|, where
+      # command is an array of strings and options is an options hash.
+      def set(&block)
+        @value = block
+      end
+
+      # Uninstall any execution stub, so that calls to
+      # Puppet::Util.execute() behave normally again.
+      def reset
+        @value = nil
+      end
+
+      # Retrieve the current execution stub, or nil if there is no stub.
+      def current_value
+        @value
+      end
+    end
+  end
+end

data/lib/puppet/util/monkey_patches.rb

@@ -21,6 +21,9 @@ class Symbol
     z.emit("!ruby/sym ")
     to_s.to_zaml(z)
   end
+  def <=> (other)
+    self.to_s <=> other.to_s
+  end
 end
 
 [Object, Exception, Integer, Struct, Date, Time, Range, Regexp, Hash, Array, Float, String, FalseClass, TrueClass, Symbol, NilClass, Class].each { |cls|
@@ -48,3 +51,21 @@ if RUBY_VERSION == '1.8.7'
   end
 end
 
+class Object
+  # The following code allows callers to make assertions that are only
+  # checked when the environment variable PUPPET_ENABLE_ASSERTIONS is
+  # set to a non-empty string.  For example:
+  #
+  #   assert_that { condition }
+  #   assert_that(message) { condition }
+  if ENV["PUPPET_ENABLE_ASSERTIONS"].to_s != ''
+    def assert_that(message = nil)
+      unless yield
+        raise Exception.new("Assertion failure: #{message}")
+      end
+    end
+  else
+    def assert_that(message = nil)
+    end
+  end
+end

data/lib/puppet/util/rdoc/code_objects.rb

@@ -124,6 +124,45 @@ module RDoc
     def add_child(child)
       @childs << child
     end
+
+    # Look up the given symbol. RDoc only looks for class1::class2.method
+    # or class1::class2#method. Since our definitions are mapped to RDoc methods
+    # but are written class1::class2::define we need to perform the lookup by
+    # ourselves.
+    def find_symbol(symbol, method=nil)
+      result = super
+      if not result and symbol =~ /::/
+        modules = symbol.split(/::/)
+        unless modules.empty?
+          module_name = modules.shift
+          result = find_module_named(module_name)
+          if result
+            last_name = ""
+            previous = nil
+            modules.each do |module_name|
+              previous = result
+              last_name = module_name
+              result = result.find_module_named(module_name)
+              break unless result
+            end
+            unless result
+              result = previous
+              method = last_name
+            end
+          end
+        end
+        if result && method
+          if !result.respond_to?(:find_local_symbol)
+            p result.name
+            p method
+            fail
+          end
+          result = result.find_local_symbol(method)
+        end
+      end
+      result
+    end
+
   end
 
   # PuppetNode holds a puppet node

data/lib/puppet/util/rdoc/generators/puppet_generator.rb

@@ -31,6 +31,24 @@ module Generators
   NODE_DIR = "nodes"
   PLUGIN_DIR = "plugins"
 
+  # We're monkey patching RDoc markup to allow
+  # lowercase class1::class2::class3 crossref hyperlinking
+  module MarkUp
+    alias :old_markup :markup
+
+    def new_markup(str, remove_para=false)
+      first = @markup.nil?
+      res = old_markup(str, remove_para)
+      if first and not @markup.nil?
+        @markup.add_special(/\b([a-z]\w+(::\w+)*)/,:CROSSREF)
+        # we need to call it again, since we added a rule
+        res = old_markup(str, remove_para)
+      end
+      res
+    end
+    alias :markup :new_markup
+  end
+
   # This is a specialized HTMLGenerator tailored to Puppet manifests
   class PuppetGenerator < HTMLGenerator
 

data/lib/puppet/util/rdoc/parser.rb

@@ -41,8 +41,10 @@ class Parser
         @parser.file = @input_file_name
         @ast = @parser.parse
       end
-      scan_top_level(@top_level)
+    else
+      @ast = env.known_resource_types
     end
+    scan_top_level(@top_level)
     @top_level
   end
 
@@ -157,8 +159,8 @@ class Parser
 
       if stmt.is_a?(Puppet::Parser::AST::Function) and ['include','require'].include?(stmt.name)
         stmt.arguments.each do |included|
-          Puppet.debug "found #{stmt.name}: #{included.value}"
-          container.send("add_#{stmt.name}",Include.new(included.value, stmt.doc))
+          Puppet.debug "found #{stmt.name}: #{included}"
+          container.send("add_#{stmt.name}",Include.new(included.to_s, stmt.doc))
         end
       end
     end

data/lib/puppet/util/settings.rb

@@ -91,7 +91,7 @@ class Puppet::Util::Settings
       varname = $2 || $1
       if varname == "environment" and environment
         environment
-      elsif pval = self.value(varname)
+      elsif pval = self.value(varname, environment)
         pval
       else
         raise Puppet::DevError, "Could not find value for #{value}"

data/spec/integration/parser/parser_spec.rb

@@ -109,5 +109,12 @@ describe Puppet::Parser::Parser do
     it "should correctly set the arrow type of a relationship" do
       "Notify[foo] <~ Notify[bar]".should parse_with { |rel| rel.arrow == "<~" }
     end
+
+    it "should be able to parse deep hash access" do
+      %q{
+        $hash = { 'a' => { 'b' => { 'c' => 'it works' } } }
+        $out = $hash['a']['b']['c']
+      }.should parse_with { |v| v.value.is_a?(Puppet::Parser::AST::ASTHash) }
+    end
   end
 end

data/spec/integration/provider/mount_spec.rb

@@ -0,0 +1,151 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+require 'puppet/file_bucket/dipper'
+
+describe "mount provider (integration)" do
+  include PuppetSpec::Files
+
+  def create_fake_fstab(initially_contains_entry)
+    File.open(@fake_fstab, 'w') do |f|
+      if initially_contains_entry
+        f.puts("/dev/disk1s1\t/Volumes/foo_disk\tmsdos\tlocal\t0\t0")
+      end
+    end
+  end
+
+  before :each do
+    @fake_fstab = tmpfile('fstab')
+    @current_options = "local"
+    @current_device = "/dev/disk1s1"
+    Puppet::Type.type(:mount).defaultprovider.stubs(:default_target).returns(@fake_fstab)
+    Facter.stubs(:value).with(:operatingsystem).returns('Darwin')
+    Puppet::Util::ExecutionStub.set do |command, options|
+      case command[0]
+      when %r{/s?bin/mount}
+        if command.length == 1
+          if @mounted
+            "#{@current_device} on /Volumes/foo_disk (msdos, #{@current_options})\n"
+          else
+            ''
+          end
+        else
+          command.length.should == 4
+          command[1].should == '-o'
+          command[3].should == '/Volumes/foo_disk'
+          @mounted.should == false # verify that we don't try to call "mount" redundantly
+          @current_options = command[2]
+          @current_device = check_fstab(true)
+          @mounted = true
+          ''
+        end
+      when %r{/s?bin/umount}
+        command.length.should == 2
+        command[1].should == '/Volumes/foo_disk'
+        @mounted.should == true # "umount" doesn't work when device not mounted (see #6632)
+        @mounted = false
+        ''
+      else
+        fail "Unexpected command #{command.inspect} executed"
+      end
+    end
+  end
+
+  after :each do
+    Puppet::Type::Mount::ProviderParsed.clear # Work around bug #6628
+  end
+
+  def check_fstab(expected_to_be_present)
+    # Verify that the fake fstab has the expected data in it
+    fstab_contents = File.read(@fake_fstab).lines.map(&:chomp).reject { |x| x =~ /^#|^$/ }
+    if expected_to_be_present
+      fstab_contents.length().should == 1
+      device, rest_of_line = fstab_contents[0].split(/\t/,2)
+      rest_of_line.should == "/Volumes/foo_disk\tmsdos\t#{@desired_options}\t0\t0"
+      device
+    else
+      fstab_contents.length().should == 0
+      nil
+    end
+  end
+
+  def run_in_catalog(settings)
+    resource = Puppet::Type.type(:mount).new(settings.merge(:name => "/Volumes/foo_disk",
+                                             :device => "/dev/disk1s1", :fstype => "msdos"))
+    Puppet::FileBucket::Dipper.any_instance.stubs(:backup) # Don't backup to the filebucket
+    resource.expects(:err).never
+    catalog = Puppet::Resource::Catalog.new
+    catalog.host_config = false # Stop Puppet from doing a bunch of magic
+    catalog.add_resource resource
+    catalog.apply
+  end
+
+  [false, true].each do |initial_state|
+    describe "When initially #{initial_state ? 'mounted' : 'unmounted'}" do
+      before :each do
+        @mounted = initial_state
+      end
+
+      [false, true].each do |initial_fstab_entry|
+        describe "When there is #{initial_fstab_entry ? 'an' : 'no'} initial fstab entry" do
+          before :each do
+            create_fake_fstab(initial_fstab_entry)
+          end
+
+          [:defined, :present, :mounted, :unmounted, :absent].each do |ensure_setting|
+            expected_final_state = case ensure_setting
+              when :mounted
+                true
+              when :unmounted, :absent
+                false
+              when :defined, :present
+                initial_state
+              else
+                fail "Unknown ensure_setting #{ensure_setting}"
+            end
+            expected_fstab_data = (ensure_setting != :absent)
+            describe "When setting ensure => #{ensure_setting}" do
+              ["local", "journaled"].each do |options_setting|
+                describe "When setting options => #{options_setting}" do
+                  it "should leave the system in the #{expected_final_state ? 'mounted' : 'unmounted'} state, #{expected_fstab_data ? 'with' : 'without'} data in /etc/fstab" do
+                    @desired_options = options_setting
+                    run_in_catalog(:ensure=>ensure_setting, :options => options_setting)
+                    @mounted.should == expected_final_state
+                    if expected_fstab_data
+                      check_fstab(expected_fstab_data).should == "/dev/disk1s1"
+                    else
+                      check_fstab(expected_fstab_data).should == nil
+                    end
+                    if @mounted
+                      if ![:defined, :present].include?(ensure_setting)
+                        @current_options.should == @desired_options
+                      elsif initial_fstab_entry
+                        @current_options.should == @desired_options
+                      else
+                        @current_options.should == 'local' #Workaround for #6645
+                      end
+                    end
+                  end
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+
+  describe "When the wrong device is mounted" do
+    it "should remount the correct device" do
+      pending "Due to bug 6309"
+      @mounted = true
+      @current_device = "/dev/disk2s2"
+      create_fake_fstab(true)
+      @desired_options = "local"
+      run_in_catalog(:ensure=>:mounted, :options=>'local')
+      @current_device.should=="/dev/disk1s1"
+      @mounted.should==true
+      @current_options.should=='local'
+      check_fstab(true).should == "/dev/disk1s1"
+    end
+  end
+end