kafo 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7361c36d1938a0cb6e0aef8e7ba478e23f8f4af0
-  data.tar.gz: 828ffbb4779539427b3b40b1cb81db900e08820c
+  metadata.gz: 7385654fc89203332aded949b93497236f18253a
+  data.tar.gz: 04174f77b271cea7470bd00a4da3c3673ce4879e
 SHA512:
-  metadata.gz: 11cf281c119c97541a028f364681fc00f7d93b86cb53123cec742b6530412bdf417d5bfc0f9a433e1a0eaf4ecdda1f857752d913a8df40e3fb59cf4c4a9675de
-  data.tar.gz: 872579a93ddff382ce44d83973a6b0eb0971a5fd7adee80733b5b3284416246e00b17ec1907aa006557639e142f0484cac4cf4582b68df648986e02921b43e8e
+  metadata.gz: 919c57adf28c7307a908eada2d67e1fd80cc21866db371178c05a55f50cc1fa53eb9aaaf4e4a9893f77984dd3bc361042a4304eaf2b6426bc52b8f4b51fb1bc3
+  data.tar.gz: 878cfbc093dd78822103d4c09352c72384d3be46a0053702e5d7dfb1cc105eb74a9f336e114228c218bb068a9f903a82860d5639925225bf87f0032a58844a91

data/bin/kafo-export-params

@@ -81,7 +81,7 @@ module Kafo
 
       def print_out
         @config.modules.sort.each do |mod|
-          puts "Parameters for '#{mod}'\n:"
+          puts "Parameters for '#{mod.name}':\n\n"
           mod.params.sort.each do |param|
             puts "#{parametrize(param)}::"
             puts param.doc.join("\n")

data/lib/kafo/hooking.rb

@@ -14,7 +14,7 @@ module Kafo
     def execute(group)
       logger.info "Executing hooks in group #{group}"
       self.hooks[group].each_pair do |name, hook|
-        result = hook.yield(kafo)
+        result = hook.call(kafo)
         logger.debug "Hook #{name} returned #{result.inspect}"
       end
       logger.info "All hooks in group #{group} finished"

data/lib/kafo/kafo_configure.rb

@@ -43,11 +43,9 @@ module Kafo
       super
 
       set_app_options
-      allowed = self.class.app_options.map(&:switches).flatten
-      allowed.map! { |s| s.include?('[no-]') ? [s.sub('[no-]', ''), s.sub('[no-]', 'no-')] : s }.flatten!
       # we need to parse app config params using clamp even before run method does it
       # so we limit parsing only to app config options (because of --help and later defined params)
-      parse ARGV.select { |a| a =~ /([a-zA-Z0-9_-]*)([= ].*)?/ && allowed.include?($1) }
+      parse clamp_app_arguments
       parse_app_arguments
       Logger.setup
 
@@ -55,7 +53,6 @@ module Kafo
       set_options
     end
 
-
     def config
       self.class.config
     end
@@ -223,6 +220,35 @@ module Kafo
       end
     end
 
+    # ARGV can contain values for attributes e.g. ['-l', 'info']
+    # so we accept either allowed args or those that does not start with '-' and are right after
+    # accepted argument
+    def clamp_app_arguments
+      @allowed_clamp_app_arguments = self.class.app_options.map do |option|
+        option.switches.map { |s| is_yes_no_flag?(s) ? build_yes_no_variants(s) : s }
+      end
+      @allowed_clamp_app_arguments.flatten!
+
+      last_was_accepted = false
+      ARGV.select { |arg| last_was_accepted = is_allowed_attribute_name?(arg) || (last_was_accepted && is_value?(arg)) }
+    end
+
+    def is_yes_no_flag?(s)
+      s.include?('[no-]')
+    end
+
+    def build_yes_no_variants(s)
+      [ s.sub('[no-]', ''), s.sub('[no-]', 'no-') ]
+    end
+
+    def is_allowed_attribute_name?(str)
+      str =~ /([a-zA-Z0-9_-]*)([= ].*)?/ && @allowed_clamp_app_arguments.include?($1)
+    end
+
+    def is_value?(str)
+      !str.start_with?('-')
+    end
+
     def parse_app_arguments
       self.class.app_options.each do |option|
         name                    = option.attribute_name

data/lib/kafo/params/boolean.rb

@@ -10,9 +10,9 @@ module Kafo
 
       def typecast(value)
         case value
-          when '0', 'false', 'f', false
+          when '0', 'false', 'f', 'n', false
             false
-          when '1', 'true', 't', true
+          when '1', 'true', 't', 'y', true
             true
           else
             value

data/lib/kafo/version.rb

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

data/lib/kafo/wizard.rb

@@ -14,8 +14,9 @@ module Kafo
 
     def run
       message = "Welcome to the #{@name} installer!"
-      say("<%= color('#{message}', :headline) %>")
-      say("<%= color('#{'-' * message.size}', :horizontal_line) %>")
+      HighLine.color(message, :important)
+      say(HighLine.color(message, :headline))
+      say(HighLine.color('-' * message.size, :horizontal_line))
       say(<<END)
 
 This wizard will gather all required information. You can change any parameter to your needs.
@@ -35,22 +36,22 @@ END
     def main_menu
       finished = false
       until finished
-        say("\n<%= color('Main Config Menu', :headline) %>")
+        say("\n" + HighLine.color('Main Config Menu', :headline))
         choose do |menu|
           menu.prompt = 'Choose an option from the menu... '
           @config.modules.each do |mod|
-            menu.choice "[#{mod.enabled? ? '✓' : '✗'}] Configure #{mod.name}" do
+            menu.choice "[#{mod.enabled? ? HighLine.color('✓', :run) : HighLine.color('✗', :cancel)}] Configure #{mod.name}" do
               configure_module(mod)
             end
           end
           menu.choice "Display current config" do
             display_hash
           end
-          menu.choice "<%= color('Save and run', :run) %>" do
+          menu.choice HighLine.color('Save and run', :run) do
             KafoConfigure.config
             finished = true
           end
-          menu.choice "<%= color('Cancel run without Saving', :cancel) %>" do
+          menu.choice HighLine.color('Cancel run without Saving', :cancel) do
             say("Bye!"); exit 0
           end
         end
@@ -59,16 +60,16 @@ END
 
     def display_hash
       data = Hash[@config.modules.map { |mod| [mod.name, mod.enabled? ? mod.params_hash : false] }]
-      say "<%= color('#{YAML.dump data}', :info) %>"
+      say HighLine.color(YAML.dump(data), :info)
     end
 
     def configure_module(mod)
       go_back = false
       until go_back
-        say("\n<%= color('Module #{mod.name} configuration', :headline) %>")
+        say("\n" + HighLine.color("Module #{mod.name} configuration", :headline))
         choose do |menu|
           menu.prompt = 'Choose an option from the menu... '
-          menu.choice("Enable/disable #{mod.name} module, current value: <%= color('#{mod.enabled?}', :info) %>") { turn_module(mod) }
+          menu.choice("Enable/disable #{mod.name} module, current value: #{HighLine.color(mod.enabled?.to_s, :info)}") { turn_module(mod) }
           if mod.enabled?
             render_params(mod.primary_parameter_group.params, menu)
 
@@ -85,7 +86,7 @@ END
     def configure_group(group)
       go_back = false
       until go_back
-        say "\n<%= color('Group #{group.formatted_name} (of module #{group.module.name})', :headline) %>"
+        say "\n" + HighLine.color("Group #{group.formatted_name} (of module #{group.module.name})", :headline)
         choose do |menu|
 
           render_params(group.params, menu)
@@ -102,7 +103,7 @@ END
     def render_params(params, menu)
       params.each do |param|
         if param.visible?(@kafo.params)
-          menu.choice "Set <%= color('#{param.name}', :important) %>, current value: <%= color('#{param.value}', :info) %>" do
+          menu.choice "Set #{HighLine.color(param.name, :important)}, current value: #{HighLine.color(param.value.to_s, :info)}" do
             configure(param)
           end
         end
@@ -110,28 +111,28 @@ END
     end
 
     def configure(param)
-      say "\n<%= color('Parameter #{param.name} (of module #{param.module.name})', :headline) %>"
-      say "<%= color(\"#{param.doc.join("\n").gsub('"', '\"')}\", :important) %>"
+      say "\n" + HighLine.color("Parameter #{param.name} (of module #{param.module.name})", :headline)
+      say HighLine.color(param.doc.join("\n").gsub('"', '\"'), :important)
       value       = param.multivalued? ? configure_multi(param) : configure_single(param)
       value_was   = param.value
       param.value = value unless value.empty?
 
       until param.valid?
         param.value = value_was
-        say "\n<%= color('Invalid value for #{param.name}', :important) %>"
+        say "\n" + HighLine.color("Invalid value for #{param.name}", :important)
         value       = param.multivalued? ? configure_multi(param) : configure_single(param)
         param.value = value unless value.empty?
       end
     end
 
     def configure_single(param)
-      say "\ncurrent value: <%= color('#{param.value}', :info) %>"
+      say "\ncurrent value: #{HighLine.color(param.value.to_s, :info)}"
       ask("new value:")
     end
 
     def configure_multi(param)
-      say "<%= color('every line is a separate value, blank line to quit', :info) %>"
-      say "\ncurrent value: <%= color('#{param.value}', :info) %>"
+      say HighLine.color('every line is a separate value, blank line to quit', :info)
+      say "\ncurrent value: #{HighLine.color(param.value.to_s, :info)} %>"
       ask("new value:") do |q|
         q.gather = ""
       end
@@ -167,5 +168,6 @@ END
 
       HighLine.color_scheme = @config.app[:colors] ? colors : nocolors
     end
+
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kafo
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Marek Hulan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-08 00:00:00.000000000 Z
+date: 2013-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler