puppet 3.0.2.rc2 → 3.0.2.rc3

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

@@ -33,7 +33,7 @@
 #
 # === Copyright
 #
-# Copyright <%= Time.now.year -%> Your name here, unless otherwise noted.
+# Copyright <%= Time.now.year %> Your name here, unless otherwise noted.
 #
 class <%= metadata.name %> {
 

data/lib/puppet/parser/collector.rb

@@ -32,7 +32,7 @@ class Puppet::Parser::Collector
     # we have an override for the collected resources
     if @overrides and !objects.empty?
       # force the resource to be always child of any other resource
-      overrides[:source].meta_def(:child_of?) do
+      overrides[:source].meta_def(:child_of?) do |klass|
         true
       end
 

data/lib/puppet/version.rb

@@ -6,7 +6,7 @@
 # Raketasks and such to set the version based on the output of `git describe`
 #
 module Puppet
-  PUPPETVERSION = '3.0.2-rc2'
+  PUPPETVERSION = '3.0.2-rc3'
 
   def self.version
     @puppet_version || PUPPETVERSION

data/spec/spec_helper.rb

@@ -24,6 +24,7 @@ end
 
 require 'pathname'
 require 'tmpdir'
+require 'fileutils'
 
 require 'puppet_spec/verbose'
 require 'puppet_spec/files'
@@ -48,6 +49,10 @@ RSpec.configure do |config|
 
   config.mock_with :mocha
 
+  tmpdir = Dir.mktmpdir("rspecrun")
+  oldtmpdir = Dir.tmpdir()
+  ENV['TMPDIR'] = tmpdir
+
   if Puppet::Util::Platform.windows?
     config.output_stream = $stdout
     config.error_stream = $stderr
@@ -121,5 +126,9 @@ RSpec.configure do |config|
         config.instance_variable_get(:@files_to_run).each { |f| logfile.puts f }
       end
     end
+    # Clean up switch of TMPDIR, don't know if needed after this, so needs to reset it
+    # to old before removing it
+    ENV['TMPDIR'] = oldtmpdir
+    FileUtils.rm_rf(tmpdir) if File.exists?(tmpdir) && tmpdir.to_s.start_with?(oldtmpdir)
   end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: puppet
 version: !ruby/object:Gem::Version 
-  hash: 3193552049
+  hash: 3784944317
   prerelease: 6
   segments: 
   - 3
   - 0
   - 2
   - rc
-  - 2
-  version: 3.0.2.rc2
+  - 3
+  version: 3.0.2.rc3
 platform: ruby
 authors: 
 - Puppet Labs
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-12-11 00:00:00 Z
+date: 2012-12-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: hiera