puppet 3.3.2 → 3.4.0.rc1

data/lib/puppet/face/file/store.rb

@@ -11,7 +11,7 @@ Puppet::Face.define(:file, '0.0.1') do
     EOT
 
     when_invoked do |path, options|
-      file = Puppet::FileBucket::File.new(IO.binread(path))
+      file = Puppet::FileBucket::File.new(Puppet::FileSystem::File.new(path).binread)
 
       Puppet::FileBucket::File.indirection.terminus_class = :file
       Puppet::FileBucket::File.indirection.save file

data/lib/puppet/face/module/generate.rb

@@ -17,16 +17,14 @@ Puppet::Face.define(:module, '1.0.0') do
       $ puppet module generate puppetlabs-ssh
       notice: Generating module at /Users/kelseyhightower/puppetlabs-ssh
       puppetlabs-ssh
-      puppetlabs-ssh/tests
-      puppetlabs-ssh/tests/init.pp
-      puppetlabs-ssh/spec
-      puppetlabs-ssh/spec/spec_helper.rb
-      puppetlabs-ssh/spec/spec.opts
-      puppetlabs-ssh/README
       puppetlabs-ssh/Modulefile
-      puppetlabs-ssh/metadata.json
+      puppetlabs-ssh/README
       puppetlabs-ssh/manifests
       puppetlabs-ssh/manifests/init.pp
+      puppetlabs-ssh/spec
+      puppetlabs-ssh/spec/spec_helper.rb
+      puppetlabs-ssh/tests
+      puppetlabs-ssh/tests/init.pp
     EOT
 
     arguments "<name>"

data/lib/puppet/face/parser.rb

@@ -35,17 +35,27 @@ Puppet::Face.define(:parser, '0.0.1') do
       if files.empty?
         if not STDIN.tty?
           Puppet[:code] = STDIN.read
-          Puppet::Node::Environment.new(Puppet[:environment]).known_resource_types.clear
+          validate_manifest
         else
            files << Puppet[:manifest]
            Puppet.notice "No manifest specified. Validating the default manifest #{Puppet[:manifest]}"
         end
       end
+      missing_files = []
       files.each do |file|
+        missing_files << file if ! Puppet::FileSystem::File.exist?(file)
         Puppet[:manifest] = file
-        Puppet::Node::Environment.new(Puppet[:environment]).known_resource_types.clear
+        validate_manifest
       end
+      raise Puppet::Error, "One or more file(s) specified did not exist:\n#{missing_files.collect {|f| " " * 3 + f + "\n"}}" if ! missing_files.empty?
       nil
     end
   end
+
+  def validate_manifest
+    Puppet::Node::Environment.new(Puppet[:environment]).known_resource_types.clear
+  rescue => detail
+    Puppet.log_exception(detail)
+    exit(1)
+  end
 end

data/lib/puppet/face/plugin.rb

@@ -42,6 +42,12 @@ Puppet::Face.define(:plugin, '0.0.1') do
                                          Puppet[:plugindest],
                                          Puppet[:pluginsource],
                                          Puppet[:pluginsignore]).evaluate
+      if Puppet.features.external_facts?
+          Puppet::Configurer::Downloader.new("pluginfacts",
+                                             Puppet[:pluginfactdest],
+                                             Puppet[:pluginfactsource],
+                                             Puppet[:pluginsignore]).evaluate
+      end
     end
 
     when_rendering :console do |value|

data/lib/puppet/feature/base.rb

@@ -70,3 +70,19 @@ Puppet.features.add(:sqlite, :libs => ["sqlite3"])
 Puppet.features.add(:hiera, :libs => ["hiera"])
 
 Puppet.features.add(:minitar, :libs => ["archive/tar/minitar"])
+
+# We can manage symlinks
+Puppet.features.add(:manages_symlinks) do
+  if ! Puppet::Util::Platform.windows?
+    true
+  else
+    begin
+      require 'Win32API'
+      Win32API.new('kernel32', 'CreateSymbolicLink', 'SSL', 'B')
+      true
+    rescue LoadError => err
+      Puppet.debug("CreateSymbolicLink is not available")
+      false
+    end
+  end
+end

data/lib/puppet/feature/external_facts.rb

@@ -0,0 +1,5 @@
+require 'facter/util/config'
+
+Puppet.features.add(:external_facts) {
+   Facter::Util::Config.respond_to?(:external_facts_dirs=)
+}

data/lib/puppet/feature/libuser.rb

@@ -4,5 +4,5 @@ require 'puppet/util/libuser'
 Puppet.features.add(:libuser) {
    File.executable?("/usr/sbin/lgroupadd") and
    File.executable?("/usr/sbin/luseradd")  and
-   File.exists?(Puppet::Util::Libuser.getconf)
+   Puppet::FileSystem::File.exist?(Puppet::Util::Libuser.getconf)
 }

data/lib/puppet/feature/msgpack.rb

@@ -0,0 +1 @@
+Puppet.features.add(:msgpack, :libs => ["msgpack"])

data/lib/puppet/feature/rails.rb

@@ -24,11 +24,11 @@ Puppet.features.add(:rails) do
     require 'active_record'
     require 'active_record/version'
   rescue LoadError
-    if FileTest.exists?("/usr/share/rails")
+    if Puppet::FileSystem::File.exist?("/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)
+        if Puppet::FileSystem::File.exist?(libdir) and ! $LOAD_PATH.include?(libdir)
           count += 1
           $LOAD_PATH << libdir
         end

data/lib/puppet/file_bucket/dipper.rb

@@ -31,8 +31,9 @@ class Puppet::FileBucket::Dipper
 
   # Back up a file to our bucket
   def backup(file)
-    raise(ArgumentError, "File #{file} does not exist") unless ::File.exist?(file)
-    contents = IO.binread(file)
+    file_handle = Puppet::FileSystem::File.new(file)
+    raise(ArgumentError, "File #{file} does not exist") unless file_handle.exist?
+    contents = file_handle.binread
     begin
       file_bucket_file = Puppet::FileBucket::File.new(contents, :bucket_path => @local_path)
       files_original_path = absolutize_path(file)
@@ -65,8 +66,9 @@ class Puppet::FileBucket::Dipper
   # Restore the file
   def restore(file,sum)
     restore = true
-    if FileTest.exists?(file)
-      cursum = Digest::MD5.hexdigest(IO.binread(file))
+    file_handle = Puppet::FileSystem::File.new(file)
+    if file_handle.exist?
+      cursum = Digest::MD5.hexdigest(file_handle.binread)
 
       # if the checksum has changed...
       # this might be extra effort
@@ -79,8 +81,8 @@ class Puppet::FileBucket::Dipper
       if newcontents = getfile(sum)
         newsum = Digest::MD5.hexdigest(newcontents)
         changed = nil
-        if FileTest.exists?(file) and ! FileTest.writable?(file)
-          changed = ::File.stat(file).mode
+        if file_handle.exist? and ! file_handle.writable?
+          changed = Puppet::FileSystem::File.new(file).stat.mode
           ::File.chmod(changed | 0200, file)
         end
         ::File.open(file, ::File::WRONLY|::File::TRUNC|::File::CREAT) { |of|

data/lib/puppet/file_bucket/file.rb

@@ -2,6 +2,7 @@ require 'puppet/file_bucket'
 require 'puppet/indirector'
 require 'puppet/util/checksums'
 require 'digest/md5'
+require 'stringio'
 
 class Puppet::FileBucket::File
   # This class handles the abstract notion of a file in a filebucket.
@@ -34,6 +35,16 @@ class Puppet::FileBucket::File
     raise ArgumentError.new("Unknown option(s): #{options.keys.join(', ')}") unless options.empty?
   end
 
+  # @return [Num] The size of the contents
+  def size
+    contents.size
+  end
+
+  # @return [IO] A stream that reads the contents
+  def stream
+    StringIO.new(contents)
+  end
+
   def checksum_type
     'md5'
   end
@@ -60,7 +71,11 @@ class Puppet::FileBucket::File
 
   def to_pson
     Puppet.deprecation_warning("Serializing Puppet::FileBucket::File objects to pson is deprecated.")
-    { "contents" => contents }.to_pson
+    to_data_hash.to_pson
+  end
+
+  def to_data_hash
+    { "contents" => contents }
   end
 
   # This method is deprecated, but cannot be removed for awhile, otherwise
@@ -69,4 +84,5 @@ class Puppet::FileBucket::File
     Puppet.deprecation_warning("Deserializing Puppet::FileBucket::File objects from pson is deprecated. Upgrade to a newer version.")
     self.new(pson["contents"])
   end
+
 end

data/lib/puppet/file_serving/base.rb

@@ -21,11 +21,18 @@ class Puppet::FileServing::Base
 
   # Return the full path to our file.  Fails if there's no path set.
   def full_path(dummy_argument=:work_arround_for_ruby_GC_bug)
-    (if relative_path.nil? or relative_path == "" or relative_path == "."
-       path
+    if relative_path.nil? or relative_path == "" or relative_path == "."
+       full_path = path
      else
-       File.join(path, relative_path)
-     end).gsub(%r{//+}, "/")
+       full_path = File.join(path, relative_path)
+     end
+
+     if Puppet.features.microsoft_windows?
+       # Replace multiple slashes as long as they aren't at the beginning of a filename
+       full_path.gsub(%r{(./)/+}, '\1')
+     else
+       full_path.gsub(%r{//+}, '/')
+     end
   end
 
   def initialize(path, options = {})
@@ -61,17 +68,21 @@ class Puppet::FileServing::Base
   # Stat our file, using the appropriate link-sensitive method.
   def stat
     @stat_method ||= self.links == :manage ? :lstat : :stat
-    File.send(@stat_method, full_path)
+    Puppet::FileSystem::File.new(full_path).send(@stat_method)
+  end
+
+  def to_data_hash
+    {
+      'path'          => @path,
+      'relative_path' => @relative_path,
+      'links'         => @links
+    }
   end
 
   def to_pson_data_hash
     {
       # No 'document_type' since we don't send these bare
-      'data'       => {
-        'path'          => @path,
-        'relative_path' => @relative_path,
-        'links'         => @links
-        },
+      'data'       => to_data_hash,
       'metadata' => {
         'api_version' => 1
         }

data/lib/puppet/file_serving/configuration.rb

@@ -1,20 +1,16 @@
-require 'monitor'
 require 'puppet'
 require 'puppet/file_serving'
 require 'puppet/file_serving/mount'
 require 'puppet/file_serving/mount/file'
 require 'puppet/file_serving/mount/modules'
 require 'puppet/file_serving/mount/plugins'
+require 'puppet/file_serving/mount/pluginfacts'
 
 class Puppet::FileServing::Configuration
   require 'puppet/file_serving/configuration/parser'
 
-  extend MonitorMixin
-
   def self.configuration
-    synchronize do
-      @configuration ||= new
-    end
+    @configuration ||= new
   end
 
   Mount = Puppet::FileServing::Mount
@@ -84,13 +80,15 @@ class Puppet::FileServing::Configuration
     @mounts["modules"].allow('*') if @mounts["modules"].empty?
     @mounts["plugins"] ||= Mount::Plugins.new("plugins")
     @mounts["plugins"].allow('*') if @mounts["plugins"].empty?
+    @mounts["pluginfacts"] ||= Mount::PluginFacts.new("pluginfacts")
+    @mounts["pluginfacts"].allow('*') if @mounts["pluginfacts"].empty?
   end
 
   # Read the configuration file.
   def readconfig(check = true)
     config = Puppet[:fileserverconfig]
 
-    return unless FileTest.exists?(config)
+    return unless Puppet::FileSystem::File.exist?(config)
 
     @parser ||= Puppet::FileServing::Configuration::Parser.new(config)
 

data/lib/puppet/file_serving/configuration/parser.rb

@@ -7,7 +7,7 @@ class Puppet::FileServing::Configuration::Parser
 
   # Parse our configuration file.
   def parse
-    raise("File server configuration #{@file} does not exist") unless FileTest.exists?(@file)
+    raise("File server configuration #{@file} does not exist") unless Puppet::FileSystem::File.exist?(@file)
     raise("Cannot read file server configuration #{@file}") unless FileTest.readable?(@file)
 
     @mounts = {}

data/lib/puppet/file_serving/content.rb

@@ -34,7 +34,7 @@ class Puppet::FileServing::Content < Puppet::FileServing::Base
       # This stat can raise an exception, too.
       raise(ArgumentError, "Cannot read the contents of links unless following links") if stat.ftype == "symlink"
 
-      @content = IO.binread(full_path)
+      @content = Puppet::FileSystem::File.new(full_path).binread
     end
     @content
   end

data/lib/puppet/file_serving/fileset.rb

@@ -77,7 +77,7 @@ class Puppet::FileServing::Fileset
     links = links.to_sym
     raise(ArgumentError, "Invalid :links value '#{links}'") unless [:manage, :follow].include?(links)
     @links = links
-    @stat_method = File.method(@links == :manage ? :lstat : :stat)
+    @stat_method = @links == :manage ? :lstat : :stat
   end
 
   private
@@ -133,7 +133,7 @@ class Puppet::FileServing::Fileset
     end
 
     def directory?
-      stat_method.call(path).directory?
+      Puppet::FileSystem::File.new(path).send(stat_method).directory?
     rescue Errno::ENOENT, Errno::EACCES
       false
     end
@@ -159,7 +159,7 @@ class Puppet::FileServing::Fileset
   end
 
   def valid?(path)
-    @stat_method.call(path)
+    Puppet::FileSystem::File.new(path).send(@stat_method)
     true
   rescue Errno::ENOENT, Errno::EACCES
     false

data/lib/puppet/file_serving/metadata.rb

@@ -65,8 +65,8 @@ class Puppet::FileServing::Metadata < Puppet::FileServing::Base
   end
 
   # Retrieve the attributes for this file, relative to a base directory.
-  # Note that File.stat raises Errno::ENOENT if the file is absent and this
-  # method does not catch that exception.
+  # Note that Puppet::FileSystem::File.new(path).stat raises Errno::ENOENT
+  # if the file is absent and this method does not catch that exception.
   def collect
     real_path = full_path
 
@@ -85,7 +85,7 @@ class Puppet::FileServing::Metadata < Puppet::FileServing::Base
       @checksum_type = "ctime"
       @checksum = ("{#{@checksum_type}}") + send("#{@checksum_type}_file", path).to_s
     when "link"
-      @destination = File.readlink(real_path)
+      @destination = Puppet::FileSystem::File.new(real_path).readlink
       @checksum = ("{#{@checksum_type}}") + send("#{@checksum_type}_file", real_path).to_s rescue nil
     else
       raise ArgumentError, "Cannot manage files of type #{stat.ftype}"
@@ -106,25 +106,29 @@ class Puppet::FileServing::Metadata < Puppet::FileServing::Base
     super(path,data)
   end
 
-  PSON.register_document_type('FileMetadata',self)
-  def to_pson_data_hash
-    {
-      'document_type' => 'FileMetadata',
-
-        'data'       => super['data'].update(
-          {
-          'owner'        => owner,
-          'group'        => group,
-          'mode'         => mode,
-          'checksum'     => {
-            'type'   => checksum_type,
-            'value'  => checksum
+  def to_data_hash
+    super.update(
+      {
+        'owner'        => owner,
+        'group'        => group,
+        'mode'         => mode,
+        'checksum'     => {
+          'type'   => checksum_type,
+          'value'  => checksum
         },
         'type'         => ftype,
         'destination'  => destination,
 
-        }),
-      'metadata' => {
+      }
+    )
+  end
+
+  PSON.register_document_type('FileMetadata',self)
+  def to_pson_data_hash
+    {
+      'document_type' => 'FileMetadata',
+      'data'          => to_data_hash,
+      'metadata'      => {
         'api_version' => 1
         }
     }

data/lib/puppet/file_serving/mount/file.rb

@@ -22,7 +22,7 @@ class Puppet::FileServing::Mount::File < Puppet::FileServing::Mount
 
     file = ::File.join(full_path, relative_path)
 
-    if !(FileTest.exist?(file) or FileTest.symlink?(file))
+    if !(Puppet::FileSystem::File.exist?(file) or Puppet::FileSystem::File.new(file).symlink?)
       Puppet.info("File does not exist or is not accessible: #{file}")
       return nil
     end

data/lib/puppet/file_serving/mount/pluginfacts.rb

@@ -0,0 +1,35 @@
+require 'puppet/file_serving/mount'
+
+# Find files in the modules' pluginfacts directories.
+# This is a very strange mount because it merges
+# many directories into one.
+class Puppet::FileServing::Mount::PluginFacts < Puppet::FileServing::Mount
+  # Return an instance of the appropriate class.
+  def find(relative_path, request)
+    return nil unless mod = request.environment.modules.find { |mod|  mod.pluginfact(relative_path) }
+
+    path = mod.pluginfact(relative_path)
+
+    path
+  end
+
+  def search(relative_path, request)
+    # We currently only support one kind of search on plugins - return
+    # them all.
+    Puppet.debug("Warning: calling Plugins.search with empty module path.") if request.environment.modules.empty?
+    paths = request.environment.modules.find_all { |mod| mod.pluginfacts? }.collect { |mod| mod.plugin_fact_directory }
+    if paths.empty?
+      # If the modulepath is valid then we still need to return a valid root
+      # directory for the search, but make sure nothing inside it is
+      # returned.
+      request.options[:recurse] = false
+      request.environment.modulepath.empty? ? nil : request.environment.modulepath
+    else
+      paths
+    end
+  end
+
+  def valid?
+    true
+  end
+end