kafo 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8347016820ee174e41f1beeeccad5b815b08c27a
-  data.tar.gz: 2eb7d6bc9c7e5595d8acfab6b64baed0239c95c5
+  metadata.gz: 831fee1d8773e349d7967d6b8e2197cb017d30b0
+  data.tar.gz: 46c3bc4a21f25b8d8f5f70c18d6d3730dd22f10d
 SHA512:
-  metadata.gz: dff1ffc53e9c5e2d05e44afd505f6ed0b9b4fc57e02091ae2f566dc432fd7d83459fc09bc4646349befcb6a146f9650f80103e81ccf9d212de9cf7d9dc2f7a3d
-  data.tar.gz: e37d7d612e98e996b3943c57e82f3cfc59c14014116f3b0576f48bb99b0eea0a04260432d7bc150c8f548b766633951c9081b109b0351df6340e88714372f9f9
+  metadata.gz: e5aa20ffadf4cbf9f0942bab11aa7382611b07b3150de7887caa0a3d16f25aa86cdb5431c4598c63370c6788d6d0cb6ece3ed965fbc1d040a2872539b598629d
+  data.tar.gz: cec32896880413196709850e0480b72f26c3807f07a7a1bea0794ddf590f3d617bb38de2c9757a961dcd5e64cc7d028058b48aa9d9a33a164733da36edeb3e64

data/lib/kafo/configuration.rb

@@ -229,8 +229,16 @@ module Kafo
       File.join(app[:log_dir], app[:log_name])
     end
 
+    def log_files_pattern
+      log_file.sub(/(\.log)\Z/i) { |suffix| "{.[0-9]*,}#{suffix}" }
+    end
+
+    def log_files
+      Dir.glob(log_files_pattern)
+    end
+
     def log_exists?
-      File.exists?(log_file) && File.size(log_file) > 0
+      log_files.any? { |f| File.size(f) > 0 }
     end
 
     def answers

data/lib/kafo/kafo_configure.rb

@@ -370,7 +370,8 @@ module Kafo
       logger.info 'Running validation checks'
       results = params.map do |param|
         result = param.valid?
-        progress_log(:error, "Parameter #{with_prefix(param)} invalid") if logging && !result
+        errors = param.validation_errors.join(', ')
+        progress_log(:error, "Parameter #{with_prefix(param)} invalid: #{errors}") if logging && !result
         result
       end
       results.all?

data/lib/kafo/param.rb

@@ -48,25 +48,23 @@ module Kafo
       if default == 'UNSET'
         self.default = nil
       else
-        if defaults.has_key?(default)
-          value = defaults[default]
-          case value
-            when :undef
-              # value can be set to :undef if value is not defined
-              # (e.g. puppetmaster = $::puppetmaster which is not defined yet)
-              self.default = nil
-            when :undefined
-              # in puppet 2.7 :undefined means that it's param which value is
-              # not set by another parameter (e.g. foreman_group = 'something')
-              # which means, default is sensible unlike dumped default
-              # newer puppet has default dump in format 'value' => 'value' so
-              # it's handled correctly by else branch
-            else
-              self.default = value
-          end
-          # if we don't have default value from dump (can happen for modules added from hooks,
-          # or without using a params class), the existing default value from the manifest will
-          # be used. On calling #value, the default will be returned if no overriding value is set.
+        # if we don't have default value from dump (can happen for modules added from hooks,
+        # or without using a params class), the existing default value from the manifest will
+        # be used. On calling #value, the default will be returned if no overriding value is set.
+        value = defaults.has_key?(default) ? defaults[default] : default
+        case value
+          when :undef
+            # value can be set to :undef if value is not defined
+            # (e.g. puppetmaster = $::puppetmaster which is not defined yet)
+            self.default = nil
+          when :undefined
+            # in puppet 2.7 :undefined means that it's param which value is
+            # not set by another parameter (e.g. foreman_group = 'something')
+            # which means, default is sensible unlike dumped default
+            # newer puppet has default dump in format 'value' => 'value' so
+            # it's handled correctly by else branch
+          else
+            self.default = value
         end
       end
     end
@@ -89,8 +87,17 @@ module Kafo
         {:name => v.name, :arguments => interpret_validation_args(args)}
       end
 
-      validator = Validator.new
-      validations.all? { |v| validator.send(v[:name], v[:arguments]) }
+      @validator = Validator.new
+      validations.each { |v| @validator.send(v[:name], v[:arguments]) }
+      @validator.errors.empty?
+    end
+
+    def validation_errors
+      if @validator
+        @validator.errors
+      else
+        []
+      end
     end
 
     # To be overwritten in children

data/lib/kafo/validator.rb

@@ -1,15 +1,17 @@
 # encoding: UTF-8
 module Kafo
   class Validator
+    attr_reader :errors
 
     def initialize
+      @errors = []
       @logger = KafoConfigure.logger
     end
 
     def validate_absolute_path(args)
       args.each do |arg|
         unless arg.to_s.start_with?('/')
-          @logger.error "#{arg.inspect} is not an absolute path."
+          error "#{arg.inspect} is not an absolute path"
           return false
         end
       end
@@ -19,7 +21,7 @@ module Kafo
     def validate_array(args)
       args.each do |arg|
         unless arg.is_a?(Array)
-          @logger.error "#{arg.inspect} is not a valid array."
+          error "#{arg.inspect} is not a valid array"
           return false
         end
       end
@@ -29,7 +31,7 @@ module Kafo
     def validate_bool(args)
       args.each do |arg|
         unless arg.is_a?(TrueClass) || arg.is_a?(FalseClass)
-          @logger.error "#{arg.inspect} is not a valid boolean."
+          error "#{arg.inspect} is not a valid boolean"
           return false
         end
       end
@@ -39,7 +41,7 @@ module Kafo
     def validate_hash(args)
       args.each do |arg|
         unless arg.is_a?(Hash)
-          @logger.error "#{arg.inspect} is not a valid hash."
+          error "#{arg.inspect} is not a valid hash"
           return false
         end
       end
@@ -52,16 +54,16 @@ module Kafo
       min = args[2]
       int = Integer(value.to_s)
       if min && int < min.to_i
-        @logger.error "#{value} must be at least #{min}."
+        error "#{value} must be at least #{min}"
         return false
       end
       if max && int > max.to_i
-        @logger.error "#{value} must be less than #{max}."
+        error "#{value} must be less than #{max}"
         return false
       end
       return true
     rescue TypeError, ArgumentError
-      @logger.error "#{value.inspect} is not a valid integer."
+      error "#{value.inspect} is not a valid integer"
       return false
     end
 
@@ -70,7 +72,7 @@ module Kafo
       valid_values = ['http', 'https', 'both']
       args.each do |arg|
         unless valid_values.include?(arg)
-          @logger.error "#{arg.inspect} is not a valid value.  Valid values are: #{valid_values.join(", ")}"
+          error "#{arg.inspect} is not a valid value.  Valid values are: #{valid_values.join(", ")}"
           return false
         end
       end
@@ -86,7 +88,7 @@ module Kafo
       if regexes.any? { |rx| value =~ Regexp.compile(rx) }
         return true
       else
-        @logger.error message
+        error message
         return false
       end
     end
@@ -94,7 +96,7 @@ module Kafo
     def validate_string(args)
       args.each do |arg|
         unless arg.is_a?(String)
-          @logger.error "#{arg.inspect} is not a valid string."
+          error "#{arg.inspect} is not a valid string"
           return false
         end
       end
@@ -109,5 +111,12 @@ module Kafo
         super
       end
     end
+
+    private
+
+    def error(message)
+      @errors << message
+      @logger.error "Validation error: #{message}"
+    end
   end
 end

data/lib/kafo/version.rb

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

data/lib/kafo/wizard.rb

@@ -131,6 +131,9 @@ END
       until param.valid?
         param.value = value_was
         say "\n" + HighLine.color("Invalid value for #{param.name}", :important)
+        param.validation_errors.each do |error|
+          say "  " + HighLine.color(error, :important)
+        end
         value       = param.multivalued? ? configure_multi(param) : configure_single(param)
         param.value = value unless value.empty?
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kafo
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Marek Hulan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-21 00:00:00.000000000 Z
+date: 2016-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -288,4 +288,3 @@ specification_version: 4
 summary: If you write puppet modules for installing your software, you can use kafo
   to create powerful installer
 test_files: []
-has_rdoc: