puppet 2.7.11 → 2.7.12

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

@@ -17,7 +17,7 @@ Puppet::Type.type(:package).provide :pkg, :parent => Puppet::Provider::Package d
       hash = {}
 
       # now turn each returned line into a package object
-      process.each { |line|
+      process.each_line { |line|
         if hash = parse_line(line)
           packages << new(hash)
         end

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

@@ -65,7 +65,7 @@ Puppet::Type.type(:package).provide :pkgdmg, :parent => Puppet::Provider::Packag
     if %r{\A[A-Za-z][A-Za-z0-9+\-\.]*://} =~ cached_source
       cached_source = "/tmp/#{name}"
       begin
-        curl "-o", cached_source, "-C", "-", "-k", "-s", "--url", source
+        curl "-o", cached_source, "-C", "-", "-k", "-L", "-s", "--url", source
         Puppet.debug "Success: curl transfered [#{name}]"
       rescue Puppet::ExecutionFailure
         Puppet.debug "curl did not transfer [#{name}].  Falling back to slower open-uri transfer methods."

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

@@ -20,7 +20,7 @@ Puppet::Type.type(:package).provide :pkgutil, :parent => :sun, :source => :sun d
     correct_wgetopts = false
     [ "/opt/csw/etc/pkgutil.conf", "/etc/opt/csw/pkgutil.conf" ].each do |confpath|
       File.open(confpath) do |conf|
-        conf.each {|line| correct_wgetopts = true if line =~ /^\s*wgetopts\s*=.*(-nv|-q|--no-verbose|--quiet)/ }
+        conf.each_line {|line| correct_wgetopts = true if line =~ /^\s*wgetopts\s*=.*(-nv|-q|--no-verbose|--quiet)/ }
       end
     end
     if ! correct_wgetopts

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

@@ -28,7 +28,7 @@ Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Packa
       end
 
       packages = []
-      search_output.each do |search_result|
+      search_output.each_line do |search_result|
         match = result_format.match(search_result)
 
         if match
@@ -89,7 +89,7 @@ Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Packa
       end
 
       packages = []
-      search_output.each do |search_result|
+      search_output.each_line do |search_result|
         match = result_format.match(search_result)
 
         if match

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

@@ -37,7 +37,7 @@ Puppet::Type.type(:package).provide :rpm, :source => :rpm, :parent => Puppet::Pr
     begin
       execpipe("#{command(:rpm)} -qa #{sig} --nodigest --qf '#{NEVRAFORMAT}\n'") { |process|
         # now turn each returned line into a package object
-        process.each { |line|
+        process.each_line { |line|
           hash = nevra_to_hash(line)
           packages << new(hash)
         }

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

@@ -39,7 +39,7 @@ Puppet::Type.type(:package).provide :sun, :parent => Puppet::Provider::Package d
     execpipe(cmd) { |process|
       # we're using the long listing, so each line is a separate
       # piece of information
-      process.each { |line|
+      process.each_line { |line|
         case line
         when /^$/
           hash[:provider] = :sun

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

@@ -4,10 +4,16 @@ Puppet::Type.type(:package).provide :zypper, :parent => :rpm do
   has_feature :versionable
 
   commands :zypper => "/usr/bin/zypper"
-  commands :rpm    => "rpm"
 
   confine    :operatingsystem => [:suse, :sles, :sled, :opensuse]
 
+  #on zypper versions <1.0, the version option returns 1
+  #some versions of zypper output on stderr
+  def zypper_version
+    cmd = [self.class.command(:zypper),"--version"]
+    execute(cmd, { :failonfail => false, :combine => true})
+  end
+
   # Install a package using 'zypper'.
   def install
     should = @resource.should(:ensure)
@@ -22,7 +28,33 @@ Puppet::Type.type(:package).provide :zypper, :parent => :rpm do
       # Add the package version
       wanted = "#{wanted}-#{should}"
     end
-    output = zypper "--quiet", :install, "-l", "-y", wanted
+
+    #This has been tested with following zypper versions
+    #SLE 10.2: 0.6.104
+    #SLE 11.0: 1.0.8
+    #OpenSuse 10.2: 0.6.13
+    #OpenSuse 11.2: 1.2.8
+    #Assume that this will work on newer zypper versions
+
+    #extract version numbers and convert to integers
+    major, minor, patch = zypper_version.scan(/\d+/).map{ |x| x.to_i }
+    self.debug "Detected zypper version #{major}.#{minor}.#{patch}"
+
+    #zypper version < 1.0 does not support --quiet flag
+    quiet = "--quiet"
+    if major < 1
+      quiet = "--terse"
+    end
+
+    license = "--auto-agree-with-licenses"
+    noconfirm = "--no-confirm"
+
+    #zypper 0.6.13 (OpenSuSE 10.2) does not support auto agree with licenses
+    if major < 1 and minor <= 6 and patch <= 13
+      zypper quiet, :install, noconfirm, wanted
+    else
+      zypper quiet, :install, license, noconfirm, wanted
+    end
 
     unless self.query
       raise Puppet::ExecutionFailure.new(
@@ -36,7 +68,7 @@ Puppet::Type.type(:package).provide :zypper, :parent => :rpm do
     #zypper can only get a list of *all* available packages?
     output = zypper "list-updates"
 
-    if output =~ /#{Regexp.escape @resource[:name]}\s*\|\s*([^\s\|]+)/
+    if output =~ /#{Regexp.escape @resource[:name]}\s*\|.*?\|\s*([^\s\|]+)/
       return $1
     else
       # zypper didn't find updates, pretend the current

data/lib/puppet/provider/scheduled_task/win32_taskscheduler.rb

@@ -6,8 +6,12 @@ if Puppet.features.microsoft_windows?
 end
 
 Puppet::Type.type(:scheduled_task).provide(:win32_taskscheduler) do
-  desc 'This uses the win32-taskscheduler gem to provide support for
-    managing scheduled tasks on Windows.'
+  desc %q{This provider uses the win32-taskscheduler gem to manage scheduled
+    tasks on Windows.
+
+    Puppet requires version 0.2.1 or later of the win32-taskscheduler gem;
+    previous versions can cause "Could not evaluate: The operation completed
+    successfully" errors.}
 
   defaultfor :operatingsystem => :windows
   confine    :operatingsystem => :windows

data/lib/puppet/provider/selmodule/semodule.rb

@@ -21,7 +21,7 @@ Puppet::Type.type(:selmodule).provide(:semodule) do
   def exists?
     self.debug "Checking for module #{@resource[:name]}"
     execpipe("#{command(:semodule)} --list") do |out|
-      out.each do |line|
+      out.each_line do |line|
         if line =~ /#{@resource[:name]}\b/
           return :true
         end
@@ -118,7 +118,7 @@ Puppet::Type.type(:selmodule).provide(:semodule) do
     begin
       execpipe("#{command(:semodule)} --list") do |output|
         lines = output.readlines
-        lines.each do |line|
+        lines.each_line do |line|
           line.chomp!
           bits = line.split
           if bits[0] == @resource[:name]

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

@@ -24,7 +24,7 @@ Puppet::Type.type(:service).provide :base do
     regex = Regexp.new(@resource[:pattern])
     self.debug "Executing '#{ps}'"
     IO.popen(ps) { |table|
-      table.each { |line|
+      table.each_line { |line|
         if regex.match(line)
           ary = line.sub(/^\s+/, '').split(/\s+/)
           return ary[1]

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

@@ -35,6 +35,8 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do
     Note that this allows you to do something `launchctl` can't do, which is to
     be in a state of "stopped/enabled" or "running/disabled".
 
+    Note that this provider does not support overriding 'restart' or 'status'.
+
   EOT
 
   include Puppet::Util::Warnings
@@ -192,6 +194,7 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do
   # conditionally enable at load, then disable by modifying the plist file
   # directly.
   def start
+    return ucommand(:start) if resource[:start]
     job_path, job_plist = plist_from_label(resource[:name])
     did_enable_job = false
     cmds = []
@@ -212,6 +215,7 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do
 
 
   def stop
+    return ucommand(:stop) if resource[:stop]
     job_path, job_plist = plist_from_label(resource[:name])
     did_disable_job = false
     cmds = []

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

@@ -30,7 +30,7 @@ Puppet::Type.type(:service).provide :src, :parent => :base do
   end
 
   def restart
-      execute([command(:lssrc), "-Ss", @resource[:name]]).each do |line|
+      execute([command(:lssrc), "-Ss", @resource[:name]]).each_line do |line|
         args = line.split(":")
 
         next unless args[0] == @resource[:name]
@@ -62,7 +62,7 @@ Puppet::Type.type(:service).provide :src, :parent => :base do
   end
 
   def status
-      execute([command(:lssrc), "-s", @resource[:name]]).each do |line|
+      execute([command(:lssrc), "-s", @resource[:name]]).each_line do |line|
         args = line.split
 
         # This is the header line

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

@@ -20,7 +20,7 @@ Puppet::Type.type(:service).provide :upstart, :parent => :init do
   def self.instances
     instances = []
     execpipe("#{command(:initctl)} list") { |process|
-      process.each { |line|
+      process.each_line { |line|
         # needs special handling of services such as network-interface:
         # initctl list:
         # network-interface (lo) start/running

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

@@ -5,11 +5,12 @@ require 'win32/service' if Puppet.features.microsoft_windows?
 Puppet::Type.type(:service).provide :windows do
 
   desc <<-EOT
-    Support for Windows Service Control Manager (SCM).
+    Support for Windows Service Control Manager (SCM). This provider can
+    start, stop, enable, and disable services, and the SCM provides working
+    status methods for all services.
 
-    Services are controlled according to the capabilities of the `win32-service`
-    gem. All SCM operations (start/stop/enable/disable/query) are supported.
-    Control of service groups (dependencies) is not yet supported.
+    Control of service groups (dependencies) is not yet supported, nor is running
+    services as a specific user.
   EOT
 
   defaultfor :operatingsystem => :windows

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

@@ -148,7 +148,7 @@ Puppet::Type.type(:user).provide :aix, :parent => Puppet::Provider::AixObject do
   # Get the groupname from its id
   def self.groupname_by_id(gid)
     groupname=nil
-    execute(lsgroupscmd("ALL")).each { |entry|
+    execute(lsgroupscmd("ALL")).each_line { |entry|
       attrs = self.parse_attr_list(entry, nil)
       if attrs and attrs.include? :id and gid == attrs[:id].to_i
         groupname = entry.split(" ")[0]
@@ -229,9 +229,9 @@ Puppet::Type.type(:user).provide :aix, :parent => Puppet::Provider::AixObject do
     user = @resource[:name]
     f = File.open("/etc/security/passwd", 'r')
     # Skip to the user
-    f.each { |l| break if l  =~ /^#{user}:\s*$/ }
+    f.each_line { |l| break if l  =~ /^#{user}:\s*$/ }
     if ! f.eof?
-      f.each { |l|
+      f.each_line { |l|
         # If there is a new user stanza, stop
         break if l  =~ /^\S*:\s*$/
         # If the password= entry is found, return it

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

@@ -54,6 +54,12 @@ Puppet::Type.type(:user).provide :pw, :parent => Puppet::Provider::NameService::
     cmd
   end
 
+  def deletecmd
+    cmd = super
+    cmd << "-r" if @resource.managehome?
+    cmd
+  end
+
   def create
     super
 

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

@@ -1,7 +1,7 @@
 require 'puppet/util/adsi'
 
 Puppet::Type.type(:user).provide :windows_adsi do
-  desc "User management for Windows."
+  desc "Local user management for Windows."
 
   defaultfor :operatingsystem => :windows
   confine    :operatingsystem => :windows

data/lib/puppet/resource/catalog.rb

@@ -105,9 +105,9 @@ class Puppet::Resource::Catalog < Puppet::SimpleGraph
     # isn't sufficient.
     if existing = @resource_table[newref]
       return if existing == resource
-      resource_definition = " at #{resource.file}:#{resource.line}" if resource.file and resource.line
-      existing_definition = " at #{existing.file}:#{existing.line}" if existing.file and existing.line
-      msg = "Cannot alias #{resource.ref} to #{key.inspect}#{resource_definition}; resource #{newref.inspect} already defined#{existing_definition}"
+      resource_declaration = " at #{resource.file}:#{resource.line}" if resource.file and resource.line
+      existing_declaration = " at #{existing.file}:#{existing.line}" if existing.file and existing.line
+      msg = "Cannot alias #{resource.ref} to #{key.inspect}#{resource_declaration}; resource #{newref.inspect} already declared#{existing_declaration}"
       raise ArgumentError, msg
     end
     @resource_table[newref] = resource
@@ -569,17 +569,17 @@ class Puppet::Resource::Catalog < Puppet::SimpleGraph
 
   private
 
-  # Verify that the given resource isn't defined elsewhere.
+  # Verify that the given resource isn't declared elsewhere.
   def fail_on_duplicate_type_and_title(resource)
     # Short-curcuit the common case,
     return unless existing_resource = @resource_table[title_key_for_ref(resource.ref)]
 
     # If we've gotten this far, it's a real conflict
-    msg = "Duplicate definition: #{resource.ref} is already defined"
+    msg = "Duplicate declaration: #{resource.ref} is already declared"
 
     msg << " in file #{existing_resource.file} at line #{existing_resource.line}" if existing_resource.file and existing_resource.line
 
-    msg << "; cannot redefine" if resource.line or resource.file
+    msg << "; cannot redeclare" if resource.line or resource.file
 
     raise DuplicateResourceError.new(msg)
   end

data/lib/puppet/resource/type.rb

@@ -71,6 +71,8 @@ class Puppet::Resource::Type
 
     set_resource_parameters(resource, scope)
 
+    resource.add_edge_to_stage
+
     code.safeevaluate(scope) if code
 
     evaluate_ruby_code(resource, scope) if ruby_code

data/lib/puppet/ssl/certificate_request.rb

@@ -146,74 +146,4 @@ class Puppet::SSL::CertificateRequest < Puppet::SSL::Base
       sort.
       uniq
   end
-
-  # Return the set of extensions requested on this CSR, in a form designed to
-  # be useful to Ruby: a hash.  Which, not coincidentally, you can pass
-  # successfully to the OpenSSL constructor later, if you want.
-  def request_extensions
-    raise Puppet::Error, "CSR needs content to extract fields" unless @content
-
-    # Prefer the standard extReq, but accept the Microsoft specific version as
-    # a fallback, if the standard version isn't found.
-    ext = @content.attributes.find {|x| x.oid == "extReq" } or
-      @content.attributes.find {|x| x.oid == "msExtReq" }
-    return [] unless ext
-
-    # Assert the structure and extract the names into an array of arrays.
-    unless ext.value.is_a? OpenSSL::ASN1::Set
-      raise Puppet::Error, "In #{ext.oid}, expected Set but found #{ext.value.class}"
-    end
-
-    unless ext.value.value.is_a? Array
-      raise Puppet::Error, "In #{ext.oid}, expected Set[Array] but found #{ext.value.value.class}"
-    end
-
-    unless ext.value.value.length == 1
-      raise Puppet::Error, "In #{ext.oid}, expected Set[Array[...]], but found #{ext.value.value.length} items in the array"
-    end
-
-    san = ext.value.value.first
-    unless san.is_a? OpenSSL::ASN1::Sequence
-      raise Puppet::Error, "In #{ext.oid}, expected Set[Array[Sequence[...]]], but found #{san.class}"
-    end
-    san = san.value
-
-    # OK, now san should be the array of items, validate that...
-    index = -1
-    san.map do |name|
-      index += 1
-
-      unless name.is_a? OpenSSL::ASN1::Sequence
-        raise Puppet::Error, "In #{ext.oid}, expected request extension record #{index} to be a Sequence, but found #{name.class}"
-      end
-      name = name.value
-
-      # OK, turn that into an extension, to unpack the content.  Lovely that
-      # we have to swap the order of arguments to the underlying method, or
-      # perhaps that the ASN.1 representation chose to pack them in a
-      # strange order where the optional component comes *earlier* than the
-      # fixed component in the sequence.
-      case name.length
-      when 2
-        ev = OpenSSL::X509::Extension.new(name[0].value, name[1].value)
-        { "oid" => ev.oid, "value" => ev.value }
-
-      when 3
-        ev = OpenSSL::X509::Extension.new(name[0].value, name[2].value, name[1].value)
-        { "oid" => ev.oid, "value" => ev.value, "critical" => ev.critical? }
-
-      else
-        raise Puppet::Error, "In #{ext.oid}, expected extension record #{index} to have two or three items, but found #{name.length}"
-      end
-    end.flatten
-  end
-
-  def subject_alt_names
-    @subject_alt_names ||= request_extensions.
-      select {|x| x["oid"] = "subjectAltName" }.
-      map {|x| x["value"].split(/\s*,\s*/) }.
-      flatten.
-      sort.
-      uniq
-  end
 end

data/lib/puppet/transaction.rb

@@ -235,7 +235,7 @@ class Puppet::Transaction
   def initialize(catalog, report = nil)
     @catalog = catalog
 
-    @report = report || Puppet::Transaction::Report.new("apply", catalog.version)
+    @report = report || Puppet::Transaction::Report.new("apply", catalog.version, Puppet[:environment])
 
     @event_manager = Puppet::Transaction::EventManager.new(self)
 

data/lib/puppet/transaction/report.rb

@@ -10,7 +10,7 @@ class Puppet::Transaction::Report
 
   indirects :report, :terminus_class => :processor
 
-  attr_accessor :configuration_version, :host
+  attr_accessor :configuration_version, :host, :environment
   attr_reader :resource_statuses, :logs, :metrics, :time, :kind, :status
 
   # This is necessary since Marshall doesn't know how to
@@ -68,7 +68,7 @@ class Puppet::Transaction::Report
     @status = compute_status(resource_metrics, change_metric)
   end
 
-  def initialize(kind, configuration_version=nil)
+  def initialize(kind, configuration_version=nil, environment=nil)
     @metrics = {}
     @logs = []
     @resource_statuses = {}
@@ -79,6 +79,7 @@ class Puppet::Transaction::Report
     @report_format = 2
     @puppet_version = Puppet.version
     @configuration_version = configuration_version
+    @environment = environment
     @status = 'failed' # assume failed until the report is finalized
   end
 

data/lib/puppet/type.rb

@@ -1258,7 +1258,7 @@ class Type
             require => File[\"/usr/local/scripts\"]
           }
 
-      Multiple dependencies can be specified by providing a comma-seperated list
+      Multiple dependencies can be specified by providing a comma-separated list
       of resources, enclosed in square brackets:
 
           require => [ File[\"/usr/local\"], File[\"/usr/local/scripts\"] ]