teuton 2.10.3 → 2.10.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa58869fb42732747d96bdf6cde59ce934c4d743532a64d67cac23c118829ffd
-  data.tar.gz: c6c40a6dec9484c83958f61f0909f5d4eceac3930e4eac0287803ea5c7361a49
+  metadata.gz: f8472b4070402de45b81b61cf0462f1b031b9920d16c0ede38b65cdc5c37a1d7
+  data.tar.gz: b42822a9e3e9b62232164545837cc70bd24ceb7f0344965cf9867cc4dfdbafb7
 SHA512:
-  metadata.gz: 9f4f778f1a56e3aedddb2039f853397814d108931745f9d114209fa30522e4c4093c2ecc39c25219ef10927d8b2d19b2ca0668a7bede5620f9d5e4ba683d83ac
-  data.tar.gz: adf9b7229d08109b18ff3576237e66f94d45b0574aab08e4c18bb17c8a9e2c69d8f34e84ae3c08a1885bb4627727870c2c93158d5ace9abd11cf134735f03a31
+  metadata.gz: d8403fef53179bee22c195be35e936e5b10096523d2360dec333aa68ee3f2f497ba82d83e6d76dc46d62e0919680926bfa3018afae8f6f9facda91de1acce335
+  data.tar.gz: a4557600f54516959f97b5c819ed7f4e3ddaa2c63936e50c5088dbc0c6138c549b10f75a66e79b8d47dc5cff42f0eb74fcb43122a6de1c92b8aed9f3b472efb9

data/README.md

@@ -21,8 +21,6 @@ Install Ruby and then:
 gem install teuton
 ```
 
-> Install Teuton as normal user: `gem install --user-install teuton`
-
 # Usage
 
 Use `teuton run TESTPATH` command to run test:

data/docs/install/README.md

@@ -8,6 +8,11 @@ We call a device with Teuton installed as t-node. [T-NODE](t-node.md) host monit
 1. Install Ruby on your system.
 2. `gem install teuton`
 
+> If you are using ed25519 for the SSH server, then you may need:
+> * `gem install ed25519 -v 1.2`
+> * `gem install bcrypt_pbkdf -v 1.0`
+> This gems requires install `ruby-devel` OS package.
+
 **SSH server installation**
 
 We call e device with SSH/Telnet service as s-node. [S-NODE](s-node.md) hosts are monitorized by T-NODE host.

data/lib/teuton/case/dsl/expect_sequence.rb

@@ -1,6 +1,5 @@
 class ExpectSequence
-  attr_reader :result
-  attr_reader :states
+  attr_reader :result, :states
 
   def initialize(lines)
     @lines = lines
@@ -38,9 +37,9 @@ class ExpectSequence
 
   def find_best_state
     @states.each do |state|
-      state[:score] = state[:steps].select { it }.size
-      state[:fails] = state[:steps].select { !it }.size
-      state[:ok] = (state[:fails] == 0)
+      state[:score] = state[:steps].count { _1 }
+      state[:fails] = state[:steps].count { !it }
+      state[:ok] = state[:fails].zero?
     end
     best = @states[0]
     @states.each { |state| best = state if state[:score] > best[:score] }

data/lib/teuton/case_manager/export_manager.rb

@@ -2,6 +2,7 @@
 
 require "rainbow"
 require_relative "../utils/project"
+require_relative "../report/formatter/formatter"
 
 ##
 # Execute "export" order: Export every case report
@@ -14,25 +15,35 @@ class ExportManager
   # @param input (Hash) Selected export options
   def call(main_report, cases, args, default_format)
     if args.class != Hash
-      puts Rainbow("[ERROR] Export argument error!").red
+      puts Rainbow("[ERROR] ExportManager:").red
+      puts Rainbow("  Export argument error!").red
       puts Rainbow("  Revise: export #{args}").red
       puts Rainbow("  Use   : export format: 'txt'").red
       puts ""
       exit 1
     end
 
+    # Step 1: Validate options
     options = strings2symbols(args)
     options[:format] = default_format if options[:format].nil?
 
-    # Step 1: Export case reports
+    unless Formatter.available_formats.include? options[:format]
+      puts Rainbow("[WARN] ExportManager:").yellow.bright
+      puts Rainbow("       Unkown format <#{options[:format]}>. Fix line <export format: FORMAT>.").yellow.bright
+      puts Rainbow("       Available formats: #{Formatter.available_formats.join(",")}.").yellow.bright
+      puts Rainbow("[INFO] Using default format <txt>.").yellow.bright
+      options[:format] = :txt
+    end
+
+    # Step 2: Export case reports
     threads = []
     cases.each { |c| threads << Thread.new { c.export(options) } }
     threads.each(&:join)
 
-    # Step 2: Export resume report
+    # Step 3: Export resume report
     main_report.export_resume(options)
 
-    # Step 3: Preserve files if required
+    # Step 4: Preserve files if required
     preserve_files if options[:preserve] == true
   end
 

data/lib/teuton/case_manager/send_manager.rb

@@ -11,22 +11,20 @@ class SendManager
   # @param args (Hash) Send options
   def call(cases, args)
     threads = []
-    puts ""
-    write("-" * 70, :green)
-    write("Started at #{Time.new}", :green)
-    write("Sending reports to reachable hosts. Options=#{args}", :green)
+    puts Rainbow("SEND REPORTS").bright
+    write("-" * 70)
+    write("Started at #{Time.new}")
 
     cases.each { |c| threads << Thread.new { c.send(@logfile, args) } }
     threads.each(&:join)
 
-    write("Finished!", :green)
+    write("Finished!")
     puts "-" * 70
   end
 
   private
 
-  def write(msg, color)
-    # puts Rainbow(msg).color(color)
+  def write(msg)
     puts msg
     @logfile.write "#{msg}\n"
     @logfile.flush

data/lib/teuton/case_manager/show_report.rb

@@ -98,10 +98,10 @@ class ShowReport
         if i.instance_of?(::Hash)
           value = 0.0
           value = i[:weight] if i[:check]
-          print tab + "%03d" % i[:id].to_i
-          print " (%2.1f" % value.to_f
-          print "/%2.1f" % i[:weight].to_f
-          puts ") %s" % i[:description].to_s
+          print tab + format("%03d", i[:id].to_i)
+          print format(" (%2.1f", value.to_f)
+          print format("/%2.1f", i[:weight].to_f)
+          puts format(") %s", i[:description].to_s)
         else
           puts "#{tab}=>  #{i}"
         end
@@ -130,7 +130,7 @@ class ShowReport
         st.add_row [line[0], line[1]]
       end
     end
-    puts "#{my_screen_table}\n"
+    puts "#{my_screen_table}\n\n"
   end
 
   def trim(input)

data/lib/teuton/report/formatter/default/array.rb

@@ -2,6 +2,8 @@ require_relative "../base_formatter"
 require_relative "../../../utils/project"
 
 class ArrayFormatter < BaseFormatter
+  MIN_HALL_OF_FAME = 3
+
   def initialize(report)
     super
     @data = {}
@@ -89,7 +91,7 @@ class ArrayFormatter < BaseFormatter
 
   def build_hof_data
     @data[:hall_of_fame] = {}
-    return if Project.value[:options][:case_number] < 3
+    return if Project.value[:options][:case_number] < MIN_HALL_OF_FAME
 
     fame = {}
     Project.value[:hall_of_fame].each { |line| fame[line[0]] = line[1] }

data/lib/teuton/report/formatter/default/txt.rb

@@ -112,7 +112,7 @@ class TXTFormatter < ArrayFormatter
     when :red
       Rainbow(text).color(:red)
     else
-      puts option
+      puts "[ERROR] TXTFormatter#colorize option=#{option}"
       exit 1
     end
   end

data/lib/teuton/report/formatter/formatter.rb

@@ -13,11 +13,32 @@ require_relative "resume/yaml"
 require_relative "moodle_csv_formatter"
 
 module Formatter
+  LIST = {
+    colored_text: ColoredTextFormatter,
+    html: HTMLFormatter,
+    json: JSONFormatter,
+    txt: TXTFormatter,
+    xml: XMLFormatter,
+    yaml: YAMLFormatter,
+    moodle_csv: MoodleCSVFormatter,
+    resume_colored_text: ResumeColoredTextFormatter,
+    resume_html: ResumeHTMLFormatter,
+    resume_json: ResumeJSONFormatter,
+    resume_txt: ResumeTXTFormatter,
+    resume_xml: ResumeTXTFormatter, # TODO
+    resume_yaml: ResumeYAMLFormatter
+  }
+
+  def self.available_formats
+    LIST.keys.take(6)
+  end
+
   def self.call(report, options, filename)
     klass = get(options[:format])
     if klass.nil?
-      puts "[ERROR] Unkown format <#{options[:format]}>. Fix line <export format: FORMAT>"
-      puts "        Available format values: colored_text, html, json, txt, or yaml"
+      puts "[ERROR] Formatter:"
+      puts "        Unkown format <#{options[:format]}>. Fix line <export format: FORMAT>"
+      puts "        Available formats: #{Formatter.available_formats.join(",")}."
       exit 1
     end
     formatter = klass.new(report)
@@ -27,30 +48,15 @@ module Formatter
   end
 
   def self.get(format)
-    list = {
-      colored_text: ColoredTextFormatter,
-      html: HTMLFormatter,
-      json: JSONFormatter,
-      txt: TXTFormatter,
-      xml: XMLFormatter,
-      yaml: YAMLFormatter,
-      moodle_csv: MoodleCSVFormatter,
-      resume_colored_text: ResumeColoredTextFormatter,
-      resume_html: ResumeHTMLFormatter,
-      resume_json: ResumeJSONFormatter,
-      resume_txt: ResumeTXTFormatter,
-      resume_xml: ResumeTXTFormatter, # TODO
-      resume_yaml: ResumeYAMLFormatter
-    }
-    list[format]
+    LIST[format]
   end
 
-  def self.hide_feedback(report)
-    report2 = report.clone
-    report2.groups.each do |group|
-      group.each do |item|
-        puts item
-      end
-    end
-  end
+  # def self.hide_feedback(report)
+  #  report2 = report.clone
+  #  report2.groups.each do |group|
+  #    group.each do |item|
+  #      puts item
+  #    end
+  #  end
+  # end
 end

data/lib/teuton/report/formatter/resume/txt.rb

@@ -3,17 +3,16 @@ require "rainbow"
 require_relative "array"
 
 class ResumeTXTFormatter < ResumeArrayFormatter
-  def initialize(report, color = false)
-    @color = color
+  MIN_HALL_OF_FAME = 3
+
+  def initialize(report, colorize = false)
+    @colorize = colorize
     super(report)
     @ext = "txt"
     @data = {}
   end
 
   def process(options = {})
-    rainbow_state = Rainbow.enabled
-    Rainbow.enabled = @color
-
     build_data(options)
     process_config
     process_cases
@@ -21,14 +20,12 @@ class ResumeTXTFormatter < ResumeArrayFormatter
     process_results
     process_hof
     deinit
-
-    Rainbow.enabled = rainbow_state
   end
 
   private
 
   def process_config
-    w "#{Rainbow("CONFIGURATION").bg(:blue)}\n"
+    w "#{colorize("CONFIGURATION", :bg_blue)}\n"
     my_screen_table = Terminal::Table.new do |st|
       @data[:config].each do |key, value|
         st.add_row [key.to_s, trim(value)]
@@ -38,7 +35,7 @@ class ResumeTXTFormatter < ResumeArrayFormatter
   end
 
   def process_cases
-    w "#{Rainbow("CASES").bg(:blue)}\n"
+    w "#{colorize("CASES", :bg_blue)}\n"
     my_screen_table = Terminal::Table.new do |st|
       st.add_row %w[CASE MEMBERS GRADE STATE]
       @data[:cases].each do |line|
@@ -64,36 +61,56 @@ class ResumeTXTFormatter < ResumeArrayFormatter
     end
     return unless my_screen_table.rows.size > 1
 
-    w "#{Rainbow("CONN ERRORS").bg(:red)}\n#{my_screen_table}\n"
+    w "#{colorize("CONN ERRORS", :bg_red)}\n#{my_screen_table}\n\n"
   end
 
   def process_results
-    w "\n#{Rainbow("RESULTS").bg(:blue)}\n"
+    w "#{colorize("RESULTS", :bg_blue)}\n"
     my_screen_table = Terminal::Table.new do |st|
       @data[:results].each do |key, value|
         st.add_row [key.to_s, value.to_s]
       end
     end
-    w "#{my_screen_table}\n"
+    w "#{my_screen_table}\n\n"
   end
 
   def process_hof
-    return if @data[:hall_of_fame].size < 3
+    return if @data[:hall_of_fame].size < MIN_HALL_OF_FAME
 
-    w "\n#{Rainbow("HALL OF FAME").bg(:blue)}\n"
+    w "#{colorize("HALL OF FAME", :bg_blue)}\n"
     my_screen_table = Terminal::Table.new do |st|
       @data[:hall_of_fame].each do |line|
-        mycolor = :green
-        mycolor = :red if line[0] < 50
-        text1 = Rainbow(line[0]).color(mycolor)
-        text2 = Rainbow(line[1]).color(mycolor)
+        color = :green
+        color = :red if line[0] < 50
+        text1 = colorize(line[0], color)
+        text2 = colorize(line[1], color)
         if line[0] == @data[:results][:grade]
-          text1 = text1.bright
-          text2 = text2.bright
+          text1 = colorize(text1, :bright)
+          text2 = colorize(text2, :bright)
         end
         st.add_row [text1, text2]
       end
     end
     w "#{my_screen_table}\n"
   end
+
+  def colorize(text, option)
+    return text unless @colorize
+
+    case option
+    when :bg_blue
+      Rainbow(text).bg(:blue)
+    when :blue_bright
+      Rainbow(text).blue.bright
+    when :bright
+      Rainbow(text).bright
+    when :green
+      Rainbow(text).color(:green)
+    when :red
+      Rainbow(text).color(:red)
+    else
+      puts "[ERROR] ResumeTXTFormatter#colorize option=#{option}"
+      exit 1
+    end
+  end
 end

data/lib/teuton/version.rb

@@ -1,5 +1,5 @@
 module Teuton
-  VERSION = "2.10.3"
+  VERSION = "2.10.4"
   APPNAME = "teuton"
   GEMNAME = "teuton"
   DOCKERNAME = "dvarrui/#{GEMNAME}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: teuton
 version: !ruby/object:Gem::Version
-  version: 2.10.3
+  version: 2.10.4
 platform: ruby
 authors:
 - David Vargas Ruiz