puppet 2.7.14 → 2.7.16

data/CHANGELOG

@@ -1,3 +1,75 @@
+2.7.16
+===
+99fecc3 Update facter dep to reflect epoch 1
+3a06246 (#8858) Explicitly set SSL peer verification mode.
+cd4bee8 Test SSL setup code, not our stubbing of it.
+ff052b8 (maint) Add mailmap to identify contributors
+8dda6c2 (#14723) Fix http report description
+ebf5386 Remove EL-related test changes from this commit.
+2aea708 Revert changes to symbolic_modes.rb -- this test should indeed be pending (it should eventually work on Windows).
+b601bb4 Update acceptance tests to use confine instead of skip_test loops
+e619304 (#14761) Add boot, reboot to excludes list for redhat provider
+7c1d8c2 (maint) Disable upstart spec test on windows
+37df5c4 (#14615) Final stub fixes for the tests.
+f11dfd6 (#14615) Fix provider spec tests to work on non gentoo systems
+060810e maint: Make it easier to test the service provider
+c0cb0fa (Maint) Close filehandles after read in upstart
+0788ea2 (#14615) Exclude helperscripts in gentoo service provider
+be6062c Apply commit from master that varies ports during tests
+a45942b (#14297) Don't remove tty1 or rsyslog during upstart acceptance
+466ab49 (#14297) Define agent in upstart acceptance test
+f5d1f74 (#14297) Update upstart provider acceptance tests
+3c5ef40 (#14297) Clean up upstart provider and tests
+36c41e1 (#14343) Test cases for more forms of variable lookup
+6cca061 (#14297) Add acceptance test for upstart provider
+b9ed026 (#14297) Update spec tests for upstart provider
+91827e8 (#14297) Handle upstart services better
+3541db6 (#14343) Lookup in correct inherited scope
+2d83e22 (Maint) Added test for fully qualified variable
+c6e006e (#8174) Allow defines to reference topscope
+e27adf4 Evaluate node classes either in top or node scope
+a3d51b2 Removed topscope being overridden by node
+53e0057 Use internal domain name for module tool tests
+f4ba59e Use absolute_path in module install spec
+ead9d25 (Maint) Color console output when the win32console gem is installed
+a76d873 (#14424) Expand path of the target directory
+95b75e1 Fix unit test failure in fileserver due to modules
+da5361d Maint: De-genericize Puppet Forge references in module face
+3b144bf Revert "maint: use relative paths to fixtures."
+dae5539 (#14440) Hack to allow help faces to be used as API
+e862cad Fix broken man page rake task
+b26699a (#10146) `-` is not legal in variable names.
+7ce9e17 maint: use relative paths to fixtures.
+a7a532c Significantly improve compilation performance when using modules
+12c5bda Fix a stub of ansicolor that I missed
+ea740f6 Add Puppet::Util::Platform to abstract platform checks
+91a4a7d Don't use features to check for color in logging
+80fe59d Remove a bad test that can lead to random hangs...
+0efb4c2 (#14296) Improve template function error message.
+d5e0cdd (#14288) gem provider should tolerate bad lines.
+d2b3ba0 Revert "Fix incorrect argument handling for expire in NodeExpirer"
+7c7d4b6 Fix #14123 for Windows
+1c9bec0 Fix incorrect argument handling for expire in NodeExpirer
+7e92a7c Fix filebucket specs on Windows
+a713f07 (#8778) Make '' == undef commutative in the DSL
+24d4bb5 Revert "(#11004) Fix regex for pkg provider line matching"
+34da6f7 (#13651) Use magenta, not purple in Facter::Util::Colors
+e37b536 (#11004) Fix regex for pkg provider line matching
+9b47110 (#13956) Fix failing spec tests
+ca313dc (maint) Fix destinations_spec failure on windows
+cde3bee Just change Puppet settings in tests, rather than stubbing.
+6aa8441 (#11004) Support Solaris 11 output in pkg package provider
+61e7d3c maint: Fix pkg_spec test
+603b368 (#14173) Enforce that filebucket paths must be absolute
+b7828ed (#3452) Autorequire user for cron
+402a425 (#14127) Add integration tests for ssh_authorized_key
+85ee441 maint: refactor integration specs for ssh_authorized_key
+b4d1c65 (#14127) ssh_authorized_keys grammer fails on blank lines.
+36d959a (#14123) Puppet shouldn't explode if PATH contains ~nonexistent_user
+a281c48 (#13645) Add test cases to tagmail_spec
+f6ac1bb (#13645) Do not open a smtp connection if nothing to report
+f40cc71 (#12392): Colorize console output on Windows
+
 2.7.14
 ===
 42b20be (#13682) Fix acceptance test failures
@@ -2075,6 +2147,19 @@ d532e6d Fixing #3185 Rakefile is loading puppet.rb twice
 5aa596c Fix #3150 - require function doesn't like ::class syntax
 3457b87 Added time module to tagmail report
 
+2.6.16
+===
+65446c9 Revert "(#5246) Puppetd does not remove it's pidfile when it exits"
+
+2.6.15
+===
+f7829ec Stub mktmpdir and remove_entry_secure in os x package providers
+7ac1ec8 (#13260) Spec test to verify that mktmpdir is used
+0180200 Refactor pkgdmg specs
+c51447d (#13260) Use mktmpdir when downloading packages
+568ded5 Fix for bucket_path security vulnerability
+6bef2e6 Removed text/marshal support
+
 2.6.14
 ===
 ade5965 Remove unnecessary fallbacks in change_{user,group}

data/conf/redhat/puppet.spec

@@ -5,8 +5,8 @@
 %global confdir conf/redhat
 
 Name:           puppet
-Version:        2.7.14
-#Release:        0.1rc1%{?dist}
+Version:        2.7.16
+#Release:        0.1rc1.2%{?dist}
 Release:        1%{?dist}
 Summary:        A network tool for managing many disparate systems
 License:        ASL 2.0
@@ -20,7 +20,7 @@ Group:          System Environment/Base
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  facter >= 1.5
+BuildRequires:  facter >= 1.5, facter < 1:2.0
 BuildRequires:  ruby >= 1.8.5
 
 BuildArch:      noarch
@@ -36,7 +36,7 @@ Requires:       ruby-shadow
 %endif
 %endif
 
-Requires:       facter >= 1.5
+Requires:       facter >= 1.5, facter < 1:2.0
 Requires:       ruby >= 1.8.5
 %{!?_without_augeas:Requires: ruby-augeas}
 
@@ -67,6 +67,7 @@ The server can also function as a certificate authority and file server.
 
 %prep
 %setup -q -n %{name}-%{version}
+#%setup -q -n %{name}-%{version}rc1
 patch -s -p1 < conf/redhat/rundir-perms.patch
 
 
@@ -177,6 +178,7 @@ echo "D /var/run/%{name} 0755 %{name} %{name} -" > \
 %{_mandir}/man8/puppet-apply.8.gz
 %{_mandir}/man8/puppet-catalog.8.gz
 %{_mandir}/man8/puppet-describe.8.gz
+%{_mandir}/man8/puppet-ca.8.gz
 %{_mandir}/man8/puppet-cert.8.gz
 %{_mandir}/man8/puppet-certificate.8.gz
 %{_mandir}/man8/puppet-certificate_request.8.gz
@@ -189,9 +191,13 @@ echo "D /var/run/%{name} 0755 %{name} %{name} -" > \
 %{_mandir}/man8/puppet-filebucket.8.gz
 %{_mandir}/man8/puppet-help.8.gz
 %{_mandir}/man8/puppet-inspect.8.gz
+%{_mandir}/man8/puppet-instrumentation_data.8.gz
+%{_mandir}/man8/puppet-instrumentation_listener.8.gz
+%{_mandir}/man8/puppet-instrumentation_probe.8.gz
 %{_mandir}/man8/puppet-key.8.gz
 %{_mandir}/man8/puppet-kick.8.gz
 %{_mandir}/man8/puppet-man.8.gz
+%{_mandir}/man8/puppet-module.8.gz
 %{_mandir}/man8/puppet-node.8.gz
 %{_mandir}/man8/puppet-parser.8.gz
 %{_mandir}/man8/puppet-plugin.8.gz
@@ -283,6 +289,27 @@ fi
 rm -rf %{buildroot}
 
 %changelog
+* Wed Jun 13 2012 Matthaus Litteken <matthaus@puppelabs.com> - 2.7.16-1
+- Update for 2.7.16
+
+* Fri Jun 08 2012 Moses Mendoza <moses@puppetlabs.com> - 2.7.16-0.1rc1.2
+- Updated facter 2.0 dep to include epoch 1
+
+* Wed Jun 06 2012 Matthaus Litteken <matthaus@puppetlabs.com> - 2.7.16-0.1rc1
+- Update for 2.7.16rc1, added generated manpages
+
+* Fri Jun 01 2012 Matthaus Litteken <matthaus@puppetlabs.com> - 2.7.15-0.1rc4
+- Update for 2.7.15rc4
+
+* Tue May 29 2012 Moses Mendoza <moses@puppetlabs.com> - 2.7.15-0.1rc3
+- Update for 2.7.15rc3
+
+* Wed May 16 2012 Moses Mendoza <moses@puppetlabs.com> - 2.7.15-0.1rc2
+- Update for 2.7.15rc2
+
+* Tue May 15 2012 Moses Mendoza <moses@puppetlabs.com> - 2.7.15-0.1rc1
+- Update for 2.7.15rc1
+
 * Wed May 02 2012 Moses Mendoza <moses@puppetlabs.com> - 2.7.14-1
 - Update for 2.7.14
 

data/lib/puppet.rb

@@ -24,7 +24,7 @@ require 'puppet/util/run_mode'
 # it's also a place to find top-level commands like 'debug'
 
 module Puppet
-  PUPPETVERSION = '2.7.14'
+  PUPPETVERSION = '2.7.16'
 
   def Puppet.version
     PUPPETVERSION

data/lib/puppet/defaults.rb

@@ -47,11 +47,10 @@ module Puppet
       exits.  Comma-separate multiple values.  For a list of all values,
       specify 'all'."],
     :color => {
-      :default => (Puppet.features.microsoft_windows? ? "false" : "ansi"),
+      :default => "ansi",
       :type    => :setting,
       :desc    => "Whether to use colors when logging to the console.  Valid values are
-      `ansi` (equivalent to `true`), `html`, and `false`, which produces no color.
-      Defaults to false on Windows, as its console does not support ansi colors.",
+      `ansi` (equivalent to `true`), `html`, and `false`, which produces no color.",
     },
     :mkusers => [false,
       "Whether to create the necessary user and group that puppet agent will

data/lib/puppet/face/module/install.rb

@@ -2,10 +2,9 @@
 
 Puppet::Face.define(:module, '1.0.0') do
   action(:install) do
-    summary "Install a module from a repository or release archive."
+    summary "Install a module from the Puppet Forge or a release archive."
     description <<-EOT
-      Installs a module from the Puppet Forge, from a release archive file
-      on-disk, or from a private Forge-like repository.
+      Installs a module from the Puppet Forge or from a release archive file.
 
       The specified module will be installed into the directory
       specified with the `--target-dir` option, which defaults to
@@ -149,6 +148,7 @@ Puppet::Face.define(:module, '1.0.0') do
     when_invoked do |name, options|
       sep = File::PATH_SEPARATOR
       if options[:target_dir]
+        options[:target_dir] = File.expand_path(options[:target_dir])
         options[:modulepath] = "#{options[:target_dir]}#{sep}#{options[:modulepath]}"
       end
 

data/lib/puppet/face/module/search.rb

@@ -2,16 +2,16 @@ require 'puppet/util/terminal'
 
 Puppet::Face.define(:module, '1.0.0') do
   action(:search) do
-    summary "Search a repository for a module."
+    summary "Search the Puppet Forge for a module."
     description <<-EOT
-      Searches a repository for modules whose names, descriptions, or keywords
+      Searches the Puppet Forge for modules whose names, descriptions, or keywords
       match the provided search term.
     EOT
 
     returns "Array of module metadata hashes"
 
     examples <<-EOT
-      Search the default repository for a module:
+      Search the Puppet Forge for a module:
 
       $ puppet module search puppetlabs
       NAME          DESCRIPTION                          AUTHOR             KEYWORDS

data/lib/puppet/indirector/face.rb

@@ -72,7 +72,7 @@ class Puppet::Indirector::Face < Puppet::Face
 
   action :save do
     summary "API only: create or overwrite an object."
-    arguments "<object>"
+    arguments "<key>"
     description <<-EOT
       API only: create or overwrite an object. As the Faces framework does not
       currently accept data from STDIN, save actions cannot currently be invoked

data/lib/puppet/network/http_pool.rb

@@ -11,14 +11,23 @@ module Puppet::Network::HttpPool
 
   # Use cert information from a Puppet client to set up the http object.
   def self.cert_setup(http)
-    # Just no-op if we don't have certs.
-    return false unless FileTest.exist?(Puppet[:hostcert]) and FileTest.exist?(Puppet[:localcacert])
-
-    http.cert_store = ssl_host.ssl_store
-    http.ca_file = Puppet[:localcacert]
-    http.cert = ssl_host.certificate.content
-    http.verify_mode = OpenSSL::SSL::VERIFY_PEER
-    http.key = ssl_host.key.content
+    if FileTest.exist?(Puppet[:hostcert]) and FileTest.exist?(Puppet[:localcacert])
+      http.cert_store  = ssl_host.ssl_store
+      http.ca_file     = Puppet[:localcacert]
+      http.cert        = ssl_host.certificate.content
+      http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+      http.key         = ssl_host.key.content
+    else
+      # We don't have the local certificates, so we don't do any verification
+      # or setup at this early stage.  REVISIT: Shouldn't we supply the local
+      # certificate details if we have them?  The original code didn't.
+      # --daniel 2012-06-03
+
+      # Ruby 1.8 defaulted to this, but 1.9 defaults to peer verify, and we
+      # almost always talk to a dedicated, not-standard CA that isn't trusted
+      # out of the box.  This forces the expected state.
+      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+    end
   end
 
   # Retrieve a cached http instance if caching is enabled, else return

data/lib/puppet/node/environment.rb

@@ -88,9 +88,7 @@ class Puppet::Node::Environment
   end
 
   def module(name)
-    mod = Puppet::Module.new(name, :environment => self)
-    return nil unless mod.exist?
-    mod
+    modules.find {|mod| mod.name == name}
   end
 
   def module_by_forge_name(forge_name)

data/lib/puppet/parser/ast.rb

@@ -103,7 +103,7 @@ class Puppet::Parser::AST
     value = Puppet::Parser::Scope.number?(value) || value
 
     # "" == undef for case/selector/if
-    obj == value or (obj == "" and value == :undef)
+    obj == value or (obj == "" and value == :undef) or (obj == :undef and value == "")
   end
 end
 

data/lib/puppet/parser/compiler.rb

@@ -27,7 +27,7 @@ class Puppet::Parser::Compiler
     raise Puppet::Error, "#{detail} on node #{node.name}"
  end
 
-  attr_reader :node, :facts, :collections, :catalog, :node_scope, :resources, :relationships
+  attr_reader :node, :facts, :collections, :catalog, :resources, :relationships, :topscope
 
   # Add a collection to the global list.
   def add_collection(coll)
@@ -127,7 +127,7 @@ class Puppet::Parser::Compiler
 
   # Evaluate all of the classes specified by the node.
   def evaluate_node_classes
-    evaluate_classes(@node.classes, topscope)
+    evaluate_classes(@node.classes, @node_scope || topscope)
   end
 
   # Evaluate each specified class in turn.  If there are any classes we can't
@@ -201,12 +201,6 @@ class Puppet::Parser::Compiler
     @resource_overrides[resource.ref]
   end
 
-  # The top scope is usually the top-level scope, but if we're using AST nodes,
-  # then it is instead the node's scope.
-  def topscope
-    node_scope || @topscope
-  end
-
   private
 
   # If ast nodes are enabled, then see if we can find and evaluate one.
@@ -229,8 +223,6 @@ class Puppet::Parser::Compiler
 
     resource.evaluate
 
-    # Now set the node scope appropriately, so that :topscope can
-    # behave differently.
     @node_scope = topscope.class_scope(astnode)
   end
 

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

@@ -17,8 +17,9 @@ Puppet::Parser::Functions::newfunction(:template, :type => :rvalue, :doc =>
       begin
         wrapper.result
       rescue => detail
+        info = detail.backtrace.first.split(':')
         raise Puppet::ParseError,
-          "Failed to parse template #{file}: #{detail}"
+          "Failed to parse template #{file}:\n  Filepath: #{info[0]}\n  Line: #{info[1]}\n  Detail: #{detail}\n"
       end
     end.join("")
 end

data/lib/puppet/parser/lexer.rb

@@ -240,11 +240,11 @@ class Puppet::Parser::Lexer
   end
   #:startdoc:
 
-  TOKENS.add_token :DOLLAR_VAR, %r{\$(::)?([-\w]+::)*[-\w]+} do |lexer, value|
+  TOKENS.add_token :DOLLAR_VAR, %r{\$(::)?(\w+::)*\w+} do |lexer, value|
     [TOKENS[:VARIABLE],value[1..-1]]
   end
 
-  TOKENS.add_token :VARIABLE, %r{(::)?([-\w]+::)*[-\w]+}
+  TOKENS.add_token :VARIABLE, %r{(::)?(\w+::)*\w+}
   #:stopdoc: # Issue #4161
   def (TOKENS[:VARIABLE]).acceptable?(context={})
     [:DQPRE,:DQMID].include? context[:after]

data/lib/puppet/parser/scope.rb

@@ -241,6 +241,7 @@ class Puppet::Parser::Scope
     # Save the originating scope for the request
     options[:origin] = self unless options[:origin]
     table = ephemeral?(name) ? @ephemeral.last : @symtable
+
     if name =~ /^(.*)::(.+)$/
       begin
         qualified_scope($1).twoscope_lookupvar($2, options.merge({:origin => nil}))
@@ -250,10 +251,10 @@ class Puppet::Parser::Scope
         :undefined
       end
     # If the value is present and either we are top/node scope or originating scope...
-    elsif (ephemeral_include?(name) or table.include?(name)) and (compiler and self == compiler.topscope or (self.resource and self.resource.type == "Node") or self == options[:origin])
+    elsif (ephemeral_include?(name) or table.include?(name)) and (compiler and self == compiler.topscope or (resource and resource.type == "Node") or self == options[:origin])
       table[name]
     elsif resource and resource.type == "Class" and parent_type = resource.resource_type.parent
-      class_scope(parent_type).twoscope_lookupvar(name,options.merge({:origin => nil}))
+      qualified_scope(parent_type).twoscope_lookupvar(name,options.merge({:origin => nil}))
     elsif parent
       parent.twoscope_lookupvar(name, options)
     else

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

@@ -26,7 +26,9 @@ Puppet::Type.type(:package).provide :gem, :parent => Puppet::Provider::Package d
     end
 
     begin
-      list = execute(gem_list_command).lines.map {|set| gemsplit(set) }
+      list = execute(gem_list_command).lines.
+        map {|set| gemsplit(set) }.
+        reject {|x| x.nil? }
     rescue Puppet::ExecutionFailure => detail
       raise Puppet::Error, "Could not list gems: #{detail}"
     end

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

@@ -22,8 +22,8 @@ Puppet::Type.type(:package).provide :pkg, :parent => Puppet::Provider::Package d
     packages
   end
 
-  self::REGEX = /^(\S+)(?:\s+\(.*?\))?\s+(\S+)\s+(\S+)\s+\S+$/
-  self::FIELDS = [:name, :version, :status]
+  self::REGEX = /^(\S+)(?:\s+\(.*?\))?\s+(\S+)\s+(\S+)?\s+(\S+)$/
+  self::FIELDS = [:name, :version, :status, :flags]
 
   def self.parse_line(line)
     hash = {}
@@ -35,6 +35,22 @@ Puppet::Type.type(:package).provide :pkg, :parent => Puppet::Provider::Package d
 
       hash[:provider] = self.name
 
+      # on solaris 11 we do not have a status field because the status
+      # seems to be merged in the flags field. Simulate old behaviour on
+      # solaris 11
+      flags = hash.delete(:flags)
+      unless hash[:status]
+        hash[:status] = case flags
+          when /^i/
+            'installed'
+          when /^-/
+            'known'
+          else
+            warning "unknown package state for #{hash[:name]}: #{flags}"
+            'unknown'
+        end
+      end
+
       if hash[:status] == "installed"
         hash[:ensure] = :present
       else