puppet 3.8.7 → 4.0.0

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

@@ -20,63 +20,63 @@ Puppet::Face.define(:module, '1.0.0') do
       Install a module:
 
       $ puppet module install puppetlabs-vcsrepo
-      Preparing to install into /etc/puppet/modules ...
+      Preparing to install into /etc/puppetlabs/code/modules ...
       Downloading from http://forgeapi.puppetlabs.com ...
       Installing -- do not interrupt ...
-      /etc/puppet/modules
+      /etc/puppetlabs/code/modules
       └── puppetlabs-vcsrepo (v0.0.4)
 
       Install a module to a specific environment:
 
       $ puppet module install puppetlabs-vcsrepo --environment development
-      Preparing to install into /etc/puppet/environments/development/modules ...
+      Preparing to install into /etc/puppetlabs/code/environments/development/modules ...
       Downloading from http://forgeapi.puppetlabs.com ...
       Installing -- do not interrupt ...
-      /etc/puppet/environments/development/modules
+      /etc/puppetlabs/code/environments/development/modules
       └── puppetlabs-vcsrepo (v0.0.4)
 
       Install a specific module version:
 
       $ puppet module install puppetlabs-vcsrepo -v 0.0.4
-      Preparing to install into /etc/puppet/modules ...
+      Preparing to install into /etc/puppetlabs/modules ...
       Downloading from http://forgeapi.puppetlabs.com ...
       Installing -- do not interrupt ...
-      /etc/puppet/modules
+      /etc/puppetlabs/code/modules
       └── puppetlabs-vcsrepo (v0.0.4)
 
       Install a module into a specific directory:
 
-      $ puppet module install puppetlabs-vcsrepo --target-dir=/usr/share/puppet/modules
-      Preparing to install into /usr/share/puppet/modules ...
+      $ puppet module install puppetlabs-vcsrepo --target-dir=/opt/puppetlabs/puppet/modules
+      Preparing to install into /opt/puppetlabs/puppet/modules ...
       Downloading from http://forgeapi.puppetlabs.com ...
       Installing -- do not interrupt ...
-      /usr/share/puppet/modules
+      /opt/puppetlabs/puppet/modules
       └── puppetlabs-vcsrepo (v0.0.4)
 
       Install a module into a specific directory and check for dependencies in other directories:
 
-      $ puppet module install puppetlabs-vcsrepo --target-dir=/usr/share/puppet/modules --modulepath /etc/puppet/modules
-      Preparing to install into /usr/share/puppet/modules ...
+      $ puppet module install puppetlabs-vcsrepo --target-dir=/opt/puppetlabs/puppet/modules --modulepath /etc/puppetlabs/code/modules
+      Preparing to install into /opt/puppetlabs/puppet/modules ...
       Downloading from http://forgeapi.puppetlabs.com ...
       Installing -- do not interrupt ...
-      /usr/share/puppet/modules
+      /opt/puppetlabs/puppet/modules
       └── puppetlabs-vcsrepo (v0.0.4)
 
       Install a module from a release archive:
 
       $ puppet module install puppetlabs-vcsrepo-0.0.4.tar.gz
-      Preparing to install into /etc/puppet/modules ...
+      Preparing to install into /etc/puppetlabs/code/modules ...
       Downloading from http://forgeapi.puppetlabs.com ...
       Installing -- do not interrupt ...
-      /etc/puppet/modules
+      /etc/puppetlabs/code/modules
       └── puppetlabs-vcsrepo (v0.0.4)
 
       Install a module from a release archive and ignore dependencies:
 
       $ puppet module install puppetlabs-vcsrepo-0.0.4.tar.gz --ignore-dependencies
-      Preparing to install into /etc/puppet/modules ...
+      Preparing to install into /etc/puppetlabs/code/modules ...
       Installing -- do not interrupt ...
-      /etc/puppet/modules
+      /etc/puppetlabs/code/modules
       └── puppetlabs-vcsrepo (v0.0.4)
 
     EOT

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

@@ -21,40 +21,40 @@ Puppet::Face.define(:module, '1.0.0') do
       List installed modules:
 
       $ puppet module list
-        /etc/puppet/modules
+        /etc/puppetlabs/code/modules
         ├── bodepd-create_resources (v0.0.1)
         ├── puppetlabs-bacula (v0.0.2)
         ├── puppetlabs-mysql (v0.0.1)
         ├── puppetlabs-sqlite (v0.0.1)
         └── puppetlabs-stdlib (v2.2.1)
-        /usr/share/puppet/modules (no modules installed)
+        /opt/puppetlabs/puppet/modules (no modules installed)
 
       List installed modules in a tree view:
 
       $ puppet module list --tree
-        /etc/puppet/modules
+        /etc/puppetlabs/code/modules
         └─┬ puppetlabs-bacula (v0.0.2)
           ├── puppetlabs-stdlib (v2.2.1)
           ├─┬ puppetlabs-mysql (v0.0.1)
           │ └── bodepd-create_resources (v0.0.1)
           └── puppetlabs-sqlite (v0.0.1)
-        /usr/share/puppet/modules (no modules installed)
+        /opt/puppetlabs/puppet/modules (no modules installed)
 
       List installed modules from a specified environment:
 
       $ puppet module list --environment production
-        /etc/puppet/modules
+        /etc/puppetlabs/code/modules
         ├── bodepd-create_resources (v0.0.1)
         ├── puppetlabs-bacula (v0.0.2)
         ├── puppetlabs-mysql (v0.0.1)
         ├── puppetlabs-sqlite (v0.0.1)
         └── puppetlabs-stdlib (v2.2.1)
-        /usr/share/puppet/modules (no modules installed)
+        /opt/puppetlabs/puppet/modules (no modules installed)
 
       List installed modules from a specified modulepath:
 
-      $ puppet module list --modulepath /usr/share/puppet/modules
-        /usr/share/puppet/modules (no modules installed)
+      $ puppet module list --modulepath /opt/puppetlabs/puppet/modules
+        /opt/puppetlabs/puppet/modules (no modules installed)
     EOT
 
     when_invoked do |options|
@@ -207,7 +207,7 @@ Puppet::Face.define(:module, '1.0.0') do
   # When the above data structure is passed to Puppet::ModuleTool.build_tree
   # you end up with something like this:
   #
-  #   /etc/puppet/modules
+  #   /etc/puppetlabs/code/modules
   #   └─┬ puppetlabs-bacula (v0.0.2)
   #     ├── puppetlabs-stdlib (v2.2.1)
   #     ├─┬ puppetlabs-mysql (v1.0.0)

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

@@ -12,22 +12,22 @@ Puppet::Face.define(:module, '1.0.0') do
       Uninstall a module:
 
       $ puppet module uninstall puppetlabs-ssh
-      Removed /etc/puppet/modules/ssh (v1.0.0)
+      Removed /etc/puppetlabs/code/modules/ssh (v1.0.0)
 
       Uninstall a module from a specific directory:
 
-      $ puppet module uninstall puppetlabs-ssh --modulepath /usr/share/puppet/modules
-      Removed /usr/share/puppet/modules/ssh (v1.0.0)
+      $ puppet module uninstall puppetlabs-ssh --modulepath /opt/puppetlabs/puppet/modules
+      Removed /opt/puppetlabs/puppet/modules/ssh (v1.0.0)
 
       Uninstall a module from a specific environment:
 
       $ puppet module uninstall puppetlabs-ssh --environment development
-      Removed /etc/puppet/environments/development/modules/ssh (v1.0.0)
+      Removed /etc/puppetlabs/code/environments/development/modules/ssh (v1.0.0)
 
       Uninstall a specific version of a module:
 
       $ puppet module uninstall puppetlabs-ssh --version 2.0.0
-      Removed /etc/puppet/modules/ssh (v2.0.0)
+      Removed /etc/puppetlabs/code/modules/ssh (v2.0.0)
     EOT
 
     arguments "<name>"

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

@@ -13,19 +13,19 @@ Puppet::Face.define(:module, '1.0.0') do
       upgrade an installed module to the latest version
 
       $ puppet module upgrade puppetlabs-apache
-      /etc/puppet/modules
+      /etc/puppetlabs/puppet/modules
       └── puppetlabs-apache (v1.0.0 -> v2.4.0)
 
       upgrade an installed module to a specific version
 
       $ puppet module upgrade puppetlabs-apache --version 2.1.0
-      /etc/puppet/modules
+      /etc/puppetlabs/puppet/modules
       └── puppetlabs-apache (v1.0.0 -> v2.1.0)
 
       upgrade an installed module for a specific environment
 
       $ puppet module upgrade puppetlabs-apache --environment test
-      /usr/share/puppet/environments/test/modules
+      /etc/puppetlabs/code/environments/test/modules
       └── puppetlabs-apache (v1.0.0 -> v2.4.0)
     EOT
 

data/lib/puppet/face/node/clean.rb

@@ -1,16 +1,10 @@
 Puppet::Face.define(:node, '0.0.1') do
   action(:clean) do
-    option "--[no-]unexport" do
-      summary "Whether to remove this node's exported resources from other nodes"
-    end
 
-    summary "Clean up everything a puppetmaster knows about a node."
+    summary "Clean up signed certs, cached facts, node objects, and reports for a node stored by the puppetmaster"
     arguments "<host1> [<host2> ...]"
     description <<-'EOT'
-      Clean up everything a puppet master knows about a node, including certificates
-      and storeconfigs data.
-
-      The full list of info cleaned by this action is:
+      Cleans up the following information a puppet master knows about a node:
 
       <Signed certificates> - ($vardir/ssl/ca/signed/node.domain.pem)
 
@@ -20,13 +14,6 @@ Puppet::Face.define(:node, '0.0.1') do
 
       <Reports> - ($vardir/reports/node.domain)
 
-      <Stored configs> - (in database) The clean action can either remove all
-      data from a host in your storeconfigs database, or, with the
-      <--unexport> option, turn every exported resource supporting ensure to
-      absent so that any other host that collected those resources can remove
-      them. Without unexporting, a removed node's exported resources become
-      unmanaged by Puppet, and may linger as cruft unless you are purging
-      that resource type.
     EOT
 
     when_invoked do |*args|
@@ -53,16 +40,15 @@ Puppet::Face.define(:node, '0.0.1') do
       Puppet::Node.indirection.terminus_class = :yaml
       Puppet::Node.indirection.cache_class = :yaml
 
-      nodes.each { |node| cleanup(node.downcase, options[:unexport]) }
+      nodes.each { |node| cleanup(node.downcase) }
     end
   end
 
-  def cleanup(node, unexport)
+  def cleanup(node)
     clean_cert(node)
     clean_cached_facts(node)
     clean_cached_node(node)
     clean_reports(node)
-    clean_storeconfigs(node, unexport)
   end
 
   # clean signed cert for +host+
@@ -94,55 +80,6 @@ Puppet::Face.define(:node, '0.0.1') do
     Puppet.info "#{node}'s reports removed"
   end
 
-  # clean storeconfig for +node+
-  def clean_storeconfigs(node, do_unexport=false)
-    return unless Puppet[:storeconfigs] && Puppet.features.rails?
-    require 'puppet/rails'
-    Puppet::Rails.connect
-    unless rails_node = Puppet::Rails::Host.find_by_name(node)
-      Puppet.notice "No entries found for #{node} in storedconfigs."
-      return
-    end
-
-    if do_unexport
-      unexport(rails_node)
-      Puppet.notice "Force #{node}'s exported resources to absent"
-      Puppet.warning "Please wait until all other hosts have checked out their configuration before finishing the cleanup with:"
-      Puppet.warning "$ puppet node clean #{node}"
-    else
-      rails_node.destroy
-      Puppet.notice "#{node} storeconfigs removed"
-    end
-  end
-
-  def unexport(node)
-    # fetch all exported resource
-    query = {:include => {:param_values => :param_name}}
-    query[:conditions] = [ "exported=? AND host_id=?", true, node.id ]
-    Puppet::Rails::Resource.find(:all, query).each do |resource|
-      if type_is_ensurable(resource)
-        line = 0
-        param_name = Puppet::Rails::ParamName.find_or_create_by_name("ensure")
-
-        if ensure_param = resource.param_values.find(
-          :first,
-          :conditions => [ 'param_name_id = ?', param_name.id ]
-        )
-          line = ensure_param.line.to_i
-          Puppet::Rails::ParamValue.delete(ensure_param.id);
-        end
-
-        # force ensure parameter to "absent"
-        resource.param_values.create(
-          :value => "absent",
-          :line => line,
-          :param_name => param_name
-        )
-        Puppet.info("#{resource.name} has been marked as \"absent\"")
-      end
-    end
-  end
-
   def environment
     @environment ||= Puppet.lookup(:current_environment)
   end
@@ -151,7 +88,7 @@ Puppet::Face.define(:node, '0.0.1') do
     if (type = Puppet::Type.type(resource.restype)) && type.validattr?(:ensure)
       return true
     else
-      type = environment.known_resource_types.find_definition('', resource.restype)
+      type = environment.known_resource_types.find_definition(resource.restype)
       return true if type && type.arguments.keys.include?('ensure')
     end
     return false

data/lib/puppet/face/node.rb

@@ -10,10 +10,9 @@ Puppet::Indirector::Face.define(:node, '0.0.1') do
     node parameters (exposed in the parser as top-scope variables), and classes.
   EOT
 
-  get_action(:destroy).summary "Invalid for this subcommand."
-  get_action(:search).summary "Invalid for this subcommand."
-  get_action(:save).summary "Invalid for this subcommand."
-  get_action(:save).description "Invalid for this subcommand."
+  deactivate_action(:destroy)
+  deactivate_action(:search)
+  deactivate_action(:save)
 
   find = get_action(:find)
   find.summary "Retrieve a node object."

data/lib/puppet/face/parser.rb

@@ -2,7 +2,7 @@ require 'puppet/face'
 require 'puppet/parser'
 
 Puppet::Face.define(:parser, '0.0.1') do
-  copyright "Puppet Labs", 2011
+  copyright "Puppet Labs", 2014
   license   "Apache 2 license; see COPYING"
 
   summary "Interact directly with the parser."
@@ -16,15 +16,12 @@ Puppet::Face.define(:parser, '0.0.1') do
       syncing any resources. If no manifest files are provided, it will
       validate the default site manifest.
 
-      When validating with --parser current, the validation stops after the first
-      encountered issue.
-
-      When validating with --parser future, multiple issues per file are reported up
+      When validating multiple issues per file are reported up
       to the settings of max_error, and max_warnings. The processing stops
       after having reported issues for the first encountered file with errors.
     EOT
     examples <<-'EOT'
-      Validate the default site manifest at /etc/puppet/manifests/site.pp:
+      Validate the default site manifest at /etc/puppetlabs/puppet/manifests/site.pp:
 
       $ puppet parser validate
 
@@ -71,13 +68,14 @@ Puppet::Face.define(:parser, '0.0.1') do
     returns "A dump of the resulting AST model unless there are syntax or validation errors."
     description <<-'EOT'
       This action parses and validates the Puppet DSL syntax without compiling a catalog
-      or syncing any resources. It automatically turns on the future parser for the parsing.
+      or syncing any resources.
 
       The command accepts one or more manifests (.pp) files, or an -e followed by the puppet
       source text.
       If no arguments are given, the stdin is read (unless it is attached to a terminal)
 
-      The output format of the dumped tree is not API, it may change from time to time.
+      The output format of the dumped tree is intended for debugging purposes and is
+      not API, it may change from time to time.
     EOT
 
     option "--e <source>" do

data/lib/puppet/face/report.rb

@@ -6,9 +6,6 @@ Puppet::Indirector::Face.define(:report, '0.0.1') do
 
   summary "Create, display, and submit reports."
 
-  get_action(:find).summary "Invalid for this face."
-  get_action(:search).summary "Invalid for this face."
-  get_action(:destroy).summary "Invalid for this face."
   save = get_action(:save)
   save.summary "API only: submit a report."
   save.arguments "<report>"
@@ -34,7 +31,7 @@ Puppet::Indirector::Face.define(:report, '0.0.1') do
     EOT
     arguments "<report>"
     examples <<-'EOT'
-      From secret_agent.rb (API example):
+      API example:
 
           # ...
           report  = Puppet::Face[:catalog, '0.0.1'].apply
@@ -51,4 +48,7 @@ Puppet::Indirector::Face.define(:report, '0.0.1') do
       end
     end
   end
+  deactivate_action(:find)
+  deactivate_action(:search)
+  deactivate_action(:destroy)
 end

data/lib/puppet/face/resource.rb

@@ -10,7 +10,7 @@ Puppet::Indirector::Face.define(:resource, '0.0.1') do
     puppet resource subcommand.
   EOT
 
-  get_action(:destroy).summary "Invalid for this subcommand."
+  deactivate_action(:destroy)
 
   search = get_action(:search)
   search.summary "API only: get all resources of a single type."

data/lib/puppet/face/resource_type.rb

@@ -28,10 +28,8 @@ Puppet::Indirector::Face.define(:resource_type, '0.0.1') do
     * `doc`       (a string)
   EOT
 
-  # Action documentation overrides:
-  get_action(:save).summary = "Invalid for this subcommand."
-  get_action(:save).description "Invalid for this subcommand."
-  get_action(:destroy).summary = "Invalid for this subcommand."
+  deactivate_action(:save)
+  deactivate_action(:destroy)
 
   find = get_action(:find)
   find.summary "Retrieve info about a resource collection."
@@ -57,6 +55,11 @@ Puppet::Indirector::Face.define(:resource_type, '0.0.1') do
 
     $ puppet resource_type find ntp --terminus rest
   EOT
+  # For this face we don't want to default to the certname like other indirector
+  # based faces. Instead we want the user to always supply a argument.
+  find.when_invoked = Proc.new do |key, options|
+    call_indirection_method :find, key, options[:extra]
+  end
 
   search = get_action(:search)
   search.summary "Search for collections matching a regular expression."

data/lib/puppet/face/status.rb

@@ -6,15 +6,13 @@ Puppet::Indirector::Face.define(:status, '0.0.1') do
 
   summary "View puppet server status."
 
-  get_action(:destroy).summary "Invalid for this subcommand."
-  get_action(:save).summary "Invalid for this subcommand."
-  get_action(:save).description "Invalid for this subcommand."
-  get_action(:search).summary "Invalid for this subcommand."
+  deactivate_action(:destroy)
+  deactivate_action(:save)
+  deactivate_action(:search)
 
   find = get_action(:find)
   find.default = true
   find.summary "Check status of puppet master server."
-  find.arguments "<dummy_text>"
   find.returns <<-'EOT'
     A "true" response or a low-level connection error. When used from the Ruby
     API: returns a Puppet::Status object.
@@ -32,22 +30,18 @@ Puppet::Indirector::Face.define(:status, '0.0.1') do
   EOT
   find.short_description <<-EOT
     Checks whether a Puppet server is properly receiving and processing HTTP
-    requests. Due to a known bug, this action requires a dummy argument, the
-    content of which is irrelevant. This action is only useful when used with
-    '--terminus rest', and will always return true when invoked locally.
+    requests. This action is only useful when used with '--terminus rest',
+    and will always return true when invoked locally.
   EOT
   find.notes <<-'EOT'
     This action requires that the server's `auth.conf` file allow find
     access to the `status` REST terminus. Puppet agent does not use this
     facility, and it is turned off by default. See
     <http://docs.puppetlabs.com/guides/rest_auth_conf.html> for more details.
-
-    Although this action always returns an unnamed status object, it requires a
-    dummy argument. This is a known bug.
   EOT
   find.examples <<-'EOT'
     Check the status of the configured puppet master:
 
-    $ puppet status find x --terminus rest
+    $ puppet status find --terminus rest
   EOT
 end

data/lib/puppet/feature/base.rb

@@ -49,16 +49,9 @@ Puppet.features.add :diff, :libs => %w{diff/lcs diff/lcs/hunk}
 # We have augeas
 Puppet.features.add(:augeas, :libs => ["augeas"])
 
-# We have RRD available
-Puppet.features.add(:rrd_legacy, :libs => ["RRDtool"])
-Puppet.features.add(:rrd, :libs => ["RRD"])
-
 # We have OpenSSL
 Puppet.features.add(:openssl, :libs => ["openssl"])
 
-# We have CouchDB
-Puppet.features.add(:couchdb, :libs => ["couchrest"])
-
 # We have sqlite
 Puppet.features.add(:sqlite, :libs => ["sqlite3"])
 

data/lib/puppet/file_bucket/dipper.rb

@@ -94,10 +94,9 @@ class Puppet::FileBucket::Dipper
         end
         ::File.open(file, ::File::WRONLY|::File::TRUNC|::File::CREAT) { |of|
           of.binmode
-          source_stream = newcontents.stream do |source_stream|
+          newcontents.stream do |source_stream|
             FileUtils.copy_stream(source_stream, of)
           end
-          #of.print(newcontents)
         }
         ::File.chmod(changed, file) if changed
       else

data/lib/puppet/file_bucket/file.rb

@@ -14,16 +14,11 @@ class Puppet::FileBucket::File
   attr :bucket_path
 
   def self.supported_formats
-    [:s, :pson]
+    [:binary]
   end
 
   def self.default_format
-    # This should really be :raw, like is done for Puppet::FileServing::Content
-    # but this class hasn't historically supported `from_raw`, so switching
-    # would break compatibility between newer 3.x agents talking to older 3.x
-    # masters. However, to/from_s has been supported and achieves the desired
-    # result without breaking compatibility.
-    :s
+    :binary
   end
 
   def initialize(contents, options = {})
@@ -64,42 +59,34 @@ class Puppet::FileBucket::File
   end
 
   def to_s
-    @contents.to_s
+    to_binary
+  end
+
+  def to_binary
+    @contents.to_binary
   end
 
   def contents
-    to_s
+    to_binary
   end
 
   def name
     "#{checksum_type}/#{checksum_data}"
   end
 
-  def self.from_s(contents)
+  def self.from_binary(contents)
     self.new(contents)
   end
 
   def to_data_hash
     # Note that this serializes the entire data to a string and places it in a hash.
-    { "contents" => contents.to_s }
+    { "contents" => contents.to_binary }
   end
 
   def self.from_data_hash(data)
     self.new(data["contents"])
   end
 
-  def to_pson
-    Puppet.deprecation_warning("Serializing Puppet::FileBucket::File objects to pson is deprecated.")
-    to_data_hash.to_pson
-  end
-
-  # This method is deprecated, but cannot be removed for awhile, otherwise
-  # older agents sending pson couldn't backup to filebuckets on newer masters
-  def self.from_pson(pson)
-    Puppet.deprecation_warning("Deserializing Puppet::FileBucket::File objects from pson is deprecated. Upgrade to a newer version.")
-    self.from_data_hash(pson)
-  end
-
   private
 
   class StringContents
@@ -125,7 +112,7 @@ class Puppet::FileBucket::File
       Puppet::Util::Checksums.method(base_method).call(@contents)
     end
 
-    def to_s
+    def to_binary
       # This is not so horrible as for FileContent, but still possible to mutate the content that the
       # checksum is based on... so semi horrible...
       return @contents;
@@ -150,7 +137,7 @@ class Puppet::FileBucket::File
       Puppet::Util::Checksums.method(:"#{base_method}_file").call(@path)
     end
 
-    def to_s
+    def to_binary
       Puppet::FileSystem::binread(@path)
     end
   end

data/lib/puppet/file_serving/base.rb

@@ -20,7 +20,7 @@ class Puppet::FileServing::Base
   end
 
   # 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)
+  def full_path
     if relative_path.nil? or relative_path == "" or relative_path == "."
        full_path = path
      else
@@ -79,16 +79,6 @@ class Puppet::FileServing::Base
     }
   end
 
-  def to_pson_data_hash
-    {
-      # No 'document_type' since we don't send these bare
-      'data'       => to_data_hash,
-      'metadata' => {
-        'api_version' => 1
-        }
-    }
-  end
-
   def self.absolute?(path)
     Puppet::Util.absolute_path?(path, :posix) or (Puppet.features.microsoft_windows? and Puppet::Util.absolute_path?(path, :windows))
   end

data/lib/puppet/file_serving/content.rb

@@ -12,20 +12,18 @@ class Puppet::FileServing::Content < Puppet::FileServing::Base
   attr_writer :content
 
   def self.supported_formats
-    [:raw]
+    [:binary]
   end
 
-  def self.from_raw(content)
+  def self.from_binary(content)
     instance = new("/this/is/a/fake/path")
     instance.content = content
     instance
   end
 
-  # BF: we used to fetch the file content here, but this is counter-productive
-  # for puppetmaster streaming of file content. So collect just returns itself
+  # This is no longer used, but is still called by the file server implementations when interacting
+  # with their model abstraction.
   def collect(source_permissions = nil)
-    return if stat.ftype == "directory"
-    self
   end
 
   # Read the content of our file in.
@@ -39,7 +37,7 @@ class Puppet::FileServing::Content < Puppet::FileServing::Base
     @content
   end
 
-  def to_raw
+  def to_binary
     File.new(full_path, "rb")
   end
 end