puppet-debugger 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: e98e90f35a13e50b2b3f02e7c8b5aa590daa90b31df68a868403fba0399ef35e
-  data.tar.gz: 10bee3e410b82be3c5ff0f8134b6ac1fb8c38cfc2a1d21a10bbd214059ba6434
+SHA1:
+  metadata.gz: e3a943d793cc70f63e92cffc0843d0f4e9dfee03
+  data.tar.gz: 892a71554b9c5e156de87363341c3ef04bc8cc7a
 SHA512:
-  metadata.gz: c4ab1e0c51864faf1f53ac54b7a54f158e74e446888b6671a1d51ec48a8fb316b15419330d98d8e350b0e7df2875e47c3d88c840bd6b72e1679fc2ae5eb89a00
-  data.tar.gz: 6185292e9b63138cee9727c78d305e8ed00e463ba43b27a44d0ff7b0e42c0d76d098263a8a6987b771f89d561950fc5cc0eac8c637e332c53d69692c2dce11cf
+  metadata.gz: 35605789439801670e2899f17de1e10ef8109d6cb998ca6766993ba403dee1ab990a02faf0e43ae619f58c2d6ee2c83fa1b240d9eb9b88d51d2fce9011a8064e
+  data.tar.gz: bb774bc6493905d0fc280c09862e33462e4ea363c081d523b2ac2958f0f03e98a06d46f3593ad26b87e24380bed1131c9b7d233250890f1337069d94fd52613d

data/.gitlab-ci.yml

@@ -17,7 +17,7 @@ stages:
     - ruby
 
 web_trigger_staging:
-  type: web_deploy
+  stage: web_deploy
   variables:
     REF: staging
   only:
@@ -37,7 +37,7 @@ rubocop_ruby:
     - bundle exec rubocop -D
 
 bump_and_tag:
-  type: release
+  stage: release
   when: manual
   tags:
     - ruby2.2
@@ -76,7 +76,7 @@ bump_and_tag:
   image: ruby:2.5
 
 
-.ruby_25: &ruby26
+.ruby_26: &ruby26
   image: ruby:2.6
 
 gem_production:
@@ -133,8 +133,8 @@ puppet_60_ruby25:
   <<: *puppet_job_def
   <<: *ruby25
 
-puppet_60_ruby25:
+puppet_60_ruby26:
   variables:
     PUPPET_GEM_VERSION: "~> 6.4"
   <<: *puppet_job_def
-  <<: *ruby25
+  <<: *ruby26

data/.ruby-version

@@ -1 +1 @@
-2.4
+2.4.5

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## Unreleased
 
+## 0.12.0
+
+- Adds ability to list resource parameters as they were evaluated
+- Fixes #61 - array output is misleading
+
 ## 0.11.0
 
 - Fixes native functions not shown in functions command

data/lib/plugins/puppet-debugger/input_responders/vars.rb

@@ -7,12 +7,41 @@ module PuppetDebugger
       COMMAND_GROUP = :scope
 
       def run(args = [])
+        filter = args
+        unless filter.empty?
+          parameters = resource_parameters(debugger.scope.catalog.resources, filter)
+          return parameters.ai(sort_keys: true, indent: -1)
+        end
         # remove duplicate variables that are also in the facts hash
         variables = debugger.scope.to_hash.delete_if { |key, _value| debugger.node.facts.values.key?(key) }
         variables['facts'] = 'removed by the puppet-debugger' if variables.key?('facts')
         output = 'Facts were removed for easier viewing'.ai + "\n"
         output += variables.ai(sort_keys: true, indent: -1)
       end
+
+      def resource_parameters(resources, filter = [])
+        find_resources(resources, filter).each_with_object({}) do | resource, acc|
+          name = "#{resource.type}[#{resource.name}]"
+          acc[name] = parameters_to_h(resource)
+          acc
+        end
+      end
+
+      def parameters_to_h(resource)
+        resource.parameters.each_with_object({}) do | param, params |
+          name = param.first.to_s
+          params[name] = param.last.value
+          params
+        end
+      end
+
+      def find_resources(resources, filter = [])
+        filter_string = filter.join(' ').downcase
+        resources.find_all do |resource|
+          resource.name.to_s.downcase.include?(filter_string) || resource.type.to_s.downcase.include?(filter_string)
+        end
+      end
+
     end
   end
 end

data/lib/puppet-debugger/cli.rb

@@ -93,25 +93,25 @@ module PuppetDebugger
       # don't return anything or returns nil if item is not in the catalog
     end
 
-    # returns a formatted array
+    # 
+    # @return [Array] - returns a formatted array
+    # @param types [Array] - an array or string
     def expand_resource_type(types)
-      output = [types].flatten.map do |t|
-        if t.class.to_s =~ /Puppet::Pops::Types/
-          to_resource_declaration(t)
-        else
-          t
-        end
-      end
-      output
+      Array(types).flatten.map { |t| contains_resources?(t) ? to_resource_declaration(t) : t }
+    end
+
+    def contains_resources?(result)
+      ! Array(result).flatten.find {|r| r.class.to_s =~ /Puppet::Pops::Types/ }.nil?
     end
 
     def normalize_output(result)
-      if result.instance_of?(Array)
+      if contains_resources?(result)
         output = expand_resource_type(result)
+        # the results might be wrapped into an array
+        # if the only output is a resource then return it
+        # otherwise it is multiple items or an actually array
         return output.first if output.count == 1
         return output
-      elsif result.class.to_s =~ /Puppet::Pops::Types/
-        return to_resource_declaration(result)
       end
       result
     end
@@ -161,6 +161,10 @@ module PuppetDebugger
         exit 1 # this can sometimes causes tests to fail
       rescue PuppetDebugger::Exception::Error => e
         output = e.message.fatal
+      rescue RuntimeException => e
+        output = e.message.fatal
+        out_buffer.puts output
+        exit 1
       end
       unless output.empty?
         out_buffer.print ' => '

data/lib/puppet-debugger/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PuppetDebugger
-  VERSION = '0.11.0'
+  VERSION = '0.12.0'
 end

data/spec/input_responders/vars_spec.rb

@@ -35,4 +35,21 @@ describe :vars do
       expect(plugin.run(args)).to match(debugger_output)
     end
   end
+
+  describe 'list variables' do
+    let(:input) do
+      <<-EOF
+      class test( $param1 = "files", $param2 = $param1 ) {}
+      include test
+      EOF
+    end
+    it 'ls test' do
+      debugger.handle_input(input)
+      out = plugin.run(['test'])
+      expect(out).to include('"param1"')
+      expect(out).to include('"param2"')
+    end
+   
+
+  end
 end

data/spec/puppet_debugger_spec.rb

@@ -225,11 +225,23 @@ describe 'PuppetDebugger' do
     it 'shows type' do
       if Gem::Version.new(Puppet.version) > Gem::Version.new('4.4')
         debugger.handle_input(input)
-        expect(output.string).to eq("\n => Tuple[Integer[1, 1], Integer[2, 2], Integer[3, 3], Integer[4, 4]]\n") if supports_type_function?
+        expect(output.string.strip.split("\n").count).to eq(6)
       end
     end
   end
 
+  describe 'multi diemension array' do
+    let(:input) do
+      '[[1, [23,4], [22], [1,[2232]]]]'
+    end
+   
+    it 'handles multi array' do
+      debugger.handle_input(input)
+      expect(output.string.count('[')).to eq(17)
+    end
+    
+  end
+
   describe 'command_completion' do
     it 'should complete on tabs' do
       allow(Readline).to receive(:line_buffer).and_return("\n")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet-debugger
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Corey Osman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-07 00:00:00.000000000 Z
+date: 2019-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: table_print
@@ -286,7 +286,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.6.14.3
 signing_key: 
 specification_version: 4
 summary: A repl based debugger for the puppet language