puppet 3.2.2 → 3.2.3.rc1

data/Gemfile

@@ -24,7 +24,7 @@ gem "hiera", *location_for(ENV['HIERA_LOCATION'] || '~> 1.0')
 gem "rake", :require => false
 gem "rspec", "~> 2.11.0", :require => false
 gem "mocha", "~> 0.10.5", :require => false
-gem "rgen", "0.6.2", :require => false
+gem "rgen", "0.6.5", :require => false
 
 gem "yarjuf", "~> 1.0"
 

data/Rakefile

@@ -1,10 +1,11 @@
 # Rakefile for Puppet -*- ruby -*-
+RAKE_ROOT = File.dirname(__FILE__)
 
 # We need access to the Puppet.version method
 $LOAD_PATH.unshift(File.expand_path("lib"))
 require 'puppet/version'
 
-$LOAD_PATH << File.join(File.dirname(__FILE__), 'tasks')
+$LOAD_PATH << File.join(RAKE_ROOT, 'tasks')
 
 begin
   require 'rubygems'
@@ -22,7 +23,11 @@ end
 require 'rake'
 
 Dir['tasks/**/*.rake'].each { |t| load t }
-Dir['ext/packaging/tasks/**/*'].sort.each { |t| load t }
+
+begin
+  load File.join(RAKE_ROOT, 'ext', 'packaging', 'packaging.rake')
+rescue LoadError
+end
 
 build_defs_file = 'ext/build_defaults.yaml'
 if File.exist?(build_defs_file)

data/ext/build_defaults.yaml

@@ -2,7 +2,7 @@
 packaging_url: 'git://github.com/puppetlabs/packaging.git --branch=master'
 packaging_repo: 'packaging'
 default_cow: 'base-squeeze-i386.cow'
-cows: 'base-lucid-i386.cow base-oneiric-i386.cow base-precise-i386.cow base-quantal-i386.cow base-raring-i386.cow base-sid-i386.cow base-squeeze-i386.cow base-stable-i386.cow base-testing-i386.cow base-unstable-i386.cow base-wheezy-i386.cow'
+cows: 'base-lucid-i386.cow base-precise-i386.cow base-quantal-i386.cow base-raring-i386.cow base-sid-i386.cow base-squeeze-i386.cow base-stable-i386.cow base-testing-i386.cow base-unstable-i386.cow base-wheezy-i386.cow'
 pbuild_conf: '/etc/pbuilderrc'
 packager: 'puppetlabs'
 gpg_name: 'info@puppetlabs.com'

data/ext/debian/changelog.erb

@@ -4,6 +4,12 @@ puppet (<%= @debversion %>) hardy lucid natty oneiric unstable sid squeeze wheez
 
  -- Puppet Labs Release <info@puppetlabs.com>  <%= Time.now.strftime("%a, %d %b %Y %H:%M:%S %z")%>
 
+puppet (3.2.3-0.1rc0puppetlabs1) lucid unstable sid squeeze wheezy precise quantal raring; urgency=low
+
+  * Update ruby-rgen dependency to 0.6.5
+
+ -- Matthaus Owens <matthaus@puppetlabs.com>  Thu, 27 Jun 2013 14:45:14 +0000
+
 puppet (3.2.0-0.1rc0puppetlabs1) lucid oneiric precise unstable sid squeeze wheezy precise; urgency=low
 
   * Add ruby-rgen dependency for new parser in Puppet 3.2

data/ext/debian/control

@@ -11,7 +11,7 @@ Homepage: http://projects.puppetlabs.com/projects/puppet
 
 Package: puppet-common
 Architecture: all
-Depends: ${misc:Depends}, ruby | ruby-interpreter, libxmlrpc-ruby, libopenssl-ruby, ruby-shadow | libshadow-ruby1.8, libaugeas-ruby | libaugeas-ruby1.9.1 | libaugeas-ruby1.8, adduser, lsb-base, sysv-rc (>= 2.86) | file-rc, hiera (>= 1.0.0), facter (>= 1.6.12), ruby-rgen
+Depends: ${misc:Depends}, ruby | ruby-interpreter, libxmlrpc-ruby, libopenssl-ruby, ruby-shadow | libshadow-ruby1.8, libaugeas-ruby | libaugeas-ruby1.9.1 | libaugeas-ruby1.8, adduser, lsb-base, sysv-rc (>= 2.86) | file-rc, hiera (>= 1.0.0), facter (>= 1.6.12), ruby-rgen (>= 0.6.5)
 Recommends: lsb-release, debconf-utils
 Suggests: ruby-selinux | libselinux-ruby1.8, librrd-ruby1.9.1 | librrd-ruby1.8
 Breaks: puppet (<< 2.6.0~rc2-1), puppetmaster (<< 0.25.4-1)

data/ext/project_data.yaml

@@ -17,7 +17,7 @@ gem_forge_project: 'puppet'
 gem_runtime_dependencies:
   facter: '~> 1.6'
   hiera: '~> 1.0'
-  rgen: '~> 0.6'
+  rgen: '~> 0.6.5'
 gem_rdoc_options:
   - --title
   - "Puppet - Configuration Management"

data/ext/redhat/puppet.spec.erb

@@ -56,7 +56,7 @@ Requires:       facter >= 1.6.11
 # Ruby 1.8.7 available for el5 at: yum.puppetlabs.com/el/5/devel/$ARCH
 Requires:       ruby >= 1.8.7
 Requires:       hiera >= 1.0.0
-Requires:       ruby-rgen
+Requires:       ruby-rgen >= 0.6.5
 Obsoletes:      hiera-puppet < 1.0.0
 Provides:       hiera-puppet >= 1.0.0
 %{!?_without_augeas:Requires: ruby-augeas}
@@ -391,6 +391,9 @@ rm -rf %{buildroot}
 * <%= Time.now.strftime("%a %b %d %Y") %> Puppet Labs Release <info@puppetlabs.com> -  <%= @rpmversion %>-<%= @rpmrelease %>
 - Build for <%= @version %>
 
+* Thu Jun 27 2013 Matthaus Owens <matthaus@puppetlabs.com> - 3.2.3-0.1rc0
+- Bump requires on ruby-rgen to 0.6.5
+
 * Fri Apr 12 2013 Matthaus Owens <matthaus@puppetlabs.com> - 3.2.0-0.1rc0
 - Add requires on ruby-rgen for new parser in Puppet 3.2
 

data/ext/windows/service/daemon.bat

@@ -3,4 +3,4 @@ SETLOCAL
 
 call "%~dp0..\bin\environment.bat" %0 %*
 
-rubyw -rubygems "%~dp0daemon.rb" %*
+ruby -rubygems "%~dp0daemon.rb" %*

data/lib/puppet/application/agent.rb

@@ -445,7 +445,7 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
   def setup
     setup_test if options[:test]
 
-    setup_logs(true)
+    setup_logs
 
     exit(Puppet.settings.print_configs ? 0 : 1) if Puppet.settings.print_configs?
 

data/lib/puppet/application.rb

@@ -376,8 +376,8 @@ class Application
     setup_logs
   end
 
-  def setup_logs(is_daemon = false)
-    if options[:debug] or options[:verbose] or is_daemon
+  def setup_logs
+    if options[:debug] or options[:verbose]
       Puppet::Util::Log.newdestination(:console)
       if options[:debug]
         Puppet::Util::Log.level = :debug

data/lib/puppet/defaults.rb

@@ -8,6 +8,9 @@ module Puppet
   #   see the docs for Settings.define_settings
   ############################################################################################
 
+  AS_DURATION = %q{This setting can be a time interval in seconds (30 or 30s), minutes (30m), hours (6h), days (2d), or years (5y).}
+  STORECONFIGS_ONLY = %q{This setting is only used by the ActiveRecord storeconfigs and inventory backends, which are deprecated.}
+
   define_settings(:main,
     :confdir  => {
         :default  => nil,
@@ -291,7 +294,7 @@ module Puppet
       :type       => :duration,
       :desc       => "The minimum time to wait between checking for updates in
       configuration files.  This timeout determines how quickly Puppet checks whether
-      a file (such as manifests or templates) has changed on disk. Can be specified as a duration.",
+      a file (such as manifests or templates) has changed on disk. #{AS_DURATION}",
     },
     :queue_type => {
       :default    => "stomp",
@@ -578,7 +581,7 @@ EOT
       :default  => "60d",
       :type     => :duration,
       :desc     => "The window of time leading up to a certificate's expiration that a notification
-        will be logged. This applies to CA, master, and agent certificates. Can be specified as a duration."
+        will be logged. This applies to CA, master, and agent certificates. #{AS_DURATION}"
     }
   )
 
@@ -685,7 +688,7 @@ EOT
       :default    => "5y",
       :type       => :duration,
       :desc       => "The default TTL for new certificates. If this setting is set, ca_days is ignored.
-      Can be specified as a duration."
+      #{AS_DURATION}"
     },
     :req_bits => {
       :default    => 4096,
@@ -904,7 +907,7 @@ EOT
       :default  => "$runinterval",
       :type     => :duration,
       :desc     => "How often RRD should expect data.
-            This should match how often the hosts report back to the server. Can be specified as a duration.",
+            This should match how often the hosts report back to the server. #{AS_DURATION}",
     }
   )
 
@@ -1025,10 +1028,10 @@ EOT
     :runinterval => {
       :default  => "30m",
       :type     => :duration,
-      :desc     => "How often puppet agent applies the client configuration; in seconds.
+      :desc     => "How often puppet agent applies the catalog.
           Note that a runinterval of 0 means \"run continuously\" rather than
           \"never run.\" If you want puppet agent to never run, you should start
-          it with the `--no-client` option. Can be specified as a duration.",
+          it with the `--no-client` option. #{AS_DURATION}",
     },
     :listen => {
       :default    => false,
@@ -1125,7 +1128,7 @@ EOT
       :default    => "$runinterval",
       :type       => :duration,
       :desc       => "The maximum time to delay before runs.  Defaults to being the same as the
-      run interval. Can be specified as a duration.",
+      run interval. #{AS_DURATION}",
     },
     :splay => {
       :default    => false,
@@ -1144,7 +1147,7 @@ EOT
       :type     => :duration,
       :desc     => "How long the client should wait for the configuration to be retrieved
       before considering it a failure.  This can help reduce flapping if too
-      many clients contact the server at one time. Can be specified as a duration.",
+      many clients contact the server at one time. #{AS_DURATION}",
     },
     :report_server => {
       :default  => "$server",
@@ -1204,10 +1207,19 @@ EOT
     :waitforcert => {
       :default  => "2m",
       :type     => :duration,
-      :desc     => "The time interval 'puppet agent' should connect to the server
-      and ask it to sign a certificate request. This is useful for the initial setup of a
-      puppet client. You can turn off waiting for certificates by specifying a time of 0.
-      Can be specified as a duration.",
+      :desc     => "How frequently puppet agent should ask for a signed certificate.
+
+      When starting for the first time, puppet agent will submit a certificate
+      signing request (CSR) to the server named in the `ca_server` setting
+      (usually the puppet master); this may be autosigned, or may need to be
+      approved by a human, depending on the CA server's configuration.
+
+      Puppet agent cannot apply configurations until its approved certificate is
+      available. Since the certificate may or may not be available immediately,
+      puppet agent will repeatedly try to fetch it at this interval. You can
+      turn off waiting for certificates by specifying a time of 0, in which case
+      puppet agent will exit if it cannot get a cert.
+      #{AS_DURATION}",
     }
   )
 
@@ -1296,21 +1308,20 @@ EOT
       :mode     => 0660,
       :owner    => "service",
       :group    => "service",
-      :desc     => "The database cache for client configurations.  Used for
-        querying within the language."
+      :desc     => "The sqlite database file. #{STORECONFIGS_ONLY}"
     },
     :dbadapter => {
       :default  => "sqlite3",
-      :desc     => "The type of database to use.",
+      :desc     => "The type of database to use. #{STORECONFIGS_ONLY}",
     },
     :dbmigrate => {
       :default  => false,
       :type     => :boolean,
-      :desc     => "Whether to automatically migrate the database.",
+      :desc     => "Whether to automatically migrate the database. #{STORECONFIGS_ONLY}",
     },
     :dbname => {
       :default  => "puppet",
-      :desc     => "The name of the database to use.",
+      :desc     => "The name of the database to use. #{STORECONFIGS_ONLY}",
     },
     :dbserver => {
       :default  => "localhost",
@@ -1320,27 +1331,27 @@ EOT
     :dbport => {
       :default  => "",
       :desc     => "The database password for caching. Only
-      used when networked databases are used.",
+      used when networked databases are used. #{STORECONFIGS_ONLY}",
     },
     :dbuser => {
       :default  => "puppet",
       :desc     => "The database user for caching. Only
-      used when networked databases are used.",
+      used when networked databases are used. #{STORECONFIGS_ONLY}",
     },
     :dbpassword => {
       :default  => "puppet",
       :desc     => "The database password for caching. Only
-      used when networked databases are used.",
+      used when networked databases are used. #{STORECONFIGS_ONLY}",
     },
     :dbconnections => {
       :default  => '',
       :desc     => "The number of database connections for networked
-      databases.  Will be ignored unless the value is a positive integer.",
+      databases.  Will be ignored unless the value is a positive integer. #{STORECONFIGS_ONLY}",
     },
     :dbsocket => {
       :default  => "",
       :desc     => "The database socket location. Only used when networked
-      databases are used.  Will be ignored if the value is an empty string.",
+      databases are used.  Will be ignored if the value is an empty string. #{STORECONFIGS_ONLY}",
     },
     :railslog => {
       :default  => "$logdir/rails.log",
@@ -1348,14 +1359,14 @@ EOT
       :mode     => 0600,
       :owner    => "service",
       :group    => "service",
-      :desc     => "Where Rails-specific logs are sent"
+      :desc     => "Where Rails-specific logs are sent. #{STORECONFIGS_ONLY}"
     },
 
     :rails_loglevel => {
         :default  => "info",
         :desc     => "The log level for Rails connections.  The value must be
             a valid log level within Rails.  Production environments normally use `info`
-            and other environments normally use `debug`.",
+            and other environments normally use `debug`. #{STORECONFIGS_ONLY}",
     }
   )
 
@@ -1364,7 +1375,8 @@ EOT
 
     :couchdb_url => {
         :default  => "http://127.0.0.1:5984/puppet",
-        :desc     => "The url where the puppet couchdb database will be created",
+        :desc     => "The url where the puppet couchdb database will be created.
+        Only used when `facts_terminus` is set to `couch`.",
     }
   )
 
@@ -1574,7 +1586,8 @@ EOT
     :document_all => {
         :default  => false,
         :type     => :boolean,
-        :desc     => "Document all resources",
+        :desc     => "Whether to document all resources when using `puppet doc` to
+        generate manifest documentation.",
     }
   )
 end

data/lib/puppet/parser/ast/block_expression.rb

@@ -34,6 +34,10 @@ class Puppet::Parser::AST
       self
     end
 
+    def sequence_with(other)
+      Puppet::Parser::AST::BlockExpression.new(:children => self.children + other.children)
+    end
+
     def to_s
       "[" + @children.collect { |c| c.to_s }.join(', ') + "]"
     end

data/lib/puppet/parser/ast/branch.rb

@@ -7,31 +7,16 @@ class Puppet::Parser::AST
     include Enumerable
     attr_accessor :pin, :children
 
-    # Yield each contained AST node in turn.  Used mostly by 'evaluate'.
-    # This definition means that I don't have to override 'evaluate'
-    # every time, but each child of Branch will likely need to override
-    # this method.
     def each
       @children.each { |child|
         yield child
       }
     end
 
-    # Initialize our object.  Largely relies on the method from the base
-    # class, but also does some verification.
     def initialize(arghash)
       super(arghash)
 
-      # Create the hash, if it was not set at initialization time.
       @children ||= []
-
-      # Verify that we only got valid AST nodes.
-      @children.each { |child|
-        unless child.is_a?(AST)
-          raise Puppet::DevError,
-            "child #{child} is a #{child.class} instead of ast"
-        end
-      }
     end
   end
 end

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

@@ -11,20 +11,21 @@ Puppet::Parser::Functions::newfunction(
   This function takes two mandatory arguments: the first should be an Array or a Hash, and the second
   a parameterized block as produced by the puppet syntax:
 
-    $a.collect |$x| { ... }
+        $a.collect |$x| { ... }
 
-  When the first argument is an Array, the block is called with each entry in turn. When the first argument
+  When the first argument `$a` is an Array, the block is called with each entry in turn. When the first argument
   is a hash the entry is an array with `[key, value]`.
 
   *Examples*
 
-    # Turns hash into array of values
-    $a.collect |$x|{ $x[1] }
+        # Turns hash into array of values
+        $a.collect |$x|{ $x[1] }
 
-    # Turns hash into array of keys
-    $a.collect |$x| { $x[0] }
+        # Turns hash into array of keys
+        $a.collect |$x| { $x[0] }
 
-  Since 3.2
+  - Since 3.2
+  - requires `parser = future`.
   ENDHEREDOC
 
   receiver = args[0]

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

@@ -9,23 +9,24 @@ Puppet::Parser::Functions::newfunction(
   This function takes two mandatory arguments: the first should be an Array or a Hash, and the second
   a parameterized block as produced by the puppet syntax:
 
-    $a.each {|$x| ... }
+        $a.each {|$x| ... }
 
   When the first argument is an Array, the parameterized block should define one or two block parameters.
   For each application of the block, the next element from the array is selected, and it is passed to
   the block if the block has one parameter. If the block has two parameters, the first is the elements
   index, and the second the value. The index starts from 0.
 
-    $a.each {|$index, $value| ... }
+        $a.each {|$index, $value| ... }
 
   When the first argument is a Hash, the parameterized block should define one or two parameters.
   When one parameter is defined, the iteration is performed with each entry as an array of `[key, value]`,
   and when two parameters are defined the iteration is performed with key and value.
 
-    $a.each {|$entry|       ..."key ${$entry[0]}, value ${$entry[1]}" }
-    $a.each {|$key, $value| ..."key ${key}, value ${value}" }
+        $a.each {|$entry|       ..."key ${$entry[0]}, value ${$entry[1]}" }
+        $a.each {|$key, $value| ..."key ${key}, value ${value}" }
 
-  Since 3.2
+  - Since 3.2
+  - requires `parser = future`.
   ENDHEREDOC
   require 'puppet/parser/ast/lambda'
 

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

@@ -9,23 +9,24 @@ Puppet::Parser::Functions::newfunction(
   This function takes two mandatory arguments: the first should be an Array or a Hash, and the second
   a parameterized block as produced by the puppet syntax:
 
-    $a.foreach {|$x| ... }
+        $a.foreach {|$x| ... }
 
   When the first argument is an Array, the parameterized block should define one or two block parameters.
   For each application of the block, the next element from the array is selected, and it is passed to
   the block if the block has one parameter. If the block has two parameters, the first is the elements
   index, and the second the value. The index starts from 0.
 
-    $a.foreach {|$index, $value| ... }
+        $a.foreach {|$index, $value| ... }
 
   When the first argument is a Hash, the parameterized block should define one or two parameters.
   When one parameter is defined, the iteration is performed with each entry as an array of `[key, value]`,
   and when two parameters are defined the iteration is performed with key and value.
 
-    $a.foreach {|$entry|       ..."key ${$entry[0]}, value ${$entry[1]}" }
-    $a.foreach {|$key, $value| ..."key ${key}, value ${value}" }
+        $a.foreach {|$entry|       ..."key ${$entry[0]}, value ${$entry[1]}" }
+        $a.foreach {|$key, $value| ..."key ${key}, value ${value}" }
 
-  Since 3.2
+  - Since 3.2
+  - requires `parser = future`.
   ENDHEREDOC
   require 'puppet/parser/ast/lambda'
 

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

@@ -9,7 +9,7 @@ Puppet::Parser::Functions::newfunction(
   This function takes two mandatory arguments: the first should be an Array or a Hash, and the last
   a parameterized block as produced by the puppet syntax:
 
-    $a.reduce |$memo, $x| { ... }
+        $a.reduce |$memo, $x| { ... }
 
   When the first argument is an Array, the block is called with each entry in turn. When the first argument
   is a hash each entry is converted to an array with `[key, value]` before being fed to the block. An optional
@@ -24,30 +24,32 @@ Puppet::Parser::Functions::newfunction(
 
   *Examples*
 
-    # Reduce an array
-    $a = [1,2,3]
-    $a.reduce |$memo, $entry| { $memo + $entry }
-    #=> 6
+        # Reduce an array
+        $a = [1,2,3]
+        $a.reduce |$memo, $entry| { $memo + $entry }
+        #=> 6
 
-    # Reduce hash values
-    $a = {a => 1, b => 2, c => 3}
-    $a.reduce |$memo, $entry| { [sum, $memo[1]+$entry[1]] }
-    #=> [sum, 6]
+        # Reduce hash values
+        $a = {a => 1, b => 2, c => 3}
+        $a.reduce |$memo, $entry| { [sum, $memo[1]+$entry[1]] }
+        #=> [sum, 6]
 
   It is possible to provide a starting 'memo' as an argument.
 
   *Examples*
-    # Reduce an array
-    $a = [1,2,3]
-    $a.reduce(4) |$memo, $entry| { $memo + $entry }
-    #=> 10
 
-    # Reduce hash values
-    $a = {a => 1, b => 2, c => 3}
-    $a.reduce([na, 4]) |$memo, $entry| { [sum, $memo[1]+$entry[1]] }
-    #=> [sum, 10]
+        # Reduce an array
+        $a = [1,2,3]
+        $a.reduce(4) |$memo, $entry| { $memo + $entry }
+        #=> 10
 
-  Since 3.2
+        # Reduce hash values
+        $a = {a => 1, b => 2, c => 3}
+        $a.reduce([na, 4]) |$memo, $entry| { [sum, $memo[1]+$entry[1]] }
+        #=> [sum, 10]
+
+  - Since 3.2
+  - requires `parser = future`.
   ENDHEREDOC
 
   require 'puppet/parser/ast/lambda'

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

@@ -11,7 +11,7 @@ Puppet::Parser::Functions::newfunction(
   This function takes two mandatory arguments: the first should be an Array or a Hash, and the second
   a parameterized block as produced by the puppet syntax:
 
-    $a.reject |$x| { ... }
+        $a.reject |$x| { ... }
 
   When the first argument is an Array, the block is called with each entry in turn. When the first argument
   is a hash the entry is an array with `[key, value]`.
@@ -20,11 +20,12 @@ Puppet::Parser::Functions::newfunction(
 
   *Examples*
 
-    # selects all that does not end with berry
-    $a = ["rasberry", "blueberry", "orange"]
-    $a.reject |$x| { $x =~ /berry$/ }
+        # selects all that does not end with berry
+        $a = ["rasberry", "blueberry", "orange"]
+        $a.reject |$x| { $x =~ /berry$/ }
 
-  Since 3.2
+  - Since 3.2
+  - requires `parser = future`.
   ENDHEREDOC
 
   receiver = args[0]

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

@@ -11,7 +11,7 @@ Puppet::Parser::Functions::newfunction(
   This function takes two mandatory arguments: the first should be an Array or a Hash, and the second
   a parameterized block as produced by the puppet syntax:
 
-    $a.select |$x| { ... }
+        $a.select |$x| { ... }
 
   When the first argument is an Array, the block is called with each entry in turn. When the first argument
   is a hash the entry is an array with `[key, value]`.
@@ -20,11 +20,12 @@ Puppet::Parser::Functions::newfunction(
 
   *Examples*
 
-    # selects all that end with berry
-    $a = ["raspberry", "blueberry", "orange"]
-    $a.select |$x| { $x =~ /berry$/ }
+        # selects all that end with berry
+        $a = ["raspberry", "blueberry", "orange"]
+        $a.select |$x| { $x =~ /berry$/ }
 
-  Since 3.2
+  - Since 3.2
+  - requires `parser = future`.
   ENDHEREDOC
 
   receiver = args[0]

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

@@ -7,11 +7,11 @@ Puppet::Parser::Functions::newfunction(
   argument and returns the first argument, or if no block is given returns a new array with a concatenation of
   the slices.
 
-  This function takes two mandatory arguments: the first should be an Array or a Hash, and the second
+  This function takes two mandatory arguments: the first, `$a`, should be an Array or a Hash, and the second, `$n`,
   the number of elements to include in each slice. The optional third argument should be a
   a parameterized block as produced by the puppet syntax:
 
-      |$x| { ... }
+      $a.slice($n) |$x| { ... }
 
   The parameterized block should have either one parameter (receiving an array with the slice), or the same number
   of parameters as specified by the slice size (each parameter receiving its part of the slice).
@@ -31,7 +31,8 @@ Puppet::Parser::Functions::newfunction(
 
       slice($[1,2,3,4,5,6], 2) # produces [[1,2], [3,4], [5,6]]
 
-  Since 3.2
+  - Since 3.2
+  - requires `parser = future`.
   ENDHEREDOC
   require 'puppet/parser/ast/lambda'
   require 'puppet/parser/scope'

data/lib/puppet/resource/catalog.rb

@@ -12,7 +12,9 @@ require 'puppet/util/tagging'
 # of the information in the catalog, including the resources
 # and the relationships between them.
 class Puppet::Resource::Catalog < Puppet::SimpleGraph
-  class DuplicateResourceError < Puppet::Error; end
+  class DuplicateResourceError < Puppet::Error
+    include Puppet::ExternalFileError
+  end
 
   extend Puppet::Indirector
   indirects :catalog, :terminus_setting => :catalog_terminus
@@ -531,11 +533,11 @@ class Puppet::Resource::Catalog < Puppet::SimpleGraph
     # If we've gotten this far, it's a real conflict
     msg = "Duplicate declaration: #{resource.ref} is already declared"
 
-    msg << " in file #{existing_resource.file} at line #{existing_resource.line}" if existing_resource.file and existing_resource.line
+    msg << " in file #{existing_resource.file}:#{existing_resource.line}" if existing_resource.file and existing_resource.line
 
-    msg << "; cannot redeclare" if resource.line or resource.file
+    msg << "; cannot redeclare"
 
-    raise DuplicateResourceError.new(msg)
+    raise DuplicateResourceError.new(msg, resource.file, resource.line)
   end
 
   # An abstracted method for converting one catalog into another type of catalog.

data/lib/puppet/resource/type.rb

@@ -191,15 +191,7 @@ class Puppet::Resource::Type
       return
     end
 
-    self.code = Puppet::Parser::AST::BlockExpression.new(:children => [self.code, other.code])
-#    array_class = Puppet::Parser::AST::ASTArray
-#    self.code = array_class.new(:children => [self.code]) unless self.code.is_a?(array_class)
-#
-#    if other.code.is_a?(array_class)
-#      code.children += other.code.children
-#    else
-#      code.children << other.code
-#    end
+    self.code = self.code.sequence_with(other.code)
   end
 
   # Make an instance of the resource type, and place it in the catalog

data/lib/puppet/scheduler/timer.rb

@@ -2,7 +2,7 @@ module Puppet::Scheduler
   class Timer
     def wait_for(seconds)
       if seconds > 0
-        select([], [], [], seconds)
+        sleep(seconds)
       end
     end