puppet 2.7.8 → 2.7.9

data/CHANGELOG

@@ -1,3 +1,9 @@
+2.7.9
+===
+da11dc7 Fix Ruby 1.8.5-incompatible code in FileBucket::Dipper spec
+737c2f6 Fix Ruby 1.8.5-incompatible code in Transaction#eval_generate
+042925d Fix Ruby 1.8.5-incompatible code in spec setup
+
 2.7.8
 ===
 3eff60a Readying for 2.7.8rc release

data/README_DEVELOPER.md

@@ -0,0 +1,63 @@
+# Developer README #
+
+This file is intended to provide a place for developers and contributors to
+document what other developers need to know about changes made to Puppet.
+
+# UTF-8 Handling #
+
+As Ruby 1.9 becomes more commonly used with Puppet, developers should be aware
+of major changes to the way Strings and Regexp objects are handled.
+Specifically, every instance of these two classes will have an encoding
+attribute determined in a number of ways.
+
+ * If the source file has an encoding specified in the magic comment at the
+   top, the instance will take on that encoding.
+ * Otherwise, the encoding will be determined by the LC\_LANG or LANG
+   environment variables.
+ * Otherwise, the encoding will default to ASCII-8BIT
+
+## References ##
+
+Excellent information about the differences between encodings in Ruby 1.8 and
+Ruby 1.9 is published in this blog series:
+[Understanding M17n](http://links.puppetlabs.com/understanding_m17n)
+
+## Encodings of Regexp and String instances ##
+
+In general, please be aware that Ruby 1.9 regular expressions need to be
+compatible with the encoding of a string being used to match them.  If they are
+not compatible you can expect to receive and error such as:
+
+    Encoding::CompatibilityError: incompatible encoding regexp match (ASCII-8BIT
+    regexp with UTF-8 string)
+
+In addition, some escape sequences were valid in Ruby 1.8 are no longer valid
+in 1.9 if the regular expression is not marked as an ASCII-8BIT object.  You
+may expect errors like this in this situation:
+
+    SyntaxError: (irb):7: invalid multibyte escape: /\xFF/
+
+This error is particularly common when serializing a string to other
+representations like JSON or YAML.  To resolve the problem you can explicitly
+mark the regular expression as ASCII-8BIT using the /n flag:
+
+    "a" =~ /\342\230\203/n
+
+Finally, any time you're thinking of a string as an array of bytes rather than
+an array of characters, common when escaping a string, you should work with
+everything in ASCII-8BIT.  Changing the encoding will not change the data
+itself and allow the Regexp and the String to deal with bytes rather than
+characters.
+
+Puppet provides a monkey patch to String which returns an encoding suitable for
+byte manipulations:
+
+    # Example of how to escape non ASCII printable characters for YAML.
+    >> snowman = "☃"
+    >> snowman.to_ascii8bit.gsub(/([\x80-\xFF])/n) { |x| "\\x#{x.unpack("C")[0].to_s(16)} }
+    => "\\xe2\\x98\\x83"
+
+If the Regexp is not marked as ASCII-8BIT using /n, then you can expect the
+SyntaxError, invalid multibyte escape as mentioned above.
+
+EOF

data/conf/redhat/puppet.spec

@@ -5,7 +5,7 @@
 %global confdir conf/redhat
 
 Name:           puppet
-Version:        2.7.8
+Version:        2.7.9
 #Release:        0.1rc1%{?dist}
 Release:        1%{?dist}
 Summary:        A network tool for managing many disparate systems
@@ -285,6 +285,9 @@ fi
 rm -rf %{buildroot}
 
 %changelog
+* Fri Dec 9 2011 Matthaus Litteken <matthaus@puppetlabs.com> - 2.7.9-1
+- Update for 2.7.9
+
 * Thu Dec 8 2011 Matthaus Litteken <matthaus@puppetlabs.com> - 2.7.8-1
 - Update for 2.7.8
 

data/ext/puppetstoredconfigclean.rb

@@ -8,7 +8,10 @@
 # duritong adapted and improved the script a bit.
 
 require 'getoptlong'
-config = '/etc/puppet/puppet.conf'
+require 'puppet'
+require 'puppet/rails'
+
+config = Puppet[:config]
 
 def printusage(error_code)
   puts "Usage: #{$0} [ list of hostnames as stored in hosts table ]"
@@ -17,14 +20,11 @@ def printusage(error_code)
   exit(error_code)
 end
 
-
-      opts = GetoptLong.new(
-
-    [ "--config",     "-c",   GetoptLong::REQUIRED_ARGUMENT ],
-    [ "--help",        "-h",   GetoptLong::NO_ARGUMENT ],
-    [ "--usage",       "-u",   GetoptLong::NO_ARGUMENT ],
-
-    [ "--version",     "-v",   GetoptLong::NO_ARGUMENT ]
+opts = GetoptLong.new(
+  [ "--config",  "-c", GetoptLong::REQUIRED_ARGUMENT ],
+  [ "--help",    "-h", GetoptLong::NO_ARGUMENT ],
+  [ "--usage",   "-u", GetoptLong::NO_ARGUMENT ],
+  [ "--version", "-v", GetoptLong::NO_ARGUMENT ]
 )
 
 begin
@@ -51,24 +51,35 @@ end
 
 printusage(1) unless ARGV.size > 0
 
-require 'puppet/rails'
-Puppet[:config] = config
-Puppet.parse_config
-pm_conf = Puppet.settings.instance_variable_get(:@values)[:master]
+if config != Puppet[:config]
+  Puppet[:config]=config
+  Puppet.settings.parse
+end
 
-adapter = pm_conf[:dbadapter]
-args = {:adapter => adapter, :log_level => pm_conf[:rails_loglevel]}
+master = Puppet.settings.instance_variable_get(:@values)[:master]
+main = Puppet.settings.instance_variable_get(:@values)[:main]
+db_config = main.merge(master)
+
+# get default values
+[:master, :main, :rails].each do |section|
+  Puppet.settings.params(section).each do |key|
+    db_config[key] ||= Puppet[key]
+  end
+end
+
+adapter = db_config[:dbadapter]
+args = {:adapter => adapter, :log_level => db_config[:rails_loglevel]}
 
 case adapter
   when "sqlite3"
-    args[:dbfile] = pm_conf[:dblocation]
-  when "mysql", "postgresql"
-    args[:host]     = pm_conf[:dbserver] unless pm_conf[:dbserver].to_s.empty?
-    args[:username] = pm_conf[:dbuser] unless pm_conf[:dbuser].to_s.empty?
-    args[:password] = pm_conf[:dbpassword] unless pm_conf[:dbpassword].to_s.empty?
-    args[:database] = pm_conf[:dbname] unless pm_conf[:dbname].to_s.empty?
-    args[:port]     = pm_conf[:dbport] unless pm_conf[:dbport].to_s.empty?
-    socket          = pm_conf[:dbsocket]
+    args[:dbfile] = db_config[:dblocation]
+  when "mysql", "mysql2", "postgresql"
+    args[:host]     = db_config[:dbserver] unless db_config[:dbserver].to_s.empty?
+    args[:username] = db_config[:dbuser] unless db_config[:dbuser].to_s.empty?
+    args[:password] = db_config[:dbpassword] unless db_config[:dbpassword].to_s.empty?
+    args[:database] = db_config[:dbname] unless db_config[:dbname].to_s.empty?
+    args[:port]     = db_config[:dbport] unless db_config[:dbport].to_s.empty?
+    socket          = db_config[:dbsocket]
     args[:socket]   = socket unless socket.to_s.empty?
   else
     raise ArgumentError, "Invalid db adapter #{adapter}"
@@ -78,14 +89,15 @@ args[:database] = "puppet" unless not args[:database].to_s.empty?
 
 ActiveRecord::Base.establish_connection(args)
 
-ARGV.each { |hostname|
+ARGV.each do |hostname|
   if @host = Puppet::Rails::Host.find_by_name(hostname.strip)
-    print "Killing #{hostname}..."
+    print "Removing #{hostname} from storedconfig..."
     $stdout.flush
     @host.destroy
     puts "done."
   else
-    puts "Can't find host #{hostname}."
+    puts "Error: Can't find host #{hostname}."
   end
-}
+end
+
 exit 0

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

data/lib/puppet/application/agent.rb

@@ -416,6 +416,35 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
     cert = @host.wait_for_cert(waitforcert) unless options[:fingerprint]
   end
 
+  def setup_agent
+    # We need tomake the client either way, we just don't start it
+    # if --no-client is set.
+    require 'puppet/agent'
+    require 'puppet/configurer'
+    @agent = Puppet::Agent.new(Puppet::Configurer)
+
+    enable_disable_client(@agent) if options[:enable] or options[:disable]
+
+    @daemon.agent = agent if options[:client]
+
+    # It'd be nice to daemonize later, but we have to daemonize before the
+    # waitforcert happens.
+    @daemon.daemonize if Puppet[:daemonize]
+
+    setup_host
+
+    @objects = []
+
+    # This has to go after the certs are dealt with.
+    if Puppet[:listen]
+      unless Puppet[:onetime]
+        setup_listen
+      else
+        Puppet.notice "Ignoring --listen on onetime run"
+      end
+    end
+  end
+
   def setup
     setup_test if options[:test]
 
@@ -460,31 +489,10 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
 
     Puppet::Resource::Catalog.indirection.cache_class = :yaml
 
-    # We need tomake the client either way, we just don't start it
-    # if --no-client is set.
-    require 'puppet/agent'
-    require 'puppet/configurer'
-    @agent = Puppet::Agent.new(Puppet::Configurer)
-
-    enable_disable_client(@agent) if options[:enable] or options[:disable]
-
-    @daemon.agent = agent if options[:client]
-
-    # It'd be nice to daemonize later, but we have to daemonize before the
-    # waitforcert happens.
-    @daemon.daemonize if Puppet[:daemonize]
-
-    setup_host
-
-    @objects = []
-
-    # This has to go after the certs are dealt with.
-    if Puppet[:listen]
-      unless Puppet[:onetime]
-        setup_listen
-      else
-        Puppet.notice "Ignoring --listen on onetime run"
-      end
+    unless options[:fingerprint]
+      setup_agent
+    else
+      setup_host
     end
   end
 end

data/lib/puppet/application/apply.rb

@@ -14,6 +14,14 @@ class Puppet::Application::Apply < Puppet::Application
   option("--detailed-exitcodes")
 
   option("--apply catalog",  "-a catalog") do |arg|
+    Puppet.warning <<EOM
+--apply is deprecated and will be removed in the future. Please
+use 'puppet apply --catalog <catalog>'.
+EOM
+    options[:catalog] = arg
+  end
+
+  option("--catalog catalog",  "-c catalog") do |arg|
     options[:catalog] = arg
   end
 
@@ -46,7 +54,7 @@ USAGE
 -----
 puppet apply [-h|--help] [-V|--version] [-d|--debug] [-v|--verbose]
   [-e|--execute] [--detailed-exitcodes] [-l|--logdest <file>]
-  [--apply <catalog>] <file>
+  [--apply <catalog>] [--catalog <catalog>] <file>
 
 
 DESCRIPTION
@@ -106,6 +114,11 @@ configuration options can also be generated by running puppet with
   Print extra information.
 
 * --apply:
+  Apply a JSON catalog (such as one generated with 'puppet master --compile'). You can
+  either specify a JSON file or pipe in JSON from standard input. Deprecated, please
+  use --catalog instead.
+
+* --catalog:
   Apply a JSON catalog (such as one generated with 'puppet master --compile'). You can
   either specify a JSON file or pipe in JSON from standard input.
 
@@ -114,6 +127,7 @@ EXAMPLE
 -------
     $ puppet apply -l /tmp/manifest.log manifest.pp
     $ puppet apply --modulepath=/root/dev/modules -e "include ntpd::server"
+    $ puppet apply --catalog catalog.json
 
 
 AUTHOR

data/lib/puppet/application/module.rb

@@ -0,0 +1,3 @@
+require 'puppet/application/face_base'
+
+class Puppet::Application::Module < Puppet::Application::FaceBase; end

data/lib/puppet/defaults.rb

@@ -199,6 +199,10 @@ module Puppet
       essentially means that you can't have any code outside of a node, class, or definition other
       than in the site manifest."]
   )
+  Puppet.setdefaults(:module_tool,
+    :module_repository  => ['http://forge.puppetlabs.com', "The module repository"],
+    :module_working_dir => ['$vardir/puppet-module', "The directory into which module tool data is stored"]
+  )
 
   hostname = Facter["hostname"].value
   domain = Facter["domain"].value

data/lib/puppet/face/module.rb

@@ -0,0 +1,12 @@
+require 'puppet/face'
+require 'puppet/module_tool'
+
+Puppet::Face.define(:module, '1.0.0') do
+  copyright "Puppet Labs", 2011
+  license   "Apache 2 license; see COPYING"
+
+  summary "Creates, installs and searches for modules on the Puppet Forge."
+  description <<-EOT
+    Creates, installs and searches for modules on the Puppet Forge.
+  EOT
+end

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

@@ -0,0 +1,31 @@
+Puppet::Face.define(:module, '1.0.0') do
+  action(:build) do
+    summary "Build a module release package."
+    description <<-EOT
+      Build a module release archive file by processing the Modulefile in the
+      module directory.  The release archive file will be stored in the pkg
+      directory of the module directory.
+    EOT
+
+    returns "Pathname object representing the path to the release archive."
+
+    examples <<-EOT
+      Build a module release:
+
+      $ puppet module build puppetlabs-apache
+      notice: Building /Users/kelseyhightower/puppetlabs-apache for release
+      puppetlabs-apache/pkg/puppetlabs-apache-0.0.1.tar.gz
+    EOT
+
+    arguments "<path>"
+
+    when_invoked do |path, options|
+      Puppet::Module::Tool::Applications::Builder.run(path, options)
+    end
+
+    when_rendering :console do |return_value|
+      # Get the string representation of the Pathname object.
+      return_value.to_s
+    end
+  end
+end

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

@@ -0,0 +1,38 @@
+Puppet::Face.define(:module, '1.0.0') do
+  action(:changes) do
+    summary "Show modified files of an installed module."
+    description <<-EOT
+      Show files that have been modified after installation of a given module
+      by comparing the on-disk md5 checksum of each file against the module's
+      metadata.
+    EOT
+
+    returns "Array of strings representing paths of modified files."
+
+    examples <<-EOT
+      Show modified files of an installed module:
+
+      $ puppet module changes /etc/puppet/modules/vcsrepo/
+      warning: 1 files modified
+      lib/puppet/provider/vcsrepo.rb
+    EOT
+
+    arguments "<path>"
+
+    when_invoked do |path, options|
+      root_path = Puppet::Module::Tool.find_module_root(path)
+      Puppet::Module::Tool::Applications::Checksummer.run(root_path, options)
+    end
+
+    when_rendering :console do |return_value|
+      if return_value.empty?
+        Puppet.notice "No modified files"
+      else
+        Puppet.warning "#{return_value.size} files modified"
+      end
+      return_value.map do |changed_file|
+        "#{changed_file}"
+      end.join("\n")
+    end
+  end
+end

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

@@ -0,0 +1,30 @@
+Puppet::Face.define(:module, '1.0.0') do
+  action(:clean) do
+    summary "Clean the module download cache."
+    description <<-EOT
+      Clean the module download cache.
+    EOT
+
+    returns <<-EOT
+      Return a status Hash:
+
+        { :status => "success", :msg => "Cleaned module cache." }
+    EOT
+
+    examples <<-EOT
+      Clean the module download cache:
+
+      $ puppet module clean
+      Cleaned module cache.
+    EOT
+
+    when_invoked do |options|
+      Puppet::Module::Tool::Applications::Cleaner.run(options)
+    end
+
+    when_rendering :console do |return_value|
+      # Print the status message to the console.
+      return_value[:msg]
+    end
+  end
+end