puppet 4.1.0-x64-mingw32 → 4.2.0-x64-mingw32

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

@@ -5,15 +5,15 @@ Puppet::Type.type(:package).provide :pkgin, :parent => Puppet::Provider::Package
 
   commands :pkgin => "pkgin"
 
-  defaultfor :operatingsystem => [ :dragonfly , :smartos ]
+  defaultfor :operatingsystem => [ :dragonfly , :smartos, :netbsd ]
 
   has_feature :installable, :uninstallable, :upgradeable, :versionable
 
   def self.parse_pkgin_line(package)
 
     # e.g.
-    #   vim-7.2.446 =        Vim editor (vi clone) without GUI
-    match, name, version, status = *package.match(/(\S+)-(\S+)(?: (=|>|<))?\s+.+$/)
+    #   vim-7.2.446;Vim editor (vi clone) without GUI
+    match, name, version, status = *package.match(/([^\s;]+)-([^\s;]+)[;\s](=|>|<)?.+$/)
     if match
       {
         :name     => name,

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

@@ -115,15 +115,14 @@ Puppet::Type.type(:package).provide :rpm, :source => :rpm, :parent => Puppet::Pr
     unless source = @resource[:source]
       @resource.fail "RPMs must specify a package source"
     end
-    # RPM gets pissy if you try to install an already
-    # installed package
-    if @resource.should(:ensure) == @property_hash[:ensure] or
-      @resource.should(:ensure) == :latest && @property_hash[:ensure] == latest
-      return
-    end
+
+    version =  @property_hash[:ensure]
+
+    # RPM gets upset if you try to install an already installed package
+    return if @resource.should(:ensure) == version || (@resource.should(:ensure) == :latest && version == latest)
 
     flag = ["-i"]
-    flag = ["-U", "--oldpackage"] if @property_hash[:ensure] and @property_hash[:ensure] != :absent
+    flag = ["-U", "--oldpackage"] if version && (version != :absent && version != :purged)
     flag += install_options if resource[:install_options]
     rpm flag, source
   end
@@ -184,14 +183,9 @@ Puppet::Type.type(:package).provide :rpm, :source => :rpm, :parent => Puppet::Pr
     return 0 if str1 == str2
 
     front_strip_re = /^[^A-Za-z0-9~]+/
-    segment_re = /^[A-Za-z0-9]/
-    # these represent RPM rpmio/rpmstring.c functions
-    risalnum = /[A-Za-z0-9]/
-    risdigit = /^[0-9]+/
-    risalpha = /[A-Za-z]/
 
     while str1.length > 0 or str2.length > 0
-      # trim anything that's !risalnum() and != '~' off the beginning of each string
+      # trim anything that's in front_strip_re and != '~' off the beginning of each string
       str1 = str1.gsub(front_strip_re, '')
       str2 = str2.gsub(front_strip_re, '')
 
@@ -211,7 +205,7 @@ Puppet::Type.type(:package).provide :rpm, :source => :rpm, :parent => Puppet::Pr
       # "grab first completely alpha or completely numeric segment"
       isnum = false
       # if the first char of str1 is a digit, grab the chunk of continuous digits from each string
-      if risdigit.match(str1)
+      if /^[0-9]+/.match(str1)
         if str1 =~ /^[0-9]+/
           segment1 = $~.to_s
           str1 = $~.post_match

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

@@ -91,6 +91,7 @@ Puppet::Type.type(:package).provide :yum, :parent => :rpm, :source => :rpm do
 
     updates = Hash.new { |h, k| h[k] = [] }
     body.split.each_slice(3) do |tuple|
+      break if tuple[0] =~ /^Obsoleting/
       hash = update_to_hash(*tuple[0..1])
       # Create entries for both the package name without a version and a
       # version since yum considers those as mostly interchangeable.
@@ -174,10 +175,10 @@ Puppet::Type.type(:package).provide :yum, :parent => :rpm, :source => :rpm do
       # because of multiarch
       return "#{upd[:epoch]}:#{upd[:version]}-#{upd[:release]}"
     else
-      # Yum didn't find updates, pretend the current
-      # version is the latest
-      raise Puppet::DevError, "Tried to get latest on a missing package" if properties[:ensure] == :absent
-      return properties[:ensure]
+      # Yum didn't find updates, pretend the current version is the latest
+      version = properties[:ensure]
+      raise Puppet::DevError, "Tried to get latest on a missing package" if version == :absent || version == :purged
+      return version
     end
   end
 

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

@@ -31,8 +31,9 @@ Puppet::Type.type(:service).provide :base, :parent => :service do
   def getpid
     @resource.fail "Either stop/status commands or a pattern must be specified" unless @resource[:pattern]
     regex = Regexp.new(@resource[:pattern])
+    ps = getps
     self.debug "Executing '#{ps}'"
-    IO.popen(getps) { |table|
+    IO.popen(ps) { |table|
       table.each_line { |line|
         if regex.match(line)
           self.debug "Process matched: #{line}"
@@ -62,7 +63,7 @@ Puppet::Type.type(:service).provide :base, :parent => :service do
       else
         return :stopped
       end
-    elsif pid = self.getpid
+    elsif pid = getpid
       self.debug "PID is #{pid}"
       return :running
     else

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

@@ -1,10 +1,8 @@
-# Manage FreeBSD services.
 Puppet::Type.type(:service).provide :bsd, :parent => :init do
   desc <<-EOT
-    FreeBSD's (and probably NetBSD's?) form of `init`-style service management.
+    Generic BSD form of `init`-style service management with `rc.d`.
 
     Uses `rc.conf.d` for service enabling and disabling.
-
   EOT
 
   confine :operatingsystem => [:freebsd, :netbsd, :dragonfly]
@@ -19,13 +17,13 @@ Puppet::Type.type(:service).provide :bsd, :parent => :init do
 
   # remove service file from rc.conf.d to disable it
   def disable
-    rcfile = File.join(rcconf_dir, @model[:name])
+    rcfile = File.join(rcconf_dir, @resource[:name])
     File.delete(rcfile) if Puppet::FileSystem.exist?(rcfile)
   end
 
   # if the service file exists in rc.conf.d then it's already enabled
   def enabled?
-    rcfile = File.join(rcconf_dir, @model[:name])
+    rcfile = File.join(rcconf_dir, @resource[:name])
     return :true if Puppet::FileSystem.exist?(rcfile)
 
     :false
@@ -35,8 +33,10 @@ Puppet::Type.type(:service).provide :bsd, :parent => :init do
   # proper contents
   def enable
     Dir.mkdir(rcconf_dir) if not Puppet::FileSystem.exist?(rcconf_dir)
-    rcfile = File.join(rcconf_dir, @model[:name])
-    open(rcfile, 'w') { |f| f << "%s_enable=\"YES\"\n" % @model[:name] }
+    rcfile = File.join(rcconf_dir, @resource[:name])
+    File.open(rcfile, File::WRONLY | File::APPEND | File::CREAT, 0644) { |f|
+      f << "%s_enable=\"YES\"\n" % @resource[:name]
+    }
   end
 
   # Override stop/start commands to use one<cmd>'s and the avoid race condition

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

@@ -16,7 +16,8 @@ Puppet::Type.type(:service).provide :debian, :parent => :init do
   # is resolved.
   commands :invoke_rc => "/usr/sbin/invoke-rc.d"
 
-  defaultfor :operatingsystem => [:debian, :cumuluslinux]
+  defaultfor :operatingsystem => :cumuluslinux
+  defaultfor :operatingsystem => :debian, :operatingsystemmajrelease => ['5','6','7']
 
   # Remove the symlinks
   def disable

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

@@ -39,7 +39,7 @@ Puppet::Type.type(:service).provide :freebsd, :parent => :init do
 
   # Extract service name
   def service_name
-    extract_value_name('service', 0, /# (.*)/, '\1')
+    extract_value_name('service', 0, /# (\S+).*/, '\1')
   end
 
   # Extract rcvar name

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

@@ -1,19 +1,23 @@
-# Manage systemd services using /bin/systemctl
+# Manage systemd services using systemctl
 
 Puppet::Type.type(:service).provide :systemd, :parent => :base do
   desc "Manages `systemd` services using `systemctl`."
 
   commands :systemctl => "systemctl"
 
+  confine :exists => "/run/systemd/system"
+
   defaultfor :osfamily => [:archlinux]
   defaultfor :osfamily => :redhat, :operatingsystemmajrelease => "7"
-  defaultfor :osfamily => :redhat, :operatingsystem => :fedora, :operatingsystemmajrelease => ["17", "18", "19", "20", "21"]
+  defaultfor :osfamily => :redhat, :operatingsystem => :fedora
   defaultfor :osfamily => :suse, :operatingsystemmajrelease => ["12", "13"]
+  defaultfor :operatingsystem => :debian, :operatingsystemmajrelease => "8"
+  defaultfor :operatingsystem => :ubuntu, :operatingsystemmajrelease => "15.04"
 
   def self.instances
     i = []
     output = systemctl('list-unit-files', '--type', 'service', '--full', '--all',  '--no-pager')
-    output.scan(/^(\S+)\s+(disabled|enabled)\s*$/i).each do |m|
+    output.scan(/^(\S+)\s+(disabled|enabled|masked)\s*$/i).each do |m|
       i << new(:name => m[0])
     end
     return i
@@ -27,14 +31,68 @@ Puppet::Type.type(:service).provide :systemd, :parent => :base do
     raise Puppet::Error, "Could not disable #{self.name}: #{output}", $!.backtrace
   end
 
+  def get_start_link_count
+    Dir.glob("/etc/rc*.d/S??#{@resource[:name]}").length
+  end
+
   def enabled?
     begin
-      systemctl("is-enabled", @resource[:name])
+      systemctl_info = systemctl(
+         'show',
+         @resource[:name],
+         '--property', 'LoadState',
+         '--property', 'UnitFileState',
+         '--no-pager'
+      )
+
+      svc_info = Hash.new
+      systemctl_info.split.each do |svc|
+        entry_pair = svc.split('=')
+        svc_info[entry_pair.first.to_sym] = entry_pair.last
+      end
+
+      # The masked state is equivalent to the disabled state in terms of
+      # comparison so we only care to check if it is masked if we want to keep
+      # it masked.
+      #
+      # We only return :mask if we're trying to mask the service. This prevents
+      # flapping when simply trying to disable a masked service.
+      return :mask if (@resource[:enable] == :mask) && (svc_info[:LoadState] == 'masked')
+      return :true if svc_info[:UnitFileState] == 'enabled'
+      if Facter.value(:osfamily) == 'debian'
+        ret = debian_enabled?(svc_info)
+        return ret if ret
+      end
     rescue Puppet::ExecutionFailure
-      return :false
+      # The execution of the systemd command can fail for quite a few reasons.
+      # In all of these cases, the failure of the query indicates that the
+      # service is disabled and therefore we simply return :false.
     end
 
-    :true
+    return :false
+  end
+
+  def debian_enabled?(svc_info)
+    # If UnitFileState == UnitFileState then we query the older way.
+    if svc_info[:UnitFileState] == 'UnitFileState'
+      system("/usr/sbin/invoke-rc.d", "--quiet", "--query", @resource[:name], "start")
+      if [104, 106].include?($CHILD_STATUS.exitstatus)
+        return :true
+      elsif [101, 105].include?($CHILD_STATUS.exitstatus)
+        # 101 is action not allowed, which means we have to do the check manually.
+        # 105 is unknown, which generally means the iniscript does not support query
+        # The debian policy states that the initscript should support methods of query
+        # For those that do not, peform the checks manually
+        # http://www.debian.org/doc/debian-policy/ch-opersys.html
+        if get_start_link_count >= 4
+          return :true
+        else
+          return :false
+        end
+      else
+        return :false
+      end
+    end
   end
 
   def status
@@ -47,11 +105,22 @@ Puppet::Type.type(:service).provide :systemd, :parent => :base do
   end
 
   def enable
+    output = systemctl("unmask", @resource[:name])
     output = systemctl("enable", @resource[:name])
   rescue Puppet::ExecutionFailure
     raise Puppet::Error, "Could not enable #{self.name}: #{output}", $!.backtrace
   end
 
+  def mask
+    self.disable
+
+    begin
+      output = systemctl("mask", @resource[:name])
+    rescue Puppet::ExecutionFailure
+      raise Puppet::Error, "Could not mask #{self.name}: #{output}", $!.backtrace
+    end
+  end
+
   def restartcmd
     [command(:systemctl), "restart", @resource[:name]]
   end

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

@@ -18,7 +18,7 @@ Puppet::Type.type(:service).provide :upstart, :parent => :debian do
     Facter.value(:operatingsystem) == 'LinuxMint',
   ]
 
-  defaultfor :operatingsystem => :ubuntu
+  defaultfor :operatingsystem => :ubuntu, :operatingsystemmajrelease => ["10.04", "12.04", "14.04", "14.10"]
 
   commands :start   => "/sbin/start",
            :stop    => "/sbin/stop",

data/lib/puppet/provider/user/pw.rb

@@ -8,6 +8,7 @@ Puppet::Type.type(:user).provide :pw, :parent => Puppet::Provider::NameService::
   has_features :manages_homedir, :allows_duplicates, :manages_passwords, :manages_expiry, :manages_shell
 
   defaultfor :operatingsystem => [:freebsd, :dragonfly]
+  confine    :operatingsystem => [:freebsd, :dragonfly]
 
   options :home, :flag => "-d", :method => :dir
   options :comment, :method => :gecos

data/lib/puppet/resource/catalog.rb

@@ -62,7 +62,7 @@ class Puppet::Resource::Catalog < Puppet::Graph::SimpleGraph
 
   def title_key_for_ref( ref )
     s = ref.index('[')
-    e = ref.index(']')
+    e = ref.rindex(']')
     if s && e && e > s
       a = [ref[0, s], ref[s+1, e-s-1]]
     else

data/lib/puppet/resource/status.rb

@@ -83,6 +83,15 @@ module Puppet
       #     while evaluating `@real_resource`.
       attr_reader :events
 
+      # @!attribute [rw] failed_dependencies
+      #   @return [Array<Puppet::Resource>] A cache of all
+      #   dependencies of this resource that failed to apply.
+      attr_accessor :failed_dependencies
+
+      def dependency_failed?
+        failed_dependencies && !failed_dependencies.empty?
+      end
+
       # A list of instance variables that should be serialized with this object
       # when converted to YAML.
       YAML_ATTRIBUTES = %w{@resource @file @line @evaluation_time @change_count

data/lib/puppet/resource/type.rb

@@ -73,8 +73,10 @@ class Puppet::Resource::Type
 
     # External documentation uses "parameters" but the internal name
     # is "arguments"
-    data['parameters'] = arguments.dup unless arguments.empty?
-
+    # Dump any arguments as source
+    data['parameters'] = Hash[arguments.map do |k,v|
+                                [k, v.respond_to?(:source_text) ? v.source_text : v]
+                              end]
     data['name'] = name
 
     unless RESOURCE_KINDS_TO_EXTERNAL_NAMES.has_key?(type)

data/lib/puppet/settings.rb

@@ -749,13 +749,13 @@ class Puppet::Settings
 
   class SearchPathElement < Struct.new(:name, :type); end
 
-  # The order in which to search for values.
+  # The order in which to search for values, without defaults.
   #
   # @param environment [String,Symbol] symbolic reference to an environment name
   # @param run_mode [Symbol] symbolic reference to a Puppet run mode
   # @return [Array<SearchPathElement>]
   # @api private
-  def searchpath(environment = nil, run_mode = preferred_run_mode)
+  def configsearchpath(environment = nil, run_mode = preferred_run_mode)
     searchpath = [
       SearchPathElement.new(:memory, :values),
       SearchPathElement.new(:cli, :values),
@@ -763,6 +763,16 @@ class Puppet::Settings
     searchpath << SearchPathElement.new(environment.intern, :environment) if environment
     searchpath << SearchPathElement.new(run_mode, :section) if run_mode
     searchpath << SearchPathElement.new(:main, :section)
+  end
+
+  # The order in which to search for values.
+  #
+  # @param environment [String,Symbol] symbolic reference to an environment name
+  # @param run_mode [Symbol] symbolic reference to a Puppet run mode
+  # @return [Array<SearchPathElement>]
+  # @api private
+  def searchpath(environment = nil, run_mode = preferred_run_mode)
+    searchpath = configsearchpath(environment, run_mode)
     searchpath << SearchPathElement.new(:application_defaults, :values)
     searchpath << SearchPathElement.new(:overridden_defaults, :values)
   end
@@ -799,6 +809,34 @@ class Puppet::Settings
     !@value_sets[:cli].lookup(param).nil?
   end
 
+  # Get values from a search path entry.
+  # @api private
+  def searchpath_values(source)
+    case source.type
+    when :values
+      @value_sets[source.name]
+    when :section
+      if @configuration_file && section = @configuration_file.sections[source.name]
+        ValuesFromSection.new(source.name, section)
+      end
+    when :environment
+      ValuesFromEnvironmentConf.new(source.name)
+    else
+      raise(Puppet::DevError, "Unknown searchpath case: #{source.type} for the #{source} settings path element.")
+    end
+  end
+
+  # Allow later inspection to determine if the setting was set by user
+  # config, rather than a default setting.
+  def set_by_config?(param)
+    param = param.to_sym
+    configsearchpath.any? do |source|
+      if vals = searchpath_values(source)
+        vals.lookup(param)
+      end
+    end
+  end
+
   # Patches the value for a param in a section.
   # This method is required to support the use case of unifying --dns-alt-names and
   # --dns_alt_names in the certificate face. Ideally this should be cleaned up.
@@ -947,6 +985,8 @@ Generated on #{Time.now}.
 
     return if sections.empty?
 
+    Puppet.debug("Applying settings catalog for sections #{sections.join(', ')}")
+
     begin
       catalog = to_catalog(*sections).to_ral
     rescue => detail
@@ -1143,20 +1183,7 @@ Generated on #{Time.now}.
 
   # Yield each search source in turn.
   def value_sets_for(environment, mode)
-    searchpath(environment, mode).collect do |source|
-      case source.type
-      when :values
-        @value_sets[source.name]
-      when :section
-        if @configuration_file && section = @configuration_file.sections[source.name]
-          ValuesFromSection.new(source.name, section)
-        end
-      when :environment
-        ValuesFromEnvironmentConf.new(source.name)
-      else
-        raise(Puppet::DevError, "Unknown searchpath case: #{source.type} for the #{source} settings path element.")
-      end
-    end.compact
+    searchpath(environment, mode).collect { |source| searchpath_values(source) }.compact
   end
 
   # Read the file in.