puppet-debugger 1.1.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b42685da91441b7bff1494b4be01e91ebfb9e5e291e1483c129fff536fd2c75c
-  data.tar.gz: 3746ddb94008917e9394800a2c1553986128af574f68368865d509e0b9d60343
+  metadata.gz: d2ccbfeec771b3cc202f749b5aa17e96e2dd5f5ebfa9090887e17fb22b035d30
+  data.tar.gz: c8169e8f2531f3cd62c7b74e3f06a93b0be8e82e09b34ad71abc6a0456a6c113
 SHA512:
-  metadata.gz: 04dccda493638a6834d285edc4d79d4871181349ef9e57bfabe6ff8106bc2c371a1ab9ae76e052aca90c8cc1a3cdf76b7f6b3813f54931f9e3b363acfd3e94cf
-  data.tar.gz: d60dd7a5fd14c6258a2a1c85612f3475e1b72081c0c1e9c6ca5cd3c777fd764caedacf18082abd0b2c5a5b863f78960e016f4086fc3e3b1ae3e23bf2a1f3b905
+  metadata.gz: c7a4b91dee8c074e955cfefdae802d89f3ab1c3c5600fb56ea55cbbffca294845110f9b88ada2809bd1481925e7821fc34c9e4a8d77d986e5f02fa81f7e3a7e1
+  data.tar.gz: 839bd3f8c4ef3d4d8a8ac4ecb4b2c4782f94b1207fda0a4ceaa7d8a623151605838934437c3b02801d095389d55d9a590de385f7423a1c87adf7723cd79fcd86

data/.gitlab-ci.yml

@@ -6,11 +6,12 @@ stages:
   - test
   - release
   - deploy
-  - web_deploy
+  #- web_deploy
 
 .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
@@ -19,14 +20,15 @@ stages:
   tags:
     - ruby
 
-web_trigger_staging:
-  stage: web_deploy
-  variables:
-    REF: staging
-  only:
-    - main
-  script:
-    - "curl -X POST -F token=$PREPL_BUILD_TRIGGER_TOKEN -F ref=$REF https://gitlab.com/api/v3/projects/1146764/trigger/builds"
+# will be replaced by akash tf provider
+# web_trigger_staging:
+#   stage: web_deploy
+#   variables:
+#     REF: staging
+#   only:
+#     - main
+#   script:
+#     - "curl -X POST -F token=$PREPL_BUILD_TRIGGER_TOKEN -F ref=$REF https://gitlab.com/api/v4/projects/1146764/trigger/builds"
 
 rubocop_ruby:
   stage: validate
@@ -36,6 +38,7 @@ rubocop_ruby:
   tags:
     - ruby
   script:
+    - rm -f Gemfile.lock
     - bundle install
     - bundle exec rubocop -D
 
@@ -43,7 +46,7 @@ bump_and_tag:
   stage: release
   when: manual
   tags:
-    - ruby2.2
+    - ruby2.7
   only:
     - main@puppet-debugger/puppet-debugger
   script:
@@ -73,8 +76,14 @@ bump_and_tag:
 .ruby_27: &ruby27
   image: ruby:2.7
 
+.ruby_30: &ruby30
+  image: ruby:3.0
+
+.ruby_31: &ruby31
+  image: ruby:3.1
+
 gem_production:
-  image: ruby:2.5
+  image: ruby:2.7
   tags:
     - ruby
   before_script:
@@ -85,18 +94,6 @@ gem_production:
   only:
     - tags
 
-puppet_5_ruby24:
-  variables:
-    PUPPET_GEM_VERSION: "~> 5.5"
-  <<: *puppet_job_def
-  <<: *ruby24
-
-puppet_5_ruby25:
-  variables:
-    PUPPET_GEM_VERSION: "~> 5.5"
-  <<: *puppet_job_def
-  <<: *ruby25
-
 puppet_6_ruby25:
   variables:
     PUPPET_GEM_VERSION: "~> 6.0"
@@ -110,8 +107,24 @@ puppet_6_ruby26:
   <<: *ruby26
 
 puppet_6_ruby27:
-  allow_failure: true
+  allow_failure: false
   variables:
     PUPPET_GEM_VERSION: "~> 6.0"
   <<: *puppet_job_def
   <<: *ruby27
+
+puppet_7_ruby27:
+  allow_failure: false
+  variables:
+    PUPPET_GEM_VERSION: "~> 7.0"
+  <<: *puppet_job_def
+  <<: *ruby27
+
+# puppet_8_ruby3.0:
+#   allow_failure: true
+#   variables:
+#     PUPPET_GEM_VERSION: "~> 8.0"
+#   <<: *puppet_job_def
+#   <<: *ruby30
+
+

data/CHANGELOG.md

@@ -1,7 +1,13 @@
 # Puppet Debugger Changelog
 
 ## Unreleased
-
+## 1.3
+- Fix failures when using Bolt 3.23+
+- Relax tty-pager constraints (for Bolt)
+- Stop testing puppet 5
+- Stop testing ruby 2.4
+## 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,27 @@ 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'
+          if Bolt::PuppetDB::Config.respond_to?(:default_config)
+            config = Bolt::PuppetDB::Config.default_config
+            Bolt::PuppetDB::Client.new(config: config)
+          else
+            config = Bolt::PuppetDB::Config.load_config({})
+            Bolt::PuppetDB::Client.new(config)
+          end
+        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 +172,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.3.0'
 end

data/puppet-debugger.gemspec

@@ -37,9 +37,10 @@ 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'])
+  s.add_runtime_dependency('tty-pager', ['~> 0.13'])
   s.add_development_dependency('rdoc', ['~> 3.12'])
   s.add_development_dependency('rspec', ['~> 3.6'])
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet-debugger
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Corey Osman
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-07 00:00:00.000000000 Z
+date: 2022-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: '0.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: '0.13'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement