puppet 3.5.1-x86-mingw32 → 3.6.0.rc1-x86-mingw32

data/lib/puppet/pops/types/types.rb

@@ -15,6 +15,9 @@ require 'rgen/metamodel_builder'
 # @api public
 #
 module Puppet::Pops::Types
+  # Used as end in a range
+  INFINITY = 1.0 / 0.0
+  NEGATIVE_INFINITY = -INFINITY
 
   class PAbstractType < Puppet::Pops::Model::PopsObject
     abstract
@@ -134,15 +137,15 @@ module Puppet::Pops::Types
 
       # Returns Float.Infinity if one end of the range is unbound
       def size
-        return 1.0 / 0.0 if from.nil? || to.nil?
+        return INFINITY if from.nil? || to.nil?
         1+(to-from).abs
       end
 
       # Returns the range as an array ordered so the smaller number is always first.
       # The number may be Infinity or -Infinity.
       def range
-        f = from || -(1.0 / 0.0)
-        t = to || (1.0 / 0.0)
+        f = from || NEGATIVE_INFINITY
+        t = to || INFINITY
         if f < t
           [f, t]
         else
@@ -253,9 +256,23 @@ module Puppet::Pops::Types
   class PCollectionType < PObjectType
     contains_one_uni 'element_type', PAbstractType
     contains_one_uni 'size_type', PIntegerType
+
     module ClassModule
+      # Returns an array with from (min) size to (max) size
+      # A negative range value in from is 
+      def size_range
+        return [0, INFINITY] if size_type.nil?
+        f = size_type.from || 0
+        t = size_type.to || INFINITY
+        if f < t
+          [f, t]
+        else
+          [t,f]
+        end
+      end
+
       def hash
-        [self.class, element_type, size].hash
+        [self.class, element_type, size_type].hash
       end
 
       def ==(o)
@@ -344,6 +361,50 @@ module Puppet::Pops::Types
     end
   end
 
+  class PCallableType < PObjectType
+    # Types of parameters and required/optional count
+    contains_one_uni 'param_types', PTupleType, :lowerBound => 1
+
+    # Although being an abstract type reference, only PAbstractCallable, and Optional[Callable] are supported
+    # If not set, the meaning is that block is not supported.
+    #
+    contains_one_uni 'block_type', PAbstractType, :lowerBound => 0
+
+    module ClassModule
+      # Returns the number of accepted arguments [min, max]
+      def size_range
+        param_types.size_range
+      end
+
+      # Returns the number of accepted arguments for the last parameter type [min, max]
+      #
+      def last_range
+        param_types.repeat_last_range
+      end
+
+      # Range [0,0], [0,1], or [1,1] for the block
+      #
+      def block_range
+        case block_type
+        when Puppet::Pops::Types::POptionalType
+          [0,1]
+        when Puppet::Pops::Types::PVariantType, Puppet::Pops::Types::PCallableType
+          [1,1]
+        else
+          [0,0]
+        end
+      end
+
+      def hash
+        [self.class, Set.new(param_types), block_type].hash
+      end
+
+      def ==(o)
+        self.class == o.class && args_type == o.args_type && block_type == o.block_type
+      end
+    end
+  end
+
   # @api public
   class PArrayType < PCollectionType
     module ClassModule

data/lib/puppet/pops/validation/checker4_0.rb

@@ -210,7 +210,7 @@ class Puppet::Pops::Validation::Checker4_0
     end
   end
 
-  # for 'class' and 'define'
+  # for 'class', 'define', and function
   def check_NamedDefinition(o)
     top(o.eContainer, o)
     if o.name !~ Puppet::Pops::Patterns::CLASSREF

data/lib/puppet/pops/validation/validator_factory_4_0.rb

@@ -25,7 +25,7 @@ class Puppet::Pops::Validation::ValidatorFactory_4_0 < Puppet::Pops::Validation:
 
     p[Issues::NAME_WITH_HYPHEN]             = :error
     p[Issues::DEPRECATED_NAME_AS_TYPE]      = :error
-
+    p[Issues::EMPTY_RESOURCE_SPECIALIZATION] = :ignore
     p
   end
 end

data/lib/puppet/property/list.rb

@@ -54,7 +54,7 @@ module Puppet
 
       def retrieve
         #ok, some 'convention' if the list property is named groups, provider should implement a groups method
-        if tmp = provider.send(name) and tmp != :absent
+        if provider and tmp = provider.send(name) and tmp != :absent
           return tmp.split(delimiter)
         else
           return :absent

data/lib/puppet/provider/augeas/augeas.rb

@@ -393,8 +393,8 @@ Puppet::Type.type(:augeas).provide(:augeas) do
             root = resource[:root].sub(/^\/$/, "")
             saved_files.map! {|key| @aug.get(key).sub(/^\/files/, root) }
             saved_files.uniq.each do |saved_file|
-              if Puppet[:show_diff]
-                notice "\n" + diff(saved_file, saved_file + ".augnew")
+              if Puppet[:show_diff] && @resource[:show_diff]
+                self.send(@resource[:loglevel], "\n" + diff(saved_file, saved_file + ".augnew"))
               end
               File.delete(saved_file + ".augnew")
             end

data/lib/puppet/provider/cron/crontab.rb

@@ -89,6 +89,14 @@ Puppet::Type.type(:cron).provide(:crontab, :parent => Puppet::Provider::ParsedFi
     end
   end
 
+  def create
+    if resource.should(:command) then
+      super
+    else
+      resource.err "no command specified, cannot create"
+    end
+  end
+
   # Look up a resource with a given name whose user matches a record target
   #
   # @api private
@@ -105,8 +113,11 @@ Puppet::Type.type(:cron).provide(:crontab, :parent => Puppet::Provider::ParsedFi
   def self.resource_for_record(record, resources)
     resource = super
 
-    if resource and record[:target] == resource[:user]
-      resource
+    if resource
+      target = resource[:target] || resource[:user]
+      if record[:target] == target
+        resource
+      end
     end
   end
 

data/lib/puppet/provider/package.rb

@@ -25,4 +25,28 @@ class Puppet::Provider::Package < Puppet::Provider
   def validate_source(value)
     true
   end
+
+  # Turns a array of options into flags to be passed to a command.
+  # The options can be passed as a string or hash. Note that passing a hash
+  # should only be used in case --foo=bar must be passed,
+  # which can be accomplished with:
+  #     install_options => [ { '--foo' => 'bar' } ]
+  # Regular flags like '--foo' must be passed as a string.
+  # @param options [Array]
+  # @return Concatenated list of options
+  # @api private
+  def join_options(options)
+    return unless options
+
+    options.collect do |val|
+      case val
+        when Hash
+          val.keys.sort.collect do |k|
+            "#{k}=#{val[k]}"
+          end
+        else
+          val
+      end
+    end.flatten
+  end
 end

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

@@ -4,7 +4,7 @@ Puppet::Type.type(:package).provide :apt, :parent => :dpkg, :source => :dpkg do
 
   desc "Package management via `apt-get`."
 
-  has_feature :versionable
+  has_feature :versionable, :install_options
 
   commands :aptget => "/usr/bin/apt-get"
   commands :aptcache => "/usr/bin/apt-cache"
@@ -63,6 +63,7 @@ Puppet::Type.type(:package).provide :apt, :parent => :dpkg, :source => :dpkg do
       cmd << "--force-yes"
     end
 
+    cmd += install_options if @resource[:install_options]
     cmd << :install << str
 
     aptget(*cmd)
@@ -104,4 +105,8 @@ Puppet::Type.type(:package).provide :apt, :parent => :dpkg, :source => :dpkg do
     # workaround a "bug" in apt, that already removed packages are not purged
     super
   end
+
+  def install_options
+    join_options(@resource[:install_options])
+  end
 end

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

@@ -8,7 +8,7 @@ Puppet::Type.type(:package).provide :gem, :parent => Puppet::Provider::Package d
     interpreted as the path to a local gem file.  If source is not present at all,
     the gem will be installed from the default gem repositories."
 
-  has_feature :versionable
+  has_feature :versionable, :install_options
 
   commands :gemcmd => "gem"
 
@@ -97,6 +97,8 @@ Puppet::Type.type(:package).provide :gem, :parent => Puppet::Provider::Package d
       command << "--no-rdoc" << "--no-ri" << resource[:name]
     end
 
+    command += install_options if resource[:install_options]
+
     output = execute(command)
     # Apparently some stupid gem versions don't exit non-0 on failure
     self.fail "Could not install: #{output.chomp}" if output.include?("ERROR")
@@ -122,4 +124,8 @@ Puppet::Type.type(:package).provide :gem, :parent => Puppet::Provider::Package d
   def update
     self.install(false)
   end
-end
+
+  def install_options
+    join_options(resource[:install_options])
+  end
+end

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

@@ -122,19 +122,4 @@ Puppet::Type.type(:package).provide(:msi, :parent => Puppet::Provider::Package)
   def shell_quote(value)
     value.include?(' ') ? %Q["#{value.gsub(/"/, '\"')}"] : value
   end
-
-  def join_options(options)
-    return unless options
-
-    options.collect do |val|
-      case val
-      when Hash
-        val.keys.sort.collect do |k|
-          "#{k}=#{val[k]}"
-        end.join(' ')
-      else
-        val
-      end
-    end
-  end
 end

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

@@ -141,30 +141,6 @@ Puppet::Type.type(:package).provide :openbsd, :parent => Puppet::Provider::Packa
     join_options(resource[:uninstall_options])
   end
 
-  # Turns a array of options into flags to be passed to pkg_add(8) and
-  # pkg_delete(8). The options can be passed as a string or hash. Note
-  # that passing a hash should only be used in case -Dfoo=bar must be passed,
-  # which can be accomplished with:
-  #     install_options => [ { '-Dfoo' => 'bar' } ]
-  # Regular flags like '-L' must be passed as a string.
-  # @param options [Array]
-  # @return Concatenated list of options
-  # @api private
-  def join_options(options)
-    return unless options
-
-    options.collect do |val|
-      case val
-      when Hash
-        val.keys.sort.collect do |k|
-          "#{k}=#{val[k]}"
-        end.join(' ')
-      else
-        val
-      end
-    end
-  end
-
   def uninstall
     pkgdelete uninstall_options.flatten.compact.join(' '), @resource[:name]
   end

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

@@ -111,7 +111,6 @@ Puppet::Type.type(:package).provide :rpm, :source => :rpm, :parent => Puppet::Pr
   end
 
   def install
-    source = nil
     unless source = @resource[:source]
       @resource.fail "RPMs must specify a package source"
     end
@@ -124,8 +123,7 @@ Puppet::Type.type(:package).provide :rpm, :source => :rpm, :parent => Puppet::Pr
 
     flag = ["-i"]
     flag = ["-U", "--oldpackage"] if @property_hash[:ensure] and @property_hash[:ensure] != :absent
-
-    flag = flag + install_options
+    flag += install_options if resource[:install_options]
     rpm flag, source
   end
 
@@ -149,7 +147,8 @@ Puppet::Type.type(:package).provide :rpm, :source => :rpm, :parent => Puppet::Pr
       end
     end
 
-    flag = ["-e"] + uninstall_options
+    flag = ['-e']
+    flag += uninstall_options if resource[:uninstall_options]
     rpm flag, nvr
   end
 
@@ -166,31 +165,6 @@ Puppet::Type.type(:package).provide :rpm, :source => :rpm, :parent => Puppet::Pr
   end
 
   private
-
-  # Turns a array of options into flags to be passed to rpm install(8) and
-  # The options can be passed as a string or hash. Note that passing a hash
-  # should only be used in case -Dfoo=bar must be passed,
-  # which can be accomplished with:
-  #     install_options => [ { '-Dfoo' => 'bar' } ]
-  # Regular flags like '-L' must be passed as a string.
-  # @param options [Array]
-  # @return Concatenated list of options
-  # @api private
-  def join_options(options)
-    return [] unless options
-
-    options.collect do |val|
-      case val
-      when Hash
-        val.keys.sort.collect do |k|
-          "#{k}=#{val[k]}"
-        end.join(' ')
-      else
-        val
-      end
-    end
-  end
-
   # @param line [String] one line of rpm package query information
   # @return [Hash] of NEVRA_FIELDS strings parsed from package info
   # or an empty hash if we failed to parse

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

@@ -105,19 +105,4 @@ Puppet::Type.type(:package).provide(:windows, :parent => Puppet::Provider::Packa
   def uninstall_options
     join_options(resource[:uninstall_options])
   end
-
-  def join_options(options)
-    return unless options
-
-    options.collect do |val|
-      case val
-      when Hash
-        val.keys.sort.collect do |k|
-          "#{k}=#{val[k]}"
-        end.join(' ')
-      else
-        val
-      end
-    end
-  end
 end

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

@@ -7,14 +7,12 @@ Puppet::Type.type(:package).provide :yum, :parent => :rpm, :source => :rpm do
   remove dependent packages with this provider use the `purgeable` feature, but note this
   feature is destructive and should be used with the utmost care."
 
-  has_feature :versionable
+  has_feature :install_options, :versionable
 
   commands :yum => "yum", :rpm => "rpm", :python => "python"
 
   self::YUMHELPER = File::join(File::dirname(__FILE__), "yumhelper.py")
 
-  attr_accessor :latest_info
-
   if command('rpm')
     confine :true => begin
       rpm('--version')
@@ -30,28 +28,65 @@ Puppet::Type.type(:package).provide :yum, :parent => :rpm, :source => :rpm do
   def self.prefetch(packages)
     raise Puppet::Error, "The yum provider can only be used as root" if Process.euid != 0
     super
-    return unless packages.detect { |name, package| package.should(:ensure) == :latest }
-
-    # collect our 'latest' info
-    updates = {}
-    python(self::YUMHELPER).each_line do |l|
-      l.chomp!
-      next if l.empty?
-      if l[0,4] == "_pkg"
-        hash = nevra_to_hash(l[5..-1])
-        [hash[:name], "#{hash[:name]}.#{hash[:arch]}"].each  do |n|
-          updates[n] ||= []
-          updates[n] << hash
-        end
-      end
+  end
+
+  # Retrieve the latest package version information for a given package name
+  # and combination of repos to enable and disable.
+  #
+  # @note If multiple package versions are defined (such as in the case where a
+  #   package is built for multiple architectures), the first package found
+  #   will be used.
+  #
+  # @api private
+  # @param package [String] The name of the package to query
+  # @param enablerepo [Array<String>] A list of repositories to enable for this query
+  # @param disablerepo [Array<String>] A list of repositories to disable for this query
+  # @return [Hash<Symbol, String>]
+  def self.latest_package_version(package, enablerepo, disablerepo)
+
+    key = [enablerepo, disablerepo]
+
+    @latest_versions ||= {}
+    if @latest_versions[key].nil?
+      @latest_versions[key] = fetch_latest_versions(enablerepo, disablerepo)
     end
 
-    # Add our 'latest' info to the providers.
-    packages.each do |name, package|
-      if info = updates[package[:name]]
-        package.provider.latest_info = info[0]
-      end
+    if @latest_versions[key][package]
+      @latest_versions[key][package].first
+    end
+  end
+
+  # Search for all installed packages that have newer versions, given a
+  # combination of repositories to enable and disable.
+  #
+  # @api private
+  # @param enablerepo [Array<String>] A list of repositories to enable for this query
+  # @param disablerepo [Array<String>] A list of repositories to disable for this query
+  # @return [Hash<String, Array<Hash<String, String>>>] All packages that were
+  #   found with a list of found versions for each package.
+  def self.fetch_latest_versions(enablerepo, disablerepo)
+    latest_versions = Hash.new {|h, k| h[k] = []}
+
+    args = [self::YUMHELPER]
+    args.concat(enablerepo.map { |repo| ['-e', repo] }.flatten)
+    args.concat(disablerepo.map { |repo| ['-d', repo] }.flatten)
+
+    python(args).scan(/^_pkg (.*)$/) do |match|
+      hash = nevra_to_hash(match[0])
+
+      # Create entries for both the package name without a version and a
+      # version since yum considers those as mostly interchangeable.
+      short_name = hash[:name]
+      long_name  = "#{hash[:name]}.#{hash[:arch]}"
+
+      latest_versions[short_name] << hash
+      latest_versions[long_name]  << hash
     end
+    latest_versions
+  end
+
+  def self.clear
+    @latest_versions = nil
   end
 
   def install
@@ -74,7 +109,9 @@ Puppet::Type.type(:package).provide :yum, :parent => :rpm, :source => :rpm do
       end
     end
 
-    yum "-d", "0", "-e", "0", "-y", operation, wanted
+    args = ["-d", "0", "-e", "0", "-y", install_options, operation, wanted].compact
+    yum *args
+
 
     is = self.query
     raise Puppet::Error, "Could not find package #{self.name}" unless is
@@ -86,7 +123,7 @@ Puppet::Type.type(:package).provide :yum, :parent => :rpm, :source => :rpm do
 
   # What's the latest package version available?
   def latest
-    upd = latest_info
+    upd = self.class.latest_package_version(@resource[:name], enablerepo, disablerepo)
     unless upd.nil?
       # FIXME: there could be more than one update for a package
       # because of multiarch
@@ -107,4 +144,44 @@ Puppet::Type.type(:package).provide :yum, :parent => :rpm, :source => :rpm do
   def purge
     yum "-y", :erase, @resource[:name]
   end
+
+  # @deprecated
+  def latest_info
+    Puppet.deprecation_warning("#{self.class}##{__method__} is deprecated and is no longer used.")
+    @latest_info
+  end
+
+  # @deprecated
+  def latest_info=(latest)
+    Puppet.deprecation_warning("#{self.class}##{__method__} is deprecated and is no longer used.")
+    @latest_info = latest
+  end
+
+  private
+
+  def enablerepo
+    scan_options(resource[:install_options], '--enablerepo')
+  end
+
+  def disablerepo
+    scan_options(resource[:install_options], '--disablerepo')
+  end
+
+  # Scan a structure that looks like the package type 'install_options'
+  # structure for all hashes that have a specific key.
+  #
+  # @api private
+  # @param options [Array<String | Hash>, nil] The options structure. If the
+  #   options are nil an empty array will be returned.
+  # @param key [String] The key to look for in all contained hashes
+  # @return [Array<String>] All hash values with the given key.
+  def scan_options(options, key)
+    return [] if options.nil?
+    options.inject([]) do |repos, opt|
+      if opt.is_a? Hash and opt[key]
+        repos << opt[key]
+      end
+      repos
+    end
+  end
 end