puppet 3.4.3 → 3.5.0.rc1

data/lib/puppet/rails/benchmark.rb

@@ -52,7 +52,7 @@ module Puppet::Rails::Benchmark
 
     file = "/tmp/time_debugging.yaml"
 
-    if Puppet::FileSystem::File.exist?(file)
+    if Puppet::FileSystem.exist?(file)
       data = YAML.load_file(file)
     else
       data = {}

data/lib/puppet/rails/resource.rb

@@ -84,7 +84,11 @@ class Puppet::Rails::Resource < ActiveRecord::Base
   end
 
   def [](param)
-    super || parameter(param)
+    if param == 'id'
+      super
+    else
+      super || parameter(param)
+    end
   end
 
   # Make sure this resource is equivalent to the provided Parser resource.

data/lib/puppet/reference/configuration.rb

@@ -1,4 +1,4 @@
-config = Puppet::Util::Reference.newreference(:configuration, :depth => 1, :doc => "A reference for all configuration parameters") do
+config = Puppet::Util::Reference.newreference(:configuration, :depth => 1, :doc => "A reference for all settings") do
   docs = {}
   Puppet.settings.each do |name, object|
     docs[name] = object

data/lib/puppet/reference/report.rb

@@ -9,7 +9,7 @@ Puppet clients can report back to the server after each transaction.  This
 transaction report is sent as a YAML dump of the
 `Puppet::Transaction::Report` class and includes every log message that was
 generated during the transaction along with as many metrics as Puppet knows how
-to collect.  See [Reports and Reporting](http://projects.puppetlabs.com/projects/puppet/wiki/Reports_And_Reporting) for more information on how to use reports.
+to collect.  See [Reports and Reporting](http://docs.puppetlabs.com/guides/reporting.html) for more information on how to use reports.
 
 Currently, clients default to not sending in reports; you can enable reporting
 by setting the `report` parameter to true.

data/lib/puppet/relationship.rb

@@ -12,21 +12,26 @@ class Puppet::Relationship
 
   attr_reader :event
 
-  def self.from_pson(pson)
-    source = pson["source"]
-    target = pson["target"]
+  def self.from_data_hash(data)
+    source = data["source"]
+    target = data["target"]
 
     args = {}
-    if event = pson["event"]
+    if event = data["event"]
       args[:event] = event
     end
-    if callback = pson["callback"]
+    if callback = data["callback"]
       args[:callback] = callback
     end
 
     new(source, target, args)
   end
 
+  def self.from_pson(pson)
+    Puppet.deprecation_warning("from_pson is being removed in favour of from_data_hash.")
+    self.from_data_hash(pson)
+  end
+
   def event=(event)
     raise ArgumentError, "You must pass a callback for non-NONE events" if event != :NONE and ! callback
     @event = event

data/lib/puppet/reports/http.rb

@@ -13,11 +13,17 @@ Puppet::Reports.register_report(:http) do
 
   def process
     url = URI.parse(Puppet[:reporturl])
-    body = self.to_yaml
     headers = { "Content-Type" => "application/x-yaml" }
+    options = {}
+    if url.user && url.password
+      options[:basic_auth] = {
+        :user => url.user,
+        :password => url.password
+      }
+    end
     use_ssl = url.scheme == 'https'
     conn = Puppet::Network::HttpPool.http_instance(url.host, url.port, use_ssl)
-    response = conn.post(url.path, body, headers)
+    response = conn.post(url.path, self.to_yaml, headers, options)
     unless response.kind_of?(Net::HTTPSuccess)
       Puppet.err "Unable to submit report to #{Puppet[:reporturl].to_s} [#{response.code}] #{response.msg}"
     end

data/lib/puppet/reports/rrdgraph.rb

@@ -114,7 +114,7 @@ Puppet::Reports.register_report(:rrdgraph) do
       metric.graph
     end
 
-    mkhtml unless Puppet::FileSystem::File.exist?(File.join(hostdir, "index.html"))
+    mkhtml unless Puppet::FileSystem.exist?(File.join(hostdir, "index.html"))
   end
 
   # Unfortunately, RRD does not deal well with changing lists of values,

data/lib/puppet/reports/store.rb

@@ -17,7 +17,7 @@ Puppet::Reports.register_report(:store) do
 
     dir = File.join(Puppet[:reportdir], host)
 
-    if ! Puppet::FileSystem::File.exist?(dir)
+    if ! Puppet::FileSystem.exist?(dir)
       FileUtils.mkdir_p(dir)
       FileUtils.chmod_R(0750, dir)
     end
@@ -54,11 +54,11 @@ Puppet::Reports.register_report(:store) do
 
     dir = File.join(Puppet[:reportdir], host)
 
-    if Puppet::FileSystem::File.exist?(dir)
+    if Puppet::FileSystem.exist?(dir)
       Dir.entries(dir).each do |file|
         next if ['.','..'].include?(file)
         file = File.join(dir, file)
-        Puppet::FileSystem::File.unlink(file) if File.file?(file)
+        Puppet::FileSystem.unlink(file) if File.file?(file)
       end
       Dir.rmdir(dir)
     end

data/lib/puppet/reports/tagmail.rb

@@ -8,7 +8,7 @@ Puppet::Reports.register_report(:tagmail) do
   desc "This report sends specific log messages to specific email addresses
     based on the tags in the log messages.
 
-    See the [documentation on tags](http://projects.puppetlabs.com/projects/puppet/wiki/Using_Tags) for more information.
+    See the [documentation on tags](http://docs.puppetlabs.com/puppet/latest/reference/lang_tags.html) for more information.
 
     To use this report, you must create a `tagmail.conf` file in the location
     specified by the `tagmap` setting.  This is a simple file that maps tags to
@@ -108,7 +108,7 @@ Puppet::Reports.register_report(:tagmail) do
 
   # Process the report.  This just calls the other associated messages.
   def process
-    unless Puppet::FileSystem::File.exist?(Puppet[:tagmap])
+    unless Puppet::FileSystem.exist?(Puppet[:tagmap])
       Puppet.notice "Cannot send tagmail report; no tagmap file #{Puppet[:tagmap]}"
       return
     end
@@ -148,7 +148,7 @@ Puppet::Reports.register_report(:tagmail) do
         rescue => detail
           message = "Could not send report emails through smtp: #{detail}"
           Puppet.log_exception(detail, message)
-          raise Puppet::Error, message
+          raise Puppet::Error, message, detail.backtrace
         end
       elsif Puppet[:sendmail] != ""
         begin
@@ -165,7 +165,7 @@ Puppet::Reports.register_report(:tagmail) do
         rescue => detail
           message = "Could not send report emails via sendmail: #{detail}"
           Puppet.log_exception(detail, message)
-          raise Puppet::Error, message
+          raise Puppet::Error, message, detail.backtrace
         end
       else
         raise Puppet::Error, "SMTP server is unset and could not find sendmail"

data/lib/puppet/resource.rb

@@ -15,9 +15,6 @@ class Puppet::Resource
 
   include Puppet::Util::Tagging
 
-  require 'puppet/resource/type_collection_helper'
-  include Puppet::Resource::TypeCollectionHelper
-
   extend Puppet::Util::Pson
   include Enumerable
   attr_accessor :file, :line, :catalog, :exported, :virtual, :validate_parameters, :strict
@@ -29,22 +26,22 @@ class Puppet::Resource
 
   ATTRIBUTES = [:file, :line, :exported]
 
-  def self.from_pson(pson)
-    raise ArgumentError, "No resource type provided in serialized data" unless type = pson['type']
-    raise ArgumentError, "No resource title provided in serialized data" unless title = pson['title']
+  def self.from_data_hash(data)
+    raise ArgumentError, "No resource type provided in serialized data" unless type = data['type']
+    raise ArgumentError, "No resource title provided in serialized data" unless title = data['title']
 
     resource = new(type, title)
 
-    if params = pson['parameters']
+    if params = data['parameters']
       params.each { |param, value| resource[param] = value }
     end
 
-    if tags = pson['tags']
+    if tags = data['tags']
       tags.each { |tag| resource.tag(tag) }
     end
 
     ATTRIBUTES.each do |a|
-      if value = pson[a.to_s]
+      if value = data[a.to_s]
         resource.send(a.to_s + "=", value)
       end
     end
@@ -52,6 +49,11 @@ class Puppet::Resource
     resource
   end
 
+  def self.from_pson(pson)
+    Puppet.deprecation_warning("from_pson is being removed in favour of from_data_hash.")
+    self.from_data_hash(pson)
+  end
+
   def inspect
     "#{@type}[#{@title}]#{to_hash.inspect}"
   end
@@ -170,23 +172,6 @@ class Puppet::Resource
     super || parameters.keys.include?( parameter_name(parameter) )
   end
 
-  # These two methods are extracted into a Helper
-  # module, but file load order prevents me
-  # from including them in the class, and I had weird
-  # behaviour (i.e., sometimes it didn't work) when
-  # I directly extended each resource with the helper.
-  def environment
-    Puppet::Node::Environment.new(@environment)
-  end
-
-  def environment=(env)
-    if env.is_a?(String) or env.is_a?(Symbol)
-      @environment = env
-    else
-      @environment = env.name
-    end
-  end
-
   %w{exported virtual strict}.each do |m|
     define_method(m+"?") do
       self.send(m)
@@ -246,15 +231,33 @@ class Puppet::Resource
     catalog ? catalog.resource(to_s) : nil
   end
 
+  # The resource's type implementation
+  # @return [Puppet::Type, Puppet::Resource::Type]
+  # @api private
   def resource_type
     @rstype ||= case type
-    when "Class"; known_resource_types.hostclass(title == :main ? "" : title)
-    when "Node"; known_resource_types.node(title)
+    when "Class"; environment.known_resource_types.hostclass(title == :main ? "" : title)
+    when "Node"; environment.known_resource_types.node(title)
     else
-      Puppet::Type.type(type) || known_resource_types.definition(type)
+      Puppet::Type.type(type) || environment.known_resource_types.definition(type)
     end
   end
 
+  # Set the resource's type implementation
+  # @param type [Puppet::Type, Puppet::Resource::Type]
+  # @api private
+  def resource_type=(type)
+    @rstype = type
+  end
+
+  def environment
+    @environment ||= Puppet.lookup(:environments).get(Puppet[:environment])
+  end
+
+  def environment=(environment)
+    @environment = environment
+  end
+
   # Produce a simple hash of our parameters.
   def to_hash
     parse_title.merge parameters
@@ -303,11 +306,8 @@ class Puppet::Resource
   # Convert our resource to a RAL resource instance.  Creates component
   # instances for resource types that don't exist.
   def to_ral
-    if typeklass = Puppet::Type.type(self.type)
-      return typeklass.new(self)
-    else
-      return Puppet::Type::Component.new(self)
-    end
+    typeklass = Puppet::Type.type(self.type) || Puppet::Type.type(:component)
+    typeklass.new(self)
   end
 
   def name
@@ -339,16 +339,7 @@ class Puppet::Resource
     return nil unless resource_type.type == :hostclass
 
     name = "#{resource_type.name}::#{param}"
-    # Lookup with injector (optionally), and if no value bound, lookup with "classic hiera"
-    result = nil
-    if scope.compiler.is_binder_active?
-      result = scope.compiler.injector.lookup(scope, name)
-    end
-    if result.nil?
-      lookup_with_databinding(name, scope)
-    else
-      result
-    end
+    lookup_with_databinding(name, scope)
   end
 
   private :lookup_external_default_for
@@ -420,6 +411,8 @@ class Puppet::Resource
     result.exported = self.exported
     result.virtual = self.virtual
     result.tag(*self.tags)
+    result.environment = environment
+    result.instance_variable_set(:@rstype, resource_type)
 
     result
   end

data/lib/puppet/resource/catalog.rb

@@ -313,7 +313,7 @@ class Puppet::Resource::Catalog < Puppet::Graph::SimpleGraph
     end
   end
 
-  def self.from_pson(data)
+  def self.from_data_hash(data)
     result = new(data['name'])
 
     if tags = data['tags']
@@ -330,14 +330,24 @@ class Puppet::Resource::Catalog < Puppet::Graph::SimpleGraph
 
     if resources = data['resources']
       result.add_resource(*resources.collect do |res|
-        Puppet::Resource.from_pson(res)
+        Puppet::Resource.from_data_hash(res)
       end)
     end
 
     if edges = data['edges']
-      edges = PSON.parse(edges) if edges.is_a?(String)
-      edges.each do |edge|
-        edge_from_pson(result, edge)
+      edges.each do |edge_hash|
+        edge = Puppet::Relationship.from_data_hash(edge_hash)
+        unless source = result.resource(edge.source)
+          raise ArgumentError, "Could not intern from data: Could not find relationship source #{edge.source.inspect}"
+        end
+        edge.source = source
+
+        unless target = result.resource(edge.target)
+          raise ArgumentError, "Could not intern from data: Could not find relationship target #{edge.target.inspect}"
+        end
+        edge.target = target
+
+        result.add_edge(edge)
       end
     end
 
@@ -348,21 +358,9 @@ class Puppet::Resource::Catalog < Puppet::Graph::SimpleGraph
     result
   end
 
-  def self.edge_from_pson(result, edge)
-    # If no type information was presented, we manually find
-    # the class.
-    edge = Puppet::Relationship.from_pson(edge) if edge.is_a?(Hash)
-    unless source = result.resource(edge.source)
-      raise ArgumentError, "Could not convert from pson: Could not find relationship source #{edge.source.inspect}"
-    end
-    edge.source = source
-
-    unless target = result.resource(edge.target)
-      raise ArgumentError, "Could not convert from pson: Could not find relationship target #{edge.target.inspect}"
-    end
-    edge.target = target
-
-    result.add_edge(edge)
+  def self.from_pson(data)
+    Puppet.deprecation_warning("from_pson is being removed in favour of from_data_hash.")
+    self.from_data_hash(data)
   end
 
   def to_data_hash

data/lib/puppet/resource/status.rb

@@ -24,12 +24,17 @@ module Puppet
         map(&:to_sym)
 
 
-      def self.from_pson(data)
+      def self.from_data_hash(data)
         obj = self.allocate
         obj.initialize_from_hash(data)
         obj
       end
 
+      def self.from_pson(data)
+        Puppet.deprecation_warning("from_pson is being removed in favour of from_data_hash.")
+        self.from_data_hash(data)
+      end
+
       # Provide a boolean method for each of the states.
       STATES.each do |attr|
         define_method("#{attr}?") do
@@ -111,7 +116,7 @@ module Puppet
         @failed = data['failed']
 
         @events = data['events'].map do |event|
-          Puppet::Transaction::Event.from_pson(event)
+          Puppet::Transaction::Event.from_data_hash(event)
         end
       end
 
@@ -136,10 +141,6 @@ module Puppet
         }
       end
 
-      def to_pson(*args)
-        to_data_hash.to_pson(*args)
-      end
-
       def to_yaml_properties
         YAML_ATTRIBUTES & super
       end

data/lib/puppet/resource/type.rb

@@ -46,7 +46,7 @@ class Puppet::Resource::Type
   extend Puppet::Indirector
   indirects :resource_type, :terminus_class => :parser
 
-  def self.from_pson(data)
+  def self.from_data_hash(data)
     name = data.delete('name') or raise ArgumentError, "Resource Type names must be specified"
     kind = data.delete('kind') || "definition"
 
@@ -63,8 +63,9 @@ class Puppet::Resource::Type
     new(type, name, data)
   end
 
-  def to_pson(*args)
-    to_data_hash.to_pson(*args)
+  def self.from_pson(data)
+    Puppet.deprecation_warning("from_pson is being removed in favour of from_data_hash.")
+    self.from_data_hash(data)
   end
 
   def to_data_hash
@@ -179,7 +180,8 @@ class Puppet::Resource::Type
       return
     end
 
-    self.code = self.code.sequence_with(other.code)
+    self.code = Puppet::Parser::ParserFactory.code_merger.concatenate([self, other])
+#    self.code = self.code.sequence_with(other.code)
   end
 
   # Make an instance of the resource type, and place it in the catalog
@@ -382,4 +384,3 @@ class Puppet::Resource::Type
     end
   end
 end
-

data/lib/puppet/resource/type_collection.rb

@@ -17,7 +17,7 @@ class Puppet::Resource::TypeCollection
   end
 
   def initialize(env)
-    @environment = env.is_a?(String) ? Puppet::Node::Environment.new(env) : env
+    @environment = env
     @hostclasses = {}
     @definitions = {}
     @nodes = {}
@@ -148,7 +148,7 @@ class Puppet::Resource::TypeCollection
 
     @version
   rescue Puppet::ExecutionFailure => e
-    raise Puppet::ParseError, "Execution of config_version command `#{environment[:config_version]}` failed: #{e.message}"
+    raise Puppet::ParseError, "Execution of config_version command `#{environment[:config_version]}` failed: #{e.message}", e.backtrace
   end
 
   def watch_file(filename)