kafo 0.0.2 → 0.0.3

data/README.md

@@ -120,12 +120,24 @@ the lower the item is the higher precedence it has:
 
 # Advanced topics
 
-## Testing aka noop
+## Testing aka noop etc
 
 You'll probably want to tweak your installer before so you may find --noop
 argument handy. This will run puppet in noop so no change will be done to your
 system. Default value is 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).
+
+## Parameters prefixes
+
+You probably noticed that every module parameter is prefixed by module name
+by default. If you use just one module it's probably unnecessary and you
+can disable this behavior in config/kafo.yaml. Just set option like this
+```yaml
+:no_prefix: true
+```
+
 ## Documentation
 
 Every parameter that can be set by kafo *must* be documented. This means that
@@ -182,6 +194,30 @@ bin/foreman-installer --puppetmaster-environments=development --puppetmaster-env
 In interactive mode you'll be prompted for another value until you specify
 blank line.
 
+## Custom modules and manifest names
+
+By default Kafo expects a common module structure. For example if you add
+```yaml
+foreman: true
+```
+to you answer file, Kafo expects a +foreman+ subdirectory in +modules/+. Also
+it expects that there will be init.pp which it will instantiate. If you need
+to change this behavior you can via +mapping+ option in +config/kafo.yaml+.
+
+Suppose we have puppet module and we want to use puppet/server.pp as our init
+file. Also we want to name our module as puppetmaster. We add following mapping
+to kafo.yaml
+
+```yaml
+:mapping
+  :puppetmaster:                # a module name, so we'll have puppetmaster: true in answer file
+    :dir_name: 'puppet'         # the subdirectory in modules/
+    :manifest_name: 'server'    # manifest filename without .pp extension
+```
+
+Note that if you add mapping you must enter both dir_name and manifest_name even
+if one of them is default.
+
 ## Validations
 
 If you specify validations of parameters in you init.pp manifest they

data/config/kafo.yaml.example

@@ -1,11 +1,15 @@
 # kafo main configuration file example
 # you can rename it to kafo.yaml so it overwrite default kafo settings
-# useful for development, e.g. when you want to move log files to local directory
+# note current configuration is written tokafo.yaml every time kafo is run
 
+## Useful for development, e.g. when you want to move log files to local directory
 # :log_dir: '/var/log/kafo'
 # :log_level: :info
 
-# Advanced configuration - if not set it's ignored
+## Kafo tuning, customization of core functionality
+# :no_prefix: false
+# :mapping: {}
+
+## Advanced configuration - if not set it's ignored
 # :log_owner: root
 # :log_group: root
-

data/lib/kafo/configuration.rb

@@ -13,6 +13,8 @@ class Configuration
   KAFO = {
       :log_dir   => '/var/log/kafo',
       :log_level => :info,
+      :no_prefix => false,
+      :mapping   => {}
   }.merge(default_hash || {})
 
   def initialize(file)

data/lib/kafo/kafo_configure.rb

@@ -54,7 +54,7 @@ class KafoConfigure < Clamp::Command
       end
     end
 
-    store_params
+    store_params unless dont_save_answers?
     run_installation
   end
 
@@ -77,9 +77,11 @@ class KafoConfigure < Clamp::Command
   end
 
   def set_options
-    self.class.option ['-i', '--interactive'], :flag, 'Run in interactive mode?'
-    self.class.option ['-v', '--verbose'], :flag, 'Display log on STDOUT instead of progressbar?'
+    self.class.option ['-i', '--interactive'], :flag, 'Run in interactive mode'
+    self.class.option ['-v', '--verbose'], :flag, 'Display log on STDOUT instead of progressbar'
     self.class.option ['-n', '--noop'], :flag, 'Run puppet in noop mode?', :default => false
+    self.class.option ['-d', '--dont-save-answers'], :flag, 'Skip saving answers to answers.yaml?',
+                      :default => false
 
     config.modules.each do |mod|
       self.class.option d("--[no-]enable-#{mod.name}"),

data/lib/kafo/puppet_module.rb

@@ -62,24 +62,19 @@ class PuppetModule
 
   private
 
-  # customer module directory name
+  # mapping from configuration with stringified keys
+  def mapping
+    @mapping ||= Hash[Configuration::KAFO[:mapping].map { |k, v| [k.to_s, v] }]
+  end
+
+  # custom module directory name
   def get_dir_name
-    case name
-      when 'puppetmaster'
-        'puppet'
-      else
-        name
-    end
+    mapping[name].nil? ? name : mapping[name][:dir_name]
   end
 
   # custom manifest filename without .pp extension
   def get_manifest_name
-    case name
-      when 'puppetmaster'
-        'server'
-      else
-        'init'
-    end
+    mapping[name].nil? ? 'init' : mapping[name][:manifest_name]
   end
 
   def get_class_name

data/lib/kafo/string_helper.rb

@@ -10,7 +10,8 @@ module StringHelper
   alias :u :underscore
 
   def with_prefix(param)
-    "#{d(param.module_name)}-#{d(param.name)}"
+    prefix = Configuration::KAFO[:no_prefix] ? '' : "#{d(param.module_name)}-"
+    "#{prefix}#{d(param.name)}"
   end
 
   def parametrize(param)

data/lib/kafo/version.rb

@@ -1,3 +1,3 @@
 module Kafo
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kafo
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-26 00:00:00.000000000 Z
+date: 2013-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler