puppet 0.25.5 → 2.6.0

data/lib/puppet/external/pson/common.rb

@@ -28,17 +28,17 @@ module PSON
     end
 
     def registered_document_types
-        @registered_document_types ||= {}
+      @registered_document_types ||= {}
     end
 
     # Register a class-constant for deserializaion.
     def register_document_type(name,klass)
-        registered_document_types[name.to_s] = klass        
+      registered_document_types[name.to_s] = klass
     end
 
-    # Return the constant located at _path_. 
+    # Return the constant located at _path_.
     # Anything may be registered as a path by calling register_path, above.
-    # Otherwise, the format of _path_ has to be either ::A::B::C or A::B::C. 
+    # Otherwise, the format of _path_ has to be either ::A::B::C or A::B::C.
     # In either of these cases A has to be defined in Object (e.g. the path
     # must be an absolute namespace path.  If the constant doesn't exist at
     # the given path, an ArgumentError is raised.
@@ -171,7 +171,7 @@ module PSON
   # * *indent*: a string used to indent levels (default: ''),
   # * *space*: a string that is put after, a : or , delimiter (default: ''),
   # * *space_before*: a string that is put before a : pair delimiter (default: ''),
-  # * *object_nl*: a string that is put at the end of a PSON object (default: ''), 
+  # * *object_nl*: a string that is put at the end of a PSON object (default: ''),
   # * *array_nl*: a string that is put at the end of a PSON array (default: ''),
   # * *check_circular*: true if checking for circular data structures
   #   should be done (the default), false otherwise.
@@ -223,11 +223,14 @@ module PSON
   # The _opts_ argument can be used to configure the generator, see the
   # generate method for a more detailed explanation.
   def pretty_generate(obj, opts = nil)
+
     state = PSON.state.new(
+
       :indent     => '  ',
       :space      => ' ',
       :object_nl  => "\n",
       :array_nl   => "\n",
+
       :check_circular => true
     )
     if opts

data/lib/puppet/external/pson/pure/generator.rb

@@ -43,19 +43,19 @@ module PSON
       string = string.dup
       string << '' # XXX workaround: avoid buffer sharing
       string.force_encoding(Encoding::ASCII_8BIT)
-      string.gsub!(/["\\\x0-\x1f]/) { MAP[$&] }
+      string.gsub!(/["\\\x0-\x1f]/) { MAP[$MATCH] }
       string.gsub!(/(
-                      (?:
-                        [\xc2-\xdf][\x80-\xbf]    |
-                        [\xe0-\xef][\x80-\xbf]{2} |
-                        [\xf0-\xf4][\x80-\xbf]{3}
-                      )+ |
-                      [\x80-\xc1\xf5-\xff]       # invalid
-                    )/nx) { |c|
-                      c.size == 1 and raise GeneratorError, "invalid utf8 byte: '#{c}'"
-                      s = PSON::UTF8toUTF16.iconv(c).unpack('H*')[0]
-                      s.gsub!(/.{4}/n, '\\\\u\&')
-                    }
+        (?:
+          [\xc2-\xdf][\x80-\xbf]    |
+          [\xe0-\xef][\x80-\xbf]{2} |
+          [\xf0-\xf4][\x80-\xbf]{3}
+            )+ |
+            [\x80-\xc1\xf5-\xff]       # invalid
+              )/nx) { |c|
+                c.size == 1 and raise GeneratorError, "invalid utf8 byte: '#{c}'"
+                s = PSON::UTF8toUTF16.iconv(c).unpack('H*')[0]
+                s.gsub!(/.{4}/n, '\\\\u\&')
+              }
       string.force_encoding(Encoding::UTF_8)
       string
     rescue Iconv::Failure => e
@@ -63,15 +63,15 @@ module PSON
     end
   else
     def utf8_to_pson(string) # :nodoc:
-      string = string.gsub(/["\\\x0-\x1f]/) { MAP[$&] }
+      string = string.gsub(/["\\\x0-\x1f]/) { MAP[$MATCH] }
       string.gsub!(/(
-                      (?:
-                        [\xc2-\xdf][\x80-\xbf]    |
-                        [\xe0-\xef][\x80-\xbf]{2} |
-                        [\xf0-\xf4][\x80-\xbf]{3}
-                      )+ |
-                      [\x80-\xc1\xf5-\xff]       # invalid
-                    )/nx) { |c|
+        (?:
+          [\xc2-\xdf][\x80-\xbf]    |
+          [\xe0-\xef][\x80-\xbf]{2} |
+          [\xf0-\xf4][\x80-\xbf]{3}
+            )+ |
+            [\x80-\xc1\xf5-\xff]       # invalid
+              )/nx) { |c|
         c.size == 1 and raise GeneratorError, "invalid utf8 byte: '#{c}'"
         s = PSON::UTF8toUTF16.iconv(c).unpack('H*')[0]
         s.gsub!(/.{4}/n, '\\\\u\&')
@@ -110,7 +110,7 @@ module PSON
         # * *indent*: a string used to indent levels (default: ''),
         # * *space*: a string that is put after, a : or , delimiter (default: ''),
         # * *space_before*: a string that is put before a : pair delimiter (default: ''),
-        # * *object_nl*: a string that is put at the end of a PSON object (default: ''), 
+        # * *object_nl*: a string that is put at the end of a PSON object (default: ''),
         # * *array_nl*: a string that is put at the end of a PSON array (default: ''),
         # * *check_circular*: true if checking for circular data structures
         #   should be done (the default), false otherwise.
@@ -172,13 +172,13 @@ module PSON
         end
 
         # Returns _true_, if _object_ was already seen during this generating
-        # run. 
+        # run.
         def seen?(object)
           @seen.key?(object.__id__)
         end
 
         # Remember _object_, to find out if it was already encountered (if a
-        # cyclic data structure is if a cyclic data structure is rendered). 
+        # cyclic data structure is if a cyclic data structure is rendered).
         def remember(object)
           @seen[object.__id__] = true
         end
@@ -212,7 +212,7 @@ module PSON
         # passed to the configure method.
         def to_h
           result = {}
-          for iv in %w[indent space space_before object_nl array_nl check_circular allow_nan max_nesting]
+          for iv in %w{indent space space_before object_nl array_nl check_circular allow_nan max_nesting}
             result[iv.intern] = instance_variable_get("@#{iv}")
           end
           result
@@ -248,7 +248,7 @@ module PSON
           def pson_check_circular(state)
             if state and state.check_circular?
               state.seen?(self) and raise PSON::CircularDatastructure,
-                  "circular data structures not supported!"
+                "circular data structures not supported!"
               state.remember self
             end
             yield
@@ -333,7 +333,7 @@ module PSON
                 pson_shift(state, depth + 1) << value.to_pson(state, depth + 1)
               }.join(delim)
               result << state.array_nl
-              result << pson_shift(state, depth) 
+              result << pson_shift(state, depth)
               result << ']'
             else
               '[' << map { |value| value.to_pson }.join(delim) << ']'

data/lib/puppet/external/pson/pure/parser.rb

@@ -6,21 +6,21 @@ module PSON
     # into a Ruby data structure.
     class Parser < StringScanner
       STRING                = /" ((?:[^\x0-\x1f"\\] |
-                                   # escaped special characters:
-                                  \\["\\\/bfnrt] |
-                                  \\u[0-9a-fA-F]{4} |
-                                   # match all but escaped special characters:
-                                  \\[\x20-\x21\x23-\x2e\x30-\x5b\x5d-\x61\x63-\x65\x67-\x6d\x6f-\x71\x73\x75-\xff])*)
-                              "/nx
+      #                              escaped special characters:
+        \\["\\\/bfnrt] |
+        \\u[0-9a-fA-F]{4} |
+        #                          match all but escaped special characters:
+          \\[\x20-\x21\x23-\x2e\x30-\x5b\x5d-\x61\x63-\x65\x67-\x6d\x6f-\x71\x73\x75-\xff])*)
+            "/nx
       INTEGER               = /(-?0|-?[1-9]\d*)/
       FLOAT                 = /(-?
-                                (?:0|[1-9]\d*)
-                                (?:
-                                  \.\d+(?i:e[+-]?\d+) |
-                                  \.\d+ |
-                                  (?i:e[+-]?\d+)
-                                )
-                                )/x
+        (?:0|[1-9]\d*)
+        (?:
+          \.\d+(?i:e[+-]?\d+) |
+          \.\d+ |
+          (?i:e[+-]?\d+)
+            )
+            )/x
       NAN                   = /NaN/
       INFINITY              = /Infinity/
       MINUS_INFINITY        = /-Infinity/
@@ -35,17 +35,17 @@ module PSON
       NULL                  = /null/
       IGNORE                = %r(
         (?:
-         //[^\n\r]*[\n\r]| # line comments
-         /\*               # c-style comments
-         (?:
-          [^*/]|        # normal chars
-          /[^*]|        # slashes that do not start a nested comment
-          \*[^/]|       # asterisks that do not end this comment
-          /(?=\*/)      # single slash before this comment's end 
-         )*
-           \*/               # the End of this comment
-           |[ \t\r\n]+       # whitespaces: space, horicontal tab, lf, cr
-        )+
+        //[^\n\r]*[\n\r]| # line comments
+        /\*               # c-style comments
+        (?:
+        [^*/]|        # normal chars
+        /[^*]|        # slashes that do not start a nested comment
+        \*[^/]|       # asterisks that do not end this comment
+        /(?=\*/)      # single slash before this comment's end
+        )*
+        \*/               # the End of this comment
+        |[ \t\r\n]+       # whitespaces: space, horicontal tab, lf, cr
+      )+
       )mx
 
       UNPARSED = Object.new
@@ -113,23 +113,26 @@ module PSON
 
       # Unescape characters in strings.
       UNESCAPE_MAP = Hash.new { |h, k| h[k] = k.chr }
-      UNESCAPE_MAP.update({
-        ?"  => '"',
-        ?\\ => '\\',
-        ?/  => '/',
-        ?b  => "\b",
-        ?f  => "\f",
-        ?n  => "\n",
-        ?r  => "\r",
-        ?t  => "\t",
-        ?u  => nil, 
+
+        UNESCAPE_MAP.update(
+          {
+            ?"  => '"',
+            ?\\ => '\\',
+            ?/  => '/',
+            ?b  => "\b",
+            ?f  => "\f",
+            ?n  => "\n",
+            ?r  => "\r",
+            ?t  => "\t",
+            ?u  => nil,
+
       })
 
       def parse_string
         if scan(STRING)
           return '' if self[1].empty?
-          string = self[1].gsub(%r((?:\\[\\bfnrt"/]|(?:\\u(?:[A-Fa-f\d]{4}))+|\\[\x20-\xff]))n) do |c|
-            if u = UNESCAPE_MAP[$&[1]]
+          string = self[1].gsub(%r{(?:\\[\\bfnrt"/]|(?:\\u(?:[A-Fa-f\d]{4}))+|\\[\x20-\xff])}n) do |c|
+            if u = UNESCAPE_MAP[$MATCH[1]]
               u
             else # \uXXXX
               bytes = ''
@@ -141,9 +144,7 @@ module PSON
               PSON::UTF16toUTF8.iconv(bytes)
             end
           end
-          if string.respond_to?(:force_encoding)
-            string.force_encoding(Encoding::UTF_8)
-          end
+          string.force_encoding(Encoding::UTF_8) if string.respond_to?(:force_encoding)
           string
         else
           UNPARSED
@@ -206,9 +207,7 @@ module PSON
               raise ParserError, "expected ',' or ']' in array at '#{peek(20)}'!"
             end
           when scan(ARRAY_CLOSE)
-            if delim
-              raise ParserError, "expected next element in array at '#{peek(20)}'!"
-            end
+            raise ParserError, "expected next element in array at '#{peek(20)}'!" if delim
             break
           when skip(IGNORE)
             ;
@@ -228,9 +227,7 @@ module PSON
           case
           when (string = parse_string) != UNPARSED
             skip(IGNORE)
-            unless scan(PAIR_DELIMITER)
-              raise ParserError, "expected ':' in object at '#{peek(20)}'!"
-            end
+            raise ParserError, "expected ':' in object at '#{peek(20)}'!" unless scan(PAIR_DELIMITER)
             skip(IGNORE)
             unless (value = parse_value).equal? UNPARSED
               result[string] = value
@@ -247,9 +244,7 @@ module PSON
               raise ParserError, "expected value in object at '#{peek(20)}'!"
             end
           when scan(OBJECT_CLOSE)
-            if delim
-              raise ParserError, "expected next name, value pair in object at '#{peek(20)}'!"
-            end
+            raise ParserError, "expected next name, value pair in object at '#{peek(20)}'!" if delim
             if @create_id and klassname = result[@create_id]
               klass = PSON.deep_const_get klassname
               break unless klass and klass.pson_creatable?

data/lib/puppet/feature/base.rb

@@ -15,7 +15,7 @@ Puppet.features.add(:usage, :libs => %w{rdoc/ri/ri_paths rdoc/usage})
 Puppet.features.add(:libshadow, :libs => ["shadow"])
 
 # We're running as root.
-Puppet.features.add(:root) { require 'puppet/util/suidmanager'; Puppet::Util::SUIDManager.uid == 0 }
+Puppet.features.add(:root) { require 'puppet/util/suidmanager'; Puppet::Util::SUIDManager.root? }
 
 # We've got mongrel available
 Puppet.features.add(:mongrel, :libs => %w{rubygems mongrel puppet/network/http_server/mongrel})
@@ -31,3 +31,23 @@ Puppet.features.add(:rrd, :libs => ["RRDtool"])
 
 # We have OpenSSL
 Puppet.features.add(:openssl, :libs => ["openssl"])
+
+# We have a syslog implementation
+Puppet.features.add(:syslog, :libs => ["syslog"])
+
+# We can use POSIX user functions
+Puppet.features.add(:posix) do
+  require 'etc'
+  Etc.getpwuid(0) != nil && Puppet.features.syslog?
+end
+
+# We can use Microsoft Windows functions
+Puppet.features.add(:microsoft_windows, :libs => ["sys/admin", "win32/process", "win32/dir"])
+
+raise Puppet::Error,"Cannot determine basic system flavour" unless Puppet.features.posix? or Puppet.features.microsoft_windows?
+
+# We have CouchDB
+Puppet.features.add(:couchdb, :libs => ["couchrest"])
+
+# We have sqlite
+Puppet.features.add(:sqlite, :libs => ["sqlite3"])

data/lib/puppet/feature/pson.rb

@@ -1,6 +1,6 @@
 Puppet.features.add(:pson) do
-    require 'puppet/external/pson/common'
-    require 'puppet/external/pson/version'
-    require 'puppet/external/pson/pure'
-    true
+  require 'puppet/external/pson/common'
+  require 'puppet/external/pson/version'
+  require 'puppet/external/pson/pure'
+  true
 end

data/lib/puppet/feature/rack.rb

@@ -3,22 +3,22 @@ require 'puppet/util/feature'
 # See if we have rack available, an HTTP Application Stack
 # Explicitly depend on rack library version >= 1.0.0
 Puppet.features.add(:rack) do
-    begin
-        require 'rack'
-    rescue LoadError => detail
-        require 'rubygems'
-        require 'rack'
-    end
+  begin
+    require 'rack'
+  rescue LoadError => detail
+    require 'rubygems'
+    require 'rack'
+  end
 
-    if ! (defined?(::Rack) and defined?(::Rack.release))
-        false
+  if ! (defined?(::Rack) and defined?(::Rack.release))
+    false
+  else
+    major_version = ::Rack.release.split('.')[0].to_i
+    if major_version >= 1
+      true
     else
-        major_version = ::Rack.release().split('.')[0].to_i
-        if major_version >= 1
-            true
-        else
-            false
-        end
+      false
     end
+  end
 end
 

data/lib/puppet/feature/rails.rb

@@ -6,32 +6,30 @@ require 'puppet/util/feature'
 Puppet.features.rubygems?
 
 Puppet.features.add(:rails) do
-    begin
-        require 'active_record'
-        require 'active_record/version'
-    rescue LoadError => detail
-        if FileTest.exists?("/usr/share/rails")
-            count = 0
-            Dir.entries("/usr/share/rails").each do |dir|
-                libdir = File.join("/usr/share/rails", dir, "lib")
-                if FileTest.exists?(libdir) and ! $:.include?(libdir)
-                    count += 1
-                    $: << libdir
-                end
-            end
-
-            if count > 0
-                retry
-            end
+  begin
+    require 'active_record'
+    require 'active_record/version'
+  rescue LoadError => detail
+    if FileTest.exists?("/usr/share/rails")
+      count = 0
+      Dir.entries("/usr/share/rails").each do |dir|
+        libdir = File.join("/usr/share/rails", dir, "lib")
+        if FileTest.exists?(libdir) and ! $LOAD_PATH.include?(libdir)
+          count += 1
+          $LOAD_PATH << libdir
         end
-    end
+      end
 
-    if ! (defined?(::ActiveRecord) and defined?(::ActiveRecord::VERSION) and defined?(::ActiveRecord::VERSION::MAJOR) and defined?(::ActiveRecord::VERSION::MINOR))
-        false
-    elsif ! (::ActiveRecord::VERSION::MAJOR == 2 and ::ActiveRecord::VERSION::MINOR >= 1)
-        Puppet.info "ActiveRecord 2.1 or later required for StoreConfigs"
-        false
-    else
-        true
+      retry if count > 0
     end
+  end
+
+  if ! (defined?(::ActiveRecord) and defined?(::ActiveRecord::VERSION) and defined?(::ActiveRecord::VERSION::MAJOR) and defined?(::ActiveRecord::VERSION::MINOR))
+    false
+  elsif ! (::ActiveRecord::VERSION::MAJOR == 2 and ::ActiveRecord::VERSION::MINOR >= 1)
+    Puppet.info "ActiveRecord 2.1 or later required for StoreConfigs"
+    false
+  else
+    true
+  end
 end

data/lib/puppet/file_bucket.rb

@@ -0,0 +1,4 @@
+# stub
+module Puppet::FileBucket
+  class BucketError < RuntimeError; end
+end

data/lib/puppet/file_bucket/dipper.rb

@@ -0,0 +1,99 @@
+require 'puppet/file_bucket'
+require 'puppet/file_bucket/file'
+require 'puppet/indirector/request'
+
+class Puppet::FileBucket::Dipper
+  # This is a transitional implementation that uses REST
+  # to access remote filebucket files.
+
+  attr_accessor :name
+
+  # Create our bucket client
+  def initialize(hash = {})
+    # Emulate the XMLRPC client
+    server      = hash[:Server]
+    port        = hash[:Port] || Puppet[:masterport]
+    environment = Puppet[:environment]
+
+    if hash.include?(:Path)
+      @local_path = hash[:Path]
+      @rest_path  = nil
+    else
+      @local_path = nil
+      @rest_path = "https://#{server}:#{port}/#{environment}/file_bucket_file/"
+    end
+  end
+
+  def local?
+    !! @local_path
+  end
+
+  # Back up a file to our bucket
+  def backup(file)
+    raise(ArgumentError, "File #{file} does not exist") unless ::File.exist?(file)
+    contents = ::File.read(file)
+    begin
+      file_bucket_file = Puppet::FileBucket::File.new(contents, :bucket_path => @local_path, :path => absolutize_path(file) )
+      dest_path = "#{@rest_path}#{file_bucket_file.name}"
+
+      file_bucket_file.save(dest_path)
+      return file_bucket_file.checksum_data
+    rescue => detail
+      puts detail.backtrace if Puppet[:trace]
+      raise Puppet::Error, "Could not back up #{file}: #{detail}"
+    end
+  end
+
+  # Retrieve a file by sum.
+  def getfile(sum)
+    source_path = "#{@rest_path}md5/#{sum}"
+    file_bucket_file = Puppet::FileBucket::File.find(source_path, :bucket_path => @local_path)
+
+    raise Puppet::Error, "File not found" unless file_bucket_file
+    file_bucket_file.to_s
+  end
+
+  # Restore the file
+  def restore(file,sum)
+    restore = true
+    if FileTest.exists?(file)
+      cursum = Digest::MD5.hexdigest(::File.read(file))
+
+      # if the checksum has changed...
+      # this might be extra effort
+      if cursum == sum
+        restore = false
+      end
+    end
+
+    if restore
+      if newcontents = getfile(sum)
+        tmp = ""
+        newsum = Digest::MD5.hexdigest(newcontents)
+        changed = nil
+        if FileTest.exists?(file) and ! FileTest.writable?(file)
+          changed = ::File.stat(file).mode
+          ::File.chmod(changed | 0200, file)
+        end
+        ::File.open(file, ::File::WRONLY|::File::TRUNC|::File::CREAT) { |of|
+          of.print(newcontents)
+        }
+        ::File.chmod(changed, file) if changed
+      else
+        Puppet.err "Could not find file with checksum #{sum}"
+        return nil
+      end
+      return newsum
+    else
+      return nil
+    end
+  end
+
+  private
+  def absolutize_path( path )
+    require 'pathname'
+    Pathname.new(path).realpath
+  end
+
+end
+