puppet 2.7.8 → 2.7.9

data/lib/puppet/module_tool/skeleton.rb

@@ -0,0 +1,34 @@
+module Puppet::Module::Tool
+
+  # = Skeleton
+  #
+  # This class provides methods for finding templates for the 'generate' action.
+  class Skeleton
+
+    # TODO Review whether the 'freeze' feature should be fixed or deleted.
+    # def freeze!
+    #   FileUtils.rm_fr custom_path rescue nil
+    #   FileUtils.cp_r default_path, custom_path
+    # end
+
+    # Return Pathname with 'generate' templates.
+    def path
+      paths.detect { |path| path.directory? }
+    end
+
+    # Return Pathnames to look for 'generate' templates.
+    def paths
+      @paths ||= [ custom_path, default_path ]
+    end
+
+    # Return Pathname of custom templates directory.
+    def custom_path
+      Pathname(Puppet.settings[:module_working_dir]) + 'skeleton'
+    end
+
+    # Return Pathname of default template directory.
+    def default_path
+      Pathname(__FILE__).dirname + 'skeleton/templates/generator'
+    end
+  end
+end

data/lib/puppet/module_tool/skeleton/templates/generator/Modulefile.erb

@@ -0,0 +1,11 @@
+name    '<%= metadata.full_module_name %>'
+version '0.0.1'
+source '<%= metadata.source %>'
+author '<%= metadata.author %>'
+license '<%= metadata.license %>'
+summary '<%= metadata.summary %>'
+description '<%= metadata.description %>'
+project_page '<%= metadata.project_page %>'
+
+## Add dependencies, if any:
+# dependency 'username/name', '>= 1.2.0'

data/lib/puppet/module_tool/skeleton/templates/generator/README.erb

@@ -0,0 +1,16 @@
+<%= metadata.name %>
+
+This is the <%= metadata.name %> module.
+
+License
+-------
+
+
+Contact
+-------
+
+
+Support
+-------
+
+Please log tickets and issues at our [Projects site](http://projects.example.com)

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

@@ -0,0 +1,41 @@
+# == Class: <%= metadata.name %>
+#
+# Full description of class <%= metadata.name %> here.
+#
+# === Parameters
+#
+# Document parameters here.
+#
+# [*sample_parameter*]
+#   Explanation of what this parameter affects and what it defaults to.
+#   e.g. "Specify one or more upstream ntp servers as an array."
+#
+# === Variables
+#
+# Here you should define a list of variables that this module would require.
+#
+# [*sample_variable*]
+#   Explanation of how this variable affects the funtion of this class and if it
+#   has a default. e.g. "The parameter enc_ntp_servers must be set by the
+#   External Node Classifier as a comma separated list of hostnames." (Note,
+#   global variables should not be used in preference to class parameters  as of
+#   Puppet 2.6.)
+#
+# === Examples
+#
+#  class { <%= metadata.name %>:
+#    servers => [ 'pool.ntp.org', 'ntp.local.company.com' ]
+#  }
+#
+# === Authors
+#
+# Author Name <author@domain.com>
+#
+# === Copyright
+#
+# Copyright 2011 Your name here, unless otherwise noted.
+#
+class <%= metadata.name %> {
+
+
+}

data/lib/puppet/module_tool/skeleton/templates/generator/metadata.json

@@ -0,0 +1,12 @@
+/*
++-----------------------------------------------------------------------+
+|                                                                       |
+|                    ==> DO NOT EDIT THIS FILE! <==                     |
+|                                                                       |
+|   You should edit the `Modulefile` and run `puppet-module build`      |
+|   to generate the `metadata.json` file for your releases.             |
+|                                                                       |
++-----------------------------------------------------------------------+
+*/
+
+{}

data/lib/puppet/module_tool/skeleton/templates/generator/spec/spec_helper.rb

@@ -0,0 +1,17 @@
+dir = File.expand_path(File.dirname(__FILE__))
+$LOAD_PATH.unshift File.join(dir, 'lib')
+
+require 'mocha'
+require 'puppet'
+require 'rspec'
+require 'spec/autorun'
+
+Spec::Runner.configure do |config|
+    config.mock_with :mocha
+end
+
+# We need this because the RAL uses 'should' as a method.  This
+# allows us the same behaviour but with a different method name.
+class Object
+    alias :must :should
+end

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

@@ -0,0 +1,11 @@
+# The baseline for module testing used by Puppet Labs is that each manifest
+# should have a corresponding test manifest that declares that class or defined
+# type.
+#
+# Tests are then run by using puppet apply --noop (to check for compilation errors
+# and view a log of events) or by fully applying the test in a virtual environment
+# (to compare the resulting system state to the desired state).
+#
+# Learn more about module testing here: http://docs.puppetlabs.com/guides/tests_smoke.html
+#
+include <%= metadata.name %>

data/lib/puppet/module_tool/utils.rb

@@ -0,0 +1,5 @@
+module Puppet::Module::Tool
+  module Utils
+    require 'puppet/module_tool/utils/interrogation'
+  end
+end

data/lib/puppet/module_tool/utils/interrogation.rb

@@ -0,0 +1,25 @@
+module Puppet::Module::Tool
+  module Utils
+
+    # = Interrogation
+    #
+    # This module contains methods to emit questions to the console.
+    module Interrogation
+      def confirms?(question)
+        $stderr.print "#{question} [y/N]: "
+        $stdin.gets =~ /y/i
+      end
+
+      def prompt(question, quiet = false)
+        $stderr.print "#{question}: "
+        system 'stty -echo' if quiet
+        $stdin.gets.strip
+      ensure
+        if quiet
+          system 'stty echo'
+          say "\n---------"
+        end
+      end
+    end
+  end
+end

data/lib/puppet/network/http/api/v1.rb

@@ -74,7 +74,8 @@ module Puppet::Network::HTTP::API::V1
 
     result = (indirection =~ /s$|_search$/) ? :plural : :singular
 
-    indirection.sub!(/s$|_search$|es$/, '')
+    indirection.sub!(/s$|_search$/, '')
+    indirection.sub!(/statuse$/, 'status')
 
     result
   end

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

@@ -1,7 +1,7 @@
 Puppet::Parser::Functions::newfunction(:create_resources, :doc => <<-'ENDHEREDOC') do |args|
     Converts a hash into a set of resources and adds them to the catalog.
 
-    This function takes two arguments: a resource type, and a hash describing
+    This function takes two mandatory arguments: a resource type, and a hash describing
     a set of resources. The hash should be in the form `{title => {parameters} }`:
 
         # A hash of user resources:
@@ -16,11 +16,24 @@ Puppet::Parser::Functions::newfunction(:create_resources, :doc => <<-'ENDHEREDOC
 
         create_resource(user, $myusers)
 
+    A third, optional parameter may be given, also as a hash:
+
+        $defaults => {
+          'ensure'   => present,
+          'provider' => 'ldap',
+        }
+
+        create_resources(user, $myusers, $defaults)
+
+    The values given on the third argument are added to the parameters of each resource
+    present in the set given on the second argument. If a parameter is present on both
+    the second and third arguments, the one on the second argument takes precedence.
+
     This function can be used to create defined resources and classes, as well
     as native resources.
   ENDHEREDOC
-  raise ArgumentError, ("create_resources(): wrong number of arguments (#{args.length}; must be 2)") if args.length != 2
-  #raise ArgumentError, 'requires resource type and param hash' if args.size < 2
+  raise ArgumentError, ("create_resources(): wrong number of arguments (#{args.length}; must be 2 or 3)") if args.length < 2 || args.length > 3
+
   # figure out what kind of resource we are
   type_of_resource = nil
   type_name = args[0].downcase
@@ -36,8 +49,10 @@ Puppet::Parser::Functions::newfunction(:create_resources, :doc => <<-'ENDHEREDOC
     end
   end
   # iterate through the resources to create
+  defaults = args[2] || {}
   args[1].each do |title, params|
     raise ArgumentError, 'params should not contain title' if(params['title'])
+    params = defaults.merge(params)
     case type_of_resource
     # JJM The only difference between a type and a define is the call to instantiate_resource
     # for a defined type.
@@ -54,7 +69,7 @@ Puppet::Parser::Functions::newfunction(:create_resources, :doc => <<-'ENDHEREDOC
       klass = find_hostclass(title)
       raise ArgumentError, "could not find hostclass #{title}" unless klass
       klass.ensure_in_catalog(self, params)
-      compiler.catalog.add_class([title])
+      compiler.catalog.add_class(title)
     end
   end
 end

data/lib/puppet/rails.rb

@@ -47,7 +47,7 @@ module Puppet::Rails
     case adapter
     when "sqlite3"
       args[:database] = Puppet[:dblocation]
-    when "mysql", "postgresql"
+    when "mysql", "mysql2", "postgresql"
       args[:host]     = Puppet[:dbserver] unless Puppet[:dbserver].to_s.empty?
       args[:port]     = Puppet[:dbport] unless Puppet[:dbport].to_s.empty?
       args[:username] = Puppet[:dbuser] unless Puppet[:dbuser].to_s.empty?

data/lib/puppet/rails/database/schema.rb

@@ -22,7 +22,7 @@ class Puppet::Rails::Schema
         # Thanks, mysql!  MySQL requires a length on indexes in text fields.
         # So, we provide them for mysql and handle everything else specially.
         # Oracle doesn't index on CLOB fields, so we skip it
-        if Puppet[:dbadapter] == "mysql"
+        if ['mysql','mysql2'].include? Puppet[:dbadapter]
           execute "CREATE INDEX typentitle ON resources (restype,title(50));"
         elsif Puppet[:dbadapter] != "oracle_enhanced"
           add_index :resources, [:title, :restype]

data/lib/puppet/ssl/host.rb

@@ -199,18 +199,26 @@ class Puppet::SSL::Host
       return nil unless Certificate.indirection.find("ca") unless ca?
       return nil unless @certificate = Certificate.indirection.find(name)
 
-      unless certificate_matches_key?
-        raise Puppet::Error, "Retrieved certificate does not match private key; please remove certificate from server and regenerate it with the current key"
-      end
+      validate_certificate_with_key
     end
     @certificate
   end
 
-  def certificate_matches_key?
-    return false unless key
-    return false unless certificate
-
-    certificate.content.check_private_key(key.content)
+  def validate_certificate_with_key
+    raise Puppet::Error, "No certificate to validate." unless certificate
+    raise Puppet::Error, "No private key with which to validate certificate with fingerprint: #{certificate.fingerprint}" unless key
+    unless certificate.content.check_private_key(key.content)
+      raise Puppet::Error, <<ERROR_STRING
+The certificate retrieved from the master does not match the agent's private key.
+Certificate fingerprint: #{certificate.fingerprint}
+To fix this, remove the certificate from both the master and the agent and then start a puppet run, which will automatically regenerate a certficate.
+On the master:
+  puppet cert clean #{Puppet[:certname]}
+On the agent:
+  rm -f #{Puppet[:hostcert]}
+  puppet agent -t
+ERROR_STRING
+    end
   end
 
   # Generate all necessary parts of our ssl host.

data/lib/puppet/transaction.rb

@@ -150,7 +150,7 @@ class Puppet::Transaction
     begin
       made = resource.eval_generate.uniq
       return false if made.empty?
-      made = Hash[made.map(&:name).zip(made)]
+      made = made.inject({}) {|a,v| a.merge(v.name => v) }
     rescue => detail
       puts detail.backtrace if Puppet[:trace]
       resource.err "Failed to generate additional resources using 'eval_generate: #{detail}"

data/lib/puppet/type/file.rb

@@ -261,13 +261,18 @@ Puppet::Type.newtype(:file) do
 
   # Autorequire the nearest ancestor directory found in the catalog.
   autorequire(:file) do
+    req = []
     path = Pathname.new(self[:path])
     if !path.root?
       # Start at our parent, to avoid autorequiring ourself
       parents = path.parent.enum_for(:ascend)
-      found = parents.find { |p| catalog.resource(:file, p.to_s) }
-      found and found.to_s
+      if found = parents.find { |p| catalog.resource(:file, p.to_s) }
+        req << found.to_s
+      end
     end
+    # if the resource is a link, make sure the target is created first
+    req << self[:target] if self[:target]
+    req
   end
 
   # Autorequire the owner and group of the file.

data/lib/puppet/type/file/ctime.rb

@@ -10,7 +10,7 @@ module Puppet
       current_value
     end
 
-    validate do
+    validate do |val|
       fail "ctime is read-only"
     end
   end

data/lib/puppet/type/file/mtime.rb

@@ -10,7 +10,7 @@ module Puppet
       current_value
     end
 
-    validate do
+    validate do |val|
       fail "mtime is read-only"
     end
   end

data/lib/puppet/type/file/type.rb

@@ -11,7 +11,7 @@ module Puppet
       current_value
     end
 
-    validate do
+    validate do |val|
       fail "type is read-only"
     end
   end

data/lib/puppet/util/queue/stomp.rb

@@ -2,12 +2,14 @@ require 'puppet/util/queue'
 require 'stomp'
 require 'uri'
 
-# Implements the Ruby Stomp client as a queue type within the Puppet::Indirector::Queue::Client
-# registry, for use with the <tt>:queue</tt> indirection terminus type.
+# Implements the Ruby Stomp client as a queue type within the
+# Puppet::Indirector::Queue::Client registry, for use with the <tt>:queue</tt>
+# indirection terminus type.
 #
-# Looks to <tt>Puppet[:queue_source]</tt> for the sole argument to the underlying Stomp::Client constructor;
-# consequently, for this client to work, <tt>Puppet[:queue_source]</tt> must use the Stomp::Client URL-like
-# syntax for identifying the Stomp message broker: <em>login:pass@host.port</em>
+# Looks to <tt>Puppet[:queue_source]</tt> for the sole argument to the
+# underlying Stomp::Client constructor; consequently, for this client to work,
+# <tt>Puppet[:queue_source]</tt> must use the Stomp::Client URL-like syntax
+# for identifying the Stomp message broker: <em>login:pass@host.port</em>
 class Puppet::Util::Queue::Stomp
   attr_accessor :stomp_client
 
@@ -26,10 +28,21 @@ class Puppet::Util::Queue::Stomp
     rescue => detail
       raise ArgumentError, "Could not create Stomp client instance with queue source #{Puppet[:queue_source]}: got internal Stomp client error #{detail}"
     end
+
+    # Identify the supported method for sending messages.
+    @method =
+      case
+      when stomp_client.respond_to?(:publish)
+        :publish
+      when stomp_client.respond_to?(:send)
+        :send
+      else
+        raise ArgumentError, "STOMP client does not respond to either publish or send"
+      end
   end
 
   def publish_message(target, msg)
-    stomp_client.publish(stompify_target(target), msg, :persistent => true)
+    stomp_client.__send__(@method, stompify_target(target), msg, :persistent => true)
   end
 
   def subscribe(target)

data/lib/puppet/util/zaml.rb

@@ -1,4 +1,15 @@
+# encoding: UTF-8
 #
+# The above encoding line is a magic comment to set the default source encoding
+# of this file for the Ruby interpreter.  It must be on the first or second
+# line of the file if an interpreter is in use.  In Ruby 1.9 and later, the
+# source encoding determines the encoding of String and Regexp objects created
+# from this source file.  This explicit encoding is important becuase otherwise
+# Ruby will pick an encoding based on LANG or LC_CTYPE environment variables.
+# These may be different from site to site so it's important for us to
+# establish a consistent behavior.  For more information on M17n please see:
+# http://links.puppetlabs.com/understanding_m17n
+
 # ZAML -- A partial replacement for YAML, writen with speed and code clarity
 #         in mind.  ZAML fixes one YAML bug (loading Exceptions) and provides
 #         a replacement for YAML.dump unimaginatively called ZAML.dump,
@@ -218,10 +229,16 @@ end
 class String
   ZAML_ESCAPES = %w{\x00 \x01 \x02 \x03 \x04 \x05 \x06 \a \x08 \t \n \v \f \r \x0e \x0f \x10 \x11 \x12 \x13 \x14 \x15 \x16 \x17 \x18 \x19 \x1a \e \x1c \x1d \x1e \x1f }
   def escaped_for_zaml
-    gsub( /\x5C/, "\\\\\\" ).  # Demi-kludge for Maglev/rubinius; the regexp should be /\\/ but parsetree chokes on that.
-    gsub( /"/, "\\\"" ).
-    gsub( /([\x00-\x1F])/ ) { |x| ZAML_ESCAPES[ x.unpack("C")[0] ] }.
-    gsub( /([\x80-\xFF])/ ) { |x| "\\x#{x.unpack("C")[0].to_s(16)}" }
+    # JJM (Note the trailing dots to construct a multi-line method chain.) This
+    # code is meant to escape all bytes which are not ASCII-8BIT printable
+    # characters.  Multi-byte unicode characters are handled just fine because
+    # each byte of the character results in an escaped string emitted to the
+    # YAML stream.  When the YAML is de-serialized back into a String the bytes
+    # will be reconstructed properly into the unicode character.
+    self.to_ascii8bit.gsub( /\x5C/n, "\\\\\\" ).  # Demi-kludge for Maglev/rubinius; the regexp should be /\\/ but parsetree chokes on that.
+    gsub( /"/n, "\\\"" ).
+    gsub( /([\x00-\x1F])/n ) { |x| ZAML_ESCAPES[ x.unpack("C")[0] ] }.
+    gsub( /([\x80-\xFF])/n ) { |x| "\\x#{x.unpack("C")[0].to_s(16)}" }
   end
   def to_zaml(z)
     z.first_time_only(self) {
@@ -238,7 +255,10 @@ class String
           (self =~ /[\s:]$/) or
           (self =~ /^[>|][-+\d]*\s/i) or
           (self[-1..-1] =~ /\s/) or
-          (self =~ /[\x00-\x08\x0B\x0C\x0E-\x1F\x80-\xFF]/) or
+          # This regular expression assumes the string is a byte sequence.
+          # It does not concern itself with characters so we convert the string
+          # to ASCII-8BIT for Ruby 1.9 to match up encodings.
+          (self.to_ascii8bit=~ /[\x00-\x08\x0B\x0C\x0E-\x1F\x80-\xFF]/n) or
           (self =~ /[,\[\]\{\}\r\t]|:\s|\s#/) or
           (self =~ /\A([-:?!#&*'"]|<<|%.+:.)/)
           )
@@ -251,6 +271,20 @@ class String
       end
     }
   end
+
+  # Return a guranteed ASCII-8BIT encoding for Ruby 1.9 This is a helper
+  # method for other methods that perform regular expressions against byte
+  # sequences deliberately rather than dealing with characters.
+  # The method may or may not return a new instance.
+  def to_ascii8bit
+    if self.respond_to?(:encoding) and self.encoding.name != "ASCII-8BIT" then
+      str = self.dup
+      str.force_encoding("ASCII-8BIT")
+      return str
+    else
+      return self
+    end
+  end
 end
 
 class Hash