puppet-debugger 1.4.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 588f4c8928181443aa7e98e820530d79c9efb705a7a9b95f5e447066d87cac96
-  data.tar.gz: 109e0616bd93547ea2e6975bbdd4e58b27e92bcc9533b206c4194d37be6a49e8
+  metadata.gz: f6b9c123d8e301638f736a18ee3a6330e677e8a74d21ae6a99725f1f06c3251b
+  data.tar.gz: 7a2508ee6b72443c40ca67150768bae8f60ea58845681f52094547d645d053ad
 SHA512:
-  metadata.gz: 592067114dea290451e1933655d0f72ee254c8c7fb063e5bcf7901d2f3caf9afb45c7f370a5c6cbbc2c9dfff22e35a2a60d776ad94e4ba5b6a6b476e2bd82c29
-  data.tar.gz: b7b2a003cdc1051f58e7be727ffcdd61d5d888312eac091015c54ea1ea137ba23ad4ac2d2c1514b0a4dd5d1ef7872a850dbf576b67d25ec49f419f0d6995c3b1
+  metadata.gz: 2925d1834927404340779da63fc1eabb2d39012a49cd9579a2deb45c6fd48d7b24a99ad18b84599bcee30d9ea4053ba80e493554749fe2bcf5883b13ae1a2e7c
+  data.tar.gz: 0beca4164a1f6aeb6a698ac7e960a4dea353f7c870f400ab93035a0544c523022221bc18cb40882803cbe32ed64873f98ad6cab3be8dae9d1c198547896b3b0b

data/.gitlab-ci.yml

@@ -24,7 +24,7 @@ stages:
   script:
     - rm -f Gemfile.lock
     - bundle install --without development validate
-    - puppet module install puppetlabs-stdlib --version 9.4.1 
+    - bundle exec puppet module install puppetlabs-stdlib --version 9.4.1 
     - bundle exec rspec
   tags:
     - ruby
@@ -115,7 +115,7 @@ puppet_7_ruby27:
   <<: *ruby27
 
 puppet_8_ruby3.2:
-  allow_failure: true
+  allow_failure: false
   variables:
     PUPPET_GEM_VERSION: "~> 8.0"
   <<: *puppet_job_def_ruby30plus
@@ -126,6 +126,17 @@ puppet_8_ruby3.4:
   variables:
     PUPPET_GEM_VERSION: "~> 8.2"
   <<: *puppet_job_def_ruby30plus
+  <<: *ruby34
+
+openvox_puppet_8_ruby3.2:
+  allow_failure: false
+  variables:
+    USE_OPENVOX: true
+    PUPPET_GEM_VERSION: "8.15.0"
+  <<: *puppet_job_def_ruby30plus
   <<: *ruby32
 
 
+
+
+

data/.ruby-version

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

data/CHANGELOG.md

@@ -1,6 +1,15 @@
 # Puppet Debugger Changelog
 
 ## Unreleased
+
+## 1.6 (4/23/25)
+- Add support for openvox puppet
+
+This drops the require of puppet gem because of the recent changes in the community opensource version and now closed source legacy version.  Puppet or Openvox gem is still required just not stated in the gemspec file.
+
+## 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)

data/Gemfile

@@ -1,17 +1,20 @@
 # frozen_string_literal: true
 
 source 'http://rubygems.org'
-gem 'awesome_print', '~> 1.7'
-gem 'facterdb', '>= 0.5.0'
+gem 'awesome_print', '~> 1.9'
+gem 'facterdb', '>= 2.0.0'
 gem 'pluginator', '~> 1.5.0'
-gem 'puppet', ENV['PUPPET_GEM_VERSION'] || '~> 8'
 gem 'rb-readline'
 gem 'table_print'
 gem 'tty-pager'
+if ENV['USE_OPENVOX']
+  gem 'openvox', git: 'https://github.com/OpenVoxProject/puppet.git', ref: ENV['PUPPET_GEM_VERSION'] || '8.15.0'
+else
+  gem 'puppet', ENV['PUPPET_GEM_VERSION'] || '~> 8'
+end
 #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 'pry'
   gem 'puppet-debugger', path: './'

data/lib/puppet-debugger/cli.rb

@@ -1,6 +1,9 @@
 # frozen_string_literal: true
-
-require 'puppet'
+begin
+  require 'puppet'
+rescue LoadError
+  abort "puppet-debugger requires either the 'puppet' or 'openvox' gem to be installed."
+end
 require 'readline'
 require 'json'
 require 'puppet-debugger/support'
@@ -16,6 +19,7 @@ module PuppetDebugger
     extend Forwardable
     attr_accessor :settings, :log_level, :in_buffer, :out_buffer, :html_mode, :extra_prompt, :bench
     attr_reader :source_file, :source_line_num, :hooks, :options
+
     def_delegators :hooks, :exec_hook, :add_hook, :delete_hook
     OUT_SYMBOL = ' => '
     def initialize(options = {})

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

@@ -142,7 +142,7 @@ module PuppetDebugger
       file
     end
 
-    # @return [Bolt::PuppetDB::Client] 
+    # @return [Bolt::PuppetDB::Client]
     def bolt_pdb_client
       @bolt_pdb_client ||=
         begin
@@ -196,7 +196,6 @@ module PuppetDebugger
     def puppet_lib_dir
       # returns something like "/Library/Ruby/Gems/2.0.0/gems/puppet-4.2.2/lib/puppet.rb"
       # "/Users/adam/.rbenv/versions/2.2.6/lib/ruby/gems/2.2.0/gems/puppet-4.9.4/lib"
-
       # this is only useful when returning a namespace with the functions
       @puppet_lib_dir ||= File.dirname(Puppet.method(:[]).source_location.first)
     end

data/lib/puppet-debugger/version.rb

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

data/puppet-debugger.gemspec

@@ -36,7 +36,7 @@ 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', ['>= 6'])
+  # s.add_runtime_dependency('puppet', ['>= 6']) - since there is now puppet and openvox, this is now a grey dependency
   # 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'])

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/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/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/spec/support_spec.rb

@@ -17,7 +17,7 @@ describe 'support' do
   end
 
   let(:puppet_version) do
-    debugger.puppet_lib_dir.scan(debugger.mod_finder).flatten.last
+    Puppet.version
   end
 
   let(:manifest_file) do
@@ -41,7 +41,7 @@ describe 'support' do
   end
 
   it 'should return a puppet version' do
-    expect(puppet_version).to match(/puppet-\d\.\d+.\d/)
+    expect(puppet_version).to match(/\d\.\d+.\d/)
   end
 
   it 'should return lib dirs' do

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.4.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Corey Osman
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-18 00:00:00.000000000 Z
+date: 2025-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
@@ -66,20 +65,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.5.0
-- !ruby/object:Gem::Dependency
-  name: puppet
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '6'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '6'
 - !ruby/object:Gem::Dependency
   name: rb-readline
   requirement: !ruby/object:Gem::Requirement
@@ -307,7 +292,6 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -322,8 +306,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: A repl based debugger for the puppet language
 test_files: []