puppet 5.0.0 → 6.0.0

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

@@ -1,63 +1,14 @@
 Puppet::Face.define(:module, '1.0.0') do
   action(:build) do
     summary _("Build a module release package.")
-    description <<-EOT
-      Prepares a local module for release on the Puppet Forge by building a
-      ready-to-upload archive file.
-
-      This action uses the metadata.json file in the module directory to set metadata
-      used by the Forge. See <https://docs.puppetlabs.com/puppet/latest/reference/modules_publishing.html> for more
-      about writing metadata.json files.
-
-      After being built, the release archive file can be found in the module's
-      `pkg` directory.
-    EOT
-
-    returns _("Pathname object representing the path to the release archive.")
-
-    examples <<-EOT
-      Build a module release:
-
-      $ puppet module build puppetlabs-apache
-      notice: Building /Users/kelseyhightower/puppetlabs-apache for release
-      Module built: /Users/kelseyhightower/puppetlabs-apache/pkg/puppetlabs-apache-0.0.1.tar.gz
-
-      Build the module in the current working directory:
-
-      $ cd /Users/kelseyhightower/puppetlabs-apache
-      $ puppet module build
-      notice: Building /Users/kelseyhightower/puppetlabs-apache for release
-      Module built: /Users/kelseyhightower/puppetlabs-apache/pkg/puppetlabs-apache-0.0.1.tar.gz
-    EOT
-
-    arguments _("[<path>]")
+    #TRANSLATORS 'Puppet Development Kit' is the name of the software package replacing this action and should not be translated.
+    description _("This action has been replaced by Puppet Development Kit. For more information visit https://puppet.com/docs/pdk/latest/pdk.html.")
 
     when_invoked do |*args|
-      options = args.pop
-      if options.nil? or args.length > 1 then
-        raise ArgumentError, _("puppet module build only accepts 0 or 1 arguments")
-      end
-
-      module_path = args.first
-      if module_path.nil?
-        pwd = Dir.pwd
-        module_path = Puppet::ModuleTool.find_module_root(pwd)
-        if module_path.nil?
-          raise _("Unable to find metadata.json in module root %{pwd} or parent directories. See <https://docs.puppetlabs.com/puppet/latest/reference/modules_publishing.html> for required file format.") % { pwd: pwd }
-        end
-      else
-        unless Puppet::ModuleTool.is_module_root?(module_path)
-          raise _("Unable to find metadata.json in module root %{module_path} or parent directories. See <https://docs.puppetlabs.com/puppet/latest/reference/modules_publishing.html> for required file format.") % { module_path: module_path }
-        end
-      end
-
-      Puppet::ModuleTool.set_option_defaults options
-      Puppet::ModuleTool::Applications::Builder.run(module_path, options)
+      #TRANSLATORS 'Puppet Development Kit' is the name of the software package replacing this action and should not be translated.
+      raise _("This action has been replaced by Puppet Development Kit. For more information visit https://puppet.com/docs/pdk/latest/pdk.html.")
     end
 
-    when_rendering :console do |return_value|
-      # Get the string representation of the Pathname object.
-      _("Module built: ") + return_value.expand_path.to_s
-    end
+    deprecate
   end
 end

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

@@ -1,251 +1,14 @@
 Puppet::Face.define(:module, '1.0.0') do
   action(:generate) do
     summary _("Generate boilerplate for a new module.")
-    description <<-EOT
-      Generates boilerplate for a new module by creating the directory
-      structure and files recommended for the Puppet community's best practices.
+    #TRANSLATORS 'Puppet Development Kit' is the name of the software package replacing this action and should not be translated.
+    description _("This action has been replaced by Puppet Development Kit. For more information visit https://puppet.com/docs/pdk/latest/pdk.html.")
 
-      A module may need additional directories beyond this boilerplate
-      if it provides plugins, files, or templates.
-    EOT
-
-    returns _("Array of Pathname objects representing paths of generated files.")
-
-    examples <<-EOT
-      Generate a new module in the current directory:
-
-      $ puppet module generate puppetlabs-ssh
-      We need to create a metadata.json file for this module.  Please answer the
-      following questions; if the question is not applicable to this module, feel free
-      to leave it blank.
-
-      Puppet uses Semantic Versioning (semver.org) to version modules.
-      What version is this module?  [0.1.0]
-      -->
-
-      Who wrote this module?  [puppetlabs]
-      -->
-
-      What license does this module code fall under?  [Apache-2.0]
-      -->
-
-      How would you describe this module in a single sentence?
-      -->
-
-      Where is this module's source code repository?
-      -->
-
-      Where can others go to learn more about this module?
-      -->
-
-      Where can others go to file issues about this module?
-      -->
-
-      ----------------------------------------
-      {
-        "name": "puppetlabs-ssh",
-        "version": "0.1.0",
-        "author": "puppetlabs",
-        "summary": null,
-        "license": "Apache-2.0",
-        "source": "",
-        "project_page": null,
-        "issues_url": null,
-        "dependencies": [
-          {
-            "name": "puppetlabs-stdlib",
-            "version_requirement": ">= 1.0.0"
-          }
-        ]
-      }
-      ----------------------------------------
-
-      About to generate this metadata; continue? [n/Y]
-      -->
-
-      Notice: Generating module at /Users/username/Projects/puppet/puppetlabs-ssh...
-      Notice: Populating ERB templates...
-      Finished; module generated in puppetlabs-ssh.
-      puppetlabs-ssh/manifests
-      puppetlabs-ssh/manifests/init.pp
-      puppetlabs-ssh/metadata.json
-      puppetlabs-ssh/README.md
-      puppetlabs-ssh/spec
-      puppetlabs-ssh/spec/spec_helper.rb
-      puppetlabs-ssh/tests
-      puppetlabs-ssh/tests/init.pp
-    EOT
-
-    option "--skip-interview" do
-      summary _("Bypass the interactive metadata interview")
-      description <<-EOT
-        Do not attempt to perform a metadata interview.  Primarily useful for automatic
-        execution of `puppet module generate`.
-      EOT
-    end
-
-    arguments _("<name>")
-
-    when_invoked do |name, options|
-      # Since we only want to interview if it's being rendered to the console
-      # (i.e. when invoked with `puppet module generate`), we can't do any work
-      # here in the when_invoked block. The result of this block is then
-      # passed to each renderer, which will handle it appropriately; by
-      # returning a simple message like this, every renderer will simply output
-      # the string.
-      # Our `when_rendering :console` handler will ignore this value and
-      # actually generate the module.
-      #
-      # All this is necessary because it is not possible at this point in time
-      # to know what the destination of the output is.
-      _("This format is not supported by this action.")
-    end
-
-    when_rendering :console do |_, name, options|
-      Puppet::ModuleTool.set_option_defaults options
-
-      begin
-        # A default dependency for all newly generated modules is being
-        # introduced as a substitute for the comments we used to include in the
-        # previous module data specifications. While introducing a default
-        # dependency is less than perfectly desirable, the cost is low, and the
-        # syntax is obtuse enough to justify its inclusion.
-        metadata = Puppet::ModuleTool::Metadata.new.update(
-          'name' => name,
-          'version' => '0.1.0',
-          'dependencies' => [
-            { 'name' => 'puppetlabs-stdlib', 'version_requirement' => '>= 1.0.0' }
-          ]
-        )
-      rescue ArgumentError
-        msg = _("Could not generate directory %{name}, you must specify a dash-separated username and module name.") % { name: name.inspect }
-        raise ArgumentError, msg, $!.backtrace
-      end
-
-      dest = Puppet::ModuleTool::Generate.destination(metadata)
-      result = Puppet::ModuleTool::Generate.generate(metadata, options[:skip_interview])
-
-      path = dest.relative_path_from(Pathname.pwd)
-      puts _("Finished; module generated in %{path}.") % { path: path }
-      result.join("\n")
-    end
-  end
-end
-
-module Puppet::ModuleTool::Generate
-  module_function
-
-  def generate(metadata, skip_interview = false)
-    interview(metadata) unless skip_interview
-    destination = duplicate_skeleton(metadata)
-    all_files = destination.basename + '**/*'
-
-    return Dir[all_files.to_s]
-  end
-
-  def interview(metadata)
-    puts _("We need to create a metadata.json file for this module.  Please answer the
-    following questions; if the question is not applicable to this module, feel free
-    to leave it blank.")
-
-    begin
-      puts
-      puts _("Puppet uses Semantic Versioning (semver.org) to version modules.")
-      puts _("What version is this module?  [%{version}]") % { version: metadata.version }
-      metadata.update 'version' => user_input(metadata.version)
-    rescue
-      Puppet.err _("We're sorry, we could not parse that as a Semantic Version.")
-      retry
-    end
-
-    puts
-    puts _("Who wrote this module?  [%{author}]") % { author: metadata.author }
-    metadata.update 'author' => user_input(metadata.author)
-
-    puts
-    puts _("What license does this module code fall under?  [%{license}]") % { license: metadata.license }
-    metadata.update 'license' => user_input(metadata.license)
-
-    puts
-    puts _("How would you describe this module in a single sentence?")
-    metadata.update 'summary' => user_input(metadata.summary)
-
-    puts
-    puts _("Where is this module's source code repository?")
-    metadata.update 'source' => user_input(metadata.source)
-
-    puts
-    puts _("Where can others go to learn more about this module?%{project_page}") % { project_page: metadata.project_page && "  [#{metadata.project_page}]" }
-    metadata.update 'project_page' => user_input(metadata.project_page)
-
-    puts
-    puts _("Where can others go to file issues about this module?%{issues}") % { issues: metadata.issues_url && "  [#{metadata.issues_url}]" }
-    metadata.update 'issues_url' => user_input(metadata.issues_url)
-
-    puts
-    puts '-' * 40
-    puts metadata.to_json
-    puts '-' * 40
-    puts
-    puts _("About to generate this metadata; continue? [n/Y]")
-
-    if user_input('Y') !~ /^y(es)?$/i
-      puts _("Aborting...")
-      exit 0
-    end
-  end
-
-  def user_input(default=nil)
-    print '--> '
-    input = STDIN.gets.chomp.strip
-    input = default if input == ''
-    return input
-  end
-
-  def destination(metadata)
-    return @dest if defined? @dest
-    @dest = Pathname.pwd + metadata.name
-    raise ArgumentError, _("%{destination} already exists.") % { destination: @dest } if @dest.exist?
-    return @dest
-  end
-
-  def duplicate_skeleton(metadata)
-    dest = destination(metadata)
-
-    puts
-    Puppet.notice _("Generating module at %{dest}...") % { dest: dest }
-    FileUtils.cp_r skeleton_path, dest
-
-    populate_templates(metadata, dest)
-    return dest
-  end
-
-  def populate_templates(metadata, destination)
-    Puppet.notice _("Populating templates...")
-
-    formatters = {
-      :erb      => proc { |data, ctx| ERB.new(data).result(ctx) },
-      :template => proc { |data, _| data },
-    }
-
-    formatters.each do |type, block|
-      templates = destination + "**/*.#{type}"
-
-      Dir.glob(templates.to_s, File::FNM_DOTMATCH).each do |erb|
-        path = Pathname.new(erb)
-        content = block[path.read, binding]
-
-        target = path.parent + path.basename(".#{type}")
-        target.open('w:UTF-8') { |f| f.write(content) }
-        path.unlink
-      end
+    when_invoked do |*args|
+      #TRANSLATORS 'Puppet Development Kit' is the name of the software package replacing this action and should not be translated.
+      raise _("This action has been replaced by Puppet Development Kit. For more information visit https://puppet.com/docs/pdk/latest/pdk.html.")
     end
-  end
 
-  def skeleton_path
-    return @path if defined? @path
-    path = Pathname(Puppet.settings[:module_skeleton_dir])
-    path = Pathname(__FILE__).dirname + '../../module_tool/skeleton/templates/generator' unless path.directory?
-    @path = path
+    deprecate
   end
 end

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

@@ -8,6 +8,7 @@ Puppet::Face.define(:module, '1.0.0') do
     summary _("Install a module from the Puppet Forge or a release archive.")
     description <<-EOT
       Installs a module from the Puppet Forge or from a release archive file.
+      Note: Module install uses MD5 checksums, which are prohibited on FIPS enabled systems.
 
       The specified module will be installed into the directory
       specified with the `--target-dir` option, which defaults to the first
@@ -119,10 +120,6 @@ Puppet::Face.define(:module, '1.0.0') do
       EOT
     end
 
-    option '--strict-semver' do
-      summary _('Whether version ranges should exclude pre-release versions')
-    end
-
     when_invoked do |name, options|
       Puppet::ModuleTool.set_option_defaults options
       Puppet.notice _("Preparing to install into %{dir} ...") % { dir: options[:target_dir] }

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

@@ -17,10 +17,6 @@ Puppet::Face.define(:module, '1.0.0') do
       summary _("Whether to show dependencies as a tree view")
     end
 
-    option '--strict-semver' do
-      summary _('Whether version ranges should exclude pre-release versions')
-    end
-
     examples <<-'EOT'
       List installed modules:
 
@@ -77,7 +73,6 @@ Puppet::Face.define(:module, '1.0.0') do
 
       output = ''
 
-      environment.modules_strict_semver = !!options[:strict_semver]
       warn_unmet_dependencies(environment)
 
       environment.modulepath.each do |path|
@@ -109,20 +104,10 @@ Puppet::Face.define(:module, '1.0.0') do
   end
 
   def warn_unmet_dependencies(environment)
-    error_types = {
-      :non_semantic_version => {
-        :title => _("Non semantic version dependency")
-      },
-      :missing => {
-        :title => _("Missing dependency")
-      },
-      :version_mismatch => {
-        :title => _("Module '%s' (v%s) fails to meet some dependencies:")
-      }
-    }
+    error_types = [:non_semantic_version, :version_mismatch, :missing]
 
     @unmet_deps = {}
-    error_types.each_key do |type|
+    error_types.each do |type|
       @unmet_deps[type] = Hash.new do |hash, key|
         hash[key] = { :errors => [], :parent => nil }
       end
@@ -160,19 +145,18 @@ Puppet::Face.define(:module, '1.0.0') do
     error_display_order = [:non_semantic_version, :version_mismatch, :missing]
     error_display_order.each do |type|
       unless @unmet_deps[type].empty?
-        @unmet_deps[type].keys.sort_by {|dep| dep }.each do |dep|
+        @unmet_deps[type].keys.sort.each do |dep|
           name    = dep.gsub('/', '-')
-          title   = error_types[type][:title]
           errors  = @unmet_deps[type][dep][:errors]
           version = @unmet_deps[type][dep][:version]
 
           msg = case type
                 when :version_mismatch
-                  title % [name, version] + "\n"
+                  _("Module '%{name}' (v%{version}) fails to meet some dependencies:\n") % { name: name, version: version }
                 when :non_semantic_version
-                  title + " '#{name}' (v#{version}):\n"
+                  _("Non semantic version dependency %{name} (v%{version}):\n") % { name: name, version: version }
                 else
-                  title + " '#{name}':\n"
+                  _("Missing dependency '%{name}':\n") % { name: name }
                 end
 
           errors.each { |error_string| msg << "  #{error_string}\n" }

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

@@ -23,7 +23,7 @@ Puppet::Face.define(:module, '1.0.0') do
 
     when_invoked do |term, options|
       Puppet::ModuleTool.set_option_defaults options
-      Puppet::ModuleTool::Applications::Searcher.new(term, Puppet::Forge.new, options).run
+      Puppet::ModuleTool::Applications::Searcher.new(term, Puppet::Forge.new(options[:module_repository] || Puppet[:module_repository]), options).run
     end
 
     when_rendering :console do |results, term, options|
@@ -44,13 +44,15 @@ Puppet::Face.define(:module, '1.0.0') do
       min_widths = Hash[ *headers.map { |k,v| [k, v.length] }.flatten ]
       min_widths['full_name'] = min_widths['author'] = 12
 
-      min_width = min_widths.inject(0) { |sum,pair| sum += pair.last } + (padding.length * (headers.length - 1))
+      min_width = min_widths.inject(0) { |sum,pair| sum + pair.last } + (padding.length * (headers.length - 1))
 
       terminal_width = [Puppet::Util::Terminal.width, min_width].max
 
       columns = results[:answers].inject(min_widths) do |hash, result|
+        deprecated_buffer = result['deprecated_at'].nil? ? 0 : 11 # ' DEPRECATED'.length
+
         {
-          'full_name' => [ hash['full_name'], result['full_name'].length          ].max,
+          'full_name' => [ hash['full_name'], result['full_name'].length + deprecated_buffer ].max,
           'desc'      => [ hash['desc'],      result['desc'].length               ].max,
           'author'    => [ hash['author'],    "@#{result['author']}".length       ].max,
           'tag_list'  => [ hash['tag_list'],  result['tag_list'].join(' ').length ].max,
@@ -80,12 +82,14 @@ Puppet::Face.define(:module, '1.0.0') do
       highlight = proc do |s|
         s = s.gsub(term, colorize(:green, term))
         s = s.gsub(term.gsub('/', '-'), colorize(:green, term.gsub('/', '-'))) if term =~ /\//
+        s = s.gsub(' DEPRECATED', colorize(:red, ' DEPRECATED'))
         s
       end
 
       format % [ headers['full_name'], headers['desc'], headers['author'], headers['tag_list'] ] +
       results[:answers].map do |match|
         name, desc, author, keywords = %w{full_name desc author tag_list}.map { |k| match[k] }
+        name += ' DEPRECATED' unless match['deprecated_at'].nil?
         desc = desc[0...(columns['desc'] - 3)] + '...' if desc.length > columns['desc']
         highlight[format % [ name.sub('/', '-'), desc, "@#{author}", [keywords].flatten.join(' ') ]]
       end.join

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

@@ -4,6 +4,7 @@ Puppet::Face.define(:module, '1.0.0') do
     description <<-EOT
       Uninstalls a puppet module from the modulepath (or a specific
       target directory).
+      Note: Module uninstall uses MD5 checksums, which are prohibited on FIPS enabled systems.
     EOT
 
     returns _("Hash of module objects representing uninstalled modules and related errors.")
@@ -55,15 +56,17 @@ Puppet::Face.define(:module, '1.0.0') do
       EOT
     end
 
-    option '--strict-semver' do
-      summary _('Whether version ranges should exclude pre-release versions')
-    end
-
     when_invoked do |name, options|
       name = name.gsub('/', '-')
 
       Puppet::ModuleTool.set_option_defaults options
-      Puppet.notice _("Preparing to uninstall '%{name}'") % { name: name } << (options[:version] ? " (#{colorize(:cyan, options[:version].sub(/^(?=\d)/, 'v'))})" : '') << " ..."
+      message = if options[:version]
+                  module_version = colorize(:cyan, options[:version].sub(/^(?=\d)/, 'v'))
+                  _("Preparing to uninstall '%{name}' (%{module_version}) ...") % { name: name, module_version: module_version }
+                else
+                  _("Preparing to uninstall '%{name}' ...") % { name: name }
+                end
+      Puppet.notice message
       Puppet::ModuleTool::Applications::Uninstaller.run(name, options)
     end
 
@@ -73,8 +76,13 @@ Puppet::Face.define(:module, '1.0.0') do
         exit 1
       else
         mod = return_value[:affected_modules].first
-        module_version = mod.version ? " (#{colorize(:cyan, mod.version.to_s.sub(/^(?=\d)/, 'v'))})" : ''
-        _("Removed '%{name}'%{module_version} from %{path}") % { name: return_value[:module_name], module_version: module_version, path: mod.modulepath }
+        message = if mod.version
+                    module_version = colorize(:cyan, mod.version.to_s.sub(/^(?=\d)/, 'v'))
+                    _("Removed '%{name}' (%{module_version}) from %{path}") % { name: return_value[:module_name], module_version: module_version, path: mod.modulepath }
+                  else
+                    _("Removed '%{name}' from %{path}") % { name: return_value[:module_name], path: mod.modulepath }
+                  end
+        message
       end
     end
   end

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

@@ -5,6 +5,7 @@ Puppet::Face.define(:module, '1.0.0') do
     summary _("Upgrade a puppet module.")
     description <<-EOT
       Upgrades a puppet module.
+      Note: Module upgrade uses MD5 checksums, which are prohibited on FIPS enabled systems.
     EOT
 
     returns "Hash"
@@ -61,10 +62,6 @@ Puppet::Face.define(:module, '1.0.0') do
       EOT
     end
 
-    option '--strict-semver' do
-      summary _('Whether version ranges should exclude pre-release versions')
-    end
-
     when_invoked do |name, options|
       name = name.gsub('/', '-')
       Puppet.notice _("Preparing to upgrade '%{name}' ...") % { name: name }

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

@@ -14,6 +14,7 @@ Puppet::Face.define(:node, '0.0.1') do
 
       <Reports> - ($vardir/reports/node.domain)
 
+      NOTE: this action now cleans up certs via Puppet Server's CA API. A running server is required for certs to be cleaned.
     EOT
 
     when_invoked do |*args|
@@ -29,12 +30,6 @@ Puppet::Face.define(:node, '0.0.1') do
       # certificates correctly.
       Puppet.settings.preferred_run_mode = "master"
 
-      if Puppet::SSL::CertificateAuthority.ca?
-        Puppet::SSL::Host.ca_location = :local
-      else
-        Puppet::SSL::Host.ca_location = :none
-      end
-
       Puppet::Node::Facts.indirection.terminus_class = :yaml
       Puppet::Node::Facts.indirection.cache_class = :yaml
       Puppet::Node.indirection.terminus_class = :yaml
@@ -51,12 +46,21 @@ Puppet::Face.define(:node, '0.0.1') do
     clean_reports(node)
   end
 
+  class LoggerIO
+    def err(message)
+      Puppet.err(message) unless message =~ /^\s*Error:\s*/
+    end
+
+    def inform(message)
+      Puppet.notice(message)
+    end
+  end
+
   # clean signed cert for +host+
   def clean_cert(node)
-    if Puppet::SSL::CertificateAuthority.ca?
-      Puppet::Face[:ca, :current].revoke(node)
-      Puppet::Face[:ca, :current].destroy(node)
-      Puppet.info _("%{node} certificates removed from ca") % { node: node }
+    if Puppet.features.puppetserver_ca?
+      require 'puppetserver/ca/action/clean'
+      Puppetserver::Ca::Action::Clean.new(LoggerIO.new).run({ 'certnames' => [node] })
     else
       Puppet.info _("Not managing %{node} certs as this host is not a CA") % { node: node }
     end

data/lib/puppet/face/node.rb

@@ -17,6 +17,7 @@ Puppet::Indirector::Face.define(:node, '0.0.1') do
   find = get_action(:find)
   find.summary _("Retrieve a node object.")
   find.arguments _("<host>")
+  #TRANSLATORS the following are specific names and should not be translated `classes`, `environment`, `expiration`, `name`, `parameters`, Puppet::Node
   find.returns _(<<-'EOT')
     A hash containing the node's `classes`, `environment`, `expiration`, `name`,
     `parameters` (its facts, combined with any ENC-set parameters), and `time`.

data/lib/puppet/face/parser.rb

@@ -64,12 +64,20 @@ Puppet::Face.define(:parser, '0.0.1') do
 
   action (:dump) do
     summary _("Outputs a dump of the internal parse tree for debugging")
-    arguments "-e " + _("<source>| [<manifest> ...] ")
+    arguments "[--format <old|pn|json>] [--pretty] { -e <source> | [<templates> ...] } "
     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.
 
+      The output format can be controlled using the --format <old|pn|json> where:
+      * 'old' is the default, but now deprecated format which is not API.
+      * 'pn' is the Puppet Extended S-Expression Notation.
+      * 'json' outputs the same graph as 'pn' but with JSON syntax.
+
+      The output will be "pretty printed" when the option --pretty is given together with --format 'pn' or 'json'. 
+      This option has no effect on the 'old' format.
+
       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)
@@ -87,6 +95,14 @@ Puppet::Face.define(:parser, '0.0.1') do
       summary _("Whether or not to validate the parsed result, if no-validate only syntax errors are reported")
     end
 
+    option('--format ' + _('<old, pn, or json>')) do
+      summary _("Get result in 'old' (deprecated format), 'pn' (new format), or 'json' (new format in JSON).")
+    end
+
+    option('--pretty') do
+      summary _('Pretty print output. Only applicable together with --format pn or json')
+    end
+
     when_invoked do |*args|
       require 'puppet/pops'
       options = args.pop
@@ -99,7 +115,6 @@ Puppet::Face.define(:parser, '0.0.1') do
           raise Puppet::Error, _("No input to parse given on command line or stdin")
         end
       else
-        missing_files = []
         files = args
         available_files = files.select do |file|
           Puppet::FileSystem.exist?(file)
@@ -121,7 +136,6 @@ Puppet::Face.define(:parser, '0.0.1') do
 
   def dump_parse(source, filename, options, show_filename = true)
     output = ""
-    dumper = Puppet::Pops::Model::ModelTreeDumper.new
     evaluating_parser = Puppet::Pops::Parser::EvaluatingParser.new
     begin
       if options[:validate]
@@ -133,7 +147,19 @@ Puppet::Face.define(:parser, '0.0.1') do
       if show_filename
         output << "--- #{filename}"
       end
-      output << dumper.dump(parse_result) << "\n"
+      fmt = options[:format]
+      if fmt.nil? || fmt == 'old'
+        output << Puppet::Pops::Model::ModelTreeDumper.new.dump(parse_result) << "\n"
+      else
+        require 'puppet/pops/pn'
+        pn = Puppet::Pops::Model::PNTransformer.transform(parse_result)
+        case fmt
+        when 'json'
+          options[:pretty] ? JSON.pretty_unparse(pn.to_data) : JSON.dump(pn.to_data)
+        else
+          pn.format(options[:pretty] ? Puppet::Pops::PN::Indent.new('  ') : nil, output)
+        end
+      end
     rescue Puppet::ParseError => detail
       if show_filename
         Puppet.err("--- #{filename}")

data/lib/puppet/face/plugin.rb

@@ -1,5 +1,4 @@
 require 'puppet/face'
-require 'puppet/configurer/downloader_factory'
 require 'puppet/configurer/plugin_handler'
 
 Puppet::Face.define(:plugin, '0.0.1') do
@@ -42,8 +41,7 @@ Puppet::Face.define(:plugin, '0.0.1') do
     when_invoked do |options|
       remote_environment_for_plugins = Puppet::Node::Environment.remote(Puppet[:environment])
 
-      factory = Puppet::Configurer::DownloaderFactory.new
-      handler = Puppet::Configurer::PluginHandler.new(factory)
+      handler = Puppet::Configurer::PluginHandler.new()
       handler.download_plugins(remote_environment_for_plugins)
     end