puppet-debugger 1.2.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22a19451584961b6bc90d4e634da4b3c5002e92780d84a9e19d5eb9d720a2aaa
-  data.tar.gz: f3dae2f5c9d2648b886d126395797562358829de51fcc7dac13c166a8fa70b76
+  metadata.gz: 588f4c8928181443aa7e98e820530d79c9efb705a7a9b95f5e447066d87cac96
+  data.tar.gz: 109e0616bd93547ea2e6975bbdd4e58b27e92bcc9533b206c4194d37be6a49e8
 SHA512:
-  metadata.gz: 88c59044e15d8209a21ce58fb4491bc267e7146dfa32fc3f3ee18f4ad7c81dd7a9969fd04208b85bd4be169cd7a1c67b26de96f0e65cdf6df3b355945621fff8
-  data.tar.gz: 75ca9baae2f01da4696b57dd7c28aad61fe251a2dcdf9909c2a4d3ed4e254fcd6ee3b64624d3b78c4b7660a6b1b303cdda92c9d23380a3349d6bf2139a1bd722
+  metadata.gz: 592067114dea290451e1933655d0f72ee254c8c7fb063e5bcf7901d2f3caf9afb45c7f370a5c6cbbc2c9dfff22e35a2a60d776ad94e4ba5b6a6b476e2bd82c29
+  data.tar.gz: b7b2a003cdc1051f58e7be727ffcdd61d5d888312eac091015c54ea1ea137ba23ad4ac2d2c1514b0a4dd5d1ef7872a850dbf576b67d25ec49f419f0d6995c3b1

data/.gitlab-ci.yml

@@ -5,29 +5,39 @@ stages:
   - validate
   - test
   - release
-  - deploy
-  - web_deploy
+  # - deploy
+  #- web_deploy
 
-.puppet_def: &puppet_job_def
+.puppet_job_def_ruby27: &puppet_job_def_ruby27
   stage: test
   script:
     - rm -f Gemfile.lock
-    - gem update --system > /dev/null
-    - gem install bundler > /dev/null
+    - gem install bundler -v 2.4.22 > /dev/null
     - bundle install --without development validate
-    - bundle exec puppet module install puppetlabs-stdlib
+    - bundle exec puppet module install puppetlabs-stdlib --version 8.6.0
     - bundle exec rspec
   tags:
     - ruby
 
-web_trigger_staging:
-  stage: web_deploy
-  variables:
-    REF: staging
-  only:
-    - main
+.puppet_job_def_ruby30plus: &puppet_job_def_ruby30plus
+  stage: test
   script:
-    - "curl -X POST -F token=$PREPL_BUILD_TRIGGER_TOKEN -F ref=$REF https://gitlab.com/api/v3/projects/1146764/trigger/builds"
+    - rm -f Gemfile.lock
+    - bundle install --without development validate
+    - puppet module install puppetlabs-stdlib --version 9.4.1 
+    - bundle exec rspec
+  tags:
+    - ruby
+
+# 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
@@ -45,7 +55,7 @@ bump_and_tag:
   stage: release
   when: manual
   tags:
-    - ruby2.2
+    - ruby2.7
   only:
     - main@puppet-debugger/puppet-debugger
   script:
@@ -63,57 +73,59 @@ bump_and_tag:
 #  script:
 #    - "curl -X POST -F token=$PREPL_BUILD_TRIGGER_TOKEN -F ref=$REF https://gitlab.com/api/v3/projects/1146764/trigger/builds"
 
-.ruby_24: &ruby24
-  image: ruby:2.4
+.ruby_27: &ruby27
+  image: ruby:2.7
 
-.ruby_25: &ruby25
-  image: ruby:2.5
+.ruby_31: &ruby31
+  image: ruby:3.1
 
-.ruby_26: &ruby26
-  image: ruby:2.6
+.ruby_32: &ruby32
+  image: ruby:3.2
 
-.ruby_27: &ruby27
-  image: ruby:2.7
+.ruby_33: &ruby33
+  image: ruby:3.3
 
-gem_production:
-  image: ruby:2.5
-  tags:
-    - ruby
-  before_script:
-    - gem install dpl
-  stage: deploy
-  script:
-    - dpl --provider=rubygems --api-key=$RUBYGEMS_API_KEY
-  only:
-    - tags
+.ruby_34: &ruby34
+  image: ruby:3.4
 
-puppet_5_ruby24:
-  variables:
-    PUPPET_GEM_VERSION: "~> 5.5"
-  <<: *puppet_job_def
-  <<: *ruby24
+# gem_production:
+#   image: ruby:2.7
+#   tags:
+#     - ruby
+#   before_script:
+#     - gem install dpl
+#   stage: deploy
+#   script:
+#     - dpl --provider=rubygems --api-key=$RUBYGEMS_API_KEY
+#   only:
+#     - tags
 
-puppet_5_ruby25:
+puppet_6_ruby27:
+  allow_failure: false
   variables:
-    PUPPET_GEM_VERSION: "~> 5.5"
-  <<: *puppet_job_def
-  <<: *ruby25
+    PUPPET_GEM_VERSION: "~> 6.0"
+  <<: *puppet_job_def_ruby27
+  <<: *ruby27
 
-puppet_6_ruby25:
+puppet_7_ruby27:
+  allow_failure: false
   variables:
-    PUPPET_GEM_VERSION: "~> 6.0"
-  <<: *puppet_job_def
-  <<: *ruby25
+    PUPPET_GEM_VERSION: "~> 7.0"
+  <<: *puppet_job_def_ruby27
+  <<: *ruby27
 
-puppet_6_ruby26:
+puppet_8_ruby3.2:
+  allow_failure: true
   variables:
-    PUPPET_GEM_VERSION: "~> 6.0"
-  <<: *puppet_job_def
-  <<: *ruby26
+    PUPPET_GEM_VERSION: "~> 8.0"
+  <<: *puppet_job_def_ruby30plus
+  <<: *ruby32
 
-puppet_6_ruby27:
+puppet_8_ruby3.4:
   allow_failure: true
   variables:
-    PUPPET_GEM_VERSION: "~> 6.0"
-  <<: *puppet_job_def
-  <<: *ruby27
+    PUPPET_GEM_VERSION: "~> 8.2"
+  <<: *puppet_job_def_ruby30plus
+  <<: *ruby32
+
+

data/.rubocop_todo.yml

@@ -132,7 +132,7 @@ Style/IfUnlessModifier:
     - 'lib/puppet-debugger/hooks.rb'
 
 # Offense count: 1
-Style/MethodMissingSuper:
+Lint/MissingSuper:
   Exclude:
     - 'lib/puppet-debugger/debugger_code.rb'
 

data/CHANGELOG.md

@@ -1,6 +1,16 @@
 # Puppet Debugger Changelog
 
 ## Unreleased
+## 1.4
+- Add support for puppet 8
+- Add support for ruby 3 (tested with 3.0-3.4)
+- Updates rdoc to 6.0 due to json issue
+
+## 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

data/Gemfile

@@ -4,7 +4,7 @@ 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'] || '~> 8'
 gem 'rb-readline'
 gem 'table_print'
 gem 'tty-pager'
@@ -16,7 +16,7 @@ group :test, :development do
   gem 'pry'
   gem 'puppet-debugger', path: './'
   gem 'rake', '~> 13.0'
-  gem 'rdoc', '~> 3.12'
+  gem 'rdoc', '~> 6.0'
   gem 'release_me'
   gem 'rspec', '~> 3.6'
   gem 'rubocop'

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

@@ -29,9 +29,10 @@ module PuppetDebugger
         files = globs.map { |g| Dir.glob(g) }.flatten
         files.map do |f|
           m = File.read(f).match(/type\s([a-z\d\:_]+)/i)
-          next if m =~ /type|alias/ # can't figure out the best way to filter type and alias out
-
-          m[1] if m && m[1] =~ /::/
+          if m
+            next if m[1] =~ /type|alias/ # can't figure out the best way to filter type and alias out
+            m[1] if m[1] =~ /::/
+          end
         end.uniq.compact
       end
 

data/lib/puppet-debugger/debugger_code.rb

@@ -325,7 +325,7 @@ class DebuggerCode
   def method_missing(name, *args, &block)
     to_s.send(name, *args, &block)
   end
-  undef =~
+  undef =~ if method_defined?(:=~)
 
   protected
 

data/lib/puppet-debugger/plugin_test_helper.rb

@@ -20,7 +20,7 @@ RSpec.shared_examples 'plugin_tests' do |_parameter|
     {}
   end
 
-  it 'commands contant is an array' do
+  it 'commands content is an array' do
     expect(plugin.class::COMMAND_WORDS).to be_a(Array)
   end
 

data/lib/puppet-debugger/support.rb

@@ -150,8 +150,13 @@ module PuppetDebugger
           require 'bolt/puppetdb'
           require 'bolt/puppetdb/client'
           require 'bolt/puppetdb/config'
-          config = Bolt::PuppetDB::Config.load_config({})
-          Bolt::PuppetDB::Client.new(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

data/lib/puppet-debugger/version.rb

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

data/puppet-debugger.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
     'LICENSE.txt',
     'README.md'
   ]
-  s.required_ruby_version = '>= 2.4'
+  s.required_ruby_version = '>= 2.7'
   s.homepage = 'https://gitlab.com/puppet-debugger/puppet-debugger'
   s.licenses = ['MIT']
   s.rubygems_version = '2.4.5.1'
@@ -36,11 +36,11 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency('bundler')
   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('puppet', ['>= 6'])
   # 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_development_dependency('rdoc', ['~> 3.12'])
-  s.add_development_dependency('rspec', ['~> 3.6'])
+  s.add_runtime_dependency('tty-pager', ['~> 0.14'])
+  s.add_development_dependency('rdoc', ['>= 6.0'])
+  s.add_development_dependency('rspec', ['>= 3.6'])
 end

data/spec/input_responders/exit_spec.rb

@@ -24,7 +24,7 @@ describe :exit do
     {}
   end
 
-  it 'commands contant is an array' do
+  it 'commands content is an array' do
     expect(plugin.class::COMMAND_WORDS).to be_a(Array)
   end
 

data/spec/pdb_spec.rb

@@ -31,7 +31,7 @@ describe 'pdb' do
 
   describe 'remote_node' do
     let(:node_obj) do
-      YAML.load_file(File.join(fixtures_dir, 'node_obj.yaml'))
+      YAML.unsafe_load_file(File.join(fixtures_dir, 'node_obj.yaml'))
     end
     let(:node_name) do
       'puppetdev.localdomain'

data/spec/remote_node_spec.rb

@@ -29,7 +29,7 @@ describe 'PuppetDebugger' do
 
   describe 'remote node' do
     let(:node_obj) do
-      YAML.load_file(File.join(fixtures_dir, 'node_obj.yaml'))
+      YAML.unsafe_load_file(File.join(fixtures_dir, 'node_obj.yaml'))
     end
     let(:node_name) do
       'puppetdev.localdomain'
@@ -69,7 +69,7 @@ describe 'PuppetDebugger' do
     end
     describe 'use defaults when invalid' do
       let(:node_obj) do
-        YAML.load_file(File.join(fixtures_dir, 'invalid_node_obj.yaml'))
+        YAML.unsafe_load_file(File.join(fixtures_dir, 'invalid_node_obj.yaml'))
       end
       let(:node_name) do
         'invalid.localdomain'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet-debugger
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Corey Osman
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-13 00:00:00.000000000 Z
+date: 2024-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.5'
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.5'
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: rb-readline
   requirement: !ruby/object:Gem::Requirement
@@ -114,40 +114,40 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: '0.14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: '0.14'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '6.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.6'
 description: A interactive command line tool for evaluating and debugging the puppet
@@ -315,14 +315,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: A repl based debugger for the puppet language