kafo 7.2.0 → 7.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b2f9f3f9827dd2b9f738acab79a596169fd4c4ea075ec5a99c35a40f291dfcee
-  data.tar.gz: 1695c0717da6eb8809a14114bd09746efcb1dd82773cf585dbb987ea97c13f8e
+  metadata.gz: 2d04f6f1cc8a7839323067b6cf40b090fe57a19674c73aa9571e95e8f93521d3
+  data.tar.gz: d0274c02639fe01e19aa6ef79fcd5e86cd29f45b8b8f28461c59a192559a21b1
 SHA512:
-  metadata.gz: 0d26ee6f46875bcaa7f77c2e83dfc7b77aaee073f0977e9dedb1afc977fd118bc55fb430f450dacab0b8d016bf0805462a4a8c4bfe5cbd82e4d515abcc6c915a
-  data.tar.gz: c5b129d7e90fb1895afc03781b723e2cd9fa792eb2f3ac1d754a8c744f120a555be977067af66f4c1868ab5fc195093bd1623195b117f73be57106888504ff43
+  metadata.gz: df7b79c1ab6245d04018b0890ea04db6e6e6585fd05ca75ac6782d81b35078b3e0043c60ab86a4072f727440b904ca706e2daf2083858b50fa3eb1e2c4956acf
+  data.tar.gz: 8b2fcefa6a4bf7789b4fcd081a10630ace85c2901f94e9f2dd7778f7e32c45273d195383e387e57ff36f83dcfe0176d7d263adb02693937f1319da7bd9ac3c8b

data/Rakefile

@@ -31,11 +31,12 @@ namespace 'test' do
   end
 end
 
-begin
-  require 'rubocop/rake_task'
-  RuboCop::RakeTask.new
-rescue LoadError
-  puts 'Rubocop not loaded'
+require 'rubocop/rake_task'
+RuboCop::RakeTask.new(:rubocop) do |task|
+  # These make the rubocop experience maybe slightly less terrible
+  task.options = ['--display-cop-names', '--display-style-guide', '--extra-details']
+  # Use Rubocop's Github Actions formatter if possible
+  task.formatters << 'github' if ENV['GITHUB_ACTIONS'] == 'true'
 end
 
 CLEAN.include 'test/tmp'

data/lib/kafo/data_type_parser.rb

@@ -8,9 +8,26 @@ module Kafo
 
     def initialize(manifest)
       @logger = KafoConfigure.logger
-      @types = {}
+
+      lines = []
+      type_line_without_newlines = +''
       manifest.each_line do |line|
-        if (type = TYPE_DEFINITION.match(line.force_encoding("UTF-8")))
+        line = line.force_encoding("UTF-8").strip
+        next if line.start_with?('#')
+
+        line = line.split(' #').first.strip
+        if line =~ TYPE_DEFINITION
+          lines << type_line_without_newlines
+          type_line_without_newlines = line
+        else
+          type_line_without_newlines << line
+        end
+      end
+      lines << type_line_without_newlines
+
+      @types = {}
+      lines.each do |line|
+        if (type = TYPE_DEFINITION.match(line))
           @types[type[1]] = type[2]
         end
       end

data/lib/kafo/kafo_configure.rb

@@ -120,7 +120,7 @@ module Kafo
       request_config_reload if applied_total > 0
 
       if ARGV.include?('--migrations-only')
-        verbose = (ARGV.include?('--verbose') || ARGV.include?('-v'))
+        verbose = ARGV.include?('--verbose') || ARGV.include?('-v')
         Logging.setup(verbose: verbose)
         self.class.logger.notice('Log buffers flushed')
         self.class.exit(0)
@@ -519,7 +519,7 @@ module Kafo
             method, message = log_parser.parse(line)
             progress_log(method, message, logger)
 
-            if (output = line.match(/(?:.+\]): Starting to evaluate the resource( \((?<count>\d+) of (?<total>\d+)\))?/))
+            if (output = line.match(/(?:.+\]): Starting to evaluate the resource(?: \((?<count>\d+) of (?<total>\d+)\))?/))
               if (output[:count].to_i % 250) == 1 && output[:count].to_i != 1
                 logger.notice("#{output[:count].to_i - 1} configuration steps out of #{output[:total]} steps complete.")
               end

data/lib/kafo/param.rb

@@ -161,7 +161,7 @@ module Kafo
 
     def normalize_value(value)
       case value
-        when ::HighLine::String  # don't persist highline extensions
+        when ::HighLine::String # don't persist highline extensions
           value.to_s
         when Array
           value.map { |v| normalize_value(v) }

data/lib/kafo/progress_bar.rb

@@ -34,7 +34,7 @@ module Kafo
       @all_lines += 1
 
       # we print every 20th line during installation preparing otherwise only update at EVALTRACE_START
-      update_bar = (@total == :unknown && @all_lines % 20 == 0)
+      update_bar = @total == :unknown && @all_lines % 20 == 0
       force_update = false
 
       if (line_monitor = MONITOR_RESOURCE.match(line))

data/lib/kafo/version.rb

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

data/modules/kafo_configure/metadata.json

@@ -9,7 +9,7 @@
   "requirements": [
     {
       "name": "puppet",
-      "version_requirement": ">= 4.5.0 < 8.0.0"
+      "version_requirement": ">= 4.5.0 < 9.0.0"
     }
   ]
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kafo
 version: !ruby/object:Gem::Version
-  version: 7.2.0
+  version: 7.4.0
 platform: ruby
 authors:
 - Marek Hulan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-22 00:00:00.000000000 Z
+date: 2024-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler