kafo 6.5.0 → 7.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2224fcf87240686b6638ceffdde5ea8026baf151e784f90f1903389305996ae8
-  data.tar.gz: c6ea88ba2845dfa6d34281c78f7f4a70073c9f6a7bb971f97a0a8cdc7e2897d8
+  metadata.gz: 8ae11e11628c99446f1b247135f656e0f5546c6045499b05b9b00b83665b5afc
+  data.tar.gz: bd4361d90a598e7f3beb6a27f28a5f7992a0e30b033f327cfbe5dd0488676766
 SHA512:
-  metadata.gz: 373d68b4cc0c8ee1e43e991c4eea2bd632f3de482d797fde26156b38975ee4eef8b0a4cd0cc934ed8c3d9b341e7a429df57b2077496710ed8f187890b1186669
-  data.tar.gz: f7d9a1356a7f260fa7baa605642c6c00d6276a9064330a03f2864561427ba0eeb99947daae84d951f9647798fac8870c7517fb9b3dd7e3330e4778d5a7975ca0
+  metadata.gz: 709acb14a02a183b1f3b5b604014d6d22aedca7d15e08fdd29408296aa189d9813be07b873cb151b412015b5a0c3b313a6224e7e91c8dea5a44c77063fb0b263
+  data.tar.gz: b53a7e0ddbe08344b26d68a965ad14a550930be9bf943920df2d352a45d5edb1806e4b9612623109a7db33d8470722a36a73429631985f20728cd57446f2f712

data/README.md

@@ -160,9 +160,8 @@ As you may have noticed there are several ways how to specify arguments. Here's
 
 ## Requirements
 
-Kafo is supported with Puppet versions 4.9+, 5 and 6. Puppet may be installed
-as a gem (add it to Gemfile) or through a package, including official AIO
-packages.
+Kafo is supported with Puppet version 7. Puppet may be installed as a gem (add
+it to Gemfile) or through a package, including official AIO packages.
 
 ## How do I report bugs or contribute?
 
@@ -207,13 +206,12 @@ When using Puppet via a Gemfile, Bundler should set up PATH to point at the
 gem version. If using a system/packaged version, it will typically find and
 execute /usr/bin/puppet from the regular PATH.
 
-When using an AIO/PC1 packaged version of Puppet, other versions of Puppet from
+When using an AIO packaged version of Puppet, other versions of Puppet from
 PATH will be preferred if they exist, so they should either be removed or PATH
 set to prefer /opt/puppetlabs/bin, i.e. `export PATH=/opt/puppetlabs/bin:$PATH`.
 Debug logs from Kafo should indicate the full path of the binary used.
 
-Note that Kafo parsers supports specific versions of Puppet, and may require
-extra modules (such as puppet-strings on Puppet 4+) to parse manifests.
+Note that Kafo parsers relies on puppet-strings to parse manifests.
 
 ## Parameters prefixes
 
@@ -728,7 +726,7 @@ If you use "params_path" for this purpose, "params_name" is ignored.
 
 ## Validations
 
-If class parameters are declared with Puppet 4 data types then Kafo will
+If class parameters are declared with Puppet data types then Kafo will
 validate user inputs against Puppet's type validation rules.
 
 ## Enabling or disabling module

data/bin/kafofy

@@ -47,7 +47,7 @@ end
 
 # Create default config file
 puts "creating #{options[:config_file]} as a default scenario file"
-if !File.exists?(options[:config_file])
+if !File.exist?(options[:config_file])
   puts "... creating config file #{options[:config_file]}"
   FileUtils.touch options[:config_file]
   File.chmod 0600, options[:config_file]
@@ -61,7 +61,7 @@ end
 # Installer script
 script_name = "bin/#{options[:name]}"
 puts "... creating #{script_name}"
-if !File.exists?(script_name)
+if !File.exist?(script_name)
   content = <<EOS
 #!/usr/bin/env ruby
 require 'rubygems'

data/lib/kafo/help_builders/advanced.rb

@@ -6,7 +6,7 @@ module Kafo
       def add_module(name, items)
         data = by_parameter_groups(items)
         if data.keys.size > 1
-          puts module_header(name + ':')
+          line module_header(name + ':')
           data.keys.each do |group|
             add_list(header(2, group), data[group])
           end

data/lib/kafo/help_builders/base.rb

@@ -17,7 +17,7 @@ module Kafo
       def add_list(heading, items)
         return if items.empty?
         if heading == 'Options'
-          puts "\n#{heading}:"
+          line "\n#{heading}:"
 
           data = by_module(items)
 

data/lib/kafo/kafo_configure.rb

@@ -304,7 +304,7 @@ module Kafo
       store = Store.new()
       store_path = self.class.config.app[:store_dir]
       store_path = File.expand_path(File.join(CONFIG_DIR, '../store.d')) if store_path.empty? && defined?(CONFIG_DIR)
-      store.add_dir(store_path) if File.exists?(store_path)
+      store.add_dir(store_path) if File.exist?(store_path)
       store
     end
 
@@ -556,10 +556,10 @@ module Kafo
     end
 
     def config_file
-      return CONFIG_FILE if defined?(CONFIG_FILE) && File.exists?(CONFIG_FILE)
+      return CONFIG_FILE if defined?(CONFIG_FILE) && File.exist?(CONFIG_FILE)
       return self.class.scenario_manager.select_scenario if self.class.scenario_manager.configured?
-      return '/etc/kafo/kafo.yaml' if File.exists?('/etc/kafo/kafo.yaml')
-      return "#{::RbConfig::CONFIG['sysconfdir']}/kafo/kafo.yaml" if File.exists?("#{::RbConfig::CONFIG['sysconfdir']}/kafo/kafo.yaml")
+      return '/etc/kafo/kafo.yaml' if File.exist?('/etc/kafo/kafo.yaml')
+      return "#{::RbConfig::CONFIG['sysconfdir']}/kafo/kafo.yaml" if File.exist?("#{::RbConfig::CONFIG['sysconfdir']}/kafo/kafo.yaml")
       File.join(Dir.pwd, 'config', 'kafo.yaml')
     end
 

data/lib/kafo/puppet_command.rb

@@ -73,16 +73,11 @@ module Kafo
     def manifest
       %{echo '
         $kafo_config_file="#{@configuration.config_file}"
-        #{add_progress}
         #{generate_version_checks.join("\n") if @puppet_version_check}
         #{@command}
       '}
     end
 
-    def add_progress
-      %{$kafo_add_progress=#{!KafoConfigure.verbose}}
-    end
-
     def generate_version_checks
       checks = []
       modules_path.each do |modulepath|

data/lib/kafo/puppet_module.rb

@@ -36,7 +36,7 @@ module Kafo
       if @configuration.module_dirs.count == 1
         module_dir       = @configuration.module_dirs.first
       else
-        module_dir         = @configuration.module_dirs.find { |dir| File.exists?(File.join(dir, module_manifest_path)) } ||
+        module_dir         = @configuration.module_dirs.find { |dir| File.exist?(File.join(dir, module_manifest_path)) } ||
           warn("Manifest #{module_manifest_path} was not found in #{@configuration.module_dirs.join(', ')}")
       end
       @manifest_path     = File.join(module_dir, module_manifest_path)

data/lib/kafo/version.rb

@@ -1,5 +1,5 @@
 # encoding: UTF-8
 module Kafo
   PARSER_CACHE_VERSION = 1
-  VERSION = "6.5.0"
+  VERSION = "7.0.0"
 end

data/modules/kafo_configure/manifests/init.pp

@@ -3,15 +3,6 @@
 #   optional $answers class parameter
 #   $modulepath/config/answers.yaml
 #   /etc/kafo-configure/answers.yaml
-#
-# @param add_progress
-#   Whether to add a progress bar. Only works on Puppet < 6.
-class kafo_configure(
-  Boolean $add_progress = $::kafo_add_progress,
-) {
-  if $add_progress and SemVer($facts['puppetversion']) =~ SemVerRange('< 6.0.0') {
-    add_progress()
-  }
-
+class kafo_configure {
   lookup('classes', {merge => unique}).include
 }

data/modules/kafo_configure/spec/classes/init_spec.rb

@@ -2,16 +2,9 @@ require 'spec_helper'
 
 describe 'kafo_configure' do
   let(:hiera_config) { 'spec/fixtures/hiera/hiera.yaml' }
-  let(:facts) { { puppetversion: Puppet.version } }
 
   context 'without parameters' do
-    let(:params) { {add_progress: false} }
     it { is_expected.to compile.with_all_deps }
     it { is_expected.to contain_class('dummy') }
   end
-
-  context 'with progress' do
-    let(:params) { {add_progress: true} }
-    it { is_expected.to compile.with_all_deps }
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kafo
 version: !ruby/object:Gem::Version
-  version: 6.5.0
+  version: 7.0.0
 platform: ruby
 authors:
 - Marek Hulan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-31 00:00:00.000000000 Z
+date: 2023-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -148,20 +148,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: 1.3.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: 1.3.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
@@ -286,7 +286,6 @@ files:
 - modules/kafo_configure/lib/puppet/functions/kafo_configure/dump_lookups.rb
 - modules/kafo_configure/lib/puppet/functions/kafo_configure/dump_variables.rb
 - modules/kafo_configure/lib/puppet/functions/kafo_configure/to_yaml.rb
-- modules/kafo_configure/lib/puppet/parser/functions/add_progress.rb
 - modules/kafo_configure/manifests/dump_values.pp
 - modules/kafo_configure/manifests/init.pp
 - modules/kafo_configure/manifests/puppet_version_semver.pp
@@ -313,14 +312,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: A gem for making installations based on puppet user friendly

data/modules/kafo_configure/lib/puppet/parser/functions/add_progress.rb

@@ -1,43 +0,0 @@
-module Puppet::Parser::Functions
-  newfunction(:add_progress) do |args|
-    loaded = false
-    begin
-      require 'puppet/transaction'
-      loaded = true
-    rescue LoadError
-      ::Puppet.warning 'Unable to load puppet/transaction for progress bar support, this version may not be supported'
-    end
-
-    if loaded
-      # Monkey patch the transaction to put our wrapper around the report object
-      class Puppet::Transaction
-        attr_accessor :in_main_catalog
-
-        def is_interesting?(resource)
-          return false if resource.class.name == :component  # ignore defined types
-          ![:schedule, :class, :stage, :filebucket, :anchor, :concat_fragment].include?(resource.to_s.split('[')[0].downcase.to_sym)
-        end
-
-        def tracked_resources
-          @tracked_resources ||= catalog.vertices.select { |resource| is_interesting?(resource) }.map(&:to_s)
-        end
-
-        def evaluate_with_trigger(*args, &block)
-          if catalog.version
-            self.in_main_catalog = true
-            tracked_resources.each { |r| ::Puppet.info "MONITOR_RESOURCE #{r}" }
-          end
-          evaluate_without_trigger(*args, &block)
-          self.in_main_catalog = false if catalog.version
-        end
-
-        if method_defined?(:evaluate) && method_defined?(:report)
-          alias_method :evaluate_without_trigger, :evaluate
-          alias_method :evaluate, :evaluate_with_trigger
-        else
-          ::Puppet.warning 'Unable to patch Puppet transactions for progress bar support, this version may not be supported'
-        end
-      end
-    end
-  end
-end