kafo 0.0.10 → 0.0.11

data/README.md

@@ -372,6 +372,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
+* '26' means that you machine does not seem to have FQDN set correctly
 
 
 # License

data/Rakefile

@@ -1 +1,9 @@
+require 'rake/testtask'
 require "bundler/gem_tasks"
+
+Rake::TestTask.new do |t|
+  t.libs << 'lib' << 'test'
+  t.test_files = FileList['test/**/*_test.rb']
+  t.verbose = true
+end
+

data/lib/kafo/kafo_configure.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+require 'facter'
 require 'pty'
 require 'clamp'
 require 'kafo/exceptions'
@@ -14,17 +15,19 @@ class KafoConfigure < Clamp::Command
   attr_reader :logger
 
   class << self
-    attr_accessor :config, :root_dir, :config_file, :gem_root, :temp_config_file
+    attr_accessor :config, :root_dir, :config_file, :gem_root, :temp_config_file, :modules_dir
   end
 
   def initialize(*args)
     self.class.config_file = config_file
     self.class.config      = Configuration.new(self.class.config_file)
     self.class.root_dir    = File.expand_path(self.class.config.app[:installer_dir])
+    modules_dir            = self.class.config.app[:module_dir] || (self.class.config.app[:installer_dir] + '/modules')
+    self.class.modules_dir = File.expand_path(modules_dir)
     self.class.gem_root    = File.join(File.dirname(__FILE__), '../../')
     Logger.setup
     @logger = Logging.logger.root
-    set_env
+    check_env
     super
     set_parameters
     set_options
@@ -95,7 +98,8 @@ class KafoConfigure < Clamp::Command
                     :manifest_error => 22,
                     :no_answer_file => 23,
                     :unknown_module => 24,
-                    :defaults_error => 25 }
+                    :defaults_error => 25,
+                    :wrong_hostname => 26}
     if error_codes.has_key? code
       return error_codes[code]
     else
@@ -208,11 +212,9 @@ class KafoConfigure < Clamp::Command
 
   def puppet_log(line)
     method, message = case
-                        when line =~ /^Error:(.*)/i
+                        when line =~ /^Error:(.*)/i || line =~ /^Err:(.*)/i
                           [:error, $1]
-                        when line =~ /^Warning:(.*)/i
-                          [:warn, $1]
-                        when line =~ /^Notice:(.*)/i
+                        when line =~ /^Warning:(.*)/i || line =~ /^Notice:(.*)/i
                           [:warn, $1]
                         when line =~ /^Info:(.*)/i
                           [:info, $1]
@@ -228,10 +230,17 @@ class KafoConfigure < Clamp::Command
     params.select { |p| p.module.enabled? && p.value_set.nil? }
   end
 
-  def set_env
-    # Puppet tries to determine FQDN from /etc/resolv.conf and we do NOT want this behavior
-    facter_hostname = Socket.gethostname
-    ENV['FACTER_fqdn'] = facter_hostname
+  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

data/lib/kafo/params/password.rb

@@ -7,15 +7,14 @@ module Params
   class Password < Param
     def value=(value)
       super
+      if @value.nil? || @value.empty?
+        @value = password_manager.password
+      end
       setup_password if @value.is_a?(::String)
       @value
     end
 
-    # if value was not specified and default is nil we generate a random password
-    # also we make sure that we have encrypted version that is to be outputted
     def value
-      @value = @value_set ? @value : (default || password_manager.password)
-      encrypt if @value.is_a?(::String)
       @encrypted
     end
 

data/lib/kafo/puppet_command.rb

@@ -30,10 +30,8 @@ class PuppetCommand
   private
 
   def modules_path
-    installer_modules = KafoConfigure.config.app[:modules_dir] ||
-        (KafoConfigure.config.app[:installer_dir] + '/modules')
     [
-        installer_modules,
+        KafoConfigure.config.app[:modules_dir],
         File.join(KafoConfigure.gem_root, 'modules')
     ].join(':')
   end

data/lib/kafo/puppet_module_parser.rb

@@ -1,6 +1,9 @@
 # encoding: UTF-8
 require 'puppet'
 require 'rdoc'
+require 'rdoc/markup'        # required for RDoc < 0.9.5
+require 'rdoc/markup/parser' # required for RDoc < 0.9.5
+
 # Based on ideas from puppet-parse by Johan van den Dorpe
 class PuppetModuleParser
   def self.parse(file)
@@ -49,7 +52,11 @@ class PuppetModuleParser
   def docs
     docs = {}
     if !@object.doc.nil?
-      rdoc  = RDoc::Markup.parse(@object.doc)
+      if RDoc::Markup.respond_to?(:parse)
+        rdoc  = RDoc::Markup.parse(@object.doc)
+      else # RDoc < 3.10.0
+        rdoc = RDoc::Markup::Parser.parse(@object.doc)
+      end
       items = rdoc.parts.select { |part| part.respond_to?(:items) }.map(&:items).flatten
       items.each do |item|
         # Skip rdoc items that aren't paragraphs

data/lib/kafo/validator.rb

@@ -2,7 +2,7 @@
 class Validator
 
   def initialize(params)
-    files = KafoConfigure.root_dir + '/modules/stdlib/lib/puppet/parser/functions/validate_*.rb'
+    files = KafoConfigure.modules_dir + '/*/lib/puppet/parser/functions/validate_*.rb'
     Dir.glob(files).each do |file|
       require file
     end

data/lib/kafo/version.rb

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

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

@@ -1,5 +1,10 @@
 # Loads a kafo master password from kafo.yaml
 #
+
+# Loading the decrypt function explicitly so that is always available in templates
+# when calling scope.function_decrypt([@password])
+require File.expand_path('../decrypt', __FILE__)
+
 module Puppet::Parser::Functions
   newfunction(:load_kafo_password, :type => :rvalue) do |args|
     YAML.load_file(lookupvar('kafo_config_file'))[:password]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kafo
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -43,6 +43,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.7.5
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.7.5
 - !ruby/object:Gem::Dependency
   name: puppet
   requirement: !ruby/object:Gem::Requirement
@@ -64,17 +80,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.9.0
 - !ruby/object:Gem::Dependency
   name: logging
   requirement: !ruby/object:Gem::Requirement