kafo 0.0.17 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50b4317c6753f887ed5f82958ccddb7c7231b0c6
-  data.tar.gz: 80e53f9fc0c40a7898beb5cd1df07e4f2159d2bb
+  metadata.gz: 7a0d5d908f8ea926b840cdd83bf863de5c3acd2a
+  data.tar.gz: 34fb06c977764e7548ec837640e781a6599b8fe8
 SHA512:
-  metadata.gz: 1d6874b159789e97761e7ac8cb1f86595a5d167d23cd1720f582914dea450408fb37c3c03269451f5ce38723e3e1d4b88abbd5cdedda284600d8976bfc0fd434
-  data.tar.gz: 6c9fb42c37dd21084cd32a0895eb3b284a918acbe8d37727d64953b928fbf511e7ffd23803d9b6e13310f5dbf28a44518ddbeebcd17cefa0d7a74aa33a739d97
+  metadata.gz: 7f5b4cce32ae6eafb2b02397acdf830a8745c4c32ca465f76519de55b44ea0e6df3a2db6f6ef194f452b871c5c316a7497cde0f731ef0c438c287363d26f3b15
+  data.tar.gz: 48f445d23ff5c7026b5876627a4fd4b7480779b37ebca3394af4b396290a61d6413eb2c3a7b0dd49b52bd8b3ccaeae4c688edd889d07e590bfb553dc9b2dbbc0

data/lib/kafo/kafo_configure.rb

@@ -9,6 +9,7 @@ require 'kafo/string_helper'
 require 'kafo/wizard'
 require 'kafo/system_checker'
 require 'kafo/puppet_command'
+require 'kafo/progress_bar'
 
 class KafoConfigure < Clamp::Command
   include StringHelper
@@ -16,7 +17,7 @@ class KafoConfigure < Clamp::Command
 
   class << self
     attr_accessor :config, :root_dir, :config_file, :gem_root, :temp_config_file,
-                  :modules_dir, :kafo_modules_dir
+                  :modules_dir, :kafo_modules_dir, :verbose
   end
 
   def initialize(*args)
@@ -29,6 +30,7 @@ class KafoConfigure < Clamp::Command
     self.class.kafo_modules_dir = self.class.config.app[:kafo_modules_dir] || (self.class.gem_root + '/modules')
     Logger.setup
     @logger = Logging.logger.root
+    @progress_bar = nil
     super
     set_parameters
     set_options
@@ -42,8 +44,10 @@ class KafoConfigure < Clamp::Command
     catch :exit do
       parse_cli_arguments
 
-      if verbose?
+      if (self.class.verbose = verbose?)
         logger.appenders = logger.appenders << ::Logging.appenders.stdout(:layout => Logger::COLOR_LAYOUT)
+      else
+        @progress_bar = ProgressBar.new
       end
 
       unless SystemChecker.check
@@ -204,7 +208,10 @@ class KafoConfigure < Clamp::Command
       command = PuppetCommand.new('include kafo_configure', options).command
       PTY.spawn(command) do |stdin, stdout, pid|
         begin
-          stdin.each { |line| puppet_log(line) }
+          stdin.each do |line|
+            puppet_log(*puppet_parse(line))
+            @progress_bar.update(line) if @progress_bar
+          end
         rescue Errno::EIO
           if PTY.respond_to?(:check) # ruby >= 1.9.2
             exit_code = PTY.check(pid, true).exitstatus
@@ -217,12 +224,18 @@ class KafoConfigure < Clamp::Command
     rescue PTY::ChildExited => e
       exit_code = e.status.exitstatus
     end
+    @progress_bar.close if @progress_bar
     logger.info "Puppet has finished, bye!"
     FileUtils.rm(temp_config_file, :force => true)
     exit(exit_code)
   end
 
-  def puppet_log(line)
+  def puppet_log(method, message)
+    @progress_bar.print ANSI::Code.red { message + "\n" } if method == :error && @progress_bar
+    Logging.logger['puppet'].send(method, message)
+  end
+
+  def puppet_parse(line)
     method, message = case
                         when line =~ /^Error:(.*)/i || line =~ /^Err:(.*)/i
                           [:error, $1]
@@ -235,7 +248,8 @@ class KafoConfigure < Clamp::Command
                         else
                           [:info, line]
                       end
-    Logging.logger['puppet'].send(method, message.chomp)
+
+    return [method, message.chomp]
   end
 
   def unset

data/lib/kafo/progress_bar.rb

@@ -0,0 +1,57 @@
+require 'powerbar'
+require 'ansi/code'
+
+class ProgressBar
+  def initialize
+    @lines                                    = 0
+    @all_lines                                = 0
+    @total                                    = :unknown
+    @bar                                      = PowerBar.new
+    @bar.settings.tty.infinite.template.main  = infinite_template
+    @bar.settings.tty.finite.template.main    = finite_template
+    @bar.settings.tty.finite.template.padchar = ' '
+    @bar.settings.tty.finite.template.barchar = '.'
+    @bar.settings.tty.finite.output           = Proc.new { |s| $stderr.print s }
+  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
+      @bar.show({ :msg   => format(line),
+                  :done  => @lines,
+                  :total => @total })
+    end
+  end
+
+  def close
+    @bar.show({ :msg   => ANSI::Code.green { 'Done' + (' ' * 46) },
+                :done  => @total == :unknown ? @bar.done + 1 : @total,
+                :total => @total }, true)
+    @bar.close
+  end
+
+  def print(line)
+    @bar.print line
+  end
+
+  private
+
+  def format(line)
+    (line.tr("\r\n", '') + (' ' * 50))[0..49]
+  end
+
+  def finite_template
+    'Installing'.ljust(22) +
+        ANSI::Code.yellow { ' ${<msg>}' } +
+        ANSI::Code.green { ' [${<percent>%}]' } +
+        ' [${<bar>}]'
+  end
+
+  def infinite_template
+    'Preparing installation' + ANSI::Code.yellow { ' ${<msg>}' }
+  end
+end

data/lib/kafo/puppet_command.rb

@@ -6,18 +6,21 @@ class PuppetCommand
     @logger  = Logging.logger.root
   end
 
-  def command
-    custom_answer_file = if KafoConfigure.temp_config_file.nil?
-      ''
-    else
-      "$kafo_answer_file=\"#{KafoConfigure.temp_config_file}\""
-    end
+  def custom_answer_file
+    KafoConfigure.temp_config_file.nil? ? '' : "$kafo_answer_file=\"#{KafoConfigure.temp_config_file}\""
+  end
 
+  def add_progress
+    KafoConfigure.verbose ? '' : "$kafo_add_progress=true"
+  end
+
+  def command
     result = [
-        "echo '$kafo_config_file=\"#{KafoConfigure.config_file}\" #{custom_answer_file} #{@command}'",
-        " | ",
-        "puppet apply #{@options.join(' ')} #{@suffix}"
-    ].join
+        "echo '$kafo_config_file=\"#{KafoConfigure.config_file}\" #{custom_answer_file} #{add_progress} #{@command}'",
+        '|',
+        "RUBYLIB=#{["#{KafoConfigure.gem_root}/modules", ENV['RUBYLIB']].join(File::PATH_SEPARATOR)}",
+        "puppet apply #{@options.join(' ')} #{@suffix}",
+    ].join(' ')
     @logger.debug result
     result
   end

data/lib/kafo/version.rb

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

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

@@ -0,0 +1,35 @@
+module Kafo
+  module Puppet
+    class ReportWrapper
+      attr_reader :transaction, :report
+
+      def initialize(transaction, report)
+        @transaction     = transaction
+        @report          = report
+        @supported       = true
+      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.is_interesting?(status.resource)
+            ::Puppet.info "RESOURCE #{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

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

@@ -0,0 +1,46 @@
+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.)
+    if supported.any? { |version| Puppet::PUPPETVERSION.start_with?(version) }
+      # Monkey patch the transaction to put our wrapper around the report object
+      require 'puppet/transaction'
+      class Puppet::Transaction
+        attr_accessor :in_main_catalog
+
+        def is_interesting?(resource)
+          ![:schedule, :class, :stage, :filebucket].include?(resource.to_s.split('[')[0].downcase.to_sym)
+        end
+
+        def resource_count
+          catalog.vertices.select { |resource| is_interesting?(resource) }.size
+        end
+
+        def evaluate_with_trigger(*args, &block)
+          if catalog.version
+            self.in_main_catalog = true
+            ::Puppet.info "START #{resource_count}"
+          end
+          evaluate_without_trigger(*args, &block)
+          self.in_main_catalog = false if catalog.version
+        end
+
+        alias_method :evaluate_without_trigger, :evaluate
+        alias_method :evaluate, :evaluate_with_trigger
+
+        def report_with_wrapper
+          unless @report_wrapper
+            @report_wrapper = Kafo::Puppet::ReportWrapper.new(self, report_without_wrapper)
+          end
+          @report_wrapper
+        end
+
+        alias_method :report_without_wrapper, :report
+        alias_method :report, :report_with_wrapper
+      end
+    else
+      ::Puppet.err 'Your puppet version does not support progress bar'
+    end
+  end
+end

data/modules/kafo_configure/manifests/init.pp

@@ -6,6 +6,10 @@
 #
 class kafo_configure {
 
+  if $kafo_add_progress {
+    add_progress()
+  }
+
   $password = load_kafo_password()
   $params   = loadanyyaml(load_kafo_answer_file())
   $keys     = kafo_ordered(hash_keys($params))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kafo
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.1.0
 platform: ruby
 authors:
 - Marek Hulan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-27 00:00:00.000000000 Z
+date: 2013-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -122,6 +122,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: powerbar
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A gem for making installations based on puppet user friendly
 email:
 - ares@igloonet.cz
@@ -144,6 +158,7 @@ files:
 - lib/kafo/validator.rb
 - lib/kafo/exceptions.rb
 - lib/kafo/system_checker.rb
+- lib/kafo/progress_bar.rb
 - lib/kafo/puppet_command.rb
 - lib/kafo/wizard.rb
 - lib/kafo/params/password.rb
@@ -158,10 +173,12 @@ files:
 - lib/kafo/version.rb
 - lib/kafo/param_builder.rb
 - lib/kafo.rb
+- modules/kafo_configure/lib/kafo/puppet/report_wrapper.rb
 - modules/kafo_configure/lib/puppet/parser/functions/decrypt.rb
 - modules/kafo_configure/lib/puppet/parser/functions/is_hash.rb
 - modules/kafo_configure/lib/puppet/parser/functions/load_kafo_answer_file.rb
 - modules/kafo_configure/lib/puppet/parser/functions/class_name.rb
+- modules/kafo_configure/lib/puppet/parser/functions/add_progress.rb
 - modules/kafo_configure/lib/puppet/parser/functions/dump_values.rb
 - modules/kafo_configure/lib/puppet/parser/functions/load_kafo_password.rb
 - modules/kafo_configure/lib/puppet/parser/functions/hash_keys.rb