puppet-debugger 0.16.0 → 1.1.0

data/lib/puppet-debugger/support/node.rb

@@ -8,8 +8,6 @@ module PuppetDebugger
       # creates a node object using defaults or gets the remote node
       # object if the remote_node_name is defined
       def create_node
-        Puppet[:trusted_server_facts] = true if Puppet.version.to_f >= 4.1 && Puppet.version.to_f < 6.0
-
         if remote_node_name
           # refetch
           node_obj = set_node_from_name(remote_node_name)
@@ -34,6 +32,7 @@ module PuppetDebugger
           # Collect our facts.
           facts = Puppet::Node::Facts.indirection.find(Puppet[:node_name_value])
           raise "Could not find facts for #{Puppet[:node_name_value]}" unless facts
+
           Puppet[:node_name_value] = facts.values[Puppet[:node_name_fact]]
           facts.name = Puppet[:node_name_value]
         end
@@ -41,6 +40,7 @@ module PuppetDebugger
           # Find our Node
           node = Puppet::Node.indirection.find(Puppet[:node_name_value])
           raise "Could not find node #{Puppet[:node_name_value]}" unless node
+
           # Merge in the facts.
           node.merge(facts.values) if facts
         end
@@ -93,11 +93,8 @@ module PuppetDebugger
       def set_node_from_name(name)
         out_buffer.puts "Fetching node #{name}"
         remote_node = get_remote_node(name)
-        if remote_node && remote_node.parameters.empty?
-          remote_node_name = nil # clear out the remote name
-          raise PuppetDebugger::Exception::UndefinedNode, name: remote_node.name
-        end
-        remote_node_name = remote_node.name
+        raise PuppetDebugger::Exception::UndefinedNode, name: remote_node.name if remote_node&.parameters&.empty?
+
         node_object = convert_remote_node(remote_node)
         set_node(node_object)
       end

data/lib/puppet-debugger/support/scope.rb

@@ -8,6 +8,35 @@ module PuppetDebugger
         @scope = value
       end
 
+      def catalog
+        @catalog || scope.compiler.catalog
+      end
+
+      def get_catalog_text(catalog)
+        return nil unless catalog
+
+        Puppet::FileSystem.read(catalog, encoding: 'utf-8')
+      end
+
+      def set_catalog(catalog_file)
+        return unless catalog_file
+
+        catalog_text = get_catalog_text(catalog_file)
+        scope # required
+        Puppet.override({ current_environment: environment }, _('For puppet debugger')) do
+          format = Puppet::Resource::Catalog.default_format
+          begin
+            c = Puppet::Resource::Catalog.convert_from(format, catalog_text)
+          rescue StandardError => e
+            raise Puppet::Error, format(_('Could not deserialize catalog from %{format}: %{detail}'), format: format, detail: e), e.backtrace
+          end
+          # Resolve all deferred values and replace them / mutate the catalog
+          # Puppet 6 only
+          Puppet::Pops::Evaluator::DeferredResolver.resolve_and_replace(node.facts, c) if Gem::Version.new(Puppet.version) >= Gem::Version.new('6.0.0')
+          @catalog = c
+        end
+      end
+
       # @return [Puppet::Pops::Scope] - returns a puppet scope object
       def scope
         @scope ||= create_scope

data/lib/puppet-debugger/trollop.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # lib/trollop.rb -- trollop command-line processing library
 # Copyright (c) 2008-2014 William Morgan.
 # Copyright (c) 2014 Red Hat, Inc.
@@ -33,10 +34,10 @@ module Trollop
   end
 
   ## Regex for floating point numbers
-  FLOAT_RE = /^-?((\d+(\.\d+)?)|(\.\d+))([eE][-+]?[\d]+)?$/
+  FLOAT_RE = /^-?((\d+(\.\d+)?)|(\.\d+))([eE][-+]?[\d]+)?$/.freeze
 
   ## Regex for parameters
-  PARAM_RE = /^-(-|\.$|[^\d\.])/
+  PARAM_RE = /^-(-|\.$|[^\d\.])/.freeze
 
   ## The commandline parser. In typical usage, the methods in this class
   ## will be handled internally by Trollop::options. In this case, only the
@@ -50,24 +51,24 @@ module Trollop
   class Parser
     ## The set of values that indicate a flag option when passed as the
     ## +:type+ parameter of #opt.
-    FLAG_TYPES = [:flag, :bool, :boolean].freeze
+    FLAG_TYPES = %i[flag bool boolean].freeze
 
     ## The set of values that indicate a single-parameter (normal) option when
     ## passed as the +:type+ parameter of #opt.
     ##
     ## A value of +io+ corresponds to a readable IO resource, including
     ## a filename, URI, or the strings 'stdin' or '-'.
-    SINGLE_ARG_TYPES = [:int, :integer, :string, :double, :float, :io, :date].freeze
+    SINGLE_ARG_TYPES = %i[int integer string double float io date].freeze
 
     ## The set of values that indicate a multiple-parameter option (i.e., that
     ## takes multiple space-separated values on the commandline) when passed as
     ## the +:type+ parameter of #opt.
-    MULTI_ARG_TYPES = [:ints, :integers, :strings, :doubles, :floats, :ios, :dates].freeze
+    MULTI_ARG_TYPES = %i[ints integers strings doubles floats ios dates].freeze
 
     ## The complete set of legal values for the +:type+ parameter of #opt.
     TYPES = FLAG_TYPES + SINGLE_ARG_TYPES + MULTI_ARG_TYPES
 
-    INVALID_SHORT_ARG_REGEX = /[\d-]/ #:nodoc:
+    INVALID_SHORT_ARG_REGEX = /[\d-]/.freeze #:nodoc:
 
     ## The values from the commandline that were not interpreted by #parse.
     attr_reader :leftovers
@@ -151,8 +152,7 @@ module Trollop
         when :doubles        then :floats
         when Class
           case opts[:type].name
-          when 'TrueClass',
-               'FalseClass'  then :flag
+          when 'TrueClass', 'FalseClass' then :flag
           when 'String'      then :string
           when 'Integer'     then :int
           when 'Float'       then :float
@@ -164,6 +164,7 @@ module Trollop
         when nil then nil
         else
           raise ArgumentError, "unsupported argument type '#{opts[:type]}'" unless TYPES.include?(opts[:type])
+
           opts[:type]
         end
 
@@ -175,14 +176,13 @@ module Trollop
                                 opts[:default].first
                               else
                                 opts[:default]
-      end
+                              end
 
       type_from_default =
         case disambiguated_default
         when Integer     then :int
         when Numeric     then :float
-        when TrueClass,
-             FalseClass  then :flag
+        when TrueClass, FalseClass then :flag
         when String      then :string
         when IO          then :io
         when Date        then :date
@@ -190,6 +190,7 @@ module Trollop
           if opts[:default].empty?
             if opts[:type]
               raise ArgumentError, 'multiple argument type must be plural' unless MULTI_ARG_TYPES.include?(opts[:type])
+
               nil
             else
               raise ArgumentError, "multiple argument type cannot be deduced from an empty array for '#{opts[:default][0].class.name}'"
@@ -220,7 +221,7 @@ module Trollop
                     when /^--([^-].*)$/ then Regexp.last_match(1)
                     when /^[^-]/        then opts[:long]
                     else raise ArgumentError, "invalid long option name #{opts[:long].inspect}"
-      end
+                    end
       raise ArgumentError, "long option name #{opts[:long].inspect} is already taken; please specify a (different) :long" if @long[opts[:long]]
 
       ## fill in :short
@@ -229,7 +230,7 @@ module Trollop
                      when /^-(.)$/          then Regexp.last_match(1)
                      when nil, :none, /^.$/ then opts[:short]
                      else                   raise ArgumentError, "invalid short option name '#{opts[:short].inspect}'"
-      end
+                     end
 
       if opts[:short]
         raise ArgumentError, "short option name #{opts[:short].inspect} is already taken; please specify a (different) :short" if @short[opts[:short]]
@@ -255,21 +256,21 @@ module Trollop
     ## Sets the version string. If set, the user can request the version
     ## on the commandline. Should probably be of the form "<program name>
     ## <version number>".
-    def version(s = nil)
-      s ? @version = s : @version
+    def version(value = nil)
+      value ? @version = value : @version
     end
 
     ## Sets the usage string. If set the message will be printed as the
     ## first line in the help (educate) output and ending in two new
     ## lines.
-    def usage(s = nil)
-      s ? @usage = s : @usage
+    def usage(value = nil)
+      value ? @usage = value : @usage
     end
 
     ## Adds a synopsis (command summary description) right below the
     ## usage line, or as the first line if usage isn't specified.
-    def synopsis(s = nil)
-      s ? @synopsis = s : @synopsis
+    def synopsis(value = nil)
+      value ? @synopsis = value : @synopsis
     end
 
     ## Adds text to the help display. Can be interspersed with calls to
@@ -347,22 +348,20 @@ module Trollop
                                 ["--#{Regexp.last_match(1)}", true]
                               else
                                 [arg, false]
-        end
+                              end
 
         sym = case arg
               when /^-([^-])$/      then @short[Regexp.last_match(1)]
               when /^--([^-]\S*)$/  then @long[Regexp.last_match(1)] || @long["no-#{Regexp.last_match(1)}"]
               else raise CommandlineError, "invalid argument syntax: '#{arg}'"
-        end
+              end
 
         sym = nil if arg =~ /--no-/ # explicitly invalidate --no-no- arguments
 
         next 0 if ignore_invalid_options && !sym
         raise CommandlineError, "unknown argument '#{arg}'" unless sym
 
-        if given_args.include?(sym) && !@specs[sym][:multi]
-          raise CommandlineError, "option '#{arg}' specified multiple times"
-        end
+        raise CommandlineError, "option '#{arg}' specified multiple times" if given_args.include?(sym) && !@specs[sym][:multi]
 
         given_args[sym] ||= {}
         given_args[sym][:arg] = arg
@@ -396,9 +395,13 @@ module Trollop
 
         case type
         when :depends
-          syms.each { |sym| raise CommandlineError, "--#{@specs[constraint_sym][:long]} requires --#{@specs[sym][:long]}" unless given_args.include? sym }
+          syms.each do |sym|
+            raise CommandlineError, "--#{@specs[constraint_sym][:long]} requires --#{@specs[sym][:long]}" unless given_args.include? sym
+          end
         when :conflicts
-          syms.each { |sym| raise CommandlineError, "--#{@specs[constraint_sym][:long]} conflicts with --#{@specs[sym][:long]}" if given_args.include?(sym) && (sym != constraint_sym) }
+          syms.each do |sym|
+            raise CommandlineError, "--#{@specs[constraint_sym][:long]} conflicts with --#{@specs[sym][:long]}" if given_args.include?(sym) && (sym != constraint_sym)
+          end
         end
       end
 
@@ -413,6 +416,7 @@ module Trollop
         opts = @specs[sym]
         if params.empty? && opts[:type] != :flag
           raise CommandlineError, "option '#{arg}' needs a parameter" unless opts[:default]
+
           params << (opts[:default].is_a?(Array) ? opts[:default].clone : [opts[:default]])
         end
 
@@ -527,7 +531,7 @@ module Trollop
                         spec[:default].join(', ')
                       else
                         spec[:default].to_s
-          end
+                      end
 
           if spec[:default]
             if spec[:desc] =~ /\.$/
@@ -553,7 +557,7 @@ module Trollop
                    end
                  else
                    80
-      end
+                 end
     end
 
     def legacy_width
@@ -580,15 +584,15 @@ module Trollop
     ## The per-parser version of Trollop::die (see that for documentation).
     def die(arg, msg = nil, error_code = nil)
       if msg
-        $stderr.puts "Error: argument --#{@specs[arg][:long]} #{msg}."
+        warn "Error: argument --#{@specs[arg][:long]} #{msg}."
       else
-        $stderr.puts "Error: #{arg}."
+        warn "Error: #{arg}."
       end
       if @educate_on_error
         $stderr.puts
         educate $stderr
       else
-        $stderr.puts 'Try --help for help.'
+        warn 'Try --help for help.'
       end
       exit(error_code || -1)
     end
@@ -602,6 +606,7 @@ module Trollop
 
       until i >= args.length
         return remains += args[i..-1] if @stop_words.member? args[i]
+
         case args[i]
         when /^--$/ # arg terminator
           return remains += args[(i + 1)..-1]
@@ -662,11 +667,13 @@ module Trollop
 
     def parse_integer_parameter(param, arg)
       raise CommandlineError, "option '#{arg}' needs an integer" unless param =~ /^-?[\d_]+$/
+
       param.to_i
     end
 
     def parse_float_parameter(param, arg)
       raise CommandlineError, "option '#{arg}' needs a floating-point number" unless param =~ FLOAT_RE
+
       param.to_f
     end
 

data/lib/puppet-debugger/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PuppetDebugger
-  VERSION = "0.16.0"
+  VERSION = '1.1.0'
 end

data/lib/puppet/application/debugger.rb

@@ -1,186 +1,199 @@
 # frozen_string_literal: true
 
-require "puppet/application"
-require "optparse"
-require "puppet/util/command_line"
+require 'puppet/application'
+require 'optparse'
+require 'puppet/util/command_line'
 
 class Puppet::Application::Debugger < Puppet::Application
   attr_reader :use_stdin
 
-  option("--execute EXECUTE", "-e") do |arg|
+  option('--execute EXECUTE', '-e') do |arg|
     options[:code] = arg
   end
 
-  option("--facterdb-filter FILTER") do |arg|
+  option('--facterdb-filter FILTER') do |arg|
     options[:use_facterdb] = true unless options[:node_name]
-    ENV["DEBUGGER_FACTERDB_FILTER"] = arg if arg
+    ENV['DEBUGGER_FACTERDB_FILTER'] = arg if arg
   end
 
-  option("--test") do |_arg|
+  option('--test') do |_arg|
     options[:quiet] = true
     options[:run_once] = true
     @use_stdin = true
   end
 
-  option("--no-facterdb") { |_arg| options[:use_facterdb] = false }
+  option('--no-facterdb') { |_arg| options[:use_facterdb] = false }
 
-  option("--log-level LEVEL", "-l") do |arg|
+  option('--log-level LEVEL', '-l') do |arg|
     Puppet::Util::Log.level = arg.to_sym
   end
 
-  option("--quiet", "-q") { |_arg| options[:quiet] = true }
+  option('--catalog catalog', '-c catalog') do |arg|
+    options[:catalog] = arg
+  end
+
+  option('--quiet', '-q') { |_arg| options[:quiet] = true }
 
-  option("--play URL", "-p") do |arg|
+  option('--play URL', '-p') do |arg|
     options[:play] = arg
   end
 
-  option("--stdin", "-s") { |_arg| @use_stdin = true }
+  option('--stdin', '-s') { |_arg| @use_stdin = true }
 
-  option("--run-once", "-r") { |_arg| options[:run_once] = true }
+  option('--run-once', '-r') { |_arg| options[:run_once] = true }
 
-  option("--node-name CERTNAME", "-n") do |arg|
+  option('--node-name CERTNAME', '-n') do |arg|
     options[:use_facterdb] = false
     options[:node_name] = arg
   end
 
   def help
-    <<-HELP
+    <<~HELP
 
-puppet-debugger(8) -- Starts a debugger session using the puppet-debugger tool
-========
+      puppet-debugger(8) -- Starts a debugger session using the puppet-debugger tool
+      ========
 
-SYNOPSIS
---------
-A interactive command line tool for evaluating the puppet language and debugging
-puppet code.
+      SYNOPSIS
+      --------
+      A interactive command line tool for evaluating the puppet language and debugging
+      puppet code.
 
-USAGE
------
-puppet debugger [--help] [--version] [-e|--execute CODE] [--facterdb-filter FILTER]
-                [--test] [--no-facterdb] [-q|--quiet] [-p|--play URL] [-s|--stdin]
-                [-r|--run-once] [-n|--node-name CERTNAME]
+      USAGE
+      -----
+      puppet debugger [--help] [--version] [-e|--execute CODE] [--facterdb-filter FILTER]
+                      [--test] [--no-facterdb] [-q|--quiet] [-p|--play URL] [-s|--stdin]
+                      [-r|--run-once] [-n|--node-name CERTNAME]
 
 
-DESCRIPTION
------------
-A interactive command line tool for evaluating the puppet language and debugging
-puppet code.
+      DESCRIPTION
+      -----------
+      A interactive command line tool for evaluating the puppet language and debugging
+      puppet code.
+
+      USAGE WITH DEBUG MODULE
+      -----------------------
+      Use the puppet debugger in conjunction with the debug::break() puppet function
+      to pry into your code during compilation.  Get immediate insight in how the puppet4
+      languge works during the execution of your code.
 
-USAGE WITH DEBUG MODULE
------------------------
-Use the puppet debugger in conjunction with the debug::break() puppet function
-to pry into your code during compilation.  Get immediate insight in how the puppet4
-languge works during the execution of your code.
+      To use the break function install the module via: puppet module install nwops/debug
 
-To use the break function install the module via: puppet module install nwops/debug
+      Now place the debug::break() function anywhere in your code to
 
-Now place the debug::break() function anywhere in your code to
+      Example:
+        puppet debugger -e '$abs_vars = [-11,-22,-33].map | Integer $num | { debug::break() ; notice($num) }'
 
-Example:
-  puppet debugger -e '$abs_vars = [-11,-22,-33].map | Integer $num | { debug::break() ; notice($num) }'
+      See: https://github.com/nwops/puppet-debug
+      OPTIONS
+      -------
+      Note that any setting that's valid in the configuration
+      file is also a valid long argument. For example, 'server' is a valid
+      setting, so you can specify '--server <servername>' as
+      an argument.
 
-See: https://github.com/nwops/puppet-debug
-OPTIONS
--------
-Note that any setting that's valid in the configuration
-file is also a valid long argument. For example, 'server' is a valid
-setting, so you can specify '--server <servername>' as
-an argument.
+      See the configuration file documentation at
+      http://docs.puppetlabs.com/references/stable/configuration.html for the
+      full list of acceptable parameters. A commented list of all
+      configuration options can also be generated by running puppet debugger with
+      '--genconfig'.
 
-See the configuration file documentation at
-http://docs.puppetlabs.com/references/stable/configuration.html for the
-full list of acceptable parameters. A commented list of all
-configuration options can also be generated by running puppet debugger with
-'--genconfig'.
+      * --help:
+        Print this help message
 
-* --help:
-  Print this help message
+      * --version:
+        Print the puppet version number and exit.
 
-* --version:
-  Print the puppet version number and exit.
+      * --execute:
+        Execute a specific piece of Puppet code
 
-* --execute:
-  Execute a specific piece of Puppet code
+      * --facterdb-filter
+        Disables the usage of the current node level facts and uses cached facts
+        from facterdb.  Specifying a filter will override the default facterdb filter.
+        Not specifiying a filter will use the default CentOS based filter.
+        This will greatly speed up the start time of the debugger since
+        you are using cached facts.  Additionally, using facterdb also allows you
+        to play with many other operating system facts that you might not have access
+        to.  For example filters please see the facterdb docs.
 
-* --facterdb-filter
-  Disables the usage of the current node level facts and uses cached facts
-  from facterdb.  Specifying a filter will override the default facterdb filter.
-  Not specifiying a filter will use the default CentOS based filter.
-  This will greatly speed up the start time of the debugger since
-  you are using cached facts.  Additionally, using facterdb also allows you
-  to play with many other operating system facts that you might not have access
-  to.  For example filters please see the facterdb docs.
+        See https://github.com/camptocamp/facterdb for more info
 
-  See https://github.com/camptocamp/facterdb for more info
+      * --no-facterdb
+        Use the facts found on this node instead of cached facts from facterdb.
 
-* --no-facterdb
-  Use the facts found on this node instead of cached facts from facterdb.
+      * --log-level
+        Set the Puppet log level which can be very useful with using the debugger.
 
-* --log-level
-  Set the Puppet log level which can be very useful with using the debugger.
+      * --quiet
+        Do not display the debugger help script upon startup.
 
-* --quiet
-  Do not display the debugger help script upon startup.
+      * --play
+        Plays back the code file supplied into the debugger.  Can also supply
+        any http based url.
 
-* --play
-  Plays back the code file supplied into the debugger.  Can also supply
-  any http based url.
+      * --run-once
+        Return the result from the debugger and exit
 
-* --run-once
-  Return the result from the debugger and exit
+      * --stdin
+        Read from stdin instead of starting the debugger right away.  Useful when piping code into the debugger.
 
-* --stdin
-  Read from stdin instead of starting the debugger right away.  Useful when piping code into the debugger.
+      * --catalog:
+        Import a JSON catalog (such as one generated with 'puppet master --compile'). You need to
+        specify a valid JSON encoded catalog file.  Gives you the ability
+        to inspect the catalog and all the parameter values that make up the resources. Can
+        specify a file or pipe to stdin with '-'.
 
-* --node-name
-  Retrieves the node information remotely via the puppet server given the node name.
-  This is extremely useful when trying to debug classification issues, as this can show
-  classes and parameters retrieved from the ENC.  You can also play around with the real facts
-  of the remote node as well.
+      * --node-name
+        Retrieves the node information remotely via the puppet server given the node name.
+        This is extremely useful when trying to debug classification issues, as this can show
+        classes and parameters retrieved from the ENC.  You can also play around with the real facts
+        of the remote node as well.
 
-  Note: this requires special permission in your puppet server's auth.conf file to allow
-  access to make remote calls from this node: #{Puppet[:certname]}
+        Note: this requires special permission in your puppet server's auth.conf file to allow
+        access to make remote calls from this node: #{Puppet[:certname]}.  If you are running
+        the debugger from the puppet server as root you do not need any special setup.
 
-  You must also have a signed cert and be able to connect to the server from this system.
+        You must also have a signed cert and be able to connect to the server from this system.
 
-  Mutually exclusive with --facterdb-filter
+        Mutually exclusive with --facterdb-filter
 
-* --test
-  Runs the code in the debugger and exit without showing the help screen ( --quiet --run-once, --stdin)
+      * --test
+        Runs the code in the debugger and exit without showing the help screen ( --quiet --run-once, --stdin)
 
-EXAMPLE
--------
-    $ puppet debugger
-    $ echo "notice('hello, can you hear me?')" | puppet debugger --test
-    $ echo "notice('hello, can you hear me?')" | puppet debugger --stdin
-    $ puppet debugger --execute "notice('hello')"
-    $ puppet debugger --facterdb-filter 'facterversion=/^2.4\./ and operatingsystem=Debian'
-    $ puppet debugger --play https://gist.github.com/logicminds/4f6bcfd723c92aad1f01f6a800319fa4
-    $ puppet debugger --facterdb-filter 'facterversion=/^2.4\./ and operatingsystem=Debian' \\
-                      --play https://gist.github.com/logicminds/4f6bcfd723c92aad1f01f6a800319fa4
-    $ puppet debugger --node-name
+      EXAMPLE
+      -------
+          $ puppet debugger
+          $ echo "notice('hello, can you hear me?')" | puppet debugger --test
+          $ echo "notice('hello, can you hear me?')" | puppet debugger --stdin
+          $ puppet debugger --execute "notice('hello')"
+          $ puppet debugger --facterdb-filter 'facterversion=/^2.4\./ and operatingsystem=Debian'
+          $ puppet debugger --play https://gist.github.com/logicminds/4f6bcfd723c92aad1f01f6a800319fa4
+          $ puppet debugger --facterdb-filter 'facterversion=/^2.4\./ and operatingsystem=Debian' \\
+                            --play https://gist.github.com/logicminds/4f6bcfd723c92aad1f01f6a800319fa4
+          $ puppet debugger --node-name
 
 
-AUTHOR
-------
-Corey Osman <corey@nwops.io>
+      AUTHOR
+      ------
+      Corey Osman <corey@nwops.io>
 
 
-COPYRIGHT
----------
-Copyright (c) 2019 NWOps
+      COPYRIGHT
+      ---------
+      Copyright (c) 2019 NWOps
 
     HELP
   end
 
   def initialize(command_line = Puppet::Util::CommandLine.new)
     @command_line = CommandLineArgs.new(command_line.subcommand_name, command_line.args.dup)
-    @options = { use_facterdb: true, play: nil, run_once: false, node_name: nil, quiet: false, help: false, scope: nil }
+    @options = { use_facterdb: true, play: nil, run_once: false,
+                 node_name: nil, quiet: false, help: false, scope: nil,
+                 catalog: nil }
     @use_stdin = false
     begin
-      require "puppet-debugger"
-    rescue LoadError => e
-      Puppet.err("You must install the puppet-debugger: gem install puppet-debugger")
+      require 'puppet-debugger'
+    rescue LoadError
+      Puppet.err('You must install the puppet-debugger: gem install puppet-debugger')
     end
   end
 
@@ -188,26 +201,26 @@ Copyright (c) 2019 NWOps
     # if this is a file we don't play back since its part of the environment
     # if just the code we put in a file and use the play feature of the debugger
     # we could do the same thing with the passed in manifest file but that might be too much code to show
-
     if options[:code]
       code_input = options.delete(:code)
-      file = Tempfile.new(["puppet_repl_input", ".pp"])
-      File.open(file, "w") do |f|
+      file = Tempfile.new(['puppet_debugger_input', '.pp'])
+      File.open(file, 'w') do |f|
         f.write(code_input)
       end
       options[:play] = file
     elsif command_line.args.empty? && use_stdin
       code_input = STDIN.read
-      file = Tempfile.new(["puppet_repl_input", ".pp"])
-      File.open(file, "w") do |f|
+      file = Tempfile.new(['puppet_debugger_input', '.pp'])
+      File.open(file, 'w') do |f|
         f.write(code_input)
       end
       options[:play] = file
     elsif !command_line.args.empty?
       manifest = command_line.args.shift
       raise "Could not find file #{manifest}" unless Puppet::FileSystem.exist?(manifest)
-      Puppet.warning("Only one file can be used per run.  Skipping #{command_line.args.join(", ")}") unless command_line.args.empty?
-      options[:play] = file
+
+      Puppet.warning("Only one file can be used per run.  Skipping #{command_line.args.join(', ')}") unless command_line.args.empty?
+      options[:play] = manifest
     end
     begin
       if !options[:use_facterdb] && options[:node_name].nil?
@@ -220,16 +233,23 @@ Copyright (c) 2019 NWOps
       end
       ::PuppetDebugger::Cli.start_without_stdin(options)
     rescue Exception => e
-      puts e
-      exit 1
+      case e.class.to_s
+      when 'SystemExit'
+        nil
+      else
+        puts e.message
+        puts e.backtrace
+      end
     end
   end
 
   def create_environment(manifest)
     configured_environment = Puppet.lookup(:current_environment)
-    manifest ?
-      configured_environment.override_with(manifest: manifest) :
+    if manifest
+      configured_environment.override_with(manifest: manifest)
+    else
       configured_environment
+    end
   end
 
   def create_node(environment)
@@ -239,14 +259,16 @@ Copyright (c) 2019 NWOps
       unless facts = Puppet::Node::Facts.indirection.find(Puppet[:node_name_value])
         raise "Could not find facts for #{Puppet[:node_name_value]}"
       end
+
       Puppet[:node_name_value] = facts.values[Puppet[:node_name_fact]]
       facts.name = Puppet[:node_name_value]
     end
-    Puppet.override({ current_environment: environment }, "For puppet debugger") do
+    Puppet.override({ current_environment: environment }, 'For puppet debugger') do
       # Find our Node
       unless node = Puppet::Node.indirection.find(Puppet[:node_name_value])
         raise "Could not find node #{Puppet[:node_name_value]}"
       end
+
       # Merge in the facts.
       node.merge(facts.values) if facts
     end
@@ -269,11 +291,14 @@ Copyright (c) 2019 NWOps
     if $stdout.isatty
       options = options.merge(scope: scope)
       # required in order to use convert puppet hash into ruby hash with symbols
-      options = options.each_with_object({}) { |(k, v), data| data[k.to_sym] = v; data }
+      options = options.each_with_object({}) do |(k, v), data|
+        data[k.to_sym] = v
+        data
+      end
       # options[:source_file], options[:source_line] = stacktrace.last
       ::PuppetRepl::Cli.start(options)
     else
-      Puppet.info "puppet debug: refusing to start the debugger without a tty"
+      Puppet.info 'puppet debug: refusing to start the debugger without a tty'
     end
   end
 
@@ -284,7 +309,7 @@ Copyright (c) 2019 NWOps
   # for compatibility with older puppet versions
   # The basics behind this are to find the `.pp` file in the list of loaded code
   def stacktrace
-    result = caller.each_with_object([]) do |loc, memo|
+    caller.each_with_object([]) do |loc, memo|
       if loc =~ /\A(.*\.pp)?:([0-9]+):in\s(.*)/
         # if the file is not found we set to code
         # and read from Puppet[:code]