puppet-debugger 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b42685da91441b7bff1494b4be01e91ebfb9e5e291e1483c129fff536fd2c75c
-  data.tar.gz: 3746ddb94008917e9394800a2c1553986128af574f68368865d509e0b9d60343
+  metadata.gz: 22a19451584961b6bc90d4e634da4b3c5002e92780d84a9e19d5eb9d720a2aaa
+  data.tar.gz: f3dae2f5c9d2648b886d126395797562358829de51fcc7dac13c166a8fa70b76
 SHA512:
-  metadata.gz: 04dccda493638a6834d285edc4d79d4871181349ef9e57bfabe6ff8106bc2c371a1ab9ae76e052aca90c8cc1a3cdf76b7f6b3813f54931f9e3b363acfd3e94cf
-  data.tar.gz: d60dd7a5fd14c6258a2a1c85612f3475e1b72081c0c1e9c6ca5cd3c777fd764caedacf18082abd0b2c5a5b863f78960e016f4086fc3e3b1ae3e23bf2a1f3b905
+  metadata.gz: 88c59044e15d8209a21ce58fb4491bc267e7146dfa32fc3f3ee18f4ad7c81dd7a9969fd04208b85bd4be169cd7a1c67b26de96f0e65cdf6df3b355945621fff8
+  data.tar.gz: 75ca9baae2f01da4696b57dd7c28aad61fe251a2dcdf9909c2a4d3ed4e254fcd6ee3b64624d3b78c4b7660a6b1b303cdda92c9d23380a3349d6bf2139a1bd722

data/.gitlab-ci.yml

@@ -11,6 +11,7 @@ stages:
 .puppet_def: &puppet_job_def
   stage: test
   script:
+    - rm -f Gemfile.lock
     - gem update --system > /dev/null
     - gem install bundler > /dev/null
     - bundle install --without development validate
@@ -36,6 +37,7 @@ rubocop_ruby:
   tags:
     - ruby
   script:
+    - rm -f Gemfile.lock
     - bundle install
     - bundle exec rubocop -D
 

data/CHANGELOG.md

@@ -1,7 +1,8 @@
 # Puppet Debugger Changelog
 
 ## Unreleased
-
+## 1.2
+- Fix puppetdb_query errors when bolt_pdb_client was not loaded
 ## 1.1
 - Catch signals and allow control-d for quitting. 
 ## 1.0

data/Gemfile

@@ -4,14 +4,15 @@ source 'http://rubygems.org'
 gem 'awesome_print', '~> 1.7'
 gem 'facterdb', '>= 0.5.0'
 gem 'pluginator', '~> 1.5.0'
-gem 'puppet', ENV['PUPPET_GEM_VERSION'] || '>= 5.5'
+gem 'puppet', ENV['PUPPET_GEM_VERSION'] || '~> 5.5'
 gem 'rb-readline'
 gem 'table_print'
 gem 'tty-pager'
+#gem 'bolt' if Gem::Version(ENV['PUPPET_GEM_VERSION'])
+
 group :test, :development do
   # ruby versions prior to 2.0 cannot install json_pure 2.0.2+
   gem 'bundler'
-  gem 'CFPropertyList'
   gem 'pry'
   gem 'puppet-debugger', path: './'
   gem 'rake', '~> 13.0'

data/lib/puppet-debugger/support.rb

@@ -142,6 +142,22 @@ module PuppetDebugger
       file
     end
 
+    # @return [Bolt::PuppetDB::Client] 
+    def bolt_pdb_client
+      @bolt_pdb_client ||=
+        begin
+          require 'bolt/logger'
+          require 'bolt/puppetdb'
+          require 'bolt/puppetdb/client'
+          require 'bolt/puppetdb/config'
+          config = Bolt::PuppetDB::Config.load_config({})
+          Bolt::PuppetDB::Client.new(config)
+        rescue LoadError
+          # not puppet 6+
+          nil
+        end
+    end
+
     # @param String - any valid puppet language code
     # @return Object - returns either a string of the result or object from puppet evaulation
     def puppet_eval(input, file: nil)
@@ -151,9 +167,9 @@ module PuppetDebugger
       manifest_file = file || manifest_file(input)
       manfifest_content = input || File.read(manifest_file)
       ast = generate_ast(manfifest_content)
-
       Puppet.override({ current_environment: puppet_environment, manifest: manifest_file,
-                        global_scope: scope, loaders: scope.compiler.loaders }, 'For puppet-debugger') do
+                        global_scope: scope, bolt_pdb_client: bolt_pdb_client,
+                        loaders: scope.compiler.loaders }, 'For puppet-debugger') do
         # because the debugger is not a module we leave the modname blank
         scope.environment.known_resource_types.import_ast(ast, '')
 

data/lib/puppet-debugger/version.rb

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

data/puppet-debugger.gemspec

@@ -37,6 +37,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency('facterdb', ['>= 0.4.0'])
   s.add_runtime_dependency('pluginator', ['~> 1.5.0'])
   s.add_runtime_dependency('puppet', ['>= 5.5'])
+  # s.add_runtime_dependency('bolt', ['>= 2.42.0'])
   s.add_runtime_dependency('rb-readline', ['>= 0.5.5'])
   s.add_runtime_dependency('table_print', ['>= 1.0.0'])
   s.add_runtime_dependency('tty-pager', ['~> 0.13.0'])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet-debugger
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Corey Osman
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-07 00:00:00.000000000 Z
+date: 2021-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print