kafo 0.2.2 → 0.3.0

data/lib/kafo/validator.rb

@@ -1,60 +1,62 @@
 # encoding: UTF-8
-class Validator
-
-  def initialize(params)
-    files = KafoConfigure.modules_dir + '/*/lib/puppet/parser/functions/validate_*.rb'
-    Dir.glob(files).each do |file|
-      require file
+module Kafo
+  class Validator
+
+    def initialize(params)
+      files = KafoConfigure.modules_dir + '/*/lib/puppet/parser/functions/validate_*.rb'
+      Dir.glob(files).each do |file|
+        require file
+      end
+
+      @params = params
+      @logger = KafoConfigure.logger
+
+      @cache ||= Hash.new do |hash, key|
+        @logger.debug "Looked for #{key}"
+        param     = @params.select { |p| p.name == key.to_s }.first
+        hash[key] = param.nil? ? nil : param.value
+      end
     end
 
-    @params = params
-    @logger = KafoConfigure.logger
-
-    @cache ||= Hash.new do |hash, key|
-      @logger.debug "Looked for #{key}"
-      param     = @params.select { |p| p.name == key.to_s }.first
-      hash[key] = param.nil? ? nil : param.value
+    def lookupvar(name, options = {})
+      @cache[name]
     end
-  end
-
-  def lookupvar(name, options = {})
-    @cache[name]
-  end
 
-  # for puppet >= 3
-  def include?(value)
-    true
-  end
+    # for puppet >= 3
+    def include?(value)
+      true
+    end
 
-  # for puppet >= 3
-  def [](value, *args)
-    lookupvar(value)
-  end
+    # for puppet >= 3
+    def [](value, *args)
+      lookupvar(value)
+    end
 
-  def method_missing(method, *args, &block)
-    method.to_s =~ /^function_(.*)$/
-    super unless $1
-    super unless Puppet::Parser::Functions.function($1)
-    # In odd circumstances, this might not end up defined by the previous
-    # method, so we might as well be certain.
-    if engine.respond_to? method
-      @logger.debug "calling #{method.inspect} with #{args.inspect}"
-      engine.send(method, *args)
-    else
-      raise Puppet::DevError, "Function #{$1} not defined despite being loaded!"
+    def method_missing(method, *args, &block)
+      method.to_s =~ /^function_(.*)$/
+      super unless $1
+      super unless Puppet::Parser::Functions.function($1)
+      # In odd circumstances, this might not end up defined by the previous
+      # method, so we might as well be certain.
+      if engine.respond_to? method
+        @logger.debug "calling #{method.inspect} with #{args.inspect}"
+        engine.send(method, *args)
+      else
+        raise Puppet::DevError, "Function #{$1} not defined despite being loaded!"
+      end
+    rescue Puppet::ParseError => e
+      @logger.error e.message
+      return false
     end
-  rescue Puppet::ParseError => e
-    @logger.error e.message
-    return false
-  end
 
-  private
+    private
 
-  def engine
-    @engine ||= begin
-      klass = Class.new
-      klass.send :include, Puppet::Parser::Functions.environment_module
-      klass.new
+    def engine
+      @engine ||= begin
+        klass = Class.new
+        klass.send :include, Puppet::Parser::Functions.environment_module
+        klass.new
+      end
     end
   end
 end

data/lib/kafo/version.rb

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

data/lib/kafo/wizard.rb

@@ -2,130 +2,170 @@
 require 'highline/import'
 require 'yaml'
 
-class Wizard
-  def initialize
-    setup_terminal
-    setup_colors
-    @name   = 'Kafo'
-    @config = KafoConfigure.config
-  end
+module Kafo
+  class Wizard
+    def initialize(kafo)
+      @kafo   = kafo
+      @config = kafo.config
+      @name   = @config.app[:name] || 'Kafo'
+      setup_terminal
+      setup_colors
+    end
 
-  def run
-    message = "Welcome to the #{@name} installer!"
-    say("<%= color('#{message}', :headline) %>")
-    say("<%= color('#{'-' * message.size}', :horizontal_line) %>")
-    say(<<END)
+    def run
+      message = "Welcome to the #{@name} installer!"
+      say("<%= color('#{message}', :headline) %>")
+      say("<%= color('#{'-' * message.size}', :horizontal_line) %>")
+      say(<<END)
 
 This wizard will gather all required information. You can change any parameter to your needs.
 
 END
 
-    exit 0 unless agree("\n<%= color('Ready to start?', :question) %> (y/n)", false)
+      exit 0 unless agree("\n<%= color('Ready to start?', :question) %> (y/n)", false)
 
-    main_menu
-  end
+      main_menu
+    rescue Interrupt
+      puts "Got interrupt, exiting"
+      exit(0)
+    end
 
-  private
-
-  def main_menu
-    finished = false
-    until finished
-      say("\n<%= color('Main Config Menu', :headline) %>")
-      choose do |menu|
-        menu.prompt = 'Choose an option from the menu... '
-        @config.modules.each do |mod|
-          menu.choice "[#{mod.enabled? ? '✓' : '✗'}] Configure #{mod.name}" do
-            configure_module(mod)
+    private
+
+    def main_menu
+      finished = false
+      until finished
+        say("\n<%= color('Main Config Menu', :headline) %>")
+        choose do |menu|
+          menu.prompt = 'Choose an option from the menu... '
+          @config.modules.each do |mod|
+            menu.choice "[#{mod.enabled? ? '✓' : '✗'}] Configure #{mod.name}" do
+              configure_module(mod)
+            end
+          end
+          menu.choice "Display current config" do
+            display_hash
+          end
+          menu.choice "<%= color('Save and run', :run) %>" do
+            KafoConfigure.config
+            finished = true
+          end
+          menu.choice "<%= color('Cancel run without Saving', :cancel) %>" do
+            say("Bye!"); exit 0
           end
-        end
-        menu.choice "Display current config" do
-          display_hash
-        end
-        menu.choice "<%= color('Save and run', :run) %>" do
-          KafoConfigure.config
-          finished = true
-        end
-        menu.choice "<%= color('Cancel run without Saving', :cancel) %>" do
-          say("Bye!"); exit 0
         end
       end
     end
-  end
 
-  def display_hash
-    data = Hash[@config.modules.map { |mod| [mod.name, mod.enabled? ? mod.params_hash : false] }]
-    say "<%= color('#{YAML.dump data}', :info) %>"
-  end
+    def display_hash
+      data = Hash[@config.modules.map { |mod| [mod.name, mod.enabled? ? mod.params_hash : false] }]
+      say "<%= color('#{YAML.dump data}', :info) %>"
+    end
 
-  def configure_module(mod)
-    go_back = false
-    until go_back
-      say("\n<%= color('Module #{mod.name} configuration', :headline) %>")
-      choose do |menu|
-        menu.prompt = 'Choose an option from the menu... '
-        menu.choice("Enable/disable #{mod.name} module, current value: <%= color('#{mod.enabled?}', :info) %>") { turn_module(mod) }
-        if mod.enabled?
-          mod.params.each do |param|
-            menu.choice "Set <%= color('#{param.name}', :important) %>, current value: <%= color('#{param.value}', :info) %>" do
-              configure(param)
+    def configure_module(mod)
+      go_back = false
+      until go_back
+        say("\n<%= color('Module #{mod.name} configuration', :headline) %>")
+        choose do |menu|
+          menu.prompt = 'Choose an option from the menu... '
+          menu.choice("Enable/disable #{mod.name} module, current value: <%= color('#{mod.enabled?}', :info) %>") { turn_module(mod) }
+          if mod.enabled?
+            render_params(mod.primary_parameter_group.params, menu)
+
+            others = mod.primary_parameter_group.children + mod.other_parameter_groups
+            others.each do |group|
+              menu.choice("Configure #{group.formatted_name}") { configure_group(group) }
             end
           end
+          menu.choice("Back to main menu") { go_back = true }
         end
-        menu.choice("Back to main menu") { go_back = true }
       end
     end
-  end
 
-  def configure(param)
-    say "\n<%= color('Parameter #{param.name} (of module #{param.module.name})', :headline) %>"
-    say "<%= color(\"#{param.doc.join("\n").gsub('"','\"')}\", :important) %>"
-    value = param.multivalued? ? configure_multi(param) : configure_single(param)
-    value_was = param.value
-    param.value = value unless value.empty?
-
-    until param.valid?
-      param.value = value_was
-      say "\n<%= color('Invalid value for #{param.name}', :important) %>"
-      value = param.multivalued? ? configure_multi(param) : configure_single(param)
+    def configure_group(group)
+      go_back = false
+      until go_back
+        say "\n<%= color('Group #{group.formatted_name} (of module #{group.module.name})', :headline) %>"
+        choose do |menu|
+
+          render_params(group.params, menu)
+
+          group.children.each do |subgroup|
+            menu.choice("Configure #{subgroup.formatted_name}") { configure_group(subgroup) }
+          end
+
+          menu.choice("Back to parent menu") { go_back = true }
+        end
+      end
+    end
+
+    def render_params(params, menu)
+      params.each do |param|
+        if param.visible?(@kafo.params)
+          menu.choice "Set <%= color('#{param.name}', :important) %>, current value: <%= color('#{param.value}', :info) %>" do
+            configure(param)
+          end
+        end
+      end
+    end
+
+    def configure(param)
+      say "\n<%= color('Parameter #{param.name} (of module #{param.module.name})', :headline) %>"
+      say "<%= color(\"#{param.doc.join("\n").gsub('"', '\"')}\", :important) %>"
+      value       = param.multivalued? ? configure_multi(param) : configure_single(param)
+      value_was   = param.value
       param.value = value unless value.empty?
+
+      until param.valid?
+        param.value = value_was
+        say "\n<%= color('Invalid value for #{param.name}', :important) %>"
+        value       = param.multivalued? ? configure_multi(param) : configure_single(param)
+        param.value = value unless value.empty?
+      end
     end
-  end
 
-  def configure_single(param)
-    say "\ncurrent value: <%= color('#{param.value}', :info) %>"
-    ask("new value:")
-  end
+    def configure_single(param)
+      say "\ncurrent value: <%= color('#{param.value}', :info) %>"
+      ask("new value:")
+    end
+
+    def configure_multi(param)
+      say "<%= color('every line is a separate value, blank line to quit', :info) %>"
+      say "\ncurrent value: <%= color('#{param.value}', :info) %>"
+      ask("new value:") do |q|
+        q.gather = ""
+      end
 
-  def configure_multi(param)
-    say "<%= color('every line is a separate value, blank line to quit', :info) %>"
-    say "\ncurrent value: <%= color('#{param.value}', :info) %>"
-    ask("new value:") do |q|
-      q.gather = ""
     end
 
-  end
+    def turn_module(mod)
+      agree("Enable #{mod.name} module? (y/n) ") ? mod.enable : mod.disable
+    end
 
-  def turn_module(mod)
-    agree("Enable #{mod.name} module? (y/n) ") ? mod.enable : mod.disable
-  end
+    def setup_terminal
+      $terminal         = HighLine.new
+      data              = HighLine::SystemExtensions.terminal_size
+      $terminal.wrap_at = data.first > 80 ? 80 : data.first
+      $terminal.page_at = data.last
+    end
 
-  def setup_terminal
-    $terminal         = HighLine.new
-    data              = HighLine::SystemExtensions.terminal_size
-    $terminal.wrap_at = data.first > 80 ? 80 : data.first
-    $terminal.page_at = data.last
-  end
+    # setup colour scheme for prompts
+    def setup_colors
+      colors = HighLine::ColorScheme.new do |cs|
+        cs[:headline]        = [:bold, :yellow, :on_black]
+        cs[:horizontal_line] = [:bold, :white, :on_black]
+        cs[:important]       = [:bold, :white, :on_black]
+        cs[:question]        = [:bold, :green, :on_black]
+        cs[:info]            = [:bold, :cyan, :on_black]
+        cs[:cancel]          = [:bold, :red, :on_black]
+        cs[:run]             = [:bold, :green, :on_black]
+      end
+
+      nocolors = HighLine::ColorScheme.new do |cs|
+        colors.keys.each { |k| cs[k.to_sym] = [] }
+      end
 
-  # setup colour scheme for prompts
-  def setup_colors
-    HighLine.color_scheme = HighLine::ColorScheme.new do |cs|
-      cs[:headline]        = [:bold, :yellow, :on_black]
-      cs[:horizontal_line] = [:bold, :white, :on_black]
-      cs[:important]       = [:bold, :white, :on_black]
-      cs[:question]        = [:bold, :green, :on_black]
-      cs[:info]            = [:bold, :cyan, :on_black]
-      cs[:cancel]          = [:bold, :red, :on_black]
-      cs[:run]             = [:bold, :green, :on_black]
+      HighLine.color_scheme = @config.app[:colors] ? colors : nocolors
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kafo
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Marek Hulan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-03 00:00:00.000000000 Z
+date: 2013-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,14 +44,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.7.5
+        version: 5.0.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.7.5
+        version: 5.0.8
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: puppet
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +114,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.2
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
@@ -151,13 +165,18 @@ files:
 - bin/kafofy
 - config/kafo.yaml.example
 - config/config_header.txt
+- lib/kafo/condition.rb
 - lib/kafo/puppet_module.rb
 - lib/kafo/puppet_module_parser.rb
+- lib/kafo/doc_parser.rb
 - lib/kafo/password_manager.rb
 - lib/kafo/configuration.rb
 - lib/kafo/validator.rb
 - lib/kafo/exceptions.rb
 - lib/kafo/system_checker.rb
+- lib/kafo/help_builders/base.rb
+- lib/kafo/help_builders/advanced.rb
+- lib/kafo/help_builders/basic.rb
 - lib/kafo/progress_bar.rb
 - lib/kafo/puppet_command.rb
 - lib/kafo/wizard.rb
@@ -166,9 +185,12 @@ files:
 - lib/kafo/params/boolean.rb
 - lib/kafo/params/array.rb
 - lib/kafo/params/integer.rb
+- lib/kafo/help_builder.rb
 - lib/kafo/kafo_configure.rb
+- lib/kafo/hooking.rb
 - lib/kafo/string_helper.rb
 - lib/kafo/logger.rb
+- lib/kafo/param_group.rb
 - lib/kafo/progress_bars/colored.rb
 - lib/kafo/progress_bars/black_white.rb
 - lib/kafo/param.rb