kafo 6.1.2 → 6.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5b062b74a81972dc7e0029799071d8b634ff87d50921e971bea9160ac007179
-  data.tar.gz: 91d16fcc9ce37cece41968d07ca8f44150016ac58cdc66adaef07ec9efa21d9f
+  metadata.gz: 21528e35ca1cc51e734b4251383a69fd840c7f83dc084a9dfe45289360b2bb21
+  data.tar.gz: ccc5e320dd763e782670173e9f7f9222c37e0a3ad3da4efe4d81e4ce21a41743
 SHA512:
-  metadata.gz: 57abd42df5d5718db2a0ad815fac3c9b7c7e670baa394c9227cedadf3cd0c18f433168d035f23b8aaf4e48d8fe2d2ae17a19371dc8f8756b0857eb31878b5a8c
-  data.tar.gz: ef4f963505fc2e6315fbe19ed8e71e69faa44bf852491b0eebcb3ac778a8ecd86d03989bb2784735e6502ff539f026bd5ae51a12062c01d467601c03fea5ea3e
+  metadata.gz: 01cc33d944f33ac1e14c38b5969c078ff452c5b52a419981206fd3a23e03e17597e8ae6a57f6f50addd6e04e7e890ba398d502128f5d5d5e7fecce9aa01a7c9e
+  data.tar.gz: 772011182c7d11ada145164683ff5177fd031f48d2596adc67888c6c0e11ae4e19311dc737fbebb3a053b574be9c52a2c4fd376f6c84908438faa0b544ba11a0

data/Rakefile

@@ -4,7 +4,7 @@ load 'tasks/jenkins.rake'
 
 Rake::TestTask.new('test:ruby') do |t|
   t.libs << 'lib' << 'test'
-  t.test_files = FileList['test/**/*_test.rb']
+  t.test_files = FileList['test/**/*_test.rb'] - FileList['test/tmp/**/*_test.rb']
   t.verbose = true
 end
 

data/lib/kafo/color_scheme.rb

@@ -1,4 +1,4 @@
-require 'highline/import'
+require 'highline'
 
 module Kafo
   class ColorScheme

data/lib/kafo/hooking.rb

@@ -48,11 +48,17 @@ module Kafo
     def execute(group, log_stage: true)
       logger = Logger.new(group)
       logger.notice "Executing hooks in group #{group}" if log_stage
-      self.hooks[group].keys.sort_by(&:to_s).each do |name|
+
+      sorted_hooks = self.hooks[group].keys.sort do |a, b|
+        File.basename(a.to_s) <=> File.basename(b.to_s)
+      end
+
+      sorted_hooks.each do |name|
         hook = self.hooks[group][name]
         result = HookContext.execute(self.kafo, logger, &hook)
         logger.debug "Hook #{name} returned #{result.inspect}"
       end
+
       logger.notice "All hooks in group #{group} finished" if log_stage
       @group = nil
     end

data/lib/kafo/progress_bar.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+require 'highline'
 require 'powerbar'
 require 'ansi/code'
 require 'set'
@@ -20,7 +21,7 @@ module Kafo
       @all_lines                                = 0
       @total                                    = :unknown
       @resources                                = Set.new
-      @term_width                               = HighLine::SystemExtensions.terminal_size[0] || 0
+      @term_width                               = terminal_width
       @bar                                      = PowerBar.new
       @bar.settings.tty.infinite.template.main  = infinite_template
       @bar.settings.tty.finite.template.main    = finite_template
@@ -85,6 +86,17 @@ module Kafo
 
     private
 
+    def terminal_width
+      # HighLine 2 has Terminal, 1 has SystemExtensions
+      terminal_size = if HighLine.respond_to?(:default_instance)
+                        HighLine.default_instance.terminal.terminal_size
+                      else
+                        HighLine::SystemExtensions.terminal_size
+                      end
+
+      terminal_size ? (terminal_size[0] || 0) : 0
+    end
+
     def done_message
       text = 'Done'
       text + (' ' * (50 - text.length))

data/lib/kafo/scenario_manager.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+require 'highline/import'
 require 'kafo_wizards'
 require 'pathname'
 

data/lib/kafo/version.rb

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

data/lib/kafo/wizard.rb

@@ -1,5 +1,6 @@
 # encoding: UTF-8
-require 'highline/import'
+require 'forwardable'
+require 'highline'
 require 'yaml'
 
 module Kafo
@@ -8,14 +9,17 @@ module Kafo
       Kafo::ENV::LANG =~ /UTF-8\z/
     end
 
+    extend Forwardable
+    def_delegators :@highline, :agree, :ask, :choose, :say
+
     OK = utf_support? ? '✓' : 'y'
     NO = utf_support? ? '✗' : 'n'
 
-    def initialize(kafo)
+    def initialize(kafo, input=$stdin, output=$stdout)
       @kafo   = kafo
       @config = kafo.config
       @name   = @config.app[:name] || 'Kafo'
-      setup_terminal
+      @highline = setup_terminal(input, output)
     end
 
     def run
@@ -178,11 +182,17 @@ END
       say "\n" + HighLine.color("Value for #{param.name} reset to default", :important)
     end
 
-    def setup_terminal
-      $terminal         = HighLine.new
-      data              = HighLine::SystemExtensions.terminal_size
-      $terminal.wrap_at = data.first > 80 ? 80 : data.first if data.first
-      $terminal.page_at = data.last if data.last
+    def setup_terminal(input, output)
+      highline = HighLine.new(input, output)
+      # HighLine 2 vs 1
+      data = if highline.respond_to?(:terminal)
+               highline.terminal.terminal_size
+             else
+               HighLine::SystemExtensions.terminal_size
+             end
+      highline.wrap_at = data.first > 80 ? 80 : data.first if data.first
+      highline.page_at = data.last if data.last
+      highline
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kafo
 version: !ruby/object:Gem::Version
-  version: 6.1.2
+  version: 6.2.0
 platform: ruby
 authors:
 - Marek Hulan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-10 00:00:00.000000000 Z
+date: 2021-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -171,7 +171,7 @@ dependencies:
         version: 1.6.21
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -181,7 +181,7 @@ dependencies:
         version: 1.6.21
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: powerbar
   requirement: !ruby/object:Gem::Requirement
@@ -293,7 +293,6 @@ files:
 - modules/kafo_configure/spec/classes/init_spec.rb
 - modules/kafo_configure/spec/fixtures/hiera/hiera.yaml
 - modules/kafo_configure/spec/fixtures/hiera/test.yaml
-- modules/kafo_configure/spec/fixtures/manifests/site.pp
 - modules/kafo_configure/spec/fixtures/modules/dummy/manifests/init.pp
 - modules/kafo_configure/spec/fixtures/modules/dummy/manifests/params.pp
 - modules/kafo_configure/spec/functions/dump_lookups_spec.rb