puppet 3.8.7 → 4.0.0.rc1

data/lib/puppet/util/metric.rb

@@ -9,19 +9,12 @@ class Puppet::Util::Metric
   attr_accessor :type, :name, :value, :label
   attr_writer :values
 
-  attr_writer :basedir
-
   def self.from_data_hash(data)
     metric = new(data['name'], data['label'])
     metric.values = data['values']
     metric
   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
-
   def to_data_hash
     {
       'name' => @name,
@@ -43,106 +36,6 @@ class Puppet::Util::Metric
     end
   end
 
-  def basedir
-    if defined?(@basedir)
-      @basedir
-    else
-      Puppet[:rrddir]
-    end
-  end
-
-  def create(start = nil)
-    Puppet.settings.use(:main, :metrics)
-
-    start ||= Time.now.to_i - 5
-
-    args = []
-
-    if Puppet.features.rrd_legacy? && ! Puppet.features.rrd?
-      @rrd = RRDtool.new(self.path)
-    end
-
-    values.each { |value|
-      # the 7200 is the heartbeat -- this means that any data that isn't
-      # more frequently than every two hours gets thrown away
-      args.push "DS:#{value[0]}:GAUGE:7200:U:U"
-    }
-    args.push "RRA:AVERAGE:0.5:1:300"
-
-    begin
-      if Puppet.features.rrd_legacy? && ! Puppet.features.rrd?
-        @rrd.create( Puppet[:rrdinterval], start, args)
-      else
-        RRD.create( self.path, '-s', Puppet[:rrdinterval].to_s, '-b', start.to_i.to_s, *args)
-      end
-    rescue => detail
-      raise detail, "Could not create RRD file #{path}: #{detail}", detail.backtrace
-    end
-  end
-
-  def dump
-    if Puppet.features.rrd_legacy? && ! Puppet.features.rrd?
-      puts @rrd.info
-    else
-      puts RRD.info(self.path)
-    end
-  end
-
-  def graph(range = nil)
-    unless Puppet.features.rrd? || Puppet.features.rrd_legacy?
-      Puppet.warning "RRD library is missing; cannot graph metrics"
-      return
-    end
-
-    unit = 60 * 60 * 24
-    colorstack = %w{#00ff00 #ff0000 #0000ff #ffff00 #ff99ff #ff9966 #66ffff #990000 #099000 #000990 #f00990 #0f0f0f #555555 #333333 #ffffff}
-
-    {:daily => unit, :weekly => unit * 7, :monthly => unit * 30, :yearly => unit * 365}.each do |name, time|
-      file = self.path.sub(/\.rrd$/, "-#{name}.png")
-      args = [file]
-
-      args.push("--title",self.label)
-      args.push("--imgformat","PNG")
-      args.push("--interlace")
-      defs = []
-      lines = []
-      #p @values.collect { |s,l| s }
-      values.zip(colorstack).each { |value,color|
-        next if value.nil?
-        # this actually uses the data label
-        defs.push("DEF:#{value[0]}=#{self.path}:#{value[0]}:AVERAGE")
-        lines.push("LINE2:#{value[0]}#{color}:#{value[1]}")
-      }
-      args << defs
-      args << lines
-      args.flatten!
-      if range
-        if Puppet.features.rrd_legacy? && ! Puppet.features.rrd?
-          args.push("--start",range[0],"--end",range[1])
-        else
-          args.push("--start",range[0].to_i.to_s,"--end",range[1].to_i.to_s)
-        end
-      else
-        if Puppet.features.rrd_legacy? && ! Puppet.features.rrd?
-          args.push("--start", Time.now.to_i - time, "--end", Time.now.to_i)
-        else
-          args.push("--start", (Time.now.to_i - time).to_s, "--end", Time.now.to_i.to_s)
-        end
-      end
-
-      begin
-        #Puppet.warning "args = #{args}"
-        if Puppet.features.rrd_legacy? && ! Puppet.features.rrd?
-          RRDtool.graph( args )
-        else
-          RRD.graph( *args )
-        end
-      rescue => detail
-        Puppet.err "Failed to graph #{self.name}: #{detail}"
-      end
-    end
-  end
-
   def initialize(name,label = nil)
     @name = name.to_s
 
@@ -151,49 +44,12 @@ class Puppet::Util::Metric
     @values = []
   end
 
-  def path
-    File.join(self.basedir, @name + ".rrd")
-  end
-
   def newvalue(name,value,label = nil)
     raise ArgumentError.new("metric name #{name.inspect} is not a string") unless name.is_a? String
     label ||= self.class.labelize(name)
     @values.push [name,label,value]
   end
 
-  def store(time)
-    unless Puppet.features.rrd? || Puppet.features.rrd_legacy?
-      Puppet.warning "RRD library is missing; cannot store metrics"
-      return
-    end
-    self.create(time - 5) unless Puppet::FileSystem.exist?(self.path)
-
-    if Puppet.features.rrd_legacy? && ! Puppet.features.rrd?
-      @rrd ||= RRDtool.new(self.path)
-    end
-
-    # XXX this is not terribly error-resistant
-    args = [time]
-    temps = []
-    values.each { |value|
-      #Puppet.warning "value[0]: #{value[0]}; value[1]: #{value[1]}; value[2]: #{value[2]}; "
-      args.push value[2]
-      temps.push value[0]
-    }
-    arg = args.join(":")
-    template = temps.join(":")
-    begin
-      if Puppet.features.rrd_legacy? && ! Puppet.features.rrd?
-        @rrd.update( template, [ arg ] )
-      else
-        RRD.update( self.path, '-t', template, arg )
-      end
-      #system("rrdtool updatev #{self.path} '#{arg}'")
-    rescue => detail
-      raise Puppet::Error, "Failed to update #{self.name}: #{detail}", detail.backtrace
-    end
-  end
-
   def values
     @values.sort { |a, b| a[1] <=> b[1] }
   end
@@ -203,8 +59,3 @@ class Puppet::Util::Metric
     name.to_s.capitalize.gsub("_", " ")
   end
 end
-
-# This is necessary because we changed the class path in early 2007,
-# and reports directly yaml-dump these metrics, so both client and server
-# have to agree on the class name.
-Puppet::Metric = Puppet::Util::Metric

data/lib/puppet/util/monkey_patches.rb

@@ -3,7 +3,7 @@ end
 
 begin
   Process.maxgroups = 1024
-rescue Exception
+rescue NotImplementedError
   # Actually, I just want to ignore it, since various platforms - JRuby,
   # Windows, and so forth - don't support it, but only because it isn't a
   # meaningful or implementable concept there.
@@ -18,10 +18,6 @@ module RDoc
   end
 end
 
-
-require "yaml"
-require "puppet/util/zaml.rb"
-
 class Symbol
   def <=> (other)
     self.to_s <=> other.to_s
@@ -32,31 +28,6 @@ class Symbol
   end unless method_defined? 'intern'
 end
 
-[Object, Exception, Integer, Struct, Date, Time, Range, Regexp, Hash, Array, Float, String, FalseClass, TrueClass, Symbol, NilClass, Class].each { |cls|
-  cls.class_eval do
-    def to_yaml(ignored=nil)
-      ZAML.dump(self)
-    end
-  end
-}
-
-def YAML.dump(*args)
-  ZAML.dump(*args)
-end
-
-#
-# Workaround for bug in MRI 1.8.7, see
-#     http://redmine.ruby-lang.org/issues/show/2708
-# for details
-#
-if RUBY_VERSION == '1.8.7'
-  class NilClass
-    def closed?
-      true
-    end
-  end
-end
-
 class Object
   # ActiveSupport 2.3.x mixes in a dangerous method
   # that can cause rspec to fork bomb
@@ -66,57 +37,8 @@ class Object
   end
 end
 
-class Symbol
-  # So, it turns out that one of the biggest memory allocation hot-spots in our
-  # code was using symbol-to-proc - because it allocated a new instance every
-  # time it was called, rather than caching (in Ruby 1.8.7 and earlier).
-  #
-  # In Ruby 1.9.3 and later Symbol#to_proc does implement a cache so we skip
-  # our monkey patch.
-  #
-  # Changing this means we can see XX memory reduction...
-  if RUBY_VERSION < "1.9.3"
-    if method_defined? :to_proc
-      alias __original_to_proc to_proc
-      def to_proc
-        @my_proc ||= __original_to_proc
-      end
-    else
-      def to_proc
-        @my_proc ||= Proc.new {|*args| args.shift.__send__(self, *args) }
-      end
-    end
-  end
-
-  # Defined in 1.9, absent in 1.8, and used for compatibility in various
-  # places, typically in third party gems.
-  def intern
-    return self
-  end unless method_defined? :intern
-end
-
-class String
-  unless method_defined? :lines
-    require 'puppet/util/monkey_patches/lines'
-    include Puppet::Util::MonkeyPatches::Lines
-  end
-end
-
 require 'fcntl'
 class IO
-  unless method_defined? :lines
-    require 'puppet/util/monkey_patches/lines'
-    include Puppet::Util::MonkeyPatches::Lines
-  end
-
-  def self.binread(name, length = nil, offset = 0)
-    Puppet.deprecation_warning("This is a monkey-patched implementation of IO.binread on ruby 1.8 and is deprecated. Read the file without this method as it will be removed in a future version.")
-    File.open(name, 'rb') do |f|
-      f.seek(offset) if offset > 0
-      f.read(length)
-    end
-  end unless singleton_methods.include?(:binread)
-
   def self.binwrite(name, string, offset = nil)
     # Determine if we should truncate or not.  Since the truncate method on a
     # file handle isn't implemented on all platforms, safer to do this in what
@@ -145,10 +67,6 @@ class IO
   end unless singleton_methods.include?(:binwrite)
 end
 
-class Float
-  INFINITY = (1.0/0.0) if defined?(Float::INFINITY).nil?
-end
-
 class Range
   def intersection(other)
     raise ArgumentError, 'value must be a Range' unless other.kind_of?(Range)
@@ -212,14 +130,3 @@ if Puppet::Util::Platform.windows?
     end
   end
 end
-
-# Older versions of SecureRandom (e.g. in 1.8.7) don't have the uuid method
-module SecureRandom
-  def self.uuid
-    # Copied from the 1.9.1 stdlib implementation of uuid
-    ary = self.random_bytes(16).unpack("NnnnnN")
-    ary[2] = (ary[2] & 0x0fff) | 0x4000
-    ary[3] = (ary[3] & 0x3fff) | 0x8000
-    "%08x-%04x-%04x-%04x-%04x%08x" % ary
-  end unless singleton_methods.include?(:uuid)
-end

data/lib/puppet/util/network_device/base.rb

@@ -10,11 +10,7 @@ class Puppet::Util::NetworkDevice::Base
   def initialize(url, options = {})
     @url = URI.parse(url)
 
-    @autoloader = Puppet::Util::Autoload.new(
-      self,
-      "puppet/util/network_device/transport",
-      :wrap => false
-    )
+    @autoloader = Puppet::Util::Autoload.new(self, "puppet/util/network_device/transport")
 
     if @autoloader.load(@url.scheme)
       @transport = Puppet::Util::NetworkDevice::Transport.const_get(@url.scheme.capitalize).new(options[:debug])

data/lib/puppet/util/network_device/cisco/interface.rb

@@ -68,8 +68,8 @@ class Puppet::Util::NetworkDevice::Cisco::Interface
       command(prefix + COMMANDS[property][1] % value)
     when Proc
       value = [value] unless value.is_a?(Array)
-      value.each do |value|
-        command(prefix + COMMANDS[property][1].call(*value))
+      value.each do |v|
+        command(prefix + COMMANDS[property][1].call(*v))
       end
     end
   end

data/lib/puppet/util/network_device/config.rb

@@ -82,11 +82,6 @@ class Puppet::Util::NetworkDevice::Config
     when "type"
       device.provider = value
     when "url"
-      begin
-        URI.parse(value)
-      rescue URI::InvalidURIError
-        raise Puppet::Error, "#{value} is an invalid url"
-      end
       device.url = value
     when "debug"
       device.options[:debug] = true

data/lib/puppet/util/network_device/transport/ssh.rb

@@ -49,8 +49,8 @@ class Puppet::Util::NetworkDevice::Transport::Ssh < Puppet::Util::NetworkDevice:
       channel.send_channel_request("shell") do |ch, success|
         raise "failed to open ssh shell channel" unless success
 
-        ch.on_data { |ch,data| @buf << data }
-        ch.on_extended_data { |ch,type,data|  @buf << data if type == 1 }
+        ch.on_data { |_,data| @buf << data }
+        ch.on_extended_data { |_,type,data|  @buf << data if type == 1 }
         ch.on_close { @eof = true }
 
         @channel = ch

data/lib/puppet/util/profiler.rb

@@ -47,7 +47,7 @@ module Puppet::Util::Profiler
   # @param metric_id [Array] A list of strings making up the ID of a metric to profile
   # @param block [Block] The segment of code to profile
   # @api public
-  def self.profile(message, metric_id = nil, &block)
+  def self.profile(message, metric_id, &block)
     @profiler.profile(message, metric_id, &block)
   end
 end

data/lib/puppet/util/profiler/aggregate.rb

@@ -43,7 +43,7 @@ class Puppet::Util::Profiler::Aggregate < Puppet::Util::Profiler::WallClock
 
   def print_metrics(metrics_hash, prefix)
     metrics_hash.sort_by {|k,v| v.time }.reverse.each do |k,v|
-      @logger.call("#{prefix}#{k}: #{v.time} ms (#{v.count} calls)")
+      @logger.call("#{prefix}#{k}: #{v.time} s (#{v.count} calls)")
       print_metrics(metrics_hash[k], "#{prefix}#{k} -> ")
     end
   end

data/lib/puppet/util/profiler/around_profiler.rb

@@ -47,7 +47,7 @@ class Puppet::Util::Profiler::AroundProfiler
   # @param metric_id [Array] A list of strings making up the ID of a metric to profile
   # @param block [Block] The segment of code to profile
   # @api private
-  def profile(message, metric_id = nil)
+  def profile(message, metric_id)
     retval = nil
     contexts = {}
     @profilers.each do |profiler|

data/lib/puppet/util/psych_support.rb

@@ -0,0 +1,38 @@
+# This module should be included when a class can be serialized to yaml and
+# needs to handle the deserialization from Psych with more control. Psych normall
+# pokes values directly into an instance using `instance_variable_set` which completely
+# bypasses encapsulation.
+#
+# The class that includes this module must implement an instance method `initialize_from_hash`
+# that is given a hash with attribute to value mappings.
+#
+module Puppet::Util::PsychSupport
+  # This method is called from the Psych Yaml deserializer.
+  # The serializer calls this instead of doing the initialization itself using
+  # `instance_variable_set`. The Status class requires this because it serializes its TagSet
+  # as an `Array` in order to optimize the size of the serialized result.
+  # When this array is later deserialized it must be reincarnated as a TagSet. The standard
+  # Psych way of doing this via poking values into instance variables cannot do this.
+  #
+  def init_with(psych_coder)
+    # The PsychCoder has a hashmap of instance variable name (sans the @ symbol) to values
+    # to set, and can thus directly be fed to initialize_from_hash.
+    #
+    initialize_from_hash(psych_coder.map)
+  end
+
+  # This method is called from the Psych Yaml serializer
+  # The serializer will call this method to create a hash that will be serialized to YAML.
+  # Instead of using the object itself during the mapping process we use what is
+  # returned by calling `to_data_hash` on the object itself since some of the
+  # objects we manage have asymmetrical serialization and deserialization.
+  #
+  def encode_with(psych_encoder)
+    tag = Psych.dump_tags[self.class]
+    unless tag
+      klass = self.class == Object ? nil : self.class.name
+      tag   = ['!ruby/object', klass].compact.join(':')
+    end
+    psych_encoder.represent_map(tag, to_data_hash)
+  end
+end

data/lib/puppet/util/rdoc.rb

@@ -5,7 +5,6 @@ module Puppet::Util::RDoc
   # launch a rdoc documenation process
   # with the files/dir passed in +files+
   def rdoc(outputdir, files, charset = nil)
-    Puppet[:ignoreimport] = true
 
     # then rdoc
     require 'rdoc/rdoc'
@@ -16,14 +15,6 @@ module Puppet::Util::RDoc
 
     r = RDoc::RDoc.new
 
-    if Puppet.features.rdoc1?
-      RDoc::RDoc::GENERATORS["puppet"] = RDoc::RDoc::Generator.new(
-          "puppet/util/rdoc/generators/puppet_generator.rb",
-          :PuppetGenerator,
-          "puppet"
-        )
-    end
-
     # specify our own format & where to output
     options = [ "--fmt", "puppet",
                 "--quiet",
@@ -33,9 +24,7 @@ module Puppet::Util::RDoc
                 "--exclude", "/modules/[^/]*/templates/.*$",
                 "--op", outputdir ]
 
-    if !Puppet.features.rdoc1? || ::Options::OptionList.options.any? { |o| o[0] == "--force-update" } # Options is a root object in the rdoc1 namespace...
-      options << "--force-update"
-    end
+    options << "--force-update"
     options += [ "--charset", charset] if charset
     # Rdoc root default is Dir.pwd, but the win32-dir gem monkey patchs Dir.pwd
     # replacing Ruby's normal / with \.  When RDoc generates relative paths it
@@ -52,45 +41,20 @@ module Puppet::Util::RDoc
 
   # launch an output to console manifest doc
   def manifestdoc(files)
-    Puppet[:ignoreimport] = true
-    files.select { |f| FileTest.file?(f) }.each do |f|
-      parser = Puppet::Parser::Parser.new(Puppet.lookup(:current_environment))
-      parser.file = f
-      ast = parser.parse
-      output(f, ast)
-    end
+    raise "RDOC SUPPORT FOR MANIFEST HAS BEEN REMOVED - See PUP-3638"
   end
 
-  # Ouputs to the console the documentation
+  # Outputs to the console the documentation
   # of a manifest
   def output(file, ast)
-    astobj = []
-    ast.instantiate('').each do |resource_type|
-      astobj << resource_type if resource_type.file == file
-    end
-
-    astobj.sort! {|a,b| a.line <=> b.line }.each do |k|
-      output_astnode_doc(k)
-    end
+    raise "RDOC SUPPORT FOR MANIFEST HAS BEEN REMOVED - See PUP-3638"
   end
 
   def output_astnode_doc(ast)
-    puts ast.doc if !ast.doc.nil? and !ast.doc.empty?
-    if Puppet.settings[:document_all]
-      # scan each underlying resources to produce documentation
-      code = ast.code.children if ast.code.is_a?(Puppet::Parser::AST::ASTArray)
-      code ||= ast.code
-      output_resource_doc(code) unless code.nil?
-    end
+    raise "RDOC SUPPORT FOR MANIFEST HAS BEEN REMOVED - See PUP-3638"
   end
 
   def output_resource_doc(code)
-    code.sort { |a,b| a.line <=> b.line }.each do |stmt|
-      output_resource_doc(stmt.children) if stmt.is_a?(Puppet::Parser::AST::ASTArray)
-
-      if stmt.is_a?(Puppet::Parser::AST::Resource)
-        puts stmt.doc if !stmt.doc.nil? and !stmt.doc.empty?
-      end
-    end
+    raise "RDOC SUPPORT FOR MANIFEST HAS BEEN REMOVED - See PUP-3638"
   end
 end