kafo 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8d91c1c416307f1a338f208ff5eff030d1b848a
-  data.tar.gz: c8b4d0291b2ab3afc351ebcd22e12b7326d96d3b
+  metadata.gz: cbf3ef253f9a74761e7ef0c3d46ea5bd1f614348
+  data.tar.gz: 543e582caf1cb8e46a994c3abb715d1164ab61a3
 SHA512:
-  metadata.gz: 3ddd5d143247c1a437f6f6ea3afe287f9a53caed1b0a966aabd763184545706e34ac4428b2bff835893e8a6c62507deb8d9292f0ee5906a11e0a667ebb19de3d
-  data.tar.gz: d07f78c6a86c1eb71617e127264bb39411ffd8f5077b9963725fd4c59d869f45b8a9edcd66ea8ddfda481b4d81967f84e675783dfe775602d06533ec6decd1fe
+  metadata.gz: c0ba6eaad2fc7396046fae8ca7ec19b6a4cdca1aa139a550f88cfd2303603f4b6e987c9ebef5198ab60d46873bb2a3dd288ec8961f944b9555c0a6e422ae278e
+  data.tar.gz: e4a91446ae30920ee6eec8893592821a881cfeefe88078aa798b1e3258a6cc13af5c06c47ca4831d153eb35321eea63a16b71a93bcaff84945391a306d8aaf10

data/README.md

@@ -1093,6 +1093,19 @@ Other exit codes that can be returned:
 
 As of Puppet 3.2, performance data can be gathered during a puppet run by adding the `--profile` option. See [Tune Puppet for Performance with Profiler](https://puppetlabs.com/blog/tune-puppet-performance-profiler) for more information from the Puppet team. Users who wish to perform a Kafo run and gather this type of profiling data to analyze can pass the same option to their installer. The profiling data will then be present in the normal Kafo logs.
 
+## Issue tracker
+
+Issues are tracked in Redmine, see:
+
+* [Open Kafo issues](http://projects.theforeman.org/projects/kafo/issues/)
+* [File new issue](http://projects.theforeman.org/projects/kafo/issues/new)
+
+## Related projects
+
+* [kafo_module_lint](https://github.com/domcleal/kafo_module_lint) will lint Puppet modules to ensure data types are specified correctly etc.
+* [kafo_parsers](https://github.com/theforeman/kafo_parsers) parses Puppet manifests for class documentation and parameter data
+* [puppet-lint-param-docs](https://github.com/voxpupuli/puppet-lint-param-docs) will lint Puppet modules to ensure all parameters are documented
+
 # License
 
 This project is licensed under the GPLv3+.

data/lib/kafo/kafo_configure.rb

@@ -423,6 +423,7 @@ module Kafo
           '--reports=',
           "--hiera_config=#{hiera.config_path}",
       ]
+      options.push '--evaltrace' if @progress_bar
       options.push '--noop' if noop?
       options.push '--profile' if profile?
       begin

data/lib/kafo/progress_bar.rb

@@ -1,6 +1,7 @@
 # encoding: UTF-8
 require 'powerbar'
 require 'ansi/code'
+require 'set'
 
 module Kafo
 # Progress bar base class
@@ -9,10 +10,16 @@ module Kafo
 # #finite_template and #infinite_template methods. Also you may find useful to
 # change more methods like #done_message or #print_error
   class ProgressBar
+    MONITOR_RESOURCE = %r{\w*MONITOR_RESOURCE ([^\]]+\])}
+    EVALTRACE_START = %r{/(.+\]): Starting to evaluate the resource}
+    EVALTRACE_END = %r{/(.+\]): Evaluated in [\d\.]+ seconds}
+    PREFETCH = %r{Prefetching .* resources for}
+
     def initialize
       @lines                                    = 0
       @all_lines                                = 0
       @total                                    = :unknown
+      @resources                                = Set.new
       @term_width                               = HighLine::SystemExtensions.terminal_size[0] || 0
       @bar                                      = PowerBar.new
       @bar.settings.tty.infinite.template.main  = infinite_template
@@ -23,15 +30,41 @@ module Kafo
     end
 
     def update(line)
-      @total     = $1.to_i if line =~ /\w*START (\d+)/
-      @lines     += 1 if line.include?('RESOURCE') && @lines < @total - 1
       @all_lines += 1
 
-      # we print every 20th line during installation preparing otherwise we update every line
-      if @all_lines % 20 == 0 || @total != :unknown
+      # we print every 20th line during installation preparing otherwise only update at EVALTRACE_START
+      update_bar = (@total == :unknown && @all_lines % 20 == 0)
+      force_update = false
+
+      if (line_monitor = MONITOR_RESOURCE.match(line))
+        @resources << line_monitor[1]
+        @total = (@total == :unknown ? 1 : @total + 1)
+      end
+
+      if (line_start = EVALTRACE_START.match(line))
+        if (known_resource = find_known_resource(line_start[1]))
+          line = known_resource
+          update_bar = true
+          force_update = true
+        end
+      end
+
+      if (line_end = EVALTRACE_END.match(line)) && @lines < @total
+        if (known_resource = find_known_resource(line_end[1]))
+          @resources.delete(known_resource)  # ensure it's only counted once
+          @lines += 1
+        end
+      end
+
+      if PREFETCH =~ line
+        update_bar = true
+        force_update = true
+      end
+
+      if update_bar
         @bar.show({ :msg   => format(line),
                     :done  => @lines,
-                    :total => @total })
+                    :total => @total }, force_update)
       end
     end
 
@@ -69,6 +102,16 @@ module Kafo
       'Installing...'
     end
 
+    def find_known_resource(resource)
+      loop do
+        return resource if @resources.include?(resource)
+        # continue to remove prefixes from /Stage[main]/Example/File[/etc/foo] until a resource name is found
+        break unless resource.include?('/')
+        resource = resource.sub %r{.*?/}, ''
+      end
+      nil
+    end
+
   end
 end
 

data/lib/kafo/puppet_module.rb

@@ -138,12 +138,12 @@ module Kafo
 
     # custom module directory name
     def get_dir_name
-      mapping[identifier].nil? ? name : mapping[identifier][:dir_name]
+      mapping[identifier].nil? ? default_dir_name : (mapping[identifier][:dir_name] || default_dir_name)
     end
 
     # custom manifest filename without .pp extension
     def get_manifest_name
-      mapping[identifier].nil? ? 'init' : mapping[identifier][:manifest_name]
+      mapping[identifier].nil? ? default_manifest_name : (mapping[identifier][:manifest_name] || default_manifest_name)
     end
 
     def get_class_name
@@ -155,8 +155,7 @@ module Kafo
     end
 
     def get_params_name
-      default = 'params'
-      mapping[identifier].nil? ? default : (mapping[identifier][:params_name] || default)
+      mapping[identifier].nil? ? default_params_name : (mapping[identifier][:params_name] || default_params_name)
     end
 
     def get_params_class_name
@@ -167,10 +166,22 @@ module Kafo
       "#{dir_name}/manifests/#{manifest_name}.pp"
     end
 
+    def default_dir_name
+      identifier.split('::').first
+    end
+
     def default_params_path
       "#{dir_name}/manifests/#{get_params_name}.pp"
     end
 
+    def default_manifest_name
+      identifier.include?('::') ? identifier.split('::')[1..-1].join('/') : 'init'
+    end
+
+    def default_params_name
+      identifier.include?('::') ? (identifier.split('::')[1..-1] + ['params']).join('/') : 'params'
+    end
+
     def get_name
       identifier.gsub('::', '_')
     end

data/lib/kafo/version.rb

@@ -1,5 +1,5 @@
 # encoding: UTF-8
 module Kafo
   PARSER_CACHE_VERSION = 1
-  VERSION = "1.0.4"
+  VERSION = "1.0.5"
 end

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

@@ -1,5 +1,3 @@
-require 'kafo_configure/lib/kafo/puppet/report_wrapper'
-
 module Puppet::Parser::Functions
   newfunction(:add_progress) do |args|
     loaded = false
@@ -16,7 +14,8 @@ module Puppet::Parser::Functions
         attr_accessor :in_main_catalog
 
         def is_interesting?(resource)
-          ![:schedule, :class, :stage, :filebucket, :anchor, :'kafo_configure::yaml_to_class'].include?(resource.to_s.split('[')[0].downcase.to_sym)
+          return false if resource.class.name == :component  # ignore defined types
+          ![:schedule, :class, :stage, :filebucket, :anchor, :concat_fragment].include?(resource.to_s.split('[')[0].downcase.to_sym)
         end
 
         def tracked_resources
@@ -26,24 +25,15 @@ module Puppet::Parser::Functions
         def evaluate_with_trigger(*args, &block)
           if catalog.version
             self.in_main_catalog = true
-            ::Puppet.info "START #{tracked_resources.size}"
+            tracked_resources.each { |r| ::Puppet.info "MONITOR_RESOURCE #{r}" }
           end
           evaluate_without_trigger(*args, &block)
           self.in_main_catalog = false if catalog.version
         end
 
-        def report_with_wrapper
-          unless @report_wrapper
-            @report_wrapper = Kafo::Puppet::ReportWrapper.new(self, report_without_wrapper)
-          end
-          @report_wrapper
-        end
-
         if method_defined?(:evaluate) && method_defined?(:report)
           alias_method :evaluate_without_trigger, :evaluate
           alias_method :evaluate, :evaluate_with_trigger
-          alias_method :report_without_wrapper, :report
-          alias_method :report, :report_with_wrapper
         else
           ::Puppet.warning 'Unable to patch Puppet transactions for progress bar support, this version may not be supported'
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kafo
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Marek Hulan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-04 00:00:00.000000000 Z
+date: 2016-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -261,7 +261,6 @@ files:
 - lib/kafo/validator.rb
 - lib/kafo/version.rb
 - lib/kafo/wizard.rb
-- modules/kafo_configure/lib/kafo/puppet/report_wrapper.rb
 - modules/kafo_configure/lib/puppet/parser/functions/add_progress.rb
 - modules/kafo_configure/lib/puppet/parser/functions/decrypt.rb
 - modules/kafo_configure/lib/puppet/parser/functions/dump_values.rb

data/modules/kafo_configure/lib/kafo/puppet/report_wrapper.rb

@@ -1,39 +0,0 @@
-require 'set'
-
-module Kafo
-  module Puppet
-    class ReportWrapper
-      attr_reader :transaction, :report
-
-      def initialize(transaction, report)
-        @transaction     = transaction
-        @report          = report
-        @supported       = true
-        @resources_seen  = Set.new
-      end
-
-      # Needed to fool Puppet's logging framework
-      def self.to_s
-        "Puppet::Transaction::Report"
-      end
-
-      def add_resource_status(status, *args, &block)
-        if @supported && report.respond_to?(:resource_statuses) && report.resource_statuses.is_a?(Hash)
-          if transaction.in_main_catalog && report.resource_statuses[status.resource.to_s] && transaction.tracked_resources.include?(status.resource) && !@resources_seen.include?(status.resource)
-            ::Puppet.info "RESOURCE #{status.resource}"
-            @resources_seen << status.resource
-          end
-          report.add_resource_status(status, *args, &block)
-        else
-          ::Puppet.err "Your puppet env is not supported, report does not define resource_statuses"
-          @supported = false
-        end
-      end
-
-      def method_missing(method, *args, &block)
-        report.send(method, *args, &block)
-      end
-    end
-
-  end
-end