puppet 2.6.4 → 2.6.5

data/CHANGELOG

@@ -1,3 +1,150 @@
+2.6.5
+=====
+30fa41d Updated CHANGELOG for 2.6.5rc5
+b481321 (#6337) Fix Ruby warning on 1.8.6 about "future compatibility"
+dcce45c (#6353) Restore the ability to store paths in the filebucket
+0450197 (#6126) Puppet inspect now reports status after run completes.
+960890f (#6364) Adjust mis-translated regex in mount provider for AIX
+9e0f9c5 Updated CHANGELOG for 2.6.5rc4
+664ef67 (#3646) Fix the documentation fix for `puppet apply --apply`
+4b6519a Updated CHANGELOG for 2.6.5rc3
+7ef2fbf Updated fix for #3646 - apply / compile documentation
+193016d (#5977) fix spec test failure when new applications are introduced.
+c08fc1b Updated CHANGELOG for 2.6.5rc2
+1f89906 (#6257) Speed up PUT and POST requests under rack
+70a43c4 Updated CHANGELOG and version for 2.6.5rc1
+f108f03 (#6018) Nick F's --help text for puppet inspect.
+04ea826 (#5823) document the not-an-API status of set_run_mode
+4ff5769 (#5823) run mode can now be set dynamically...
+bddfa1e (6114) Update the audit metaparameter for 2.6.5.
+ac8d316 Fix for #5755 -- making zaml serialization robust over projected objects
+c912a2a (#4139) hook log autoflush into global defaults
+f9e2e2b Augmentation of tests for prior commit
+392504a Fix to fix for #5755 -- backref serialization issues in zaml
+a732a15 Fixed #5564 - Added some more fqdn_rand documentation
+f279f2c Fixed #4968 - Updated list of options turned on by --test in documentation
+ce5a2bf (#5061) - allow special hostclass/define variables to be evaluated as defaults.
+fd73874 (#6107) Fix an error when auditing a file with empty content
+530496b Remove already initialized constant warning from file_spec.rb tests
+76788f8 (#5566) Treat source only File checksums as syntax errors when used with content
+d657292 Rename variable used in File type validation to be more clear
+3398139 Remove invalid "timestamp" and "time", and add missing "ctime" File checksum types.
+6c93eb2 Remove order dependency when specifying source and checksum on File type
+3a125d4 Bug #5755 -- ZAML generates extra newline in some hash backreferences.
+50c12e5 bug #5681 -- code fix to handle AIX mount output
+139760b Bug #5681 -- parse AIX mount command output.
+2f74d83 Spec for #5681 to allow parsing of AIX mount output in mount provider
+878f266 Fixed #6091 - Changed POSIX path matching to allow multiple leading slashes
+eb97aa5 Bug #6091 -- test leading double-slash in filenames are allowed.
+1bfc9a0 Fixed #6071 - Fixed typo and improved exec path error message
+c50a48e Fixed #6061 - Allowed -1 as password min/max age
+bf44e72 Bug #6061 -- verify that negative {min,max}_password_age are accepted.
+af1c1fe Feature #5855 -- fix withenv call in freebsd package provider
+d871641 Feature #5855 -- undefined method 'withenv' in FreeBSD package provider.
+f1ab588 Fixed #6009 - nested member list vs directory service group provider
+86a2a00 (#5944) Remove documentation of define() when used on nodes, as it is not a supported use of this function.
+2b9f653 (#5944) Further edits of inline defined() documentation.
+5d108e8 (#5944) Improve documentation of defined() function
+7d38ab2 (#5594) Update documentation of exec resource type.
+67e1bba (#5931) Prevent errors when calling insync? on audited properties
+0f9d236 Maint: Removed dead code from resource harness.
+0765afb Maint: Rename misleading insync? method in file provider
+0084b08 (#5548) Specify return values of manual status commands in service type description.
+dd332f6 Fixed #6002 - Added note about function execution
+3cfbd07 (#5045) Cleaning up some tests and code
+a2036ea (#5045) External node classifiers should be able to specify params for classes
+18ca97b (#5045) Adds support to resource/type to also accept a param hash
+70630b9 Fix #3165 Ralsh (bin/puppet resource) can't manage files
+1fd3600 Fixed #3646 - Added documentation for compile and apply to man page
+ae48634 Fixed #5914 Removed genconfig = true from genconfig output
+7e7f342 Fixed #1657 - Added note about target file
+069f29b Fixed #2096 - clarified option modification and tested it is working
+66b442b Fixes #5916 - Cleanup of unused doc methods and documentation
+9b74968 Modified rubydoc in lib/puppet/util/command_line/puppetca to fix inaccurate description of --clean.
+e58f5dc Fixed #5742 - Removed legacy fqdn option from documentation
+4d1b51f Fixed #5167 - misleading documentation in the defaults of [main]
+c1b5c7f (#5913) Fix Puppet::Application.find constant lookup behavior
+7b3b56e (5977) Puppet::Applications can be loaded from multiple paths.
+f9bfb96 (#5900) Include ResourceStatus#failed in serialized reports
+79b6332 (#5882) Added error-handling for bucketing files in puppet inspect
+17843d5 (#5882) Added error-handling to puppet inspect when auditing
+1a6fab2 (#5171) Made "puppet inspect" upload audited files to a file bucket
+a7cd185 Prep for #5171: Added a missing require to inspect application.
+71ac9cf Locked Puppet license to GPLv2
+abc6256 (#5838) Support paths as part of file bucket requests.
+002f9f1 (#5838) Improve the quality of file bucket specs.
+94d7179 (#5838) Make file bucket dipper efficient when saving a file that already exists
+89f5692 (#5838) Implemented the "head" method for FileBucketFile::File terminus.
+9cfd3d5 (#5838) Reworked file dipper spec to perform less stubbing.
+c514c64 (#5838) Added support for HEAD requests to the indirector.
+2b9b7a5 (#5838) Refactored error handling logic into find_in_cache.
+08561b2 (#5838) Refactored Puppet::Network::Rights#fail_on_deny
+87c5c30 (#5910) Improved logging when declared classes cannot be found:
+4efc98a maint: Remove unused Rakefile in spec directory
+a002231 (#5171) Made filebucket able to perform diffs
+8f314f2 (#5710) Removed unnecessary calls to insync?
+e270086 Prep for fixing #5710: Refactor stub provider in resource harness spec
+c57a677 Maint: test partial resource failure
+8aa8b9d (#5799) Simplify report dir creation
+2d88844 maint: Add vim swap files to .gitignore
+3d3baec maint: Remove rspec options from the Rakefile
+df65304 maint: Inspect reports should have audited = true on events
+4c9eca1 Maint: Added "skipped" to the YAML output for Puppet::Resource::Status
+717670f (#5771): Fix spec failures associated with rspec upgrade
+52760a4 (#5771) Upgrade rspec to version 2
+7603b05 maint: remove stray debug statement.
+7661ba8 maint: Prune #inspect methods on various objects
+80bfb54 (#5758) Verify that report events are correctly created
+de85f8d Prep work for #5758: set audited=true on all audit events
+e162da9 Prep work for #5758: clean up initializer for Puppet::Transaction::Event
+06a8d1e Fix #5698 puppet inspect shouldn't report of attributes of deleted files
+1f72c31 (#5715) Added attributes resource_type and title to Puppet::Resource::Status.
+a6cd736 (#5715) Removed attribute source_description from the YAML representation of Puppet::Resource::Status.
+98db2da (#5715) Removed unnecessary attributes from YAML of Puppet::Transaction::Event.
+bd4a8a1 (#5715) Make certain report attributes always present.
+716ee1c (#5715) Changed the type of metric names to always be strings.
+037eac4 (#5715) Add status attribute to reports.
+e4a2e04 (#5715) Made the report "calculate" methods strictly functional.
+71db5be (#5715) Made the changes/total and events/total metrics always present
+a4e40f4 (#5715) Refactor in preparation for adding a status attribute to reports.
+15dda94 (#5715) Added total time to inspect reports and made inspect metrics more consistent.
+d1bcdec (#5715) Removed Puppet::Transaction::Report#external_times from YAML output.
+1550bbb (#5715) Added total time metric to apply reports.
+4cc42cd (#5715) Removed redundant attribute Transaction::Event#version
+1907650 (#5715) Removed redundant attribute Resource::Status#version
+e596a57 (#5715) Removed Puppet::Util::Log#version.
+908e0e0 (#5715) Removed the unused attribute Puppet::Transaction::Event#node
+0e39ec5 (#5715) Removed Resource::Status#skipped_reason.  It was never used.
+b765f0e (#5715) Prep work: Fixed add_statuses in report_spec.
+8631709 (#5723) Fix failing type/package specs
+76fe2b3 Implement #5168 and #5169 ctime and mtime are properties
+d11ae78 [3782] Test isolation problem in test/ral/providers/cron/crontab.rb
+4d3030c Modified the behavior of Puppet::Resource::Status as follows:
+7fff780 (#5408) Reworked ResourceHarness so that code is clearer and all behaviors are tested
+d516f63 (#5493) Add report_format, puppet_version, and configuration_version to Reports
+093c45f (#5375) Rework puppet apply to use configurer.run
+e99a3ea Fix #5566 none, mtime, and ctime checksum types can write file contents
+d74e8e1 maint: Fix ActiveRecord confine issue
+6daeb16 maint: Fix a test that was missing a require
+5db696b maint: Fix tests that don't run on their own
+7f4e058 (#4487) Fix environment column in hosts table
+3ac50fa maint: restore plugin handler safety
+f38c36c (#5408) Attributes can be both audited and managed
+54a1025 maint: missing stub
+1d3192e maint: missing stub
+1aa8157 maint: missing line and filename stubs
+5e5ee97 maint: Fully stub partially stubbed test.
+3d7c8d0 maint: remove Puppet.settings stubs
+52fba89 maint: test was expecting Catalog.find too few times
+8c134b6 maint: broken test not failing due to over-eager exception catching
+3e59277 Fix #1757 Change file mode representation to octal
+84bf02e Bug #5423: This moves the home directory property before the uid property, thus minimizing room for damage when usermod is in use.
+1131ad7 (#4943) Add puppet inspect application
+e005cc7 maint: Remove bogus mongrel test
+c908fdb (#5261) Fix #5261 Don't escape Unicode characters in PSON
+b27e9b4 [#5081] Revert "Fix #4349 - Parsing with ignoreimport=true was always loading site.pp"
+af6e08c (#5304) Use internal_name rather than real_name for maillist provider
+
 2.6.4
 =====
 76890a5  Revert "(#5304) Use internal_name rather than real_name for maillist provider"

data/LICENSE

@@ -4,8 +4,8 @@ Puppet Labs can be contacted at: info@puppetlabs.com
 
 This program and entire repository is free software; you can
 redistribute it and/or modify it under the terms of the GNU
-General Public License as published by the Free Software
-Foundation; either version 2 of the License, or any later version.
+General Public License Version 2 as published by the Free Software
+Foundation.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of

data/Rakefile

@@ -5,8 +5,8 @@ $LOAD_PATH << File.join(File.dirname(__FILE__), 'tasks')
 require 'rake'
 require 'rake/packagetask'
 require 'rake/gempackagetask'
-require 'spec'
-require 'spec/rake/spectask'
+require 'rspec'
+require "rspec/core/rake_task"
 
 module Puppet
     PUPPETVERSION = File.read('lib/puppet.rb')[/PUPPETVERSION *= *'(.*)'/,1] or fail "Couldn't find PUPPETVERSION"
@@ -42,8 +42,7 @@ end
 desc "Create the tarball and the gem - use when releasing"
 task :puppetpackages => [:create_gem, :package]
 
-Spec::Rake::SpecTask.new do |t|
-    t.spec_opts = ['--format','s', '--loadby','mtime','--color']
+RSpec::Core::RakeTask.new do |t|
     t.pattern ='spec/{unit,integration}/**/*.rb'
     t.fail_on_error = false
 end

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.6.4'
+  PUPPETVERSION = '2.6.5'
 
   def Puppet.version
     PUPPETVERSION

data/lib/puppet/application.rb

@@ -212,10 +212,17 @@ class Application
     end
 
     def find(name)
-        self.const_get(name.to_s.capitalize)
-    rescue
+      klass = name.to_s.capitalize
+
+      # const_defined? is used before const_get since const_defined? will only
+      # check within our namespace, whereas const_get will check ancestor
+      # trees as well, resulting in unexpected behaviour.
+      if !self.const_defined?(klass)
         puts "Unable to find application '#{name.to_s}'."
         Kernel::exit(1)
+      end
+
+      self.const_get(klass)
     end
 
     def [](name)
@@ -257,9 +264,21 @@ class Application
   def initialize(command_line = nil)
     require 'puppet/util/command_line'
     @command_line = command_line || Puppet::Util::CommandLine.new
-    @run_mode = self.class.run_mode
+    set_run_mode self.class.run_mode
     @options = {}
 
+    require 'puppet'
+  end
+
+  # WARNING: This is a totally scary, frightening, and nasty internal API.  We
+  # strongly advise that you do not use this, and if you insist, we will
+  # politely allow you to keep both pieces of your broken code.
+  #
+  # We plan to provide a supported, long-term API to deliver this in a way
+  # that you can use.  Please make sure that you let us know if you do require
+  # this, and this message is still present in the code. --daniel 2011-02-03
+  def set_run_mode(mode)
+    @run_mode = mode
     $puppet_application_mode = @run_mode
     $puppet_application_name = name
 
@@ -274,8 +293,6 @@ class Application
       Puppet.settings.set_value(:rundir, Puppet.run_mode.run_dir, :mutable_defaults)
       Puppet.settings.set_value(:run_mode, Puppet.run_mode.name.to_s, :mutable_defaults)
     end
-
-    require 'puppet'
   end
 
   # This is the main application entry point

data/lib/puppet/application/apply.rb

@@ -123,25 +123,9 @@ class Puppet::Application::Apply < Puppet::Application
 
       require 'puppet/configurer'
       configurer = Puppet::Configurer.new
-      configurer.execute_prerun_command
+      report = configurer.run(:skip_plugin_download => true, :catalog => catalog)
 
-      # And apply it
-      if Puppet[:report]
-        report = configurer.initialize_report
-        Puppet::Util::Log.newdestination(report)
-      end
-      transaction = catalog.apply
-
-      configurer.execute_postrun_command
-
-      if Puppet[:report]
-        Puppet::Util::Log.close(report)
-        configurer.send_report(report, transaction)
-      else
-        transaction.generate_report
-      end
-
-      exit( Puppet[:noop] ? 0 : options[:detailed_exitcodes] ? transaction.report.exit_status : 0 )
+      exit( Puppet[:noop] ? 0 : options[:detailed_exitcodes] ? report.exit_status : 0 )
     rescue => detail
       puts detail.backtrace if Puppet[:trace]
       $stderr.puts detail.message

data/lib/puppet/application/doc.rb

@@ -8,7 +8,7 @@ class Puppet::Application::Doc < Puppet::Application
   attr_accessor :unknown_args, :manifest
 
   def preinit
-    {:references => [], :mode => :text, :format => :to_rest }.each do |name,value|
+    {:references => [], :mode => :text, :format => :to_markdown }.each do |name,value|
       options[name] = value
     end
     @unknown_args = []
@@ -113,9 +113,6 @@ class Puppet::Application::Doc < Puppet::Application
 
     text += Puppet::Util::Reference.footer unless with_contents # We've only got one reference
 
-    # Replace the trac links, since they're invalid everywhere else
-    text.gsub!(/`\w+\s+([^`]+)`:trac:/) { |m| $1 }
-
     if options[:mode] == :pdf
       Puppet::Util::Reference.pdf(text)
     else

data/lib/puppet/application/inspect.rb

@@ -0,0 +1,178 @@
+require 'puppet'
+require 'puppet/application'
+require 'puppet/file_bucket/dipper'
+
+class Puppet::Application::Inspect < Puppet::Application
+
+  should_parse_config
+  run_mode :agent
+
+  option("--debug","-d")
+  option("--verbose","-v")
+
+  option("--logdest LOGDEST", "-l") do |arg|
+    begin
+      Puppet::Util::Log.newdestination(arg)
+      options[:logset] = true
+    rescue => detail
+      $stderr.puts detail.to_s
+    end
+  end
+
+  def help
+    puts <<-HELP ; exit # XXX
+
+SYNOPSIS
+========
+
+Prepare and submit an inspection report to the puppet master.
+
+
+USAGE
+=====
+
+  puppet inspect
+
+
+DESCRIPTION
+===========
+
+This command uses the cached catalog from the previous run of 'puppet
+agent' to determine which attributes of which resources have been
+marked as auditable with the 'audit' metaparameter. It then examines
+the current state of the system, writes the state of the specified
+resource attributes to a report, and submits the report to the puppet
+master.
+
+Puppet inspect does not run as a daemon, and must be run manually or from cron.
+
+
+OPTIONS
+=======
+
+Any configuration setting which is valid in the configuration file is
+also a valid long argument, e.g. '--server=master.domain.com'. See the
+configuration file documentation at
+http://docs.puppetlabs.com/references/latest/configuration.html for
+the full list of acceptable settings.
+
+
+AUTHOR
+======
+
+Puppet Labs
+
+
+COPYRIGHT
+=========
+
+Copyright (c) 2011 Puppet Labs, LLC
+Licensed under the GNU General Public License version 2
+
+    HELP
+  end
+
+  def setup
+    exit(Puppet.settings.print_configs ? 0 : 1) if Puppet.settings.print_configs?
+
+    raise "Inspect requires reporting to be enabled. Set report=true in puppet.conf to enable reporting." unless Puppet[:report]
+
+    @report = Puppet::Transaction::Report.new("inspect")
+
+    Puppet::Util::Log.newdestination(@report)
+    Puppet::Util::Log.newdestination(:console) unless options[:logset]
+
+    trap(:INT) do
+      $stderr.puts "Exiting"
+      exit(1)
+    end
+
+    if options[:debug]
+      Puppet::Util::Log.level = :debug
+    elsif options[:verbose]
+      Puppet::Util::Log.level = :info
+    end
+
+    Puppet::Transaction::Report.terminus_class = :rest
+    Puppet::Resource::Catalog.terminus_class = :yaml
+  end
+
+  def run_command
+    benchmark(:notice, "Finished inspection") do
+      retrieval_starttime = Time.now
+
+      unless catalog = Puppet::Resource::Catalog.find(Puppet[:certname])
+        raise "Could not find catalog for #{Puppet[:certname]}"
+      end
+
+      @report.configuration_version = catalog.version
+
+      inspect_starttime = Time.now
+      @report.add_times("config_retrieval", inspect_starttime - retrieval_starttime)
+
+      if Puppet[:archive_files]
+        dipper = Puppet::FileBucket::Dipper.new(:Server => Puppet[:archive_file_server])
+      end
+
+      catalog.to_ral.resources.each do |ral_resource|
+        audited_attributes = ral_resource[:audit]
+        next unless audited_attributes
+
+        status = Puppet::Resource::Status.new(ral_resource)
+
+        begin
+          audited_resource = ral_resource.to_resource
+        rescue StandardError => detail
+          puts detail.backtrace if Puppet[:trace]
+          ral_resource.err "Could not inspect #{ral_resource}; skipping: #{detail}"
+          audited_attributes.each do |name|
+            event = ral_resource.event(
+                                       :property => name,
+                                       :status   => "failure",
+                                       :audited  => true,
+                                       :message  => "failed to inspect #{name}"
+                                       )
+            status.add_event(event)
+          end
+        else
+          audited_attributes.each do |name|
+            next if audited_resource[name].nil?
+            # Skip :absent properties of :absent resources. Really, it would be nicer if the RAL returned nil for those, but it doesn't. ~JW
+            if name == :ensure or audited_resource[:ensure] != :absent or audited_resource[name] != :absent
+              event = ral_resource.event(
+                                         :previous_value => audited_resource[name],
+                                         :property       => name,
+                                         :status         => "audit",
+                                         :audited        => true,
+                                         :message        => "inspected value is #{audited_resource[name].inspect}"
+                                         )
+              status.add_event(event)
+            end
+          end
+        end
+        if Puppet[:archive_files] and ral_resource.type == :file and audited_attributes.include?(:content)
+          path = ral_resource[:path]
+          if File.readable?(path)
+            begin
+              dipper.backup(path)
+            rescue StandardError => detail
+              Puppet.warning detail
+            end
+          end
+        end
+        @report.add_resource_status(status)
+      end
+
+      finishtime = Time.now
+      @report.add_times("inspect", finishtime - inspect_starttime)
+      @report.finalize_report
+
+      begin
+        @report.save
+      rescue => detail
+        puts detail.backtrace if Puppet[:trace]
+        Puppet.err "Could not send report: #{detail}"
+      end
+    end
+  end
+end