puppet 2.7.21 → 2.7.22

data/lib/puppet/network/http/handler.rb

@@ -239,7 +239,7 @@ module Puppet::Network::HTTP::Handler
       next result if param == :ip
       value = CGI.unescape(value)
       if value =~ /^---/
-        value = YAML.safely_load(value)
+        value = YAML.load(value, :safe => true, :deserialize_symbols => true)
       else
         value = true if value == "true"
         value = false if value == "false"

data/lib/puppet/node.rb

@@ -20,6 +20,31 @@ class Puppet::Node
   attr_accessor :name, :classes, :source, :ipaddress, :parameters
   attr_reader :time
 
+  ::PSON.register_document_type('Node',self)
+
+  def self.from_pson(pson)
+    raise ArgumentError, "No name provided in serialized data" unless name = pson['name']
+
+    node = new(name)
+    node.classes = pson['classes']
+    node.parameters = pson['parameters']
+    node.environment = pson['environment']
+    node
+  end
+
+  def to_pson(*args)
+    result = {
+      'document_type' => "Node",
+      'data' => {}
+    }
+    result['data']['name'] = name
+    result['data']['classes'] = classes unless classes.empty?
+    result['data']['parameters'] = parameters unless parameters.empty?
+    result['data']['environment'] = environment.name
+
+    result.to_pson(*args)
+  end
+
   def environment
     return super if @environment
 

data/lib/puppet/node/facts.rb

@@ -47,6 +47,26 @@ class Puppet::Node::Facts
     end
   end
 
+  def initialize_from_hash(data)
+    @name = data['name']
+    @values = data['values']
+    # Timestamp will be here in YAML
+    timestamp = data['values']['_timestamp']
+    @values.delete_if do |key, val|
+      key =~ /^_/
+    end
+
+    #Timestamp will be here in pson
+    timestamp ||= data['timestamp']
+    timestamp = Time.parse(timestamp) if timestamp.is_a? String
+    self.timestamp = timestamp
+
+    self.expiration = data['expiration']
+    if expiration.is_a? String
+      self.expiration = Time.parse(expiration)
+    end
+  end
+
   # Convert all fact values into strings.
   def stringify
     values.each do |fact, value|
@@ -60,10 +80,9 @@ class Puppet::Node::Facts
   end
 
   def self.from_pson(data)
-    result = new(data['name'], data['values'])
-    result.timestamp = Time.parse(data['timestamp'])
-    result.expiration = Time.parse(data['expiration'])
-    result
+    new_facts = allocate
+    new_facts.initialize_from_hash(data)
+    new_facts
   end
 
   def to_pson(*args)

data/lib/puppet/resource.rb

@@ -28,8 +28,8 @@ class Puppet::Resource
   ATTRIBUTES = [:file, :line, :exported]
 
   def self.from_pson(pson)
-    raise ArgumentError, "No resource type provided in pson data" unless type = pson['type']
-    raise ArgumentError, "No resource title provided in pson data" unless title = pson['title']
+    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']
 
     resource = new(type, title)
 
@@ -47,8 +47,6 @@ class Puppet::Resource
       end
     end
 
-    resource.exported ||= false
-
     resource
   end
 

data/lib/puppet/resource/status.rb

@@ -14,6 +14,13 @@ module Puppet
 
       YAML_ATTRIBUTES = %w{@resource @file @line @evaluation_time @change_count @out_of_sync_count @tags @time @events @out_of_sync @changed @resource_type @title @skipped @failed}
 
+
+      def self.from_pson(data)
+        obj = self.allocate
+        obj.initialize_from_hash(data)
+        obj
+      end
+
       # Provide a boolean method for each of the states.
       STATES.each do |attr|
         define_method("#{attr}?") do
@@ -65,6 +72,27 @@ module Puppet
         @title = resource.title
       end
 
+      def initialize_from_hash(data)
+        @resource_type = data['resource_type']
+        @title = data['title']
+        @resource = data['resource']
+        @file = data['file']
+        @line = data['line']
+        @evaluation_time = data['evaluation_time']
+        @change_count = data['change_count']
+        @out_of_sync_count = data['out_of_sync_count']
+        @tags = data['tags']
+        @time = data['time']
+        @out_of_sync = data['out_of_sync']
+        @changed = data['changed']
+        @skipped = data['skipped']
+        @failed = data['failed']
+
+        @events = data['events'].map do |event|
+          Puppet::Transaction::Event.from_pson(event)
+        end
+      end
+
       def to_yaml_properties
         YAML_ATTRIBUTES & instance_variables
       end

data/lib/puppet/run.rb

@@ -32,6 +32,17 @@ class Puppet::Run
     @options = options
   end
 
+  def initialize_from_hash(hash)
+    @options = {}
+
+    hash['options'].each do |key, value|
+      @options[key.to_sym] = value
+    end
+
+    @background = hash['background']
+    @status = hash['status']
+  end
+
   def log_run
     msg = ""
     msg += "triggered run" % if options[:tags]
@@ -62,9 +73,20 @@ class Puppet::Run
     self
   end
 
-  def self.from_pson( pson )
+  def self.from_hash(hash)
+    obj = allocate
+    obj.initialize_from_hash(hash)
+    obj
+  end
+
+  def self.from_pson(hash)
+    if hash['options']
+      return from_hash(hash)
+    end
+
     options = {}
-    pson.each do |key, value|
+
+    hash.each do |key, value|
       options[key.to_sym] = value
     end
 

data/lib/puppet/status.rb

@@ -14,8 +14,12 @@ class Puppet::Status
     @status.to_pson
   end
 
-  def self.from_pson( pson )
-    self.new( pson )
+  def self.from_pson(pson)
+    if pson.include?('status')
+      self.new(pson['status'])
+    else
+      self.new(pson)
+    end
   end
 
   def name

data/lib/puppet/transaction/event.rb

@@ -16,6 +16,12 @@ class Puppet::Transaction::Event
 
   EVENT_STATUSES = %w{noop success failure audit}
 
+  def self.from_pson(data)
+    obj = self.allocate
+    obj.initialize_from_hash(data)
+    obj
+  end
+
   def initialize(options = {})
     @audited = false
     options.each { |attr, value| send(attr.to_s + "=", value) }
@@ -23,6 +29,19 @@ class Puppet::Transaction::Event
     @time = Time.now
   end
 
+  def initialize_from_hash(data)
+    @audited = data['audited']
+    @property = data['property']
+    @previous_value = data['previous_value']
+    @desired_value = data['desired_value']
+    @historical_value = data['historical_value']
+    @message = data['message']
+    @name = data['name'].intern
+    @status = data['status']
+    @time = data['time']
+    @time = Time.parse(@time) if @time.is_a? String
+  end
+
   def property=(prop)
     @property = prop.to_s
   end

data/lib/puppet/transaction/report.rb

@@ -19,6 +19,12 @@ class Puppet::Transaction::Report
     :yaml
   end
 
+  def self.from_pson(data)
+    obj = self.allocate
+    obj.initialize_from_hash(data)
+    obj
+  end
+
   def <<(msg)
     @logs << msg
     self
@@ -83,6 +89,39 @@ class Puppet::Transaction::Report
     @status = 'failed' # assume failed until the report is finalized
   end
 
+  def initialize_from_hash(data)
+    @puppet_version = data['puppet_version']
+    @report_format = data['report_format']
+    @configuration_version = data['configuration_version']
+    @environment = data['environment']
+    @status = data['status']
+    @host = data['host']
+    @time = data['time']
+    if @time.is_a? String
+      @time = Time.parse(@time)
+    end
+    @kind = data['kind']
+
+    @metrics = {}
+    data['metrics'].each do |name, hash|
+      @metrics[name] = Puppet::Util::Metric.from_pson(hash)
+    end
+
+    @logs = data['logs'].map do |record|
+      Puppet::Util::Log.from_pson(record)
+    end
+
+    @resource_statuses = {}
+    data['resource_statuses'].map do |record|
+      if record[1] == {}
+        status = nil
+      else
+        status = Puppet::Resource::Status.from_pson(record[1])
+      end
+      @resource_statuses[record[0]] = status
+    end
+  end
+
   def name
     host
   end

data/lib/puppet/util/log.rb

@@ -206,6 +206,12 @@ class Puppet::Util::Log
     @levels.include?(level)
   end
 
+  def self.from_pson(data)
+    obj = allocate
+    obj.initialize_from_hash(data)
+    obj
+  end
+
   attr_accessor :time, :remote, :file, :line, :source
   attr_reader :level, :message
 
@@ -228,6 +234,19 @@ class Puppet::Util::Log
     Log.newmessage(self)
   end
 
+  def initialize_from_hash(data)
+    @level = data['level'].intern
+    @message = data['message']
+    @source = data['source']
+    @tags = data['tags']
+    @time = data['time']
+    if @time.is_a? String
+      @time = Time.parse(@time)
+    end
+    @file = data['file'] if data['file']
+    @line = data['line'] if data['line']
+  end
+
   def message=(msg)
     raise ArgumentError, "Puppet::Util::Log requires a message" unless msg
     @message = msg.to_s

data/lib/puppet/util/metric.rb

@@ -9,6 +9,12 @@ class Puppet::Util::Metric
 
   attr_writer :basedir
 
+  def self.from_pson(data)
+    metric = new(data['name'], data['label'])
+    metric.values = data['values']
+    metric
+  end
+
   # Return a specific value
   def [](name)
     if value = @values.find { |v| v[0] == name }

data/lib/puppet/util/monkey_patches.rb

@@ -1,4 +1,3 @@
-
 unless defined? JRUBY_VERSION
   Process.maxgroups = 1024
 end
@@ -34,21 +33,6 @@ end
   end
 }
 
-if defined?(YAML::ENGINE) and YAML::ENGINE.yamler == 'psych'
-  def Psych.safely_load(str)
-    result = Psych.parse(str)
-    if invalid_node = result.find { |node| node.tag =~ /!map:(.*)/ || node.tag =~ /!ruby\/hash:(.*)/ }
-      raise ArgumentError, "Illegal YAML mapping found with tag #{invalid_node.tag}; please use !ruby/object:#{$1} instead"
-    else
-      result.to_ruby
-    end
-  end
-else
-  def YAML.safely_load(str)
-    self.load(str)
-  end
-end
-
 def YAML.dump(*args)
   ZAML.dump(*args)
 end

data/lib/puppet/vendor.rb

@@ -0,0 +1,55 @@
+module Puppet
+  # Simple module to manage vendored code.
+  #
+  # To vendor a library:
+  #
+  # * Download its whole git repo or untar into `lib/puppet/vendor/<libname>`
+  # * Create a lib/puppetload_libraryname.rb file to add its libdir into the $:.
+  #   (Look at existing load_xxx files, they should all follow the same pattern).
+  # * To load the vendored lib upfront, add a `require '<vendorlib>'`line to
+  #   `vendor/require_vendored.rb`.
+  # * To load the vendored lib on demand, add a comment to `vendor/require_vendored.rb`
+  #    to make it clear it should not be loaded upfront.
+  #
+  # At runtime, the #load_vendored method should be called. It will ensure
+  # all vendored libraries are added to the global `$:` path, and
+  # will then call execute the up-front loading specified in `vendor/require_vendored.rb`.
+  #
+  # The intention is to not change vendored libraries and to eventually
+  # make adding them in optional so that distros can simply adjust their
+  # packaging to exclude this directory and the various load_xxx.rb scripts
+  # if they wish to install these gems as native packages.
+  #
+  class Vendor
+    class << self
+      # @api private
+      def vendor_dir
+        File.join([File.dirname(File.expand_path(__FILE__)), "vendor"])
+      end
+
+      # @api private
+      def load_entry(entry)
+        Puppet.debug("Loading vendored #{$1}")
+        load "#{vendor_dir}/#{entry}"
+      end
+
+      # @api private
+      def require_libs
+        require 'puppet/vendor/require_vendored'
+      end
+
+      # Configures the path for all vendored libraries and loads required libraries.
+      # (This is the entry point for loading vendored libraries).
+      #
+      def load_vendored
+        Dir.entries(vendor_dir).each do |entry|
+          if entry.match(/load_(\w+?)\.rb$/)
+            load_entry entry
+          end
+        end
+
+        require_libs
+      end
+    end
+  end
+end

data/lib/puppet/vendor/load_safe_yaml.rb

@@ -0,0 +1 @@
+$: << File.join([File.dirname(__FILE__), "safe_yaml/lib"])

data/lib/puppet/vendor/require_vendored.rb

@@ -0,0 +1,4 @@
+# This adds upfront requirements on vendored code found under lib/vendor/x
+# Add one requirement per vendored package (or a comment if it is loaded on demand).
+
+require 'safe_yaml'

data/lib/puppet/vendor/safe_yaml/CHANGES.md

@@ -0,0 +1,104 @@
+0.9.2
+-----
+
+- fixed error w/ parsing "!" when whitelisting tags
+- fixed parsing of the number 0 (d'oh!)
+
+0.9.1
+-----
+
+- added Yecht support (JRuby)
+- more bug fixes
+
+0.9.0
+-----
+
+- added `whitelist!` method for easily whitelisting tags
+- added support for call-specific options
+- removed deprecated methods
+
+0.8.6
+-----
+
+- fixed bug in float matcher
+
+0.8.5
+-----
+
+- performance improvements
+- made less verbose by default
+- bug fixes
+
+0.8.4
+-----
+
+- enhancements to parsing of integers, floats, and dates
+- updated built-in whitelist
+- more bug fixes
+
+0.8.3
+-----
+
+- fixed exception on parsing empty document
+- fixed handling of octal & hexadecimal numbers
+
+0.8.2
+-----
+
+- bug fixes
+
+0.8.1
+-----
+
+- added `:raise_on_unknown_tag` option
+- renamed `reset_defaults!` to `restore_defaults!`
+
+0.8
+---
+
+- added tag whitelisting
+- more API changes
+
+0.7
+---
+
+- separated YAML engine support from Ruby version
+- added support for binary scalars
+- numerous bug fixes and enhancements
+
+0.6
+---
+
+- several API changes
+- added `SafeYAML::OPTIONS` for specifying default behavior
+
+0.5
+---
+
+Added support for dates
+
+0.4
+---
+
+- efficiency improvements
+- made `YAML.load` use `YAML.safe_load` by default
+- made symbol deserialization optional
+
+0.3
+---
+
+Added Syck support
+
+0.2
+---
+
+Added support for:
+
+- anchors & aliases
+- booleans
+- nils
+
+0.1
+---
+
+Initial release