puppet 3.0.1 → 3.0.2.rc1

data/lib/puppet/agent.rb

@@ -10,13 +10,13 @@ class Puppet::Agent
   require 'puppet/agent/disabler'
   include Puppet::Agent::Disabler
 
-  attr_reader :client_class, :client, :splayed
-  attr_accessor :should_fork
+  attr_reader :client_class, :client, :splayed, :should_fork
 
   # Just so we can specify that we are "the" instance.
-  def initialize(client_class)
+  def initialize(client_class, should_fork=true)
     @splayed = false
 
+    @should_fork = should_fork
     @client_class = client_class
   end
 

data/lib/puppet/application/agent.rb

@@ -335,7 +335,6 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
     @daemon.set_signal_traps
 
     begin
-      @agent.should_fork = false
       exitstatus = @agent.run
     rescue => detail
       Puppet.log_exception(detail)
@@ -404,7 +403,7 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
     # if --no-client is set.
     require 'puppet/agent'
     require 'puppet/configurer'
-    @agent = Puppet::Agent.new(Puppet::Configurer)
+    @agent = Puppet::Agent.new(Puppet::Configurer, (not(Puppet[:onetime])))
 
     enable_disable_client(@agent) if options[:enable] or options[:disable]
 

data/lib/puppet/application/cert.rb

@@ -108,11 +108,10 @@ unless the '--all' option is set.
   Print the full-text version of a host's certificate.
 
 * revoke:
-  Revoke the certificate of a client. The certificate can be specified
-  either by its serial number (given as a decimal number or a
-  hexadecimal number prefixed by '0x') or by its hostname. The
-  certificate is revoked by adding it to the Certificate Revocation List
-  given by the 'cacrl' configuration option. Note that the puppet master
+  Revoke the certificate of a client. The certificate can be specified either
+  by its serial number (given as a hexadecimal number prefixed by '0x') or by its
+  hostname. The certificate is revoked by adding it to the Certificate Revocation
+  List given by the 'cacrl' configuration option. Note that the puppet master
   needs to be restarted after revoking certificates.
 
 * sign:

data/lib/puppet/application/kick.rb

@@ -144,6 +144,9 @@ with '--genconfig'.
   forking for each client to which to connect. The default is 1, meaning
   serial execution.
 
+* --puppetport:
+  Use the specified TCP port to connect to agents. Defaults to 8139.
+
 * --tag:
   Specify a tag for selecting the objects to apply. Does not work with
   the --test option.

data/lib/puppet/defaults.rb

@@ -1479,14 +1479,27 @@ database from within the Puppet Master process."
     }
   )
 
-  # This doesn't actually work right now.
-
   define_settings(:parser,
     :templatedir => {
         :default  => "$vardir/templates",
         :type     => :directory,
         :desc     => "Where Puppet looks for template files.  Can be a list of colon-separated
       directories.",
+    },
+
+    :allow_variables_with_dashes => {
+      :default => false,
+      :desc    => <<-'EOT'
+Permit hyphens (`-`) in variable names and issue deprecation warnings about
+them. This setting **should always be `false`;** setting it to `true`
+will cause subtle and wide-ranging bugs. It will be removed in a future version.
+
+Hyphenated variables caused major problems in the language, but were allowed
+between Puppet 2.7.3 and 2.7.14. If you used them during this window, we
+apologize for the inconvenience --- you can temporarily set this to `true`
+in order to upgrade, and can rename your variables at your leisure. Please
+revert it to `false` after you have renamed all affected variables.
+EOT
     }
   )
   define_settings(:puppetdoc,

data/lib/puppet/indirector/exec.rb

@@ -16,7 +16,7 @@ class Puppet::Indirector::Exec < Puppet::Indirector::Terminus
     # Add our name to it.
     external_command << name
     begin
-      output = execute(external_command, :combine => false)
+      output = execute(external_command, :failonfail => true, :combine => false)
     rescue Puppet::ExecutionFailure => detail
       raise Puppet::Error, "Failed to find #{name} via exec: #{detail}"
     end

data/lib/puppet/module_tool/skeleton/templates/generator/manifests/init.pp.erb

@@ -33,7 +33,7 @@
 #
 # === Copyright
 #
-# Copyright 2011 Your name here, unless otherwise noted.
+# Copyright <%= Time.now.year -%> Your name here, unless otherwise noted.
 #
 class <%= metadata.name %> {
 

data/lib/puppet/parser/functions/hiera_include.rb

@@ -2,10 +2,12 @@ module Puppet::Parser::Functions
   newfunction(:hiera_include) do |*args|
     require 'hiera_puppet'
     key, default, override = HieraPuppet.parse_args(args)
-    answer = HieraPuppet.lookup(key, default, self, override, :array)
-
-    method = Puppet::Parser::Functions.function(:include)
-    send(method, answer)
+    if answer = HieraPuppet.lookup(key, default, self, override, :array)
+      method = Puppet::Parser::Functions.function(:include)
+      send(method, answer)
+    else
+      raise Puppet::ParseError, "Could not find data item #{key}"
+    end
   end
 end
 

data/lib/puppet/parser/lexer.rb

@@ -100,6 +100,11 @@ class Puppet::Parser::Lexer
     def sort_tokens
       @string_tokens.sort! { |a, b| b.string.length <=> a.string.length }
     end
+
+    # Yield each token name and value in turn.
+    def each
+      @tokens.each {|name, value| yield name, value }
+    end
   end
 
   TOKENS = TokenList.new
@@ -232,10 +237,30 @@ class Puppet::Parser::Lexer
   end
   #:startdoc:
 
+  TOKENS.add_token :DOLLAR_VAR_WITH_DASH, %r{\$(?:::)?(?:[-\w]+::)*[-\w]+} do |lexer, value|
+    lexer.warn_if_variable_has_hyphen(value)
+
+    [TOKENS[:VARIABLE], value[1..-1]]
+  end
+  def (TOKENS[:DOLLAR_VAR_WITH_DASH]).acceptable?(context = {})
+    Puppet[:allow_variables_with_dashes]
+  end
+
   TOKENS.add_token :DOLLAR_VAR, %r{\$(::)?(\w+::)*\w+} do |lexer, value|
     [TOKENS[:VARIABLE],value[1..-1]]
   end
 
+  TOKENS.add_token :VARIABLE_WITH_DASH, %r{(?:::)?(?:[-\w]+::)*[-\w]+} do |lexer, value|
+    lexer.warn_if_variable_has_hyphen(value)
+
+    [TOKENS[:VARIABLE], value]
+  end
+  #:stopdoc: # Issue #4161
+  def (TOKENS[:VARIABLE_WITH_DASH]).acceptable?(context={})
+    Puppet[:allow_variables_with_dashes] and TOKENS[:VARIABLE].acceptable?(context)
+  end
+  #:startdoc:
+
   TOKENS.add_token :VARIABLE, %r{(::)?(\w+::)*\w+}
   #:stopdoc: # Issue #4161
   def (TOKENS[:VARIABLE]).acceptable?(context={})
@@ -514,9 +539,15 @@ class Puppet::Parser::Lexer
   def tokenize_interpolated_string(token_type,preamble='')
     value,terminator = slurpstring('"$')
     token_queue << [TOKENS[token_type[terminator]],preamble+value]
+    variable_regex = if Puppet[:allow_variables_with_dashes]
+                       TOKENS[:VARIABLE_WITH_DASH].regex
+                     else
+                       TOKENS[:VARIABLE].regex
+                     end
     if terminator != '$' or @scanner.scan(/\{/)
       token_queue.shift
-    elsif var_name = @scanner.scan(TOKENS[:VARIABLE].regex)
+    elsif var_name = @scanner.scan(variable_regex)
+      warn_if_variable_has_hyphen(var_name)
       token_queue << [TOKENS[:VARIABLE],var_name]
       tokenize_interpolated_string(DQ_continuation_token_types)
     else
@@ -547,4 +578,10 @@ class Puppet::Parser::Lexer
   def commentpush
     @commentstack.push(['', @line])
   end
+
+  def warn_if_variable_has_hyphen(var_name)
+    if var_name.include?('-')
+      Puppet.deprecation_warning("Using `-` in variable names is deprecated at #{file || '<string>'}:#{line}. See http://links.puppetlabs.com/puppet-hyphenated-variable-deprecation")
+    end
+  end
 end

data/lib/puppet/parser/relationship.rb

@@ -54,7 +54,9 @@ class Puppet::Parser::Relationship
       raise ArgumentError, "Could not find resource '#{target}' for relationship from '#{source}'"
     end
     Puppet.debug "Adding relationship from #{source} to #{target} with '#{param_name}'"
-    source_resource[param_name] ||= []
+    if source_resource[param_name].class != Array
+      source_resource[param_name] = [source_resource[param_name]].compact
+    end
     source_resource[param_name] << target
   end
 end

data/lib/puppet/provider.rb

@@ -164,7 +164,7 @@ class Puppet::Provider
         @confiner.confine :exists => @path, :for_binary => true
       end
 
-      Puppet::Provider::Command.new(@name, @path, Puppet::Util, Puppet::Util::Execution, { :custom_environment => @custom_environment })
+      Puppet::Provider::Command.new(@name, @path, Puppet::Util, Puppet::Util::Execution, { :failonfail => true, :combine => true, :custom_environment => @custom_environment })
     end
   end
 

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

@@ -24,7 +24,7 @@ Puppet::Type.type(:augeas).provide(:augeas) do
   include Puppet::Util::Diff
   include Puppet::Util::Package
 
-  confine :true => Puppet.features.augeas?
+  confine :feature => :augeas
 
   has_features :parse_commands, :need_to_run?,:execute_changes
 

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

@@ -11,38 +11,19 @@ Puppet::Type.type(:file).provide :windows do
     include Puppet::Util::Windows::Security
   end
 
-  ERROR_INVALID_SID_STRUCTURE = 1337
-
-  def id2name(id)
-    # If it's a valid sid, get the name. Otherwise, it's already a name, so
-    # just return it.
-    begin
-      if string_to_sid_ptr(id)
-        name = nil
-        Puppet::Util::ADSI.execquery(
-          "SELECT Name FROM Win32_Account WHERE SID = '#{id}'
-           AND LocalAccount = true"
-        ).each { |a| name ||= a.name }
-        return name
-      end
-    rescue Puppet::Util::Windows::Error => e
-      raise unless e.code == ERROR_INVALID_SID_STRUCTURE
-    end
-
-    id
-  end
-
   # Determine if the account is valid, and if so, return the UID
   def name2id(value)
-    # If it's a valid sid, then return it. Else, it's a name we need to convert
-    # to sid.
-    begin
-      return value if string_to_sid_ptr(value)
-    rescue Puppet::Util::Windows::Error => e
-      raise unless e.code == ERROR_INVALID_SID_STRUCTURE
-    end
+    Puppet::Util::Windows::Security.name_to_sid(value)
+  end
 
-    Puppet::Util::ADSI.sid_for_account(value) rescue nil
+  # If it's a valid SID, get the name. Otherwise, it's already a name,
+  # so just return it.
+  def id2name(id)
+    if Puppet::Util::Windows::Security.valid_sid?(id)
+      Puppet::Util::Windows::Security.sid_to_name(id)
+    else
+      id
+    end
   end
 
   # We use users and groups interchangeably, so use the same methods for both

data/lib/puppet/provider/group/ldap.rb

@@ -12,7 +12,7 @@ Puppet::Type.type(:group).provide :ldap, :parent => Puppet::Provider::Ldap do
     not specify one, but it is a potentially expensive operation, as it
     iterates across all existing groups to pick the appropriate next one."
 
-  confine :true => Puppet.features.ldap?, :false => (Puppet[:ldapuser] == "")
+  confine :feature => :ldap, :false => (Puppet[:ldapuser] == "")
 
   # We're mapping 'members' here because we want to make it
   # easy for the ldap user provider to manage groups.  This

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

@@ -41,7 +41,7 @@ Puppet::Type.type(:group).provide :windows_adsi do
   end
 
   def gid
-    Puppet::Util::ADSI.sid_for_account(@resource[:name])
+    Puppet::Util::Windows::Security.name_to_sid(@resource[:name])
   end
 
   def gid=(value)

data/lib/puppet/provider/ldap.rb

@@ -46,7 +46,11 @@ class Puppet::Provider::Ldap < Puppet::Provider
     @property_hash[:ensure] = :present
     self.class.resource_type.validproperties.each do |property|
       if val = resource.should(property)
-        @property_hash[property] = val
+        if property.to_s == 'gid'
+          self.gid = val
+        else
+          @property_hash[property] = val
+        end
       end
     end
   end

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

@@ -155,7 +155,7 @@ Puppet::Type.type(:macauthorization).provide :macauthorization, :parent => Puppe
     # paranoid given the low cost of quering the db once more.
     cmds = []
     cmds << :security << "authorizationdb" << "read" << resource[:name]
-    output = execute(cmds, :combine => false)
+    output = execute(cmds, :failonfail => false, :combine => false)
     current_values = Plist::parse_xml(output)
     current_values ||= {}
     specified_values = convert_plist_to_native_attributes(@property_hash)
@@ -186,11 +186,7 @@ Puppet::Type.type(:macauthorization).provide :macauthorization, :parent => Puppe
       Plist::Emit.save_plist(values, tmp.path)
       cmds = []
       cmds << :security << "authorizationdb" << "write" << name
-
-        output = execute(
-          cmds, :combine => false,
-
-            :stdinfile => tmp.path.to_s)
+      output = execute(cmds, :failonfail => false, :combine => false, :stdinfile => tmp.path.to_s)
     rescue Errno::EACCES => e
       raise Puppet::Error.new("Cannot save right to #{tmp.path}: #{e}")
     ensure

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

@@ -134,22 +134,18 @@ Puppet::Type.type(:package).provide :dpkg, :parent => Puppet::Provider::Package
 
   def hold
     self.install
-    begin
-      Tempfile.open('puppet_dpkg_set_selection') { |tmpfile|
-        tmpfile.write("#{@resource[:name]} hold\n")
-        tmpfile.flush
-        execute([:dpkg, "--set-selections"], :stdinfile => tmpfile.path.to_s)
-      }
+    Tempfile.open('puppet_dpkg_set_selection') do |tmpfile|
+      tmpfile.write("#{@resource[:name]} hold\n")
+      tmpfile.flush
+      execute([:dpkg, "--set-selections"], :failonfail => false, :combine => false, :stdinfile => tmpfile.path.to_s)
     end
   end
 
   def unhold
-    begin
-      Tempfile.open('puppet_dpkg_set_selection') { |tmpfile|
-        tmpfile.write("#{@resource[:name]} install\n")
-        tmpfile.flush
-        execute([:dpkg, "--set-selections"], :stdinfile => tmpfile.path.to_s)
-      }
+    Tempfile.open('puppet_dpkg_set_selection') do |tmpfile|
+      tmpfile.write("#{@resource[:name]} install\n")
+      tmpfile.flush
+      execute([:dpkg, "--set-selections"], :failonfail => false, :combine => false, :stdinfile => tmpfile.path.to_s)
     end
   end
 end

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

@@ -70,7 +70,7 @@ Puppet::Type.type(:package).provide :macports, :parent => Puppet::Provider::Pack
   end
 
   def query
-    result = self.class.parse_installed_query_line(execute([command(:port), "-q", :installed, @resource[:name]], :combine => false))
+    result = self.class.parse_installed_query_line(execute([command(:port), "-q", :installed, @resource[:name]], :failonfail => false, :combine => false))
     return {} if result.nil?
     return result
   end
@@ -79,7 +79,7 @@ Puppet::Type.type(:package).provide :macports, :parent => Puppet::Provider::Pack
     # We need both the version and the revision to be confident
     # we've got the latest revision of a specific version
     # Note we're still not doing anything with variants here.
-    info_line = execute([command(:port), "-q", :info, "--line", "--version", "--revision", @resource[:name]], :combine => false)
+    info_line = execute([command(:port), "-q", :info, "--line", "--version", "--revision", @resource[:name]], :failonfail => false, :combine => false)
     return nil if info_line == ""
 
     if newest = self.class.parse_info_query_line(info_line)

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

@@ -74,7 +74,7 @@ Puppet::Type.type(:package).provide(:msi, :parent => Puppet::Provider::Package)
     # because of the special quoting we need to do around the MSI
     # properties to use.
     command = ['msiexec.exe', '/qn', '/norestart', '/i', shell_quote(resource[:source]), install_options].flatten.compact.join(' ')
-    execute(command, :combine => true)
+    execute(command, :failonfail => false, :combine => true)
 
     check_result(exit_status)
   end
@@ -83,7 +83,7 @@ Puppet::Type.type(:package).provide(:msi, :parent => Puppet::Provider::Package)
     fail("The productcode property is missing.") unless properties[:productcode]
 
     command = ['msiexec.exe', '/qn', '/norestart', '/x', properties[:productcode], uninstall_options].flatten.compact.join(' ')
-    execute(command, :combine => true)
+    execute(command, :failonfail => false, :combine => true)
 
     check_result(exit_status)
   end

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

@@ -61,7 +61,7 @@ Puppet::Type.type(:package).provide :sun, :parent => Puppet::Provider::Package d
     cmd = [command(:pkginfo), '-l']
     cmd << '-d' << device if device
     cmd << @resource[:name]
-    pkgs = self.class.parse_pkginfo(execute(cmd, :failonfail => false))
+    pkgs = self.class.parse_pkginfo(execute(cmd, :failonfail => false, :combine => false))
     errmsg = case pkgs.size
              when 0; 'No message'
              when 1; pkgs[0]['ERROR']

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

@@ -59,14 +59,14 @@ Puppet::Type.type(:package).provide(:windows, :parent => Puppet::Provider::Packa
     installer = Puppet::Provider::Package::Windows::Package.installer_class(resource)
 
     command = [installer.install_command(resource), install_options].flatten.compact.join(' ')
-    execute(command, {:combine => true})
+    execute(command, :failonfail => false, :combine => true)
 
     check_result(exit_status)
   end
 
   def uninstall
     command = [package.uninstall_command, uninstall_options].flatten.compact.join(' ')
-    execute(command, {:combine => true})
+    execute(command, :failonfail => false, :combine => true)
 
     check_result(exit_status)
   end

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

@@ -1,7 +1,11 @@
 require 'puppet/util/package'
 
 Puppet::Type.type(:package).provide :yum, :parent => :rpm, :source => :rpm do
-  desc "Support via `yum`."
+  desc "Support via `yum`.
+  
+  Using this provider's `uninstallable` feature will not remove dependent packages. To 
+  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