puppet 3.2.4 → 3.3.0.rc2

data/lib/puppet/util/rdoc/generators/puppet_generator.rb

@@ -795,7 +795,6 @@ module Generators
       end
       @values["title"]     = "#{@values['classmod']}: #{h_name}"
 
-      c = @context
       @values["full_name"] = h_name
 
       files = []

data/lib/puppet/util/rdoc/generators/template/puppet/puppet.rb

@@ -25,21 +25,37 @@ module RDoc
     FONTS = "Verdana,Arial,Helvetica,sans-serif"
 
 STYLE = %{
+/* Reset */
+html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,big,cite,code,del,dfn,em,font,img,ins,kbd,q,s,samp,small,strike,strong,sub,sup,tt,var,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td{margin:0;padding:0;border:0;outline:0;font-weight:inherit;font-style:inherit;font-size:100%;font-family:inherit;vertical-align:baseline;}
+:focus{outline:0;}
+body{line-height:1;color:#282828;background:#fff;}
+ol,ul{list-style:none;}
+table{border-collapse:separate;border-spacing:0;}
+caption,th,td{text-align:left;font-weight:normal;}
+blockquote:before,blockquote:after,q:before,q:after{content:"";}
+blockquote,q{quotes:"""";}
+
 body {
     font-family: Verdana,Arial,Helvetica,sans-serif;
-    font-size:   90%;
-    margin: 0;
-    margin-left: 40px;
-    padding: 0;
-    background: white;
+    font-size: 0.9em;
 }
 
+pre {
+    background: none repeat scroll 0 0 #F7F7F7;
+    border: 1px dashed #DDDDDD;
+    color: #555555;
+    font-family: courier;
+    margin: 10px 19px;
+    padding: 10px;
+ }
+
 h1,h2,h3,h4 { margin: 0; color: #efefef; background: transparent; }
-h1 { font-size: 150%; }
-h2,h3,h4 { margin-top: 1em; }
+h1 { font-size: 1.2em; }
+h2,h3,h4 { margin-top: 1em; color:#558; }
+h2,h3 { font-size: 1.1em; }
 
-a { background: #eef; color: #039; text-decoration: none; }
-a:hover { background: #039; color: #eef; }
+a { color: #037; text-decoration: none; }
+a:hover { color: #04d; }
 
 /* Override the base stylesheet's Anchor inside a table cell */
 td > a {
@@ -58,32 +74,26 @@ td > a {
 /* === Structural elements =================================== */
 
 div#index {
-    margin: 0;
-    margin-left: -40px;
     padding: 0;
-    font-size: 90%;
 }
 
 
 div#index a {
-    margin-left: 0.7em;
+	display:inline-block;
+	padding:2px 10px;
 }
 
+
 div#index .section-bar {
-   margin-left: 0px;
-   padding-left: 0.7em;
-   background: #ccc;
-   font-size: small;
+	background: #ffe;
+	padding:10px;
 }
 
 
 div#classHeader, div#fileHeader {
-    width: auto;
-    color: white;
-    padding: 0.5em 1.5em 0.5em 1.5em;
-    margin: 0;
-    margin-left: -40px;
-    border-bottom: 3px solid #006;
+    border-bottom: 1px solid #ddd;
+	padding:10px;
+	font-size:0.9em;
 }
 
 div#classHeader a, div#fileHeader a {
@@ -92,8 +102,9 @@ div#classHeader a, div#fileHeader a {
 }
 
 div#classHeader td, div#fileHeader td {
-    background: inherit;
     color: white;
+	padding:3px;
+	font-size:0.9em;
 }
 
 
@@ -110,19 +121,19 @@ div#nodeHeader {
 }
 
 .class-name-in-header {
-  font-size:  180%;
   font-weight: bold;
 }
 
 
 div#bodyContent {
-    padding: 0 1.5em 0 1.5em;
+    padding: 10px;
 }
 
 div#description {
-    padding: 0.5em 1.5em;
-    background: #efefef;
-    border: 1px dotted #999;
+    padding: 10px;
+    background: #f5f5f5;
+    border: 1px dotted #ddd;
+	line-height:1.2em;
 }
 
 div#description h1,h2,h3,h4,h5,h6 {
@@ -165,17 +176,18 @@ table.header-table {
 
 .section-bar {
    color: #333;
-   border-bottom: 1px solid #999;
-    margin-left: -20px;
+   border-bottom: 1px solid #ddd;
+   padding:10px 0;
+   margin:5px 0 10px 0;
 }
 
+div#class-list, div#methods, div#includes, div#resources, div#requires, div#realizes, div#attribute-list { padding:10px; }
 
 .section-title {
     background: #79a;
     color: #eee;
     padding: 3px;
     margin-top: 2em;
-    margin-left: -30px;
     border: 1px solid #999;
 }
 
@@ -191,22 +203,18 @@ table.header-table {
 
 /* --- Method classes -------------------------- */
 .method-detail {
-    background: #efefef;
-    padding: 0;
-    margin-top: 0.5em;
-    margin-bottom: 1em;
-    border: 1px dotted #ccc;
+    background: #f5f5f5;
 }
 .method-heading {
-  color: black;
-  background: #ccc;
-  border-bottom: 1px solid #666;
-  padding: 0.2em 0.5em 0 0.5em;
+  color: #333;
+  font-style:italic;
+  background: #ddd;
+  padding:5px 10px;
 }
 .method-signature { color: black; background: inherit; }
 .method-name { font-weight: bold; }
 .method-args { font-style: italic; }
-.method-description { padding: 0 0.5em 0 0.5em; }
+.method-description { padding: 10px 10px 20px 10px; }
 
 /* --- Source code sections -------------------- */
 

data/lib/puppet/util/retryaction.rb

@@ -14,7 +14,6 @@ module Puppet::Util::RetryAction
     raise RetryException::NoRetriesGiven if parameters[:retries].nil?
     parameters[:retry_exceptions] ||= Hash.new
 
-    start = Time.now
     failures = 0
 
     begin

data/lib/puppet/util/symbolic_file_mode.rb

@@ -1,6 +1,8 @@
 require 'puppet/util'
 
-module Puppet::Util::SymbolicFileMode
+module Puppet
+module Util
+module SymbolicFileMode
   SetUIDBit = ReadBit  = 4
   SetGIDBit = WriteBit = 2
   StickyBit = ExecBit  = 1
@@ -138,3 +140,5 @@ module Puppet::Util::SymbolicFileMode
     return result
   end
 end
+end
+end

data/lib/puppet/util/tagging.rb

@@ -62,8 +62,6 @@ module Puppet::Util::Tagging
   private
 
   def handle_qualified_tags(qualified)
-    # LAK:NOTE See http://snurl.com/21zf8  [groups_google_com]
-    x = 1
     qualified.each do |name|
       name.split("::").each do |tag|
         @tags << tag unless @tags.include?(tag)

data/lib/puppet/util/warnings.rb

@@ -6,6 +6,9 @@ module Puppet::Util::Warnings
     Puppet::Util::Warnings.maybe_log(msg, self.class) { Puppet.notice msg }
   end
 
+  def debug_once(msg)
+    Puppet::Util::Warnings.maybe_log(msg, self.class) { Puppet.debug msg }
+  end
 
   def warnonce(msg)
     Puppet::Util::Warnings.maybe_log(msg, self.class) { Puppet.warning msg }

data/lib/puppet/util/watched_file.rb

@@ -0,0 +1,37 @@
+require 'puppet/util/watcher'
+
+# Monitor a given file for changes on a periodic interval. Changes are detected
+# by looking for a change in the file ctime.
+class Puppet::Util::WatchedFile
+  # @!attribute [r] filename
+  #   @return [String] The fully qualified path to the file.
+  attr_reader :filename
+
+  # @param filename [String] The fully qualified path to the file.
+  # @param file_timeout [Integer] The polling interval for checking for file
+  #   changes. Setting the timeout to a negative value will treat the file as
+  #   always changed. Defaults to `Puppet[:filetimeout]`
+  def initialize(filename, timer = Puppet::Util::Watcher::Timer.new(Puppet[:filetimeout]))
+    @filename = filename
+    @timer = timer
+
+    @info = Puppet::Util::Watcher::PeriodicWatcher.new(
+      Puppet::Util::Watcher::Common.file_ctime_change_watcher(@filename),
+      timer)
+  end
+
+  # @return [true, false] If the file has changed since it was last checked.
+  def changed?
+    @info.changed?
+  end
+
+  # Allow this to be used as the name of the file being watched in various
+  # other methods (such as File.exist?)
+  def to_str
+    @filename
+  end
+
+  def to_s
+    "<WatchedFile: filename = #{@filename}, timeout = #{@timer.timeout}>"
+  end
+end

data/lib/puppet/util/watcher.rb

@@ -0,0 +1,17 @@
+module Puppet::Util::Watcher
+  require 'puppet/util/watcher/timer'
+  require 'puppet/util/watcher/change_watcher'
+  require 'puppet/util/watcher/periodic_watcher'
+
+  module Common
+    def self.file_ctime_change_watcher(filename)
+      Puppet::Util::Watcher::ChangeWatcher.watch(lambda do
+        begin
+          File.stat(filename).ctime
+        rescue Errno::ENOENT, Errno::ENOTDIR
+          :absent
+        end
+      end)
+    end
+  end
+end

data/lib/puppet/util/watcher/change_watcher.rb

@@ -0,0 +1,33 @@
+# Watches for changes over time. It only re-examines the values when it is requested to update readings.
+# @api private
+class Puppet::Util::Watcher::ChangeWatcher
+  def self.watch(reader)
+    Puppet::Util::Watcher::ChangeWatcher.new(nil, nil, reader).next_reading
+  end
+
+  def initialize(previous, current, value_reader)
+    @previous = previous
+    @current = current
+    @value_reader = value_reader
+  end
+
+  def changed?
+    if uncertain?
+      false
+    else
+      @previous != @current
+    end
+  end
+
+  def uncertain?
+    @previous.nil? || @current.nil?
+  end
+
+  def change_current_reading_to(new_value)
+    Puppet::Util::Watcher::ChangeWatcher.new(@current, new_value, @value_reader)
+  end
+
+  def next_reading
+    change_current_reading_to(@value_reader.call)
+  end
+end

data/lib/puppet/util/watcher/periodic_watcher.rb

@@ -0,0 +1,37 @@
+# Monitor a given watcher for changes on a periodic interval.
+class Puppet::Util::Watcher::PeriodicWatcher
+  # @param watcher [Puppet::Util::Watcher::ChangeWatcher] a watcher for the value to watch
+  # @param timer [Puppet::Util::Watcher::Timer] A timer to determin when to
+  #   recheck the watcher. If the timout of the timer is negative, then the
+  #   watched value is always considered to be changed
+  def initialize(watcher, timer)
+    @watcher = watcher
+    @timer = timer
+
+    @timer.start
+  end
+
+  # @return [true, false] If the file has changed since it was last checked.
+  def changed?
+    return true if always_consider_changed?
+
+    @watcher = examine_watched_info(@watcher)
+    @watcher.changed?
+  end
+
+  private
+
+  def always_consider_changed?
+    @timer.timeout < 0
+  end
+
+  def examine_watched_info(known)
+    if @timer.expired?
+      @timer.start
+      known.next_reading
+    else
+      known
+    end
+  end
+end
+

data/lib/puppet/util/watcher/timer.rb

@@ -0,0 +1,19 @@
+class Puppet::Util::Watcher::Timer
+  attr_reader :timeout
+
+  def initialize(timeout)
+    @timeout = timeout
+  end
+
+  def start
+    @start_time = now
+  end
+
+  def expired?
+    (now - @start_time) >= @timeout
+  end
+
+  def now
+    Time.now.to_i
+  end
+end

data/lib/puppet/util/windows/user.rb

@@ -44,7 +44,7 @@ module Puppet::Util::Windows::User
   def password_is?(name, password)
     logon_user(name, password)
     true
-  rescue Puppet::Util::Windows::Error => e
+  rescue Puppet::Util::Windows::Error
     false
   end
   module_function :password_is?

data/lib/puppet/version.rb

@@ -7,7 +7,7 @@
 
 
 module Puppet
-  PUPPETVERSION = '3.2.4'
+  PUPPETVERSION = '3.3.0-rc2'
 
   ##
   # version is a public API method intended to always provide a fast and

data/lib/puppetx.rb

@@ -0,0 +1,109 @@
+# The Puppet Extensions Module.
+#
+# Submodules of this module should be named after the publisher (e.g. 'user' part of a Puppet Module name).
+# The submodule {Puppetx::Puppet} contains the puppet extension points.
+#
+# This module also contains constants that are used when defining extensions.
+#
+# @api public
+#
+module Puppetx
+
+  # The lookup **key** for the multibind containing syntax checkers used to syntax check embedded string in non
+  # puppet DSL syntax.
+  # @api public
+  SYNTAX_CHECKERS       = 'puppetx::puppet::syntaxcheckers'
+
+  # The lookup **type** for the multibind containing syntax checkers used to syntax check embedded string in non
+  # puppet DSL syntax.
+  # @api public
+  SYNTAX_CHECKERS_TYPE  = 'Puppetx::Puppet::SyntaxChecker'
+
+  # The lookup **key** for the multibind containing a map from scheme name to scheme handler class for bindings schemes.
+  # @api public
+  BINDINGS_SCHEMES      = 'puppetx::puppet::bindings::schemes'
+
+  # The lookup **type** for the multibind containing a map from scheme name to scheme handler class for bindings schemes.
+  # @api public
+  BINDINGS_SCHEMES_TYPE = 'Puppetx::Puppet::BindingsSchemeHandler'
+
+  # The lookup **key** for the multibind containing a map from hiera-2 backend name to class implementing the backend.
+  # @api public
+  HIERA2_BACKENDS      = 'puppetx::puppet::hiera2::backends'
+
+  # The lookup **type** for the multibind containing a map from hiera-2 backend name to class implementing the backend.
+  # @api public
+  HIERA2_BACKENDS_TYPE = 'Puppetx::Puppet::Hiera2Backend'
+
+  # This module is the name space for extension points
+  # @api public
+  module Puppet
+
+    if ::Puppet[:binder] || ::Puppet[:parser] == 'future'
+        # Extension-points are registered here:
+        # - If in a Ruby submodule it is best to create it here
+        # - The class does not have to be required; it will be auto required when the binder
+        #   needs it.
+        # - If the extension is a multibind, it can be registered here; either with a required
+        #   class or a class reference in string form.
+
+        # Register extension points
+        # -------------------------
+        system_bindings = ::Puppet::Pops::Binder::SystemBindings
+        extensions = system_bindings.extensions()
+        extensions.multibind(SYNTAX_CHECKERS).name(SYNTAX_CHECKERS).hash_of(SYNTAX_CHECKERS_TYPE)
+        extensions.multibind(BINDINGS_SCHEMES).name(BINDINGS_SCHEMES).hash_of(BINDINGS_SCHEMES_TYPE)
+        extensions.multibind(HIERA2_BACKENDS).name(HIERA2_BACKENDS).hash_of(HIERA2_BACKENDS_TYPE)
+
+        # Register injector boot bindings
+        # -------------------------------
+        boot_bindings = system_bindings.injector_boot_bindings()
+
+        # Register the default bindings scheme handlers
+        require 'puppetx/puppet/bindings_scheme_handler'
+        { 'module'        => 'ModuleScheme', 
+          'confdir'       => 'ConfdirScheme',
+          'module-hiera'  => 'ModuleHieraScheme',
+          'confdir-hiera' => 'ConfdirHieraScheme'
+        }.each do |scheme, class_name|
+          boot_bindings.bind.name(scheme).instance_of(BINDINGS_SCHEMES_TYPE).in_multibind(BINDINGS_SCHEMES).
+            to_instance("Puppet::Pops::Binder::SchemeHandler::#{class_name}")
+        end
+
+        # Register the default hiera2 backends
+        require 'puppetx/puppet/hiera2_backend'
+        { 'json' => 'JsonBackend',
+          'yaml' => 'YamlBackend'
+        }.each do |symbolic, class_name|
+          boot_bindings.bind.name(symbolic).instance_of(HIERA2_BACKENDS_TYPE).in_multibind(HIERA2_BACKENDS).
+            to_instance("Puppet::Pops::Binder::Hiera2::#{class_name}")
+        end
+      end
+  end
+
+  # Module with implementations of various extensions
+  # @api public
+  module Puppetlabs
+    # Default extensions delivered in Puppet Core are included here
+
+    # @api public
+    module SyntaxCheckers
+      if ::Puppet[:binder] || ::Puppet[:parser] == 'future'
+
+        # Classes in this name-space are lazily loaded as they may be overridden and/or never used
+        # (Lazy loading is done by binding to the name of a class instead of a Class instance).
+
+        # Register extensions
+        # -------------------
+        system_bindings = ::Puppet::Pops::Binder::SystemBindings
+        bindings = system_bindings.default_bindings()
+        bindings.bind do
+          name('json')
+          instance_of(SYNTAX_CHECKERS_TYPE)
+          in_multibind(SYNTAX_CHECKERS)
+          to_instance('Puppetx::Puppetlabs::SyntaxCheckers::Json')
+        end
+      end
+    end
+  end
+end