kafo 0.9.5 → 0.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0891988265b632e07a6cc18c78d1675cdce70ff
-  data.tar.gz: 6225f461595283a292a6c9ed9ccad6ae1cc3ca04
+  metadata.gz: 1abb02cb76f9cc6da781a4445c9d64e70ca1e8e2
+  data.tar.gz: 80bfce63b57202c0a67ce9c97ca9813e336b95aa
 SHA512:
-  metadata.gz: 58caffa69d462436a789a1a23a5cc238872e39393ebe5216f94f69e3ff44ddea5c94debf3642ef646799bc69e19d1c62ebc197a310cdad688c08e096881e757b
-  data.tar.gz: 7d89c58aac9b309531cbb7ebe3666a08fca3c41d9b59ef7de899c333befbc8af333496b0db50875fd1b50fd89f3f5191f229a685be7d44c35fc1cf80eeb81357
+  metadata.gz: f40af68f5e25559d989390c134de82122476c8f46321d52bcc5d76025405507f1206b246823298e7a37cfec43e000afd2c2f7603eb20eb66482f8b5553c8de88
+  data.tar.gz: d30b8109790718f85b2ef2b3458c1d95b2f2358552ac6ec696acd4ed8fd36d6e1b65fe2014f6d28232286e0b6135e97056660d5ef4bc66f49f422ca1e7f19f82

data/README.md

@@ -365,6 +365,18 @@ and e.g. migration to new scenario is still possible.
 
 Disabled scenario can be enabled back again with `foreman-installer --enable-scenario SCENARIO`.
 
+## Store
+
+Kafo features simple key value store that can be used to ship data with the installer.
+
+The data are loaded from yaml files located in `store.d` directory that is either specified in
+the scenario config's `store_dir:` or on same directory
+level as configuration directory containing the scenarios. The files are loaded in
+alphabetical order and the data are merged in that order.
+
+The store is read-only during the run and the content can be influenced only by adding
+new files into the `store.d` directory (e.g. from installer plugins)
+
 ## Documentation
 
 Every parameter that can be set by kafo *must* be documented. This means that
@@ -883,6 +895,7 @@ paths. In order to do that you can use following configuration options:
 * :hook_dirs: /user/share/foreman-installer/hooks
 * :check_dirs: /user/share/foreman-installer/checks
 * :kafo_modules_dir: /usr/share/kafo/modules
+* :store_dir: /etc/foreman-installer/store.d
 
 Answer file is obvious. The "installer_dir" is the place where your installer is
 located. E.g. system checks will be loaded from here (under checks
@@ -1044,6 +1057,7 @@ Other exit codes that can be returned:
 * '25' means that kafo could not get default values from puppet
 * '26' means that kafo could not find the specified scenario
 * '27' means that kafo found found scenario configuration error that prevents installation from continuing
+* '28' means that a value is missing for a parameter given on the command line
 * '130' user interrupt (^C)
 
 ## Running Puppet Profiling

data/lib/kafo/configuration.rb

@@ -14,6 +14,7 @@ module Kafo
         :description          => '',
         :enabled              => true,
         :log_dir              => '/var/log/kafo',
+        :store_dir            => '',
         :log_name             => 'configuration.log',
         :log_level            => 'info',
         :no_prefix            => false,

data/lib/kafo/exit_handler.rb

@@ -17,7 +17,8 @@ module Kafo
           :unknown_module => 24,
           :defaults_error => 25,
           :unset_scenario => 26,
-          :scenario_error => 27
+          :scenario_error => 27,
+          :missing_argument => 28
       }
     end
 

data/lib/kafo/kafo_configure.rb

@@ -13,6 +13,7 @@ require 'kafo/color_scheme'
 require 'kafo_parsers/exceptions'
 require 'kafo/exceptions'
 require 'kafo/migrations'
+require 'kafo/store'
 require 'kafo/configuration'
 require 'kafo/logger'
 require 'kafo/string_helper'
@@ -20,6 +21,7 @@ require 'kafo/help_builder'
 require 'kafo/wizard'
 require 'kafo/system_checker'
 require 'kafo/puppet_command'
+require 'kafo/puppet_log_parser'
 require 'kafo/progress_bar'
 require 'kafo/hooking'
 require 'kafo/exit_handler'
@@ -33,7 +35,7 @@ module Kafo
     class << self
       attr_accessor :config, :root_dir, :config_file, :gem_root,
                     :module_dirs, :kafo_modules_dir, :verbose, :app_options, :logger,
-                    :check_dirs, :exit_handler, :scenario_manager
+                    :check_dirs, :exit_handler, :scenario_manager, :store
       attr_writer :hooking
 
       def hooking
@@ -102,6 +104,10 @@ module Kafo
       self.class.config
     end
 
+    def store
+      self.class.store
+    end
+
     def logger
       self.class.logger
     end
@@ -230,6 +236,7 @@ module Kafo
       self.class.gem_root         = self.class.config.gem_root
       self.class.kafo_modules_dir = self.class.config.kafo_modules_dir
       self.class.hooking.load
+      self.class.store            = setup_store
       self.class.hooking.kafo     = self
     end
 
@@ -247,6 +254,14 @@ module Kafo
       ScenarioManager.new((defined?(CONFIG_DIR) && CONFIG_DIR) || (defined?(CONFIG_FILE) && CONFIG_FILE))
     end
 
+    def setup_store
+      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
+    end
+
     def set_parameters
       config.preset_defaults_from_puppet
       self.class.hooking.execute(:pre_values)
@@ -357,10 +372,18 @@ module Kafo
         variable_name = u(with_prefix(param))
         variable_name += '_list' if param.multivalued?
         cli_value     = instance_variable_get("@#{variable_name}")
+        if argument_missing?(cli_value)
+          puts "Parameter #{with_prefix(param)} is missing a value on the command line"
+          self.class.exit(:missing_argument)
+        end
         param.value   = cli_value unless cli_value.nil?
       end
     end
 
+    def argument_missing?(value)
+      !!self.class.declared_options.find { |opt| opt.handles?(value) }
+    end
+
     def store_params(file = nil)
       data = Hash[config.modules.map { |mod| [mod.identifier, mod.enabled? ? mod.params_hash : false] }]
       config.store(data, file)
@@ -400,10 +423,11 @@ module Kafo
       options.push '--profile' if profile?
       begin
         command = PuppetCommand.new('include kafo_configure', options).command
+        log_parser = PuppetLogParser.new
         PTY.spawn(command) do |stdin, stdout, pid|
           begin
             stdin.each do |line|
-              progress_log(*puppet_parse(line))
+              progress_log(*log_parser.parse(line))
               @progress_bar.update(line) if @progress_bar
             end
           rescue Errno::EIO # we reach end of input
@@ -432,23 +456,6 @@ module Kafo
       logger.send(method, message)
     end
 
-    def puppet_parse(line)
-      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
-                            [:info, $1]
-                          when line =~ /^Debug:(.*)/i
-                            [:debug, $1]
-                          else
-                            [:info, line]
-                        end
-
-      return [method, message.chomp]
-    end
-
     def unset
       params.select { |p| p.module.enabled? && p.value_set.nil? }
     end

data/lib/kafo/puppet_command.rb

@@ -13,7 +13,7 @@ module Kafo
     end
 
     def add_progress
-      KafoConfigure.verbose ? '' : "$kafo_add_progress=true"
+      %{$kafo_add_progress="#{!KafoConfigure.verbose}"}
     end
 
     def command

data/lib/kafo/puppet_log_parser.rb

@@ -0,0 +1,25 @@
+module Kafo
+  class PuppetLogParser
+    def initialize
+      @last_level = nil
+    end
+
+    def parse(line)
+      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
+                            [:info, $1]
+                          when line =~ /^Debug:(.*)/i
+                            [:debug, $1]
+                          else
+                            [@last_level.nil? ? :info : @last_level, line]
+                        end
+
+      @last_level = method
+      return [method, message.chomp]
+    end
+  end
+end

data/lib/kafo/store.rb

@@ -0,0 +1,38 @@
+require 'yaml'
+
+module Kafo
+  class Store
+    attr_accessor :data
+
+    def initialize(path=nil)
+      @data = {}
+      load_path(path) if path
+    end
+
+    def load_path(path)
+      if File.directory?(path)
+        add_dir(path)
+      else
+        add_file(path)
+      end
+    end
+
+    def add(data)
+      @data.merge!(data)
+    end
+
+    def add_dir(path)
+      Dir.glob(File.join(path, "*.yaml")).sort.each do |file|
+        add_file(file)
+      end
+    end
+
+    def add_file(file)
+      add(YAML.load_file(file))
+    end
+
+    def get(key)
+      @data[key]
+    end
+  end
+end

data/lib/kafo/version.rb

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

data/modules/kafo_configure/manifests/init.pp

@@ -6,7 +6,7 @@
 #
 class kafo_configure {
 
-  if $kafo_add_progress {
+  if $kafo_add_progress == 'true' {
     add_progress()
   }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kafo
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors:
 - Marek Hulan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-01 00:00:00.000000000 Z
+date: 2016-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -249,8 +249,10 @@ files:
 - lib/kafo/progress_bars/black_white.rb
 - lib/kafo/progress_bars/colored.rb
 - lib/kafo/puppet_command.rb
+- lib/kafo/puppet_log_parser.rb
 - lib/kafo/puppet_module.rb
 - lib/kafo/scenario_manager.rb
+- lib/kafo/store.rb
 - lib/kafo/string_helper.rb
 - lib/kafo/system_checker.rb
 - lib/kafo/validator.rb