Merge remote branch 'paul/ticket/next/4657' into next

This patch conflicts with a backport of itself. This merge resolution
favors the original patch for the code changes, and the 2.6.2 patch for
the specs.

Manually Resolved Conflicts:
	lib/puppet/dsl/resource_type_api.rb
	lib/puppet/parser/ast/definition.rb
	lib/puppet/parser/parser_support.rb
	spec/integration/parser/ruby_manifest_spec.rb
	spec/unit/dsl/resource_type_api_spec.rb

1 files changed, 5 insertions, 2 deletions

diff --git a/lib/puppet/parser/ast/definition.rb b/lib/puppet/parser/ast/definition.rb
index 287845ade..c43422f82 100644
--- a/lib/puppet/parser/ast/definition.rb
+++ b/lib/puppet/parser/ast/definition.rb
@@ -3,12 +3,15 @@ require 'puppet/parser/ast/top_level_construct'
 class Puppet::Parser::AST::Definition < Puppet::Parser::AST::TopLevelConstruct
   attr_accessor :context
 
-  def initialize(name, context = {})
+  def initialize(name, context = {}, &ruby_code)
     @name = name
     @context = context
+    @ruby_code = ruby_code
   end
 
   def instantiate(modname)
-    return [Puppet::Resource::Type.new(:definition, @name, @context.merge(:module_name => modname))]
+    new_definition = Puppet::Resource::Type.new(:definition, @name, @context.merge(:module_name => modname))
+    new_definition.ruby_code = @ruby_code if @ruby_code
+    [new_definition]
   end
 end