kafo 0.3.7 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d19db45310802b9ec8accfbdf35c9744ba7d8c26
-  data.tar.gz: dd65098dfe239223143b997c40670dc55183a049
+  metadata.gz: 2097c6e99602c8b478265219c447052baaece53b
+  data.tar.gz: 2edb25f2bbe58a5f25ba2ad3ee98b49bb1cd8532
 SHA512:
-  metadata.gz: b0d661901003eee9440f6c1ea87732fd8ccb9b221ebc21a3df124e4b23adbbe55cb2bd02755b40a65d6082dc855c1c1c1e2cba574724cce48939e996978c157e
-  data.tar.gz: 49d8de9235174a299f47e975066fbb7b9828dc632e04e351a992e053ce7dd6453f74ff73438c9f671b621c42b4b33124dba72e8148d156b3069b47d722ef2c85
+  metadata.gz: 6e889867eb668c139ccffc103824e3597ee5c2122f9f9309b6eb359a099b90d491a0ea500dba55a86fb835b34133cabf8c1bd278181f6363e9ff28fbca4a72f0
+  data.tar.gz: 8e72a851e7320ef021e5dc9bd3ceba54803dd4dd6cde30e9b4cf387269f100e74ec6507035bb8ba90b41858c968b5c84c640f315d9a75d6d29d5eb572c892f39

data/bin/kafo-export-params

@@ -4,11 +4,16 @@ require 'ostruct'
 require 'clamp'
 require 'logging'
 require 'kafo/string_helper'
+require 'kafo/exceptions'
+require 'logger'
 
 $LOAD_PATH.unshift File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'kafo'))
 require 'configuration'
 
 KafoConfigure = OpenStruct.new
+def KafoConfigure.exit(code)
+  Kernel.exit(1)
+end
 
 module Kafo
   class KafoExportParams < Clamp::Command
@@ -29,6 +34,7 @@ module Kafo
       KafoConfigure.config      = c
       KafoConfigure.root_dir    = File.expand_path(c.app[:installer_dir])
       KafoConfigure.modules_dir = File.expand_path(c.app[:modules_dir])
+      KafoConfigure.logger      = Logger.new(STDOUT)
 
       exporter = self.class.const_get(format.capitalize).new(c)
       exporter.print_out

data/lib/kafo/configuration.rb

@@ -95,7 +95,7 @@ module Kafo
     end
 
     def module_enabled?(mod)
-      value = @data[mod.is_a?(String) ? mod : mod.name]
+      value = @data[mod.is_a?(String) ? mod : mod.identifier]
       !!value || value.is_a?(Hash)
     end
 

data/lib/kafo/kafo_configure.rb

@@ -271,7 +271,7 @@ module Kafo
     end
 
     def store_params(file = nil)
-      data = Hash[config.modules.map { |mod| [mod.name, mod.enabled? ? mod.params_hash : false] }]
+      data = Hash[config.modules.map { |mod| [mod.identifier, mod.enabled? ? mod.params_hash : false] }]
       config.store(data, file)
     end
 

data/lib/kafo/puppet_module.rb

@@ -8,11 +8,12 @@ module Kafo
   class PuppetModule
     PRIMARY_GROUP_NAME = 'Parameters'
 
-    attr_reader :name, :params, :dir_name, :class_name, :manifest_name, :manifest_path,
+    attr_reader :name, :identifier, :params, :dir_name, :class_name, :manifest_name, :manifest_path,
                 :groups
 
-    def initialize(name, parser = PuppetModuleParser)
-      @name          = name
+    def initialize(identifier, parser = PuppetModuleParser)
+      @identifier    = identifier
+      @name          = get_name
       @dir_name      = get_dir_name
       @manifest_name = get_manifest_name
       @class_name    = get_class_name
@@ -97,21 +98,25 @@ module Kafo
 
     # custom module directory name
     def get_dir_name
-      mapping[name].nil? ? name : mapping[name][:dir_name]
+      mapping[identifier].nil? ? name : mapping[identifier][:dir_name]
     end
 
     # custom manifest filename without .pp extension
     def get_manifest_name
-      mapping[name].nil? ? 'init' : mapping[name][:manifest_name]
+      mapping[identifier].nil? ? 'init' : mapping[identifier][:manifest_name]
     end
 
     def get_class_name
-      manifest_name == 'init' ? name : "#{dir_name}::#{manifest_name}"
+      manifest_name == 'init' ? name : "#{dir_name}::#{manifest_name.gsub('_', '::')}"
     end
 
     def module_manifest_path
       "#{dir_name}/manifests/#{manifest_name}.pp"
     end
 
+    def get_name
+      identifier.gsub('::', '_')
+    end
+
   end
 end

data/lib/kafo/validator.rb

@@ -3,8 +3,11 @@ module Kafo
   class Validator
 
     def initialize(params)
-      files = KafoConfigure.modules_dir + '/*/lib/puppet/parser/functions/validate_*.rb'
-      Dir.glob(files).each do |file|
+      validate_files = KafoConfigure.modules_dir + '/*/lib/puppet/parser/functions/validate_*.rb'
+      is_function_files = KafoConfigure.modules_dir + '/*/lib/puppet/parser/functions/is_*.rb'
+      definitions = Dir.glob(validate_files) + Dir.glob(is_function_files)
+
+      definitions.each do |file|
         require file
       end
 

data/lib/kafo/version.rb

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

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

@@ -9,7 +9,7 @@ module Puppet::Parser::Functions
   newfunction(:class_name, :type => :rvalue) do |args|
     mapping = YAML.load_file(lookupvar('kafo_config_file'))[:mapping]
     mod = args[0].to_sym
-    mapping[mod].nil? ? mod : "#{mapping[mod][:dir_name]}::#{mapping[mod][:manifest_name]}"
+    mapping[mod].nil? ? mod : "#{mapping[mod][:dir_name]}::#{mapping[mod][:manifest_name].gsub('/', '::')}"
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kafo
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.8
 platform: ruby
 authors:
 - Marek Hulan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-14 00:00:00.000000000 Z
+date: 2014-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler