kafo 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e97bd2473d708bd19a6a85e1e4e861420697f58
-  data.tar.gz: c3d5788d32f73a7801f0474338c6916f5ac1c354
+  metadata.gz: 04471c1066e9f6dd65d78a5367cdc0eb56321c0c
+  data.tar.gz: 17179ea8c8da4b0982b6a9bbedb82eade0e66cfe
 SHA512:
-  metadata.gz: e3030707d7cec780ab60a04f7b08c50ec3ae481792ff091d96ab1f823561320ccf8100064aba7583cc561966ea91f0c62dd7c3ccc8cf484aedcfe6f21d7b5695
-  data.tar.gz: 841dc1c57a6332259e51e9e63e5ff065f5159b77416b6264d54b36381177a96e4f76bc9e7102ce9a7f673c8db387c96e0d83b43e32a39828f0b84dd43a9bf1b1
+  metadata.gz: 3a55344a02495577be8d8a43227b605f39baeea111cad9555dcab69ea13a97547e6359ba3cf6c91a47d0736120ab544bb18e8dcdec45a1fa6460eb496c7273de
+  data.tar.gz: ab04cfc6b76c6131d23557074736fe4eb75066ac978da2646202ceed53e3e8ce7e442afd97b4b1eaa607469c51729059125b630f4daf228ecc835761dcfb44c4

data/README.md

@@ -451,10 +451,14 @@ to kafo.yaml
   :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
+    :params_path: ...           # params manifest full path, overriding params_name, must be with .pp extension
+    :params_name: 'params'      # name of manifest holding the params class 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.
+if one of them is default. Arguments params_path and params_name are optional. You can
+use just params_name or override not just file name but complete path using params_path.
+If you use params_path for this purpose, params_name is ignored.
 
 ## Validations
 

data/lib/kafo/configuration.rb

@@ -123,10 +123,10 @@ module Kafo
 
     def includes
       modules.map do |mod|
-        params_file = File.join(KafoConfigure.modules_dir, modules.first.dir_name, 'manifests', 'params.pp')
+        params_file = File.join(KafoConfigure.modules_dir, mod.params_path)
         @logger.debug "checking presence of #{params_file}"
-        File.exist?(params_file) ? "include #{mod.dir_name}::params" : nil
-      end.compact.join(' ')
+        File.exist?(params_file) ? "include #{mod.dir_name}::#{mod.params_class_name}" : nil
+      end.uniq.compact.join(' ')
     end
 
     def params

data/lib/kafo/puppet_module.rb

@@ -9,20 +9,22 @@ module Kafo
     PRIMARY_GROUP_NAME = 'Parameters'
 
     attr_reader :name, :identifier, :params, :dir_name, :class_name, :manifest_name, :manifest_path,
-                :groups
+                :groups, :params_path, :params_class_name
 
     def initialize(identifier, parser = KafoParsers::PuppetModuleParser)
-      @identifier    = identifier
-      @name          = get_name
-      @dir_name      = get_dir_name
-      @manifest_name = get_manifest_name
-      @class_name    = get_class_name
-      @params        = []
-      @manifest_path = File.join(KafoConfigure.modules_dir, module_manifest_path)
-      @parser        = parser
-      @validations   = []
-      @logger        = KafoConfigure.logger
-      @groups        = {}
+      @identifier        = identifier
+      @name              = get_name
+      @dir_name          = get_dir_name
+      @manifest_name     = get_manifest_name
+      @class_name        = get_class_name
+      @params            = []
+      @manifest_path     = File.join(KafoConfigure.modules_dir, module_manifest_path)
+      @parser            = parser
+      @validations       = []
+      @logger            = KafoConfigure.logger
+      @groups            = {}
+      @params_path       = get_params_path
+      @params_class_name = get_params_class_name
     end
 
     def enabled?
@@ -107,16 +109,37 @@ module Kafo
     end
 
     def get_class_name
-      manifest_name == 'init' ? name : "#{dir_name}::#{manifest_name.gsub('_', '::')}"
+      manifest_name == 'init' ? name : "#{dir_name}::#{manifest_name.gsub('/', '::')}"
+    end
+
+    def get_params_path
+      mapping[identifier].nil? ? default_params_path : (mapping[identifier][:params_path] || default_params_path)
+    end
+
+    def get_params_name
+      default = 'params'
+      mapping[identifier].nil? ? default : (mapping[identifier][:params_name] || default)
+    end
+
+    def get_params_class_name
+      name_to_class_name(get_params_name)
     end
 
     def module_manifest_path
       "#{dir_name}/manifests/#{manifest_name}.pp"
     end
 
+    def default_params_path
+      "#{dir_name}/manifests/#{get_params_name}.pp"
+    end
+
     def get_name
       identifier.gsub('::', '_')
     end
 
+    def name_to_class_name(name)
+      name.gsub('/', '::')
+    end
+
   end
 end

data/lib/kafo/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kafo
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Marek Hulan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-08 00:00:00.000000000 Z
+date: 2014-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler