kafo 0.0.12 → 0.0.13

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 541f62325d16907e10fd685ba52feef25b508de8
+  data.tar.gz: e28b1ff37b0e106ac9102809ba9f5ffe8844c67a
+SHA512:
+  metadata.gz: 715a6ac0b8a5dbd3496b03e9b7898c11386ed7fbb0d64a98e1c8030e5d9bd6c6becc77bbb3e494d4e43914c5ac91272ea826e99ce8d385341fc16c830d28bba2
+  data.tar.gz: bbe4615a666ca4fc1e4ac3f8afabe8eddb28fe9d10890541d9816853b721f07918a2056d9dab0e530bc9937ecfe2113d9452c4dd785931529ed336fe24d1a636

data/README.md

@@ -364,6 +364,7 @@ exit $?
 Kafo can terminate either before or after puppet is ran. Puppet is ran with
 --detailed-exitcodes and Kafo returns the same exit code as puppet does. If
 kafo terminates after puppet run exit codes are:
+* '1' means there were parser/validation errors
 * '2' means there were changes,
 * '4' means there were failures during the transaction,
 * '6' means there were both changes and failures.
@@ -376,7 +377,6 @@ 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
-* '26' means that you machine does not seem to have FQDN set correctly
 
 
 # License

data/bin/kafo-export-params

@@ -0,0 +1,104 @@
+#!/usr/bin/env ruby
+require 'clamp'
+require 'logging'
+require 'kafo/string_helper'
+
+$LOAD_PATH.unshift File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'kafo'))
+require 'configuration'
+
+KafoConfigure = OpenStruct.new
+
+class KafoExportParams < Clamp::Command
+  TYPES = %w(md html)
+
+  option ['-c', '--config'], 'FILE', 'Config file for which should we generate params',
+         :required => true
+
+  option ['-f', '--format'], 'FORMAT',
+         'Config file for which should we generate params', :default => 'md' do |format|
+    format = format.downcase
+    raise ArgumentError unless TYPES.include?(format)
+    format
+  end
+
+  def execute
+    c = Configuration.new(config, false)
+    KafoConfigure.config = c
+    KafoConfigure.root_dir = File.expand_path(c.app[:installer_dir])
+
+    exporter = self.class.const_get(format.capitalize).new(c)
+    exporter.print_out
+  end
+
+  class Html
+    include StringHelper
+
+    def initialize(config)
+      @config = config
+    end
+
+    def print_out
+      puts '<div id="installer-options">'
+      puts '  <table class="table table-bordered table-condensed">'
+      header
+      puts '    <tbody>'
+
+      @config.modules.each do |mod|
+        mod.params.each do |param|
+          puts '      <tr>'
+          puts "        <td>#{parametrize(param)}</td>"
+          puts "        <td>#{param.doc.join(' ')}</td>"
+          puts '      </tr>'
+        end
+      end
+
+      puts '    </tbody>'
+      puts '  </table>'
+      puts '</div>'
+    end
+
+    private
+
+    def header
+      puts '    <thead>'
+      puts '      <tr>'
+      puts '        <th>Option</th>'
+      puts '        <th>Description</th>'
+      puts '      </tr>'
+      puts '    </thead>'
+    end
+  end
+
+  class Md
+    include StringHelper
+
+    def initialize(config)
+      @config = config
+      @max = max_description_length
+    end
+
+    def print_out
+      puts "| #{('Parameter name').ljust(40)} | #{'Description'.ljust(@max)} |"
+      puts "| #{'-'*40} | #{'-' * @max} |"
+      @config.modules.each do |mod|
+        mod.params.each do |param|
+          puts "| #{parametrize(param).ljust(40)} | #{param.doc.join(' ').ljust(@max)} |"
+        end
+      end
+    end
+
+    private
+
+    def header
+      @header ||= "| #{'-'*40} | #{'-' * @max} |"
+    end
+
+    def max_description_length
+      doc_lengths = @config.modules.map { |mod| mod.params.map { |param| param.doc.join(' ').length } }.flatten
+      doc_lengths << 52
+      doc_lengths.max
+    end
+  end
+end
+
+KafoExportParams.run

data/config/kafo.yaml.example

@@ -5,7 +5,7 @@
 ## Installer configuration
 # Path to answer file, if the file does not exist a $pwd/config/answers.yaml is used as a fallback
 # :answer_file: /etc/kafo/kafo.yaml
-# Custome installer path
+# Custom installer path
 # :installer_dir: /usr/share/kafo/
 # Uncomment if you want to load puppet modules from a specific path, $pwd/modules is used by default
 # :modules_dir: /usr/share/kafo/modules
@@ -19,6 +19,7 @@
 
 ## Useful for development, e.g. when you want to move log files to local directory
 # :log_dir: /var/log/kafo
+# :log_name: configure.log
 # :log_level: :info
 
 # Change if you want to debug default answers for you modules, this directory holds default answers

data/lib/kafo/configuration.rb

@@ -17,8 +17,9 @@ class Configuration
       :default_values_dir => '/tmp'
   }
 
-  def initialize(file)
+  def initialize(file, persist = true)
     @config_file = file
+    @persist = persist
     configure_application
     @logger = Logging.logger.root
 
@@ -34,6 +35,7 @@ class Configuration
   end
 
   def save_configuration(configuration)
+    return true unless @persist
     FileUtils.touch @config_file
     File.chmod 0600, @config_file
     File.open(@config_file, 'w') { |file| file.write(YAML.dump(configuration)) }

data/lib/kafo/kafo_configure.rb

@@ -29,7 +29,6 @@ class KafoConfigure < Clamp::Command
     self.class.kafo_modules_dir = self.class.config.app[:kafo_modules_dir] || (self.class.gem_root + '/modules')
     Logger.setup
     @logger = Logging.logger.root
-    check_env
     super
     set_parameters
     set_options
@@ -100,8 +99,7 @@ class KafoConfigure < Clamp::Command
                     :manifest_error => 22,
                     :no_answer_file => 23,
                     :unknown_module => 24,
-                    :defaults_error => 25,
-                    :wrong_hostname => 26}
+                    :defaults_error => 25}
     if error_codes.has_key? code
       return error_codes[code]
     else
@@ -232,19 +230,6 @@ class KafoConfigure < Clamp::Command
     params.select { |p| p.module.enabled? && p.value_set.nil? }
   end
 
-  def check_env
-    # Check that facter actually has a value that matches the hostname.
-    # This should always be true for facter >= 1.7
-    fqdn_exit("'facter fqdn' does not match 'hostname -f'") if Facter.fqdn != `hostname -f`.chomp
-    # Every FQDN should have at least one dot
-    fqdn_exit("Invalid FQDN: #{Facter.fqdn}, check your hostname") unless Facter.fqdn.include?('.')
-  end
-
-  def fqdn_exit(message)
-    logger.error message
-    exit(:wrong_hostname)
-  end
-
   def config_file
     return CONFIG_FILE if defined?(CONFIG_FILE) && File.exists?(CONFIG_FILE)
     return '/etc/kafo/kafo.yaml' if File.exists?('/etc/kafo/kafo.yaml')

data/lib/kafo/logger.rb

@@ -28,7 +28,7 @@ class Logger
     end
 
     logger   = Logging.logger.root
-    filename = "#{KafoConfigure.config.app[:log_dir]}/configure.log"
+    filename = "#{KafoConfigure.config.app[:log_dir]}/#{KafoConfigure.config.app[:log_name] || 'configure.log'}"
     begin
       logger.appenders = ::Logging.appenders.rolling_file('configure',
                                                           :filename => filename,

data/lib/kafo/version.rb

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

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

@@ -2,7 +2,9 @@
 #
 module Puppet::Parser::Functions
   newfunction(:dump_values) do |args|
-    data = Hash[args.map { |arg| [arg, lookupvar(arg)] }]
+    options = []
+    options<< false if Puppet::PUPPETVERSION.start_with?('2.6')
+    data = Hash[args.map { |arg| [arg, lookupvar(arg, *options)] }]
     dump_dir = YAML.load_file(lookupvar('kafo_config_file'))[:default_values_dir]
     File.open("#{dump_dir}/default_values.yaml", 'w') { |file| file.write(YAML.dump(data)) }
   end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: kafo
 version: !ruby/object:Gem::Version
-  version: 0.0.12
-  prerelease: 
+  version: 0.0.13
 platform: ruby
 authors:
 - Marek Hulan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-06 00:00:00.000000000 Z
+date: 2013-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,23 +27,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,81 +55,71 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: puppet
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.9.0
 - !ruby/object:Gem::Dependency
   name: logging
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: clamp
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: A gem for making installations based on puppet user friendly
@@ -144,11 +127,13 @@ email:
 - ares@igloonet.cz
 executables:
 - kafo-configure
+- kafo-export-params
 - kafofy
 extensions: []
 extra_rdoc_files: []
 files:
 - bin/kafo-configure
+- bin/kafo-export-params
 - bin/kafofy
 - config/kafo.yaml.example
 - config/config_header.txt
@@ -199,28 +184,26 @@ files:
 homepage: https://github.com/theforeman/kafo
 licenses:
 - GPLv3+
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: If you write puppet modules for installing your software, you can use kafo
   to create powerful installer
 test_files: []
-has_rdoc: