kafo 0.3.8 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2097c6e99602c8b478265219c447052baaece53b
-  data.tar.gz: 2edb25f2bbe58a5f25ba2ad3ee98b49bb1cd8532
+  metadata.gz: 1aba96236792eab1ec4fdf251ed8ffa9b2eb97b5
+  data.tar.gz: 985d1ca234e1b51e5004b7738c35673ecabed643
 SHA512:
-  metadata.gz: 6e889867eb668c139ccffc103824e3597ee5c2122f9f9309b6eb359a099b90d491a0ea500dba55a86fb835b34133cabf8c1bd278181f6363e9ff28fbca4a72f0
-  data.tar.gz: 8e72a851e7320ef021e5dc9bd3ceba54803dd4dd6cde30e9b4cf387269f100e74ec6507035bb8ba90b41858c968b5c84c640f315d9a75d6d29d5eb572c892f39
+  metadata.gz: 90264b64775acb7b4c08ad04b936fddf3e4650eab45fe9aa41013cff0db599373c48061a272a7d3ecd27afde0b6e773e94722327cb93b8192bda5319b11354d9
+  data.tar.gz: 6bde752677b5921c939fe56f1e6b045e0f7edd7f4b39b934318b85655d25805ac4e73ff618a7c34410f98cfbf6425766a55764c46af8671d9a67c23359213e94

data/bin/kafofy

@@ -35,5 +35,5 @@ puts "Your directory was kafofied"
 
 puts "Now you should:"
 puts "  1. upload your puppet modules to modules directory (you can use librarian-puppet project)"
-puts "  2. create default config/answers.yaml or modify config/kafo.yaml to laod another answer file"
+puts "  2. create default config/answers.yaml or modify config/kafo.yaml to load another answer file"
 puts "  3. run #{script_name}"

data/config/kafo.yaml.example

@@ -3,6 +3,8 @@
 # note current configuration is written to kafo.yaml every time kafo is run
 
 ## Installer configuration
+# Your project name
+# :name: Kafo
 # 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
 # Custom installer path

data/lib/kafo/configuration.rb

@@ -13,6 +13,7 @@ module Kafo
 
     DEFAULT = {
         :log_dir            => '/var/log/kafo',
+        :log_name           => 'configuration.log',
         :log_level          => 'info',
         :no_prefix          => false,
         :mapping            => {},
@@ -121,7 +122,7 @@ module Kafo
     def params
       params = modules.map(&:params).flatten
       params = params.select { |p| p.default != 'UNSET' }
-      params.map { |param| "#{param.default}" }.join(',')
+      params.map { |param| "#{param.dump_default}" }.join(',')
     end
 
     def format(data)

data/lib/kafo/param.rb

@@ -26,6 +26,10 @@ module Kafo
       @value     = value == 'UNDEF' ? nil : value
     end
 
+    def dump_default
+      default
+    end
+
     def module_name
       self.module.name
     end

data/lib/kafo/params/boolean.rb

@@ -6,6 +6,10 @@ module Kafo
         @value = typecast(@value)
       end
 
+      def dump_default
+        %{"#{super}"}
+      end
+
       private
 
       def typecast(value)

data/lib/kafo/params/string.rb

@@ -4,6 +4,10 @@ module Kafo
       def condition_value
         %{"#{value}"}
       end
+
+      def dump_default
+        %{"#{super}"}
+      end
     end
   end
 end

data/lib/kafo/version.rb

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

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

@@ -4,7 +4,7 @@ module Puppet::Parser::Functions
   newfunction(:dump_values) do |args|
     options = []
     options<< false if Puppet::PUPPETVERSION.start_with?('2.6')
-    data = Hash[args.map { |arg| [arg, lookupvar(arg, *options)] }]
+    data = Hash[args.map { |arg| [arg, lookupvar(arg, *options) || arg] }]
     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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kafo
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.3.9
 platform: ruby
 authors:
 - Marek Hulan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-24 00:00:00.000000000 Z
+date: 2014-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler