puppet 2.7.9 → 2.7.11

data/lib/puppet/indirector/indirection.rb

@@ -1,12 +1,19 @@
 require 'puppet/util/docs'
 require 'puppet/indirector/envelope'
 require 'puppet/indirector/request'
+require 'puppet/util/instrumentation/instrumentable'
 
 # The class that connects functional classes with their different collection
 # back-ends.  Each indirection has a set of associated terminus classes,
 # each of which is a subclass of Puppet::Indirector::Terminus.
 class Puppet::Indirector::Indirection
   include Puppet::Util::Docs
+  extend Puppet::Util::Instrumentation::Instrumentable
+
+  probe :find, :label => Proc.new { |parent, key, *args| "find_#{parent.name}_#{parent.terminus_class}" }, :data => Proc.new { |parent, key, *args| { :key => key }}
+  probe :save, :label => Proc.new { |parent, key, *args| "save_#{parent.name}_#{parent.terminus_class}" }, :data => Proc.new { |parent, key, *args| { :key => key }}
+  probe :search, :label => Proc.new { |parent, key, *args| "search_#{parent.name}_#{parent.terminus_class}" }, :data => Proc.new { |parent, key, *args| { :key => key }}
+  probe :destroy, :label => Proc.new { |parent, key, *args| "destroy_#{parent.name}_#{parent.terminus_class}" }, :data => Proc.new { |parent, key, *args| { :key => key }}
 
   @@indirections = []
 

data/lib/puppet/indirector/instrumentation_data.rb

@@ -0,0 +1,3 @@
+# A stub class, so our constants work.
+class Puppet::Indirector::InstrumentationData
+end

data/lib/puppet/indirector/instrumentation_data/local.rb

@@ -0,0 +1,19 @@
+require 'puppet/indirector/instrumentation_data'
+
+class Puppet::Indirector::InstrumentationData::Local < Puppet::Indirector::Code
+  def find(request)
+    model.new(request.key)
+  end
+
+  def search(request)
+    raise Puppet::DevError, "You cannot search for instrumentation data"
+  end
+
+  def save(request)
+    raise Puppet::DevError, "You cannot save instrumentation data"
+  end
+
+  def destroy(request)
+    raise Puppet::DevError, "You cannot remove instrumentation data"
+  end
+end

data/lib/puppet/indirector/instrumentation_data/rest.rb

@@ -0,0 +1,5 @@
+require 'puppet/indirector/rest'
+require 'puppet/indirector/instrumentation_data'
+
+class Puppet::Indirector::InstrumentationData::Rest < Puppet::Indirector::REST
+end

data/lib/puppet/indirector/instrumentation_listener.rb

@@ -0,0 +1,3 @@
+# A stub class, so our constants work.
+class Puppet::Indirector::InstrumentationListener
+end

data/lib/puppet/indirector/instrumentation_listener/local.rb

@@ -0,0 +1,23 @@
+require 'puppet/indirector/instrumentation_listener'
+
+class Puppet::Indirector::InstrumentationListener::Local < Puppet::Indirector::Code
+  def find(request)
+    Puppet::Util::Instrumentation[request.key]
+  end
+
+  def search(request)
+    Puppet::Util::Instrumentation.listeners
+  end
+
+  def save(request)
+    res = request.instance
+    Puppet::Util::Instrumentation[res.name] = res
+    nil # don't leak the listener
+  end
+
+  def destroy(request)
+    listener = Puppet::Util::Instrumentation[request.key]
+    raise "Listener #{request.key} hasn't been subscribed" unless listener
+    Puppet::Util::Instrumentation.unsubscribe(listener)
+  end
+end

data/lib/puppet/indirector/instrumentation_listener/rest.rb

@@ -0,0 +1,5 @@
+require 'puppet/indirector/instrumentation_listener'
+require 'puppet/indirector/rest'
+
+class Puppet::Indirector::InstrumentationListener::Rest < Puppet::Indirector::REST
+end

data/lib/puppet/indirector/instrumentation_probe.rb

@@ -0,0 +1,3 @@
+# A stub class, so our constants work.
+class Puppet::Indirector::InstrumentationProbe
+end

data/lib/puppet/indirector/instrumentation_probe/local.rb

@@ -0,0 +1,24 @@
+require 'puppet/indirector/instrumentation_probe'
+require 'puppet/indirector/code'
+require 'puppet/util/instrumentation/indirection_probe'
+
+class Puppet::Indirector::InstrumentationProbe::Local < Puppet::Indirector::Code
+  def find(request)
+  end
+
+  def search(request)
+    probes = []
+    Puppet::Util::Instrumentation::Instrumentable.each_probe do |probe|
+      probes << Puppet::Util::Instrumentation::IndirectionProbe.new("#{probe.klass}.#{probe.method}")
+    end
+    probes
+  end
+
+  def save(request)
+    Puppet::Util::Instrumentation::Instrumentable.enable_probes
+  end
+
+  def destroy(request)
+    Puppet::Util::Instrumentation::Instrumentable.disable_probes
+  end
+end

data/lib/puppet/indirector/instrumentation_probe/rest.rb

@@ -0,0 +1,5 @@
+require 'puppet/indirector/rest'
+require 'puppet/indirector/instrumentation_probe'
+
+class Puppet::Indirector::InstrumentationProbe::Rest < Puppet::Indirector::REST
+end

data/lib/puppet/indirector/rest.rb

@@ -95,7 +95,7 @@ class Puppet::Indirector::REST < Puppet::Indirector::Terminus
   rescue OpenSSL::SSL::SSLError => error
     if error.message.include? "certificate verify failed"
       raise Puppet::Error, "#{error.message}.  This is often because the time is out of sync on the server or client"
-    elsif error.message.include? "hostname was not match"
+    elsif error.message =~ /hostname (was )?not match/
       raise unless cert = peer_certs.find { |c| c.name !~ /^puppet ca/i }
 
       valid_certnames = [cert.name, *cert.subject_alt_names].uniq

data/lib/puppet/module.rb

@@ -19,13 +19,6 @@ class Puppet::Module
 
   FILETYPES = [MANIFESTS, FILES, TEMPLATES, PLUGINS]
 
-  # Return an array of paths by splitting the +modulepath+ config
-  # parameter. Only consider paths that are absolute and existing
-  # directories
-  def self.modulepath(environment = nil)
-    Puppet::Node::Environment.new(environment).modulepath
-  end
-
   # Find and return the +module+ that +path+ belongs to. If +path+ is
   # absolute, or if there is no module whose name is the first component
   # of +path+, return +nil+
@@ -48,15 +41,16 @@ class Puppet::Module
     return metadata.is_a?(Hash) && !metadata.keys.empty?
   end
 
-  def initialize(name, environment = nil)
+  def initialize(name, options = {})
     @name = name
+    @path = options[:path]
 
     assert_validity
 
-    if environment.is_a?(Puppet::Node::Environment)
-      @environment = environment
+    if options[:environment].is_a?(Puppet::Node::Environment)
+      @environment = options[:environment]
     else
-      @environment = Puppet::Node::Environment.new(environment)
+      @environment = Puppet::Node::Environment.new(options[:environment])
     end
 
     load_metadata if has_metadata?
@@ -141,7 +135,7 @@ class Puppet::Module
 
   # Find this module in the modulepath.
   def path
-    environment.modulepath.collect { |path| File.join(path, name) }.find { |d| FileTest.directory?(d) }
+    @path ||= environment.modulepath.collect { |path| File.join(path, name) }.find { |d| FileTest.directory?(d) }
   end
 
   # Find all plugin directories.  This is used by the Plugins fileserving mount.
@@ -149,11 +143,6 @@ class Puppet::Module
     subpath("plugins")
   end
 
-  def requires(name, version = nil)
-    @requires ||= []
-    @requires << [name, version]
-  end
-
   def supports(name, version = nil)
     @supports ||= []
     @supports << [name, version]
@@ -204,4 +193,11 @@ class Puppet::Module
   def assert_validity
     raise InvalidName, "Invalid module name; module names must be alphanumeric (plus '-'), not '#{name}'" unless name =~ /^[-\w]+$/
   end
+
+  def ==(other)
+    self.name == other.name &&
+      self.version == other.version &&
+      self.path == other.path &&
+      self.environment == other.environment
+  end
 end

data/lib/puppet/module_tool/applications.rb

@@ -8,5 +8,6 @@ module Puppet::Module::Tool
     require 'puppet/module_tool/applications/installer'
     require 'puppet/module_tool/applications/searcher'
     require 'puppet/module_tool/applications/unpacker'
+    require 'puppet/module_tool/applications/uninstaller'
   end
 end

data/lib/puppet/module_tool/applications/uninstaller.rb

@@ -0,0 +1,33 @@
+module Puppet::Module::Tool
+  module Applications
+    class Uninstaller < Application
+
+      def initialize(name, options = {})
+        @name = name
+        @target_directories = options[:target_directories]
+        @removed_dirs = []
+      end
+
+      def run
+        uninstall
+        Puppet.notice "#{@name} is not installed" if @removed_dirs.empty?
+        @removed_dirs
+      end
+
+      private
+
+      def uninstall
+        # TODO: #11803 Check for broken dependencies before uninstalling modules.
+        #
+        # Search each path in the target directories for the specified module
+        # and delete the directory.
+        @target_directories.each do |target|
+          if File.directory? target
+            module_path = File.join(target, @name)
+            @removed_dirs << FileUtils.rm_rf(module_path).first if File.directory?(module_path)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/puppet/module_tool/contents_description.rb

@@ -73,7 +73,7 @@ module Puppet::Module::Tool
     # containing :name and :doc.
     def provider_doc(type)
       [].tap do |providers|
-        type.providers.sort_by{ |o| o.to_s }.each do |prov|
+        type.providers.sort.each do |prov|
           providers.push(:name => prov, :doc => type.provider(prov).doc)
         end
       end

data/lib/puppet/network/server.rb

@@ -22,7 +22,7 @@ class Puppet::Network::Server
       $stderr.reopen $stdout
       Puppet::Util::Log.reopen
     rescue => detail
-      Puppet::Util.secure_open("/tmp/daemonout", "w") { |f|
+      Puppet::Util.replace_file("/tmp/daemonout", 0644) { |f|
         f.puts "Could not start #{Puppet[:name]}: #{detail}"
       }
       raise "Could not start #{Puppet[:name]}: #{detail}"
@@ -40,8 +40,7 @@ class Puppet::Network::Server
   # Remove the pid file for our daemon.
   def remove_pidfile
     Puppet::Util.synchronize_on(Puppet[:name],Sync::EX) do
-      locker = Puppet::Util::Pidlock.new(pidfile)
-      locker.unlock or Puppet.err "Could not remove PID file #{pidfile}" if locker.locked?
+      Puppet::Util::Pidlock.new(pidfile).unlock
     end
   end
 

data/lib/puppet/node/environment.rb

@@ -54,7 +54,6 @@ class Puppet::Node::Environment
     @root
   end
 
-  # This is only used for testing.
   def self.clear
     @seen.clear
   end
@@ -88,7 +87,7 @@ class Puppet::Node::Environment
   end
 
   def module(name)
-    mod = Puppet::Module.new(name, self)
+    mod = Puppet::Module.new(name, :environment => self)
     return nil unless mod.exist?
     mod
   end
@@ -107,13 +106,27 @@ class Puppet::Node::Environment
     module_names = modulepath.collect { |path| Dir.entries(path) }.flatten.uniq
     module_names.collect do |path|
       begin
-        Puppet::Module.new(path, self)
+        Puppet::Module.new(path, :environment => self)
       rescue Puppet::Module::Error => e
         nil
       end
     end.compact
   end
 
+  # Modules broken out by directory in the modulepath
+  def modules_by_path
+    modules_by_path = {}
+    modulepath.each do |path|
+      Dir.chdir(path) do
+        module_names = Dir.glob('*').select { |d| FileTest.directory? d }
+        modules_by_path[path] = module_names.map do |name|
+          Puppet::Module.new(name, :environment => self, :path => File.join(path, name))
+        end
+      end
+    end
+    modules_by_path
+  end
+
   def to_s
     name.to_s
   end

data/lib/puppet/parser/ast/leaf.rb

@@ -161,7 +161,7 @@ class Puppet::Parser::AST
 
       raise Puppet::ParseError, "#{variable} is not an hash or array when accessing it with #{accesskey}" unless object.is_a?(Hash) or object.is_a?(Array)
 
-      object[array_index_or_key(object, accesskey)]
+      object[array_index_or_key(object, accesskey)] || :undef
     end
 
     # Assign value to this hashkey or array index

data/lib/puppet/parser/functions/create_resources.rb

@@ -14,7 +14,7 @@ Puppet::Parser::Functions::newfunction(:create_resources, :doc => <<-'ENDHEREDOC
                       groups => ['developers', 'prosvc', 'release'], }
         }
 
-        create_resource(user, $myusers)
+        create_resources(user, $myusers)
 
     A third, optional parameter may be given, also as a hash:
 

data/lib/puppet/parser/type_loader.rb

@@ -112,7 +112,7 @@ class Puppet::Parser::TypeLoader
     # behavior) only load files from the first module of a given name.  E.g.,
     # given first/foo and second/foo, only files from first/foo will be loaded.
     module_names.each do |name|
-      mod = Puppet::Module.new(name, environment)
+      mod = Puppet::Module.new(name, :environment => environment)
       Find.find(File.join(mod.path, "manifests")) do |path|
         if path =~ /\.pp$/ or path =~ /\.rb$/
           import(path)

data/lib/puppet/property.rb

@@ -166,22 +166,57 @@ class Puppet::Property < Puppet::Parameter
     raise "Puppet::Property#safe_insync? shouldn't be overridden; please override insync? instead" if sym == :safe_insync?
   end
 
-  # This method should be overridden by derived classes if necessary
+  # This method may be overridden by derived classes if necessary
   # to provide extra logic to determine whether the property is in
-  # sync.
+  # sync.  In most cases, however, only `property_matches?` needs to be
+  # overridden to give the correct outcome - without reproducing all the array
+  # matching logic, etc, found here.
   def insync?(is)
     self.devfail "#{self.class.name}'s should is not array" unless @should.is_a?(Array)
 
     # an empty array is analogous to no should values
     return true if @should.empty?
 
-    # Look for a matching value
-    return (is == @should or is == @should.collect { |v| v.to_s }) if match_all?
-
-    @should.each { |val| return true if is == val or is == val.to_s }
+    # Look for a matching value, either for all the @should values, or any of
+    # them, depending on the configuration of this property.
+    if match_all? then
+      # Emulate Array#== using our own comparison function.
+      # A non-array was not equal to an array, which @should always is.
+      return false unless is.is_a? Array
+
+      # If they were different lengths, they are not equal.
+      return false unless is.length == @should.length
+
+      # Finally, are all the elements equal?  In order to preserve the
+      # behaviour of previous 2.7.x releases, we need to impose some fun rules
+      # on "equality" here.
+      #
+      # Specifically, we need to implement *this* comparison: the two arrays
+      # are identical if the is values are == the should values, or if the is
+      # values are == the should values, stringified.
+      #
+      # This does mean that property equality is not commutative, and will not
+      # work unless the `is` value is carefully arranged to match the should.
+      return (is == @should or is == @should.map(&:to_s))
+
+      # When we stop being idiots about this, and actually have meaningful
+      # semantics, this version is the thing we actually want to do.
+      #
+      # return is.zip(@should).all? {|a, b| property_matches?(a, b) }
+    else
+      return @should.any? {|want| property_matches?(is, want) }
+    end
+  end
 
-    # otherwise, return false
-    false
+  # Compare the current and desired value of a property in a property-specific
+  # way.  Invoked by `insync?`; this should be overridden if your property
+  # has a different comparison type but does not actually differentiate the
+  # overall insync? logic.
+  def property_matches?(current, desired)
+    # This preserves the older Puppet behaviour of doing raw and string
+    # equality comparisons for all equality.  I am not clear this is globally
+    # desirable, but at least it is not a breaking change. --daniel 2011-11-11
+    current == desired or current == desired.to_s
   end
 
   # because the @should and @is vars might be in weird formats,
@@ -194,13 +229,10 @@ class Puppet::Property < Puppet::Parameter
 
   # Send a log message.
   def log(msg)
-
-          Puppet::Util::Log.create(
-
-      :level => resource[:loglevel],
+    Puppet::Util::Log.create(
+      :level   => resource[:loglevel],
       :message => msg,
-
-      :source => self
+      :source  => self
     )
   end
 

data/lib/puppet/provider.rb

@@ -204,15 +204,15 @@ class Puppet::Provider
 
   dochook(:defaults) do
     if @defaults.length > 0
-      return "  Default for " + @defaults.collect do |f, v|
-        "`#{f}` == `#{v}`"
+      return "Default for " + @defaults.collect do |f, v|
+        "`#{f}` == `#{[v].flatten.join(', ')}`"
       end.join(" and ") + "."
     end
   end
 
   dochook(:commands) do
     if @commands.length > 0
-      return "  Required binaries: " + @commands.collect do |n, c|
+      return "Required binaries: " + @commands.collect do |n, c|
         "`#{c}`"
       end.join(", ") + "."
     end
@@ -220,7 +220,7 @@ class Puppet::Provider
 
   dochook(:features) do
     if features.length > 0
-      return "  Supported features: " + features.collect do |f|
+      return "Supported features: " + features.collect do |f|
         "`#{f}`"
       end.join(", ") + "."
     end
@@ -277,5 +277,14 @@ class Puppet::Provider
   def to_s
     "#{@resource}(provider=#{self.class.name})"
   end
+
+  # Make providers comparable.
+  include Comparable
+  def <=>(other)
+    # We can only have ordering against other providers.
+    return nil unless other.is_a? Puppet::Provider
+    # Otherwise, order by the providers class name.
+    return self.class.name <=> other.class.name
+  end
 end