kafo 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 91d324d1a64249a43c1144c0004d10ec06ac7fdf
-  data.tar.gz: 8348a33dbabf43af7c171c05512a221b94ebbffe
+  metadata.gz: f3f998e2006a64519cc5db13a1af9ed98a894766
+  data.tar.gz: 4659343e1af1974cfcd916b77612674b9b168905
 SHA512:
-  metadata.gz: 1c4f76dafc8713b732a522bdb76e7edbf8400a6fe10786f487963f7b514d60d0fa95ff348b69638a2ab0fe4d84dad6ac17d2ac33f811f7804fa993d0aaa78c99
-  data.tar.gz: 11ec6f6db6d8025c67e6f7d8a58872760ea3b95208aff2bd2e70a41051252076848446c9ad29011b366bab01565d5eb43692a60dda9783f96ca403f1381be91a
+  metadata.gz: 2874a1f991c8a20d00378e220a4f24465641bc7a9586d151a233181f748cee666b7c7ce0bffc26eb87874b0406e9d4f46daa9e8a5b4711fd5767fd91054573a1
+  data.tar.gz: b4059406b9309d066445a46498ccb17f56ee64dbe9546fb833f35bc6596f22eedc5cb093b01f0cc66956881ba8476269fb4fdbb684d27fe360eac93a74c127d8

data/README.md

@@ -9,7 +9,7 @@ echo "include some_modules" | puppet apply
 ```
 ## Why should I care?
 
-Suppose you work on a software which you want to distribute to a machine in
+Suppose you work on software which you want to distribute to a machine in
 infrastructure managed by puppet. You write a puppet module for your app.
 But you also want to be able to distribute this app to a machine outside of
 puppet infrastructure (e.g. install it to your clients) or you want to install
@@ -271,6 +271,21 @@ bin/foreman-installer --puppetmaster-environments=development --puppetmaster-env
 In interactive mode you'll be prompted for another value until you specify
 blank line.
 
+## Hash arguments
+
+You can use Hash value not unlike Arrays. It's also multivalue type but
+you have to specify a key:value pairs like this.
+```bash
+bin/foreman-installer --puppet-server-git-branch-map=master:some --puppet-server-git-branch-map=development:another
+```
+
+The same applies in interactive mode, you enter each pair on separate line
+just like with Array, the only difference is that the line must be formatted
+as key:value.
+
+When parsing the value, the first colon divides key and value. All other
+colons are ignored.
+
 ## Grouping in interactive mode
 
 If your module has too much parameters you may find useful grouping. Every

data/lib/kafo/kafo_configure.rb

@@ -188,7 +188,7 @@ module Kafo
                             :default => !!config.app[:colors]
       self.class.app_option ['-d', '--dont-save-answers'], :flag, 'Skip saving answers to answers.yaml?',
                             :default => !!config.app[:dont_save_answers]
-      self.class.app_option '--ignore-undocumented', :flag, 'Ignore inconsistent parameters documentation',
+      self.class.app_option '--ignore-undocumented', :flag, 'Ignore inconsistent parameter documentation',
                             :default => false
       self.class.app_option ['-i', '--interactive'], :flag, 'Run in interactive mode'
       self.class.app_option '--log-level', 'LEVEL', 'Log level for log file output',
@@ -209,7 +209,7 @@ module Kafo
       modules.each do |mod|
         self.class.option d("--[no-]enable-#{mod.name}"),
                           :flag,
-                          "Enable puppet module #{mod.name}?",
+                          "Enable '#{mod.name}' puppet module",
                           :default => mod.enabled?
       end
 

data/lib/kafo/param.rb

@@ -107,4 +107,5 @@ require 'kafo/params/boolean'
 require 'kafo/params/string'
 require 'kafo/params/password'
 require 'kafo/params/array'
+require 'kafo/params/hash'
 require 'kafo/params/integer'

data/lib/kafo/params/hash.rb

@@ -0,0 +1,31 @@
+module Kafo
+  module Params
+    class Hash < Param
+      def value=(value)
+        super
+        @value = typecast(@value)
+      end
+
+      def multivalued?
+        true
+      end
+
+      def condition_value
+        value.inspect
+      end
+
+      private
+
+      def typecast(value)
+        if value.nil?
+          nil
+        elsif value.is_a?(::Hash)
+          value
+        else
+          value = [value].flatten
+          ::Hash[value.map { |v| v.split(':', 2) }]
+        end
+      end
+    end
+  end
+end

data/lib/kafo/version.rb

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

data/lib/kafo/wizard.rb

@@ -131,7 +131,7 @@ END
     end
 
     def configure_multi(param)
-      say HighLine.color('every line is a separate value, blank line to quit', :info)
+      say HighLine.color('every line is a separate value, blank line to quit, for hash use key:value syntax', :info)
       say "\ncurrent value: #{HighLine.color(param.value.to_s, :info)} %>"
       ask("new value:") do |q|
         q.gather = ""

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

@@ -2,7 +2,7 @@ require 'kafo_configure/lib/kafo/puppet/report_wrapper'
 
 module Puppet::Parser::Functions
   newfunction(:add_progress) do |args|
-    supported = %w(2.6. 2.7. 3.0. 3.1. 3.2. 3.3.)
+    supported = %w(2.6. 2.7. 3.0. 3.1. 3.2. 3.3. 3.4.)
     if supported.any? { |version| Puppet::PUPPETVERSION.start_with?(version) }
       # Monkey patch the transaction to put our wrapper around the report object
       require 'puppet/transaction'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kafo
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Marek Hulan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-03 00:00:00.000000000 Z
+date: 2013-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -197,6 +197,7 @@ files:
 - lib/kafo/params/password.rb
 - lib/kafo/params/string.rb
 - lib/kafo/params/boolean.rb
+- lib/kafo/params/hash.rb
 - lib/kafo/params/array.rb
 - lib/kafo/params/integer.rb
 - lib/kafo/help_builder.rb