kafo 0.6.5 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 00f2eeecb2ef8b1d26ecfeda03acd948a3c946bd
-  data.tar.gz: dbee5095cd640977d5139371b57b810729ced588
+  metadata.gz: 6c90ef90e7f725d167df9f4cf981149fbf73ec80
+  data.tar.gz: 1fe6598e413848a5e3e20959e8d40b85d4a54265
 SHA512:
-  metadata.gz: 4ee3fa73336db84c868839389bea60ed5e4733b5bc86672e4636fc330520a4c6a6e33d499ed3a2f2871c565c99f5d83fcebc31eb1fd35bcc2542cd4767a3ad9a
-  data.tar.gz: 6bb72c9b683c57d07f7c0cb7ec3367e08f1fb7fbf55ec5598e0a1e328fd42f20c574bf65ba53e657c33ecd1e2a462b7b754ce4b6b3477cba558afee1c6b09136
+  metadata.gz: ae156929be2c13cff6cb3224cc484a47b28dfdbe371415abfe60f1a9e80fa7e04f0a65d2ffa8bafe7bfd84805286adc4c462bcca05325a9f15da23dd95324c65
+  data.tar.gz: 694b8a569838d3f7ce01c9cbacb3233a386aa13a493ebcb6d4d4865837b321e1bcb9f3a6d0120b69e60ce8ccbb21347392633198dfaecae12276ee1de7c03458

data/README.md

@@ -171,6 +171,8 @@ false!
 Sometimes you may want kafo not to store answers from current run. You can
 disable saving by passing a ```--dont-save-answers``` argument (or -d for short).
 
+Note that running ```--noop``` implies ```--dont-save-answers```.
+
 ## Parameters prefixes
 
 You probably noticed that every module parameter is prefixed by module name
@@ -507,6 +509,10 @@ bin/foreman-installer --foreman-db-password=UNDEF
 
 It also works in interactive mode.
 
+You may also need to override array parameter with empty array value. For this
+purpose you can use `EMPTY_ARRAY` string as a value. Similarly you can use
+`EMPTY_HASH` for hash parameters.
+
 ## Hooks
 
 You may need to add new features to the installer. Kafo provides simple hook
@@ -690,6 +696,25 @@ order:
 If you have other modules in your answer file they will be executed after
 those that have explicit order. Their order is not be specified.
 
+## Changing the order of module appearance in interactive mode
+
+We sort our module alphabetically. Sometimes you may want to reorder
+module, e.g. display plugin modules last. For this you can use ```low_priority_modules```
+configuration option. It accepts an array of patterns considering the
+first to have the lowest priority. So in follwing example
+
+```yaml
+low_priority_modules:
+  - compute
+  - plugin
+```
+
+all modules containing a word compute in their name would be listed
+at the end. If there are two modules containing compute, their order
+is alphabetical on suffix after compute word. If there are some modules
+containing word plugin, they will be above compute modules as they
+were mentioned later.
+
 ## Changing of log directory and user/group
 
 By default kafo logs every run to a separate file in /var/log/kafo.
@@ -710,8 +735,9 @@ but you want the logs to be readable by specific users.
 
 When you want to make sure that user has some software installed or has the
 right version you can write a simple script and put it into checks directory.
-All files found there will be ran and if any has non-zero exit code, kafo
-wont execute puppet.
+All files found there will be executed and if any of these exits with an non-zero
+exit code, kafo won't execute puppet but print an error message 
+`Your system does not meet configuration criteria.`
 
 Everything on STDOUT and STDERR is logged in error level.
 
@@ -723,6 +749,11 @@ java -version 2>&1 | grep OpenJDK
 exit $?
 ```
 
+If you want to ignore results of check scripts, you can use the builtin
+parameter `--skip-checks-i-know-better` (or `-s`). This will completely
+disable running all system check scripts. Note that this option is
+not persisted between runs.
+
 ## Exit code
 
 Kafo can terminate either before or after puppet is ran. Puppet is ran with
@@ -741,7 +772,7 @@ Other exit codes that can be returned:
 * '23' means that you have no answer file
 * '24' means that your answer file asks for puppet module that you did not provide
 * '25' means that kafo could not get default values from puppet
-
+* '130' user interrupt (^C)
 
 # License
 

data/config/kafo.yaml.example

@@ -22,6 +22,7 @@
 # :no_prefix: false
 # :mapping: {}
 # :order:
+# :low_priority_modules:
 
 ## Useful for development, e.g. when you want to move log files to local directory
 # :log_dir: /var/log/kafo

data/lib/kafo/configuration.rb

@@ -13,19 +13,20 @@ module Kafo
     end
 
     DEFAULT = {
-        :log_dir             => '/var/log/kafo',
-        :log_name            => 'configuration.log',
-        :log_level           => 'info',
-        :no_prefix           => false,
-        :mapping             => {},
-        :answer_file         => './config/answers.yaml',
-        :installer_dir       => '.',
-        :modules_dir         => './modules',
-        :default_values_dir  => '/tmp',
-        :colors              => Configuration.colors_possible?,
-        :color_of_background => :dark,
-        :hook_dirs           => [],
-        :custom              => {}
+        :log_dir              => '/var/log/kafo',
+        :log_name             => 'configuration.log',
+        :log_level            => 'info',
+        :no_prefix            => false,
+        :mapping              => {},
+        :answer_file          => './config/answers.yaml',
+        :installer_dir        => '.',
+        :modules_dir          => './modules',
+        :default_values_dir   => '/tmp',
+        :colors               => Configuration.colors_possible?,
+        :color_of_background  => :dark,
+        :hook_dirs            => [],
+        :custom               => {},
+        :low_priority_modules => [],
     }
 
     def initialize(file, persist = true)
@@ -81,7 +82,7 @@ module Kafo
     end
 
     def modules
-      @modules ||= @data.keys.map { |mod| PuppetModule.new(mod).parse }
+      @modules ||= @data.keys.map { |mod| PuppetModule.new(mod).parse }.sort
     end
 
     def add_module(name)
@@ -102,13 +103,16 @@ module Kafo
         @logger.debug "Creating tmp dir within #{app[:default_values_dir]}..."
         temp_dir = Dir.mktmpdir(nil, app[:default_values_dir])
         KafoConfigure.exit_handler.register_cleanup_path temp_dir
-        @logger.info "Parsing default values from puppet modules..."
+        @logger.info 'Loading default values from puppet modules...'
         command = PuppetCommand.new("$temp_dir=\"#{temp_dir}\" #{includes} dump_values(#{params})").append('2>&1').command
-        @logger.debug `#{command}`
+        result = `#{command}`
+        @logger.debug result
         unless $?.exitstatus == 0
           log = app[:log_dir] + '/' + app[:log_name]
           puts "Could not get default values, check log file at #{log} for more information"
-          @logger.error "Could not get default values, cannot continue"
+          @logger.error command
+          @logger.error result
+          @logger.error 'Could not get default values, cannot continue'
           KafoConfigure.exit(:defaults_error)
         end
         @logger.info "... finished"

data/lib/kafo/kafo_configure.rb

@@ -84,9 +84,11 @@ module Kafo
         @progress_bar = self.class.config.app[:colors] ? ProgressBars::Colored.new : ProgressBars::BlackWhite.new
       end
 
-      unless SystemChecker.check
-        puts "Your system does not meet configuration criteria"
-        self.class.exit(:invalid_system)
+      unless skip_checks_i_know_better?
+        unless SystemChecker.check
+          puts "Your system does not meet configuration criteria"
+          self.class.exit(:invalid_system)
+        end
       end
 
       self.class.hooking.execute(:pre_validations)
@@ -100,7 +102,7 @@ module Kafo
         end
       end
 
-      if dont_save_answers?
+      if dont_save_answers? || noop?
         self.class.temp_config_file = temp_config_file
         store_params(temp_config_file)
       else
@@ -207,6 +209,7 @@ module Kafo
                             :default => config.app[:log_level]
       self.class.app_option ['-n', '--noop'], :flag, 'Run puppet in noop mode?',
                             :default => false
+      self.class.app_option ['-s', '--skip-checks-i-know-better'], :flag, 'Skip all system checks', :default => false
       self.class.app_option ['-v', '--verbose'], :flag, 'Display log on STDOUT instead of progressbar'
       self.class.app_option ['-l', '--verbose-log-level'], 'LEVEL', 'Log level for verbose mode output',
                             :default => 'info'

data/lib/kafo/params/array.rb

@@ -3,7 +3,11 @@ module Kafo
     class Array < Param
       def value=(value)
         super
-        @value = typecast(@value)
+        if @value == ['EMPTY_ARRAY']
+          @value = []
+        else
+          @value = typecast(@value)
+        end
       end
 
       def multivalued?

data/lib/kafo/params/hash.rb

@@ -3,7 +3,11 @@ module Kafo
     class Hash < Param
       def value=(value)
         super
-        @value = typecast(@value)
+        if @value == ['EMPTY_HASH']
+          @value = {}
+        else
+          @value = typecast(@value)
+        end
       end
 
       def multivalued?

data/lib/kafo/puppet_module.rb

@@ -78,6 +78,14 @@ module Kafo
     end
 
     def <=> o
+      KafoConfigure.config.app[:low_priority_modules].each do |module_name|
+        return 1 if self.name.include?(module_name) && !o.name.include?(module_name)
+        return -1 if !self.name.include?(module_name) && o.name.include?(module_name)
+        if self.name.include?(module_name) && o.name.include?(module_name)
+          return self.name.sub(/.*#{module_name}/, '') <=> o.name.sub(/.*#{module_name}/, '')
+        end
+      end
+
       self.name <=> o.name
     end
 

data/lib/kafo/version.rb

@@ -1,4 +1,4 @@
 # encoding: UTF-8
 module Kafo
-  VERSION = "0.6.5"
+  VERSION = "0.6.6"
 end

data/lib/kafo/wizard.rb

@@ -34,7 +34,7 @@ END
       main_menu
     rescue Interrupt
       puts "Got interrupt, exiting"
-      KafoConfigure.exit(0)
+      KafoConfigure.exit(130)
     end
 
     private
@@ -84,7 +84,7 @@ END
           if mod.enabled?
             render_params(mod.primary_parameter_group.params, menu)
 
-            others = mod.primary_parameter_group.children + mod.other_parameter_groups
+            others = (mod.primary_parameter_group.children + mod.other_parameter_groups).uniq
             others.each do |group|
               menu.choice("Configure #{group.formatted_name}") { configure_group(group) }
             end

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

@@ -40,7 +40,7 @@ module Puppet::Parser::Functions
         alias_method :report, :report_with_wrapper
       end
     else
-      ::Puppet.err 'Your puppet version does not support progress bar'
+      ::Puppet.warning 'Your puppet version does not support progress bar'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kafo
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.6
 platform: ruby
 authors:
 - Marek Hulan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-09 00:00:00.000000000 Z
+date: 2015-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -143,6 +143,9 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 1.6.21
+    - - <
+      - !ruby/object:Gem::Version
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -150,6 +153,9 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 1.6.21
+    - - <
+      - !ruby/object:Gem::Version
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: powerbar
   requirement: !ruby/object:Gem::Requirement