puppet 0.25.0 → 0.25.1

data/lib/puppet/parser/loaded_code.rb

@@ -36,6 +36,10 @@ class Puppet::Parser::LoadedCode
         nil
     end
 
+    def node_exists?(name)
+        @nodes[check_name(name)]
+    end
+
     def nodes?
         @nodes.length > 0
     end

data/lib/puppet/parser/parser_support.rb

@@ -376,7 +376,7 @@ class Puppet::Parser::Parser
         doc = lexer.getcomment
         names.collect do |name|
             name = AST::HostName.new :value => name unless name.is_a?(AST::HostName)
-            if other = @loaded_code.node(name)
+            if other = @loaded_code.node_exists?(name)
                 error("Node %s is already defined at %s:%s; cannot redefine" % [other.name, other.file, other.line])
             end
             name = name.to_s if name.is_a?(Symbol)
@@ -484,7 +484,10 @@ class Puppet::Parser::Parser
             return @version
         end
 
-        @version = %x{#{Puppet[:config_version]}}.chomp
+        @version = Puppet::Util.execute([Puppet[:config_version]]).strip
+
+    rescue Puppet::ExecutionFailure => e
+        raise Puppet::ParseError, "Unable to set config_version: #{e.message}"
     end
 
     # Add a new file to be checked when we're checking to see if we should be

data/lib/puppet/parser/resource.rb

@@ -17,7 +17,7 @@ class Puppet::Parser::Resource
     include Puppet::Parser::YamlTrimmer
 
     attr_accessor :source, :scope, :rails_id
-    attr_accessor :virtual, :override, :translated
+    attr_accessor :virtual, :override, :translated, :catalog
 
     attr_reader :exported, :evaluated, :params
 
@@ -139,6 +139,12 @@ class Puppet::Parser::Resource
         if params = options[:params]
             options.delete(:params)
             params.each do |param|
+                # Don't set the same parameter twice
+                if @params[param.name]
+                    self.fail Puppet::ParseError, "Duplicate parameter '%s' for on %s" %
+                        [param.name, self.to_s]
+                end
+
                 set_parameter(param)
             end
         end
@@ -175,6 +181,11 @@ class Puppet::Parser::Resource
         end
     end
 
+    # Unless we're running >= 0.25, we're in compat mode.
+    def metaparam_compatibility_mode?
+        ! (catalog and version = catalog.client_version and version = version.split(".") and version[0] == "0" and version[1].to_i >= 25)
+    end
+
     # Return the resource name, or the title if no name
     # was specified.
     def name
@@ -304,20 +315,34 @@ class Puppet::Parser::Resource
         end
     end
 
+    def add_backward_compatible_relationship_param(name)
+        # Skip metaparams for which we get no value.
+        return unless val = scope.lookupvar(name.to_s, false) and val != :undefined
+
+        # The default case: just set the value
+        set_parameter(name, val) and return unless @params[name]
+
+        # For relationship params, though, join the values (a la #446).
+        @params[name].value = [@params[name].value, val].flatten
+    end
+
     # Add any metaparams defined in our scope. This actually adds any metaparams
     # from any parent scope, and there's currently no way to turn that off.
     def add_metaparams
+        compat_mode = metaparam_compatibility_mode?
+
         Puppet::Type.eachmetaparam do |name|
-            next if self.class.relationship_parameter?(name)
-            # Skip metaparams that we already have defined, unless they're relationship metaparams.
-            # LAK:NOTE Relationship metaparams get treated specially -- we stack them, instead of
-            # overriding.
+            if self.class.relationship_parameter?(name)
+                add_backward_compatible_relationship_param(name) if compat_mode
+                next
+            end
+
             next if @params[name]
 
             # Skip metaparams for which we get no value.
             next unless val = scope.lookupvar(name.to_s, false) and val != :undefined
 
-            set_parameter(name, val) and next unless @params[name]
+            set_parameter(name, val)
         end
     end
 

data/lib/puppet/property.rb

@@ -1,4 +1,4 @@
- # The virtual base class for properties, which are the self-contained building
+# The virtual base class for properties, which are the self-contained building
 # blocks for actually doing work on the system.
 
 require 'puppet'
@@ -144,6 +144,7 @@ class Puppet::Property < Puppet::Parameter
         rescue Puppet::Error, Puppet::DevError
             raise
         rescue => detail
+            puts detail.backtrace if Puppet[:trace]
             raise Puppet::DevError, "Could not convert change %s to string: %s" %
                 [self.name, detail]
         end
@@ -384,7 +385,7 @@ class Puppet::Property < Puppet::Parameter
     # Make sure that we've got all of the required features for a given value.
     def validate_features_per_value(value)
         if features = self.class.value_option(self.class.value_name(value), :required_features)
-            raise ArgumentError, "Provider must have features '%s' to set '%s' to '%s'" % [features.collect { |f| f.to_s }.join(", "), self.class.name, value] unless provider.satisfies?(features)
+            raise ArgumentError, "Provider must have features '%s' to set '%s' to '%s'" % [[features].flatten.join(", "), self.class.name, value] unless provider.satisfies?(features)
         end
     end
 

data/lib/puppet/provider/macauthorization/macauthorization.rb

@@ -226,11 +226,18 @@ Puppet::Type.type(:macauthorization).provide :macauthorization, :parent => Puppe
         # This mainly converts the keys from the puppet attributes to the
         # 'native' ones, but also enforces that the keys are all Strings
         # rather than Symbols so that any merges of the resultant Hash are
-        # sane.
+        # sane. The exception is booleans, where we coerce to a proper bool
+        # if they come in as a symbol.
         newplist = {}
         propertylist.each_pair do |key, value|
             next if key == :ensure     # not part of the auth db schema.
             next if key == :auth_type  # not part of the auth db schema.
+            case value
+            when true, :true
+                value = true
+            when false, :false
+                value = false
+            end
             new_key = key
             if PuppetToNativeAttributeMap.has_key?(key)
                 new_key = PuppetToNativeAttributeMap[key].to_s
@@ -243,7 +250,7 @@ Puppet::Type.type(:macauthorization).provide :macauthorization, :parent => Puppe
     end
 
     def retrieve_value(resource_name, attribute)
-
+        # We set boolean values to symbols when retrieving values
         if not self.class.parsed_auth_db.has_key?(resource_name)
             raise Puppet::Error.new("Cannot find #{resource_name} in auth db")
         end
@@ -257,10 +264,10 @@ Puppet::Type.type(:macauthorization).provide :macauthorization, :parent => Puppe
         if self.class.parsed_auth_db[resource_name].has_key?(native_attribute)
             value = self.class.parsed_auth_db[resource_name][native_attribute]
             case value
-            when true, "true", :true
-                value = true
-            when false, "false", :false
-                value = false
+            when true, :true
+                value = :true
+            when false, :false
+                value = :false
             end
 
             @property_hash[attribute] = value
@@ -287,14 +294,7 @@ Puppet::Type.type(:macauthorization).provide :macauthorization, :parent => Puppe
         end
 
         define_method(field.to_s + "=") do |value|
-            case value
-            when true, "true", :true
-                @property_hash[field] = true
-            when false, "false", :false
-                @property_hash[field] = false
-            else
-                @property_hash[field] = value
-            end
+            @property_hash[field] = value
         end
     end
 

data/lib/puppet/provider/package/dpkg.rb

@@ -83,7 +83,7 @@ Puppet::Type.type(:package).provide :dpkg, :parent => Puppet::Provider::Package
     def latest
         output = dpkg_deb "--show", @resource[:source]
         matches = /^(\S+)\t(\S+)$/.match(output).captures
-        unless matches[0].match(@resource[:name])
+        unless matches[0].match( Regexp.escape(@resource[:name]) )
             warning "source doesn't contain named package, but %s" % matches[0]
         end
         matches[1]

data/lib/puppet/provider/package/portage.rb

@@ -1,11 +1,12 @@
 require 'puppet/provider/package'
 
 Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Package do
+    include Puppet::Util::Execution
     desc "Provides packaging support for Gentoo's portage system."
 
     has_feature :versionable
 
-    commands :emerge => "/usr/bin/emerge", :eix => "/usr/bin/eix", :update_eix => "/usr/bin/update-eix"
+    commands :emerge => "/usr/bin/emerge", :eix => "/usr/bin/eix", :update_eix => "/usr/bin/eix-update"
 
     confine :operatingsystem => :gentoo
 
@@ -15,13 +16,17 @@ Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Packa
         result_format = /(\S+) (\S+) \[(?:([0-9.a-zA-Z]+(?:_(?:alpha|beta|pre|rc|p)[0-9]*)*(?:-r[0-9]*)?)(?:\([^\)]+\))?(?:\[([^\]]+)\])?[ ]*)*\] \[(?:(?:\{M\})?(?:\([~*]+\))?([0-9.a-zA-Z]+(?:_(?:alpha|beta|pre|rc|p)[0-9]*)*(?:-r[0-9]*)?)(?:\(([^\)]+)\))?(?:![mf])*(?:\[([^\]]+)\])?)?\] ([\S]*) (.*)/
         result_fields = [:category, :name, :ensure, :ensure_overlay, :version_available, :slot, :overlay, :vendor, :description]
 
-        search_format = "{installedversionsshort}<category> <name> [<installedversionsshort>] [<best>] <homepage> <description>{}"
+        version_format = "<version>{!last} {}"
+        search_format = "<category> <name> [<installedversions:SPLITVERSIONS>] [<bestversion:SPLITVERSIONS>] <homepage> <description>"
 
         begin
             if !FileUtils.uptodate?("/var/cache/eix", %w(/usr/bin/eix /usr/portage/metadata/timestamp))
                 update_eix
             end
-            search_output = eix "--nocolor", "--format", search_format
+            search_output = nil
+            withenv :SPLITVERSIONS => version_format do
+                search_output = eix "--nocolor", "--pure-packages", "--installed", "--format", search_format
+            end
 
             packages = []
             search_output.each do |search_result|
@@ -74,13 +79,18 @@ Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Packa
 
         search_field = package_name.count('/') > 0 ? "--category-name" : "--name"
         search_value = package_name
-        search_format = "<category> <name> [<installedversionsshort>] [<best>] <homepage> <description>"
+
+        version_format = "<version>{!last} {}"
+        search_format = "<category> <name> [<installedversions:FORMAT_PVERSION>] [<bestversion:FORMAT_PVERSION>] <homepage> <description>"
 
         begin
             if !FileUtils.uptodate?("/var/cache/eix", %w(/usr/bin/eix /usr/portage/metadata/timestamp))
                 update_eix
             end
-            search_output = eix "--nocolor", "--format", search_format, "--exact", search_field, search_value
+            search_output = nil
+            withenv :SPLITVERSIONS => version_format do
+                search_output = eix "--nocolor", "--pure-packages", "--format", search_format, "--exact", search_field, search_value
+            end
 
             packages = []
             search_output.each do |search_result|

data/lib/puppet/provider/package/rug.rb

@@ -36,7 +36,7 @@ Puppet::Type.type(:package).provide :rug, :parent => :rpm do
         #rug can only get a list of *all* available packages?
         output = rug "list-updates"
 
-        if output =~ /#{@resource[:name]}\s*\|\s*([0-9\.\-]+)/
+        if output =~ /#{Regexp.escape @resource[:name]}\s*\|\s*([0-9\.\-]+)/
             return $1
         else
             # rug didn't find updates, pretend the current

data/lib/puppet/provider/package/up2date.rb

@@ -25,7 +25,7 @@ Puppet::Type.type(:package).provide :up2date, :parent => :rpm, :source => :rpm d
         #up2date can only get a list of *all* available packages?
         output = up2date "--showall"
 
-        if output =~ /^#{@resource[:name]}-(\d+.*)\.\w+/
+        if output =~ /^#{Regexp.escape @resource[:name]}-(\d+.*)\.\w+/
             return $1
         else
             # up2date didn't find updates, pretend the current

data/lib/puppet/provider/package/urpmi.rb

@@ -43,7 +43,7 @@ Puppet::Type.type(:package).provide :urpmi, :parent => :rpm, :source => :rpm do
     def latest
         output = urpmq "-S", @resource[:name]
 
-        if output =~ /^#{@resource[:name]}\s+:\s+.*\(\s+(\S+)\s+\)/
+        if output =~ /^#{Regexp.escape @resource[:name]}\s+:\s+.*\(\s+(\S+)\s+\)/
             return $1
         else
             # urpmi didn't find updates, pretend the current

data/lib/puppet/provider/service/daemontools.rb

@@ -2,7 +2,7 @@
 #
 # author Brice Figureau <brice-puppet@daysofwonder.com>
 Puppet::Type.type(:service).provide :daemontools, :parent => :base do
-    desc """Daemontools service management.
+    desc "Daemontools service management.
 
     This provider manages daemons running supervised by D.J.Bernstein daemontools.
     It tries to detect the service directory, with by order of preference:
@@ -37,7 +37,7 @@ Puppet::Type.type(:service).provide :daemontools, :parent => :base do
     If a service has ensure => \"stopped\", it will only down the service, not
     remove the /path/to/service link.
 
-    """
+    "
 
     commands :svc  => "/usr/bin/svc", :svstat => "/usr/bin/svstat"
 
@@ -124,11 +124,6 @@ Puppet::Type.type(:service).provide :daemontools, :parent => :base do
         return :stopped
     end
 
-    def startcmd
-        self.enable if ! FileTest.symlink?(self.service)
-        [command(:svc), "-u", self.service ]
-    end
-
     def setupservice
         begin
             if resource[:manifest]
@@ -144,10 +139,12 @@ Puppet::Type.type(:service).provide :daemontools, :parent => :base do
 
     def enabled?
         case self.status
-        when :running:
+        when :running
+            # obviously if the daemon is running then it is enabled
             return :true
         else
-            return :false
+            # the service is enabled if it is linked
+            return FileTest.symlink?(self.service) ? :true : :false
         end
     end
 
@@ -191,7 +188,7 @@ Puppet::Type.type(:service).provide :daemontools, :parent => :base do
     end
 
     def start
-        enable unless enabled?
+        enable unless enabled? == :true
         svc "-u", self.service
     end
 

data/lib/puppet/provider/service/runit.rb

@@ -2,7 +2,7 @@
 #
 # author Brice Figureau <brice-puppet@daysofwonder.com>
 Puppet::Type.type(:service).provide :runit, :parent => :daemontools do
-    desc """Runit service management.
+    desc "Runit service management.
 
   This provider manages daemons running supervised by Runit.
   It tries to detect the service directory, with by order of preference:
@@ -31,7 +31,7 @@ Puppet::Type.type(:service).provide :runit, :parent => :daemontools do
    * status
 
 
-"""
+"
 
     commands :sv => "/usr/bin/sv"
 
@@ -66,10 +66,6 @@ Puppet::Type.type(:service).provide :runit, :parent => :daemontools do
         @servicedir
     end
 
-    def restartcmd
-        [ command(:sv), "restart", self.service]
-    end
-
     def status
         begin
             output = sv "status", self.daemon
@@ -82,23 +78,17 @@ Puppet::Type.type(:service).provide :runit, :parent => :daemontools do
         return :stopped
     end
 
-    # relay to the stopcmd
     def stop
-        ucommand( :stop )
-    end
-
-    def stopcmd
-        [ command(:sv), "stop", self.service]
+        sv "stop", self.service
     end
 
-    # relay to the startcmd
     def start
-        enable unless enabled?
-        ucommand( :start )
+        enable unless enabled? == :true
+        sv "start", self.service
     end
 
-    def startcmd
-        [ command(:sv), "start", self.service]
+    def restart
+        sv "restart", self.service
     end
 
     # disable by removing the symlink so that runit

data/lib/puppet/provider/ssh_authorized_key/parsed.rb

@@ -15,19 +15,13 @@ Puppet::Type.type(:ssh_authorized_key).provide(:parsed,
         :optional => %w{options},
         :rts => /^\s+/,
         :match    => /^(?:(.+) )?(ssh-dss|ssh-rsa) ([^ ]+)(?: (.+))?$/,
-        :post_parse => proc { |record|
-            if record[:options].nil?
-                record[:options] = [:absent]
-            else
-                record[:options] = Puppet::Type::Ssh_authorized_key::ProviderParsed.parse_options(record[:options])
-            end
+        :post_parse => proc { |h|
+            h[:options] ||= [:absent]
+            h[:options] = Puppet::Type::Ssh_authorized_key::ProviderParsed.parse_options(h[:options]) if h[:options].is_a? String
         },
-        :pre_gen => proc { |record|
-            if record[:options].include?(:absent)
-                record[:options] = ""
-            else
-                record[:options] = record[:options].join(',')
-            end
+        :pre_gen => proc { |h|
+            h[:options] = [] if h[:options].include?(:absent)
+            h[:options] = h[:options].join(',')
         }
 
     record_line :key_v1,
@@ -36,14 +30,6 @@ Puppet::Type.type(:ssh_authorized_key).provide(:parsed,
         :rts      => /^\s+/,
         :match    => /^(?:(.+) )?(\d+) (\d+) (\d+)(?: (.+))?$/
 
-    def target
-        @resource.should(:target)
-    end
-
-    def user
-        @resource.should(:user)
-    end
-
     def dir_perm
         # Determine correct permission for created directory and file
         # we can afford more restrictive permissions when the user is known
@@ -67,39 +53,13 @@ Puppet::Type.type(:ssh_authorized_key).provide(:parsed,
     end
 
     def target
-        if user
-            File.expand_path("~%s/.ssh/authorized_keys" % user)
-        elsif target = @resource.should(:target)
-            target
-        end
+        @resource.should(:target) || File.expand_path("~%s/.ssh/authorized_keys" % user)
     end
 
     def user
         @resource.should(:user)
     end
 
-    def dir_perm
-        # Determine correct permission for created directory and file
-        # we can afford more restrictive permissions when the user is known
-        if target
-            if user
-                0700
-            else
-                0755
-            end
-        end
-    end
-
-    def file_perm
-        if target
-            if user
-                0600
-            else
-                0644
-            end
-        end
-    end
-
     def flush
         # As path expansion had to be moved in the provider, we cannot generate new file
         # resources and thus have to chown and chmod here. It smells hackish.