kafo 4.1.0 → 6.1.0

data/lib/kafo/logging.rb

@@ -0,0 +1,128 @@
+# encoding: UTF-8
+
+require 'fileutils'
+require 'logging'
+
+module Kafo
+  class Logging
+
+    LOG_LEVELS = [:debug, :info, :notice, :warn, :error, :fatal]
+
+    if ::Logging::LEVELS.keys.map(&:to_symbol) != LOG_LEVELS
+      ::Logging.init(:debug, :info, :notice, :warn, :error, :fatal)
+    end
+
+    class << self
+      def root_logger
+        @root_logger ||= ::Logging.logger.root
+      end
+
+      def setup(verbose: false)
+        set_color_scheme
+
+        level = KafoConfigure.config.app[:log_level]
+
+        setup_file_logging(
+          level,
+          KafoConfigure.config.app[:log_dir],
+          KafoConfigure.config.app[:log_owner],
+          KafoConfigure.config.app[:log_group]
+        )
+        setup_verbose(level: KafoConfigure.config.app[:verbose_log_level] || level) if verbose
+      end
+
+      def setup_file_logging(log_level, log_dir, log_owner, log_group)
+        filename = KafoConfigure.config.log_file
+
+        begin
+          FileUtils.mkdir_p(log_dir, :mode => 0750)
+        rescue Errno::EACCES
+          puts "No permissions to create log dir #{log_dir}"
+        end
+
+        begin
+          root_logger.appenders = ::Logging.appenders.rolling_file(
+            'configure',
+            level: log_level,
+            filename: filename,
+            layout: layout(color: false),
+            truncate: true,
+            roll_by: 'date'
+          )
+
+          FileUtils.chown(
+            log_owner,
+            log_group,
+            filename
+          )
+        rescue ArgumentError
+          puts "File #{filename} not writeable, won't log anything to file!"
+        end
+      end
+
+      def set_color_scheme
+        ::Logging.color_scheme(
+          'bright',
+          :levels => {
+            :info => :cyan,
+            :notice => :green,
+            :warn  => :yellow,
+            :error => :red,
+            :fatal => [:white, :on_red]
+          },
+          :date   => :blue,
+          :logger => :cyan,
+          :line   => :yellow,
+          :file   => :yellow,
+          :method => :yellow
+        )
+      end
+
+      def layout(color: false)
+        ::Logging::Layouts::Pattern.new(
+          pattern: "%d [%-6l] [%c] %m\n",
+          color_scheme: color ? 'bright' : nil,
+          date_pattern: '%Y-%m-%d %H:%M:%S'
+        )
+      end
+
+      def add_logger(name)
+        ::Logging.logger[name]
+      end
+
+      def setup_verbose(level: :notice)
+        root_logger.add_appenders(
+          ::Logging.appenders.stdout(
+            'verbose',
+            layout: layout(color: KafoConfigure.use_colors?),
+            level: level
+          )
+        )
+      end
+
+      def buffer
+        @buffer ||= []
+      end
+
+      def buffering?
+        root_logger.appenders.empty?
+      end
+
+      def dump_needed?
+        !buffer.empty?
+      end
+
+      def to_buffer(*args)
+        buffer << args
+      end
+
+      def dump_buffer
+        @buffer.each do |log|
+          ::Logging.logger[log[0]].send(log[1], *([log[2]].flatten(2)), &log[3])
+        end
+        @buffer.clear
+      end
+    end
+
+  end
+end

data/lib/kafo/puppet_log_parser.rb

@@ -8,18 +8,24 @@ module Kafo
       method, message = case
                           when line =~ /^Error:(.*)/i || line =~ /^Err:(.*)/i
                             [:error, $1]
-                          when line =~ /^Warning:(.*)/i || line =~ /^Notice:(.*)/i
-                            [:warn, $1]
-                          when line =~ /^Info:(.*)/i
+                          when line =~ /^Notice:(.*)/i
                             [:info, $1]
-                          when line =~ /^Debug:(.*)/i
+                          when line =~ /^Warning:(.*)/i || line =~ /^Debug:(.*)/i || line =~ /^Info:(.*)/i
                             [:debug, $1]
                           else
                             [@last_level.nil? ? :info : @last_level, line]
                         end
 
+      if message.include?('Loading facts') && method != :error
+        method = :debug
+      end
+
+      if message.include?('Applying configuration version')
+        method = :debug
+      end
+
       @last_level = method
-      return [method, message.chomp]
+      return [method, message.chomp.strip]
     end
   end
 end

data/lib/kafo/scenario_manager.rb

@@ -7,6 +7,7 @@ module Kafo
     attr_reader :config_dir, :last_scenario_link, :previous_scenario
 
     def initialize(config, last_scenario_link_name='last_scenario.yaml')
+      @logger = Logger.new('scenario_manager')
       @config_dir = File.file?(config) ? File.dirname(config) : config
       @last_scenario_link = File.join(config_dir, last_scenario_link_name)
       @previous_scenario = File.exist?(last_scenario_link) ? Pathname.new(last_scenario_link).realpath.to_s : nil
@@ -30,7 +31,7 @@ module Kafo
     end
 
     def list_available_scenarios
-      say ::HighLine.color("Available scenarios", :info)
+      say ::HighLine.color("Available scenarios", :notice)
       available_scenarios.each do |config_file, content|
         scenario = File.basename(config_file, '.yaml')
         use = (File.expand_path(config_file) == @previous_scenario ? 'INSTALLED' : "use: --scenario #{scenario}")
@@ -78,12 +79,19 @@ module Kafo
 
     def scenario_from_args(arg_name='--scenario|-S')
       # try scenario provided in the args via -S or --scenario
-      parsed = ARGV.join(" ").match(/(#{arg_name})(\s+|[=]?)(\S+)/)
-      if parsed
-        scenario_file = File.join(config_dir, "#{parsed[3]}.yaml")
-        return scenario_file if File.exist?(scenario_file)
-        fail_now("Scenario (#{scenario_file}) was not found, can not continue", :unset_scenario)
+      ARGV.each_with_index do |arg, index|
+        parsed = arg.match(/^(#{arg_name})($|=(?<scenario>\S+))/)
+        if parsed
+          scenario = parsed[:scenario] || ARGV[index + 1]
+          next unless scenario
+
+          scenario_file = File.join(config_dir, "#{scenario}.yaml")
+          return scenario_file if File.exist?(scenario_file)
+          fail_now("Scenario (#{scenario_file}) was not found, can not continue", :unset_scenario)
+        end
       end
+
+      nil
     end
 
     def select_scenario
@@ -103,7 +111,7 @@ module Kafo
     end
 
     def show_scenario_diff(prev_scenario, new_scenario)
-      say ::HighLine.color("Scenarios are being compared, that may take a while...", :info)
+      say ::HighLine.color("Scenarios are being compared, that may take a while...", :notice)
       prev_conf = load_and_setup_configuration(prev_scenario)
       new_conf = load_and_setup_configuration(new_scenario)
       print_scenario_diff(prev_conf, new_conf)
@@ -116,7 +124,7 @@ module Kafo
           dump_log_and_exit(0)
         else
           confirm_scenario_change(scenario)
-          KafoConfigure.logger.info "Scenario #{scenario} was selected"
+          @logger.notice "Scenario #{scenario} was selected"
         end
       end
     end
@@ -159,7 +167,7 @@ module Kafo
       elsif !ARGV.include?('--force') && !KafoConfigure.in_help_mode?
         message = "You are trying to replace existing installation with different scenario. This may lead to unpredictable states. " +
         "Use --force to override. You can use --compare-scenarios to see the differences"
-        KafoConfigure.logger.error(message)
+        @logger.error(message)
         dump_log_and_exit(:scenario_error)
       end
       true
@@ -218,19 +226,17 @@ module Kafo
 
     def fail_now(message, exit_code)
       $stderr.puts "ERROR: #{message}"
-      KafoConfigure.logger.error message
+      @logger.error message
       KafoConfigure.exit(exit_code)
     end
 
     def dump_log_and_exit(code)
-      if Logger.buffering? && Logger.buffer.any?
-        Logger.setup_verbose
-        KafoConfigure.verbose = true
+      if Logging.buffering? && Logging.buffer.any?
         if !KafoConfigure.config.nil?
-          Logger.setup
-          KafoConfigure.logger.info("Log was be written to #{KafoConfigure.config.log_file}")
+          Logging.setup(verbose: true)
+          @logger.notice("Log was be written to #{KafoConfigure.config.log_file}")
         end
-        KafoConfigure.logger.info('Logs flushed')
+        @logger.notice('Logs flushed')
       end
       KafoConfigure.exit(code)
     end

data/lib/kafo/system_checker.rb

@@ -15,7 +15,7 @@ module Kafo
     end
 
     def logger
-      Logging::logger['checks']
+      ::Logging::logger['checks']
     end
 
     def check

data/lib/kafo/version.rb

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

data/lib/kafo/wizard.rb

@@ -68,7 +68,7 @@ END
 
     def display_hash
       data = Hash[@config.modules.map { |mod| [mod.name, mod.enabled? ? mod.params_hash : false] }]
-      say HighLine.color(YAML.dump(data), :info)
+      say HighLine.color(YAML.dump(data), :notice)
     end
 
     def configure_module(mod)
@@ -79,7 +79,7 @@ END
           menu.prompt = 'Choose an option from the menu... '
           menu.select_by = :index
 
-          menu.choice("Enable/disable #{mod.name} module, current value: #{HighLine.color(mod.enabled?.to_s, :info)}") { turn_module(mod) }
+          menu.choice("Enable/disable #{mod.name} module, current value: #{HighLine.color(mod.enabled?.to_s, :notice)}") { turn_module(mod) }
           if mod.enabled?
             render_params(mod.primary_parameter_group.params, menu)
 
@@ -114,7 +114,7 @@ END
     def render_params(params, menu)
       params.each do |param|
         if param.visible?(@kafo.params)
-          menu.choice "Set #{HighLine.color(param.name, :important)}, current value: #{HighLine.color(param.value_to_s, :info)}" do
+          menu.choice "Set #{HighLine.color(param.name, :important)}, current value: #{HighLine.color(param.value_to_s, :notice)}" do
             configure(param)
           end
         end
@@ -141,13 +141,13 @@ END
     end
 
     def configure_single(param)
-      say "\ncurrent value: #{HighLine.color(param.value_to_s, :info)}"
+      say "\ncurrent value: #{HighLine.color(param.value_to_s, :notice)}"
       ask("new value:")
     end
 
     def configure_multi(param)
-      say HighLine.color('every line is a separate value, blank line to quit, for hash use key:value syntax', :info)
-      say "\ncurrent value: #{HighLine.color(param.value_to_s, :info)} %>"
+      say HighLine.color('every line is a separate value, blank line to quit, for hash use key:value syntax', :notice)
+      say "\ncurrent value: #{HighLine.color(param.value_to_s, :notice)} %>"
       ask("new value:") do |q|
         q.gather = ""
       end
@@ -164,7 +164,7 @@ END
         say "\n" + HighLine.color("Resetting parameters of module #{mod.name}", :headline)
         choose do |menu|
           mod.params.each do |param|
-            menu.choice "Reset #{HighLine.color(param.name, :important)}, current value: #{HighLine.color(param.value_to_s, :info)}, default value: #{HighLine.color(param.default_to_s, :info)}" do
+            menu.choice "Reset #{HighLine.color(param.name, :important)}, current value: #{HighLine.color(param.value_to_s, :notice)}, default value: #{HighLine.color(param.default_to_s, :notice)}" do
               reset(param)
             end if param.visible?(@kafo.params)
           end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kafo
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 6.1.0
 platform: ruby
 authors:
 - Marek Hulan
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-02 00:00:00.000000000 Z
+date: 2020-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -217,7 +217,10 @@ files:
 - config/kafo.yaml.example
 - doc/kafo_run.png
 - doc/kafo_run.uml
+- doc/plantuml.jar
 - lib/kafo.rb
+- lib/kafo/app_option/declaration.rb
+- lib/kafo/app_option/definition.rb
 - lib/kafo/base_context.rb
 - lib/kafo/color_scheme.rb
 - lib/kafo/condition.rb
@@ -257,6 +260,7 @@ files:
 - lib/kafo/hooking.rb
 - lib/kafo/kafo_configure.rb
 - lib/kafo/logger.rb
+- lib/kafo/logging.rb
 - lib/kafo/migration_context.rb
 - lib/kafo/migrations.rb
 - lib/kafo/param.rb
@@ -290,6 +294,7 @@ files:
 - modules/kafo_configure/spec/classes/init_spec.rb
 - modules/kafo_configure/spec/fixtures/hiera/hiera.yaml
 - modules/kafo_configure/spec/fixtures/hiera/test.yaml
+- modules/kafo_configure/spec/fixtures/manifests/site.pp
 - modules/kafo_configure/spec/fixtures/modules/dummy/manifests/init.pp
 - modules/kafo_configure/spec/fixtures/modules/dummy/manifests/params.pp
 - modules/kafo_configure/spec/functions/dump_lookups_spec.rb
@@ -300,7 +305,7 @@ homepage: https://github.com/theforeman/kafo
 licenses:
 - GPL-3.0+
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -308,15 +313,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.4.0
 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.1.4
+signing_key:
 specification_version: 4
 summary: A gem for making installations based on puppet user friendly
 test_files: []