puppet-debugger 1.3.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2ccbfeec771b3cc202f749b5aa17e96e2dd5f5ebfa9090887e17fb22b035d30
-  data.tar.gz: c8169e8f2531f3cd62c7b74e3f06a93b0be8e82e09b34ad71abc6a0456a6c113
+  metadata.gz: c05bac6e844493bd642e75761c8aa9362e7b1858c7b425c304f7f9babd973965
+  data.tar.gz: c067b4abb4088b86050f77afecc23bd14b75a1ae58f8136e4407ac2e7002b58e
 SHA512:
-  metadata.gz: c7a4b91dee8c074e955cfefdae802d89f3ab1c3c5600fb56ea55cbbffca294845110f9b88ada2809bd1481925e7821fc34c9e4a8d77d986e5f02fa81f7e3a7e1
-  data.tar.gz: 839bd3f8c4ef3d4d8a8ac4ecb4b2c4782f94b1207fda0a4ceaa7d8a623151605838934437c3b02801d095389d55d9a590de385f7423a1c87adf7723cd79fcd86
+  metadata.gz: 001e82eafc7e251adb9fe445a7657cdf9171d301621e848c416dcbd75c9e39965f0e50058ec177a03b895e28b23ed5e5ae618b1279272c6a318224dc0a56b990
+  data.tar.gz: 95858260c3286ac3b1f2eed2a8b0a01e6a1554426c981483b680ce3089119468bed28a58f5171e10b9e93f66d1b677d629b667902894949ea34674f024eb1bc8

data/.gitlab-ci.yml

@@ -5,17 +5,26 @@ stages:
   - validate
   - test
   - release
-  - 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
+
+.puppet_job_def_ruby30plus: &puppet_job_def_ruby30plus
+  stage: test
+  script:
+    - rm -f Gemfile.lock
+    - bundle install --without development validate
+    - puppet module install puppetlabs-stdlib --version 9.4.1 
     - bundle exec rspec
   tags:
     - ruby
@@ -64,67 +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_25: &ruby25
-  image: ruby:2.5
-
-.ruby_26: &ruby26
-  image: ruby:2.6
-
 .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.7
-  tags:
-    - ruby
-  before_script:
-    - gem install dpl
-  stage: deploy
-  script:
-    - dpl --provider=rubygems --api-key=$RUBYGEMS_API_KEY
-  only:
-    - tags
+.ruby_32: &ruby32
+  image: ruby:3.2
 
-puppet_6_ruby25:
-  variables:
-    PUPPET_GEM_VERSION: "~> 6.0"
-  <<: *puppet_job_def
-  <<: *ruby25
+.ruby_33: &ruby33
+  image: ruby:3.3
 
-puppet_6_ruby26:
-  variables:
-    PUPPET_GEM_VERSION: "~> 6.0"
-  <<: *puppet_job_def
-  <<: *ruby26
+.ruby_34: &ruby34
+  image: ruby:3.4
+
+# 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_6_ruby27:
   allow_failure: false
   variables:
     PUPPET_GEM_VERSION: "~> 6.0"
-  <<: *puppet_job_def
+  <<: *puppet_job_def_ruby27
   <<: *ruby27
 
 puppet_7_ruby27:
   allow_failure: false
   variables:
     PUPPET_GEM_VERSION: "~> 7.0"
-  <<: *puppet_job_def
+  <<: *puppet_job_def_ruby27
   <<: *ruby27
 
-# puppet_8_ruby3.0:
-#   allow_failure: true
-#   variables:
-#     PUPPET_GEM_VERSION: "~> 8.0"
-#   <<: *puppet_job_def
-#   <<: *ruby30
+puppet_8_ruby3.2:
+  allow_failure: true
+  variables:
+    PUPPET_GEM_VERSION: "~> 8.0"
+  <<: *puppet_job_def_ruby30plus
+  <<: *ruby32
+
+puppet_8_ruby3.4:
+  allow_failure: true
+  variables:
+    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/.ruby-version

@@ -1 +1 @@
-2.6.5
+3.4.2

data/CHANGELOG.md

@@ -1,6 +1,15 @@
 # Puppet Debugger Changelog
 
 ## Unreleased
+
+## 1.5 (3/28/25)
+- Fix legacy facterdb fact issue
+
+## 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)

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/facts.rb

@@ -12,7 +12,7 @@ module PuppetDebugger
       end
 
       def default_facterdb_filter
-        "operatingsystem=#{facter_os_name} and operatingsystemrelease=#{facter_os_version} and architecture=x86_64 and facterversion=#{facter_version}"
+        "os.name=#{facter_os_name} and os.release.major=#{facter_os_version} and os.architecture=x86_64 and facterversion=#{facter_version}"
       end
 
       def facter_version
@@ -21,19 +21,15 @@ module PuppetDebugger
 
       # return the correct supported version of facter facts
       def default_facter_version
-        if Gem::Version.new(Puppet.version) >= Gem::Version.new(4.4)
-          '/^3\.1/'
-        else
-          '/^2\.4/'
-        end
+        '/^4/'
       end
 
       def facter_os_name
-        ENV['DEBUGGER_FACTER_OS_NAME'] || 'Fedora'
+        ENV['DEBUGGER_FACTER_OS_NAME'] || 'Rocky'
       end
 
       def facter_os_version
-        ENV['DEBUGGER_FACTER_OS_VERSION'] || '23'
+        ENV['DEBUGGER_FACTER_OS_VERSION'] || '8'
       end
 
       def set_facts(value)
@@ -49,7 +45,8 @@ module PuppetDebugger
           message = <<~OUT
             Using filter: #{dynamic_facterdb_filter}
             Bad FacterDB filter, please change the filter so it returns a result set.
-            See https://github.com/camptocamp/facterdb/#with-a-string-filter
+            Use puppet debugger --no-facterdb to disable facterdb.
+            See https://github.com/voxpupuli/facterdb/#with-a-string-filter
           OUT
           raise PuppetDebugger::Exception::BadFilter, message: message
         end

data/lib/puppet-debugger/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PuppetDebugger
-  VERSION = '1.3.0'
+  VERSION = '1.5.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'])
-  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/facts_spec.rb

@@ -8,7 +8,7 @@ describe 'facts' do
   end
 
   let(:puppet_version) do
-    '4.5.3'
+    '8.1'
   end
 
   let(:facter_version) do
@@ -19,28 +19,9 @@ describe 'facts' do
     allow(Puppet).to receive(:version).and_return(puppet_version)
   end
 
-  describe '2.4' do
-    before(:each) do
-      ENV['DEBUGGER_FACTERDB_FILTER'] = nil
-    end
-    let(:puppet_version) do
-      '4.2.0'
-    end
-    it 'returns 2.4' do
-      expect(facter_version).to eq('/^2\.4/')
-    end
-    it 'return default filter' do
-      expect(debugger.dynamic_facterdb_filter).to eq('operatingsystem=Fedora and operatingsystemrelease=23 and architecture=x86_64 and facterversion=/^2\\.4/')
-    end
-    it 'get node_facts' do
-      expect(debugger.node_facts).to be_instance_of(Hash)
-    end
-    it 'has fqdn' do
-      expect(debugger.node_facts[:fqdn]).to eq('foo.example.com')
-    end
-  end
 
-  describe '3.1' do
+
+  describe '4' do
     before(:each) do
       ENV['DEBUGGER_FACTERDB_FILTER'] = nil
     end
@@ -56,11 +37,11 @@ describe 'facts' do
     it 'has fqdn' do
       expect(debugger.node_facts[:fqdn]).to eq('foo.example.com')
     end
-    it 'returns 3.1' do
-      expect(facter_version).to eq('/^3\.1/')
+    it 'returns 4' do
+      expect(facter_version).to eq('/^4/')
     end
     it 'return default filter' do
-      expect(debugger.dynamic_facterdb_filter).to eq('operatingsystem=Fedora and operatingsystemrelease=23 and architecture=x86_64 and facterversion=/^3\\.1/')
+      expect(debugger.dynamic_facterdb_filter).to eq("os.name=Rocky and os.release.major=8 and os.architecture=x86_64 and facterversion=/^4/")
     end
   end
 
@@ -78,10 +59,10 @@ describe 'facts' do
     end
     describe 'good filter' do
       before(:each) do
-        ENV['DEBUGGER_FACTERDB_FILTER'] = 'facterversion=/^3\.1/'
+        ENV['DEBUGGER_FACTERDB_FILTER'] = 'facterversion=/^4.0.52/'
       end
       it 'return filter' do
-        expect(debugger.dynamic_facterdb_filter).to eq('facterversion=/^3\\.1/')
+        expect(debugger.dynamic_facterdb_filter).to eq('facterversion=/^4.0.52/')
       end
     end
   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/input_responders/functions_spec.rb

@@ -43,6 +43,7 @@ describe :functions do
     debugger_output = /HELLO/
     debugger.handle_input("swapcase('hello')")
     expect(output.string).to match(debugger_output)
+    # did you run? bundle exec puppet module install puppetlabs-stdlib
   end
 
   it '#function_obj with native function' do

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'

data/spec/spec_helper.rb

@@ -32,7 +32,8 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 
 require 'rspec'
 require 'puppet-debugger'
-ENV['REPL_FACTERDB_FILTER'] = 'operatingsystem=Fedora and operatingsystemrelease=23 and architecture=x86_64 and facterversion=/^2\\.4/'
+
+ENV['REPL_FACTERDB_FILTER'] = 'os.name=Rocky and os.release.major=8 and architecture=x86_64 and facterversion=/^4/'
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].sort.each { |f| require f }

data/test_matrix.rb

@@ -23,7 +23,7 @@ def run_container(image, puppet_version)
 end
 
 def ci_data
-  @ci_data ||= YAML.load_file(File.expand_path('.gitlab-ci.yml'))
+  @ci_data ||= YAML.load_file(File.expand_path('.gitlab-ci.yml'), aliases: true)
 end
 
 def matrix

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: puppet-debugger
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Corey Osman
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-02 00:00:00.000000000 Z
+date: 2025-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
@@ -72,14 +71,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 +113,40 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '0.14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        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
@@ -307,7 +306,6 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -315,15 +313,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
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: A repl based debugger for the puppet language
 test_files: []