teuton 2.3.11 → 2.4.0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: teuton
 version: !ruby/object:Gem::Version
-  version: 2.3.11
+  version: 2.4.0
 platform: ruby
 authors:
 - David Vargas Ruiz
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-09 00:00:00.000000000 Z
+date: 2022-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -30,70 +30,70 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: net-sftp
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: net-telnet
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: json_pure
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '3.0'
 description: |2
     Intrastructure test, useful for:
     (1) Sysadmin teachers to evaluate students remote machines.
@@ -139,6 +139,7 @@ extra_rdoc_files:
 - README.md
 - LICENSE
 - docs/CHANGELOG.md
+- docs/changelog/todo.md
 - docs/changelog/v2.0.md
 - docs/changelog/v2.1.md
 - docs/changelog/v2.2.md
@@ -165,8 +166,8 @@ extra_rdoc_files:
 - docs/es/guess_os.md
 - docs/ideas/Challenge-Server-Project.md
 - docs/ideas/contributions.md
-- docs/ideas/ideas.md
 - docs/ideas/servidor-de-retos.md
+- docs/ideas/todo.md
 - docs/install/README.md
 - docs/install/manual.md
 - docs/install/modes_of_use.md
@@ -195,6 +196,7 @@ files:
 - README.md
 - bin/teuton
 - docs/CHANGELOG.md
+- docs/changelog/todo.md
 - docs/changelog/v2.0.md
 - docs/changelog/v2.1.md
 - docs/changelog/v2.2.md
@@ -221,8 +223,8 @@ files:
 - docs/es/guess_os.md
 - docs/ideas/Challenge-Server-Project.md
 - docs/ideas/contributions.md
-- docs/ideas/ideas.md
 - docs/ideas/servidor-de-retos.md
+- docs/ideas/todo.md
 - docs/install/README.md
 - docs/install/manual.md
 - docs/install/modes_of_use.md
@@ -280,7 +282,6 @@ files:
 - lib/teuton/case_manager/hall_of_fame.rb
 - lib/teuton/case_manager/main.rb
 - lib/teuton/case_manager/report.rb
-- lib/teuton/case_manager/show.rb
 - lib/teuton/case_manager/utils.rb
 - lib/teuton/check/builtin.rb
 - lib/teuton/check/dsl.rb
@@ -295,24 +296,22 @@ files:
 - lib/teuton/readme/dsl.rb
 - lib/teuton/readme/lang.rb
 - lib/teuton/readme/readme.rb
-- lib/teuton/report/close.rb
-- lib/teuton/report/formatter/array_formatter.rb
 - lib/teuton/report/formatter/base_formatter.rb
-- lib/teuton/report/formatter/csv_formatter.rb
-- lib/teuton/report/formatter/formatter_factory.rb
-- lib/teuton/report/formatter/html_formatter.rb
-- lib/teuton/report/formatter/json_formatter.rb
-- lib/teuton/report/formatter/list_formatter.rb
+- lib/teuton/report/formatter/default/array.rb
+- lib/teuton/report/formatter/default/colored_text.rb
+- lib/teuton/report/formatter/default/html.rb
+- lib/teuton/report/formatter/default/json.rb
+- lib/teuton/report/formatter/default/txt.rb
+- lib/teuton/report/formatter/default/xml.rb
+- lib/teuton/report/formatter/default/yaml.rb
+- lib/teuton/report/formatter/formatter.rb
 - lib/teuton/report/formatter/moodle_csv_formatter.rb
-- lib/teuton/report/formatter/resume_array_formatter.rb
-- lib/teuton/report/formatter/resume_html_formatter.rb
-- lib/teuton/report/formatter/resume_json_formatter.rb
-- lib/teuton/report/formatter/resume_list_formatter.rb
-- lib/teuton/report/formatter/resume_txt_formatter.rb
-- lib/teuton/report/formatter/resume_yaml_formatter.rb
-- lib/teuton/report/formatter/txt_formatter.rb
-- lib/teuton/report/formatter/xml_formatter.rb
-- lib/teuton/report/formatter/yaml_formatter.rb
+- lib/teuton/report/formatter/resume/array.rb
+- lib/teuton/report/formatter/resume/colored_text.rb
+- lib/teuton/report/formatter/resume/html.rb
+- lib/teuton/report/formatter/resume/json.rb
+- lib/teuton/report/formatter/resume/txt.rb
+- lib/teuton/report/formatter/resume/yaml.rb
 - lib/teuton/report/report.rb
 - lib/teuton/report/show.rb
 - lib/teuton/skeleton.rb

data/lib/teuton/case_manager/show.rb

@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "../application"
-
-# CaseManager show method
-class CaseManager
-  ##
-  # Show cases and resume report data on screep
-  # @param mode (Symbol) Values => :resume, :cases or :all
-  def show(mode = :resume)
-    return if Application.instance.quiet?
-
-    # Show resume report data on screen
-    @report.show if %i[resume all].include? mode
-
-    # Show cases report data on screen
-    return if mode == :resume
-
-    @cases.each do |c|
-      puts "=" * 40
-      c.show
-    end
-  end
-end

data/lib/teuton/report/close.rb

@@ -1,38 +0,0 @@
-class Report
-  ##
-  # Calculate final values:
-  # * grade
-  # * max_weight
-  # * good_weight,d
-  # * fail_weight
-  # * fail_counter
-  def close
-    app = Application.instance
-    max = 0.0
-    good = 0.0
-    fail = 0.0
-    fail_counter = 0
-    @lines.each do |i|
-      next unless i.instance_of? Hash
-
-      max += i[:weight] if i[:weight].positive?
-      if i[:check]
-        good += i[:weight]
-        @history += app.letter[:good]
-      else
-        fail += i[:weight]
-        fail_counter += 1
-        @history += app.letter[:bad]
-      end
-    end
-    @tail[:max_weight] = max
-    @tail[:good_weight] = good
-    @tail[:fail_weight] = fail
-    @tail[:fail_counter] = fail_counter
-
-    i = good.to_f / max
-    i = 0 if i.nan?
-    @tail[:grade] = (100.0 * i).round
-    @tail[:grade] = 0 if @tail[:unique_fault].positive?
-  end
-end

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

@@ -1,25 +0,0 @@
-require_relative "base_formatter"
-
-class CSVFormatter < BaseFormatter
-	def process
-		d = ";"
-		@head.each { |key, value| w "HEAD#{d}#{key}#{d}#{value}\n" }
-		@datagroups.each { |item| process_datagroup(item,d) }
-		@tail.each { |key, value| w "TAIL#{d}#{key}#{d}#{value}\n" }
-		deinit
-	end
-
-	def process_datagroup(group, delimiter = ";")
-		d = delimiter
-		a = "DATAGROUP#{group.order}#{d}"
-		group.head.each { |key, value| w "#{a}HEAD#{d}#{key}#{d}#{value}\n" }
-		group.lines.each do |i|
-			if i.instance_of? Hash
-				w "#{a}LINES#{d}ACTION#{d}#{i[:id]}#{d}#{i[:weight]}#{d}#{i[:description]}\n"
-			else
-        w "#{a}LINES#{d}LOG#{d}#{i}\n"
-			end
-		end
-		group.tail.each { |key, value| w "#{a}TAIL#{d}#{key}#{d}#{value}\n" }
-	end
-end

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

@@ -1,79 +0,0 @@
-# frozen_string_literal: true
-
-require "rainbow"
-require_relative "json_formatter"
-require_relative "html_formatter"
-require_relative "list_formatter"
-require_relative "txt_formatter"
-require_relative "yaml_formatter"
-require_relative "resume_json_formatter"
-require_relative "resume_html_formatter"
-require_relative "resume_list_formatter"
-require_relative "resume_yaml_formatter"
-require_relative "resume_txt_formatter"
-require_relative "moodle_csv_formatter"
-require_relative "csv_formatter"
-require_relative "xml_formatter"
-
-# FormaterFactory module
-module FormatterFactory
-  def self.get(report, format, filename)
-    case format
-    when :colored_text
-      f = TXTFormatter.new(report, true)
-    when :csv
-      f = CSVFormatter.new(report)
-    when :html
-      f = HTMLFormatter.new(report)
-    when :json
-      f = JSONFormatter.new(report)
-    when :list
-      f = ListFormatter.new(report)
-    when :txt
-      f = TXTFormatter.new(report, false)
-    when :xml
-      f = XMLFormatter.new(report)
-    when :yaml
-      f = YAMLFormatter.new(report)
-    when :moodle_csv
-      f = MoodleCSVFormatter.new(report)
-    when :resume_txt
-      f = ResumeTXTFormatter.new(report, false)
-    when :resume_colored_text
-      f = ResumeTXTFormatter.new(report, true)
-    when :resume_json
-      f = ResumeJSONFormatter.new(report)
-    when :resume_html
-      f = ResumeHTMLFormatter.new(report)
-    when :resume_list
-      f = ResumeListFormatter.new(report)
-    when :resume_yaml
-      f = ResumeYAMLFormatter.new(report)
-    else
-      raise "[ERROR] FormaterFactory #{format} unkown!"
-    end
-    f.init(filename)
-    f
-  end
-
-  def self.ext(format)
-    data = {
-      cvs: "csv",
-      colored_text: "txt",
-      json: "json",
-      list: "txt",
-      txt: "txt",
-      yaml: "yaml",
-      resume_colored_text: "txt",
-      resume_csv: "csv",
-      resume_json: "json",
-      resume_html: "html",
-      resume_list: "txt",
-      resume_txt: "txt",
-      resume_yaml: "yaml"
-    }
-    return format.to_s if data[format].nil?
-
-    data[format]
-  end
-end

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

@@ -1,57 +0,0 @@
-# frozen_string_literal: true
-
-require "erb"
-require_relative "yaml_formatter"
-require_relative "../../application"
-
-class HTMLFormatter < YAMLFormatter
-  def initialize(report)
-    super(report)
-    @data = {}
-    filepath = File.join(File.dirname(__FILE__), '..', '..', 'files', 'template', 'case.html')
-    @template = File.read(filepath)
-  end
-
-  def process
-    build_data
-    build_page
-    deinit
-  end
-
-  def build_page
-    # config = @data[:config]
-    # results = @data[:results]
-    # logs = @data[:logs]
-    # groups = @data[:groups]
-    # hall_of_fame = @data[:hall_of_fame]
-    # version = Application::VERSION
-    render = ERB.new(@template)
-    w render.result(binding)
-  end
-
-  private
-
-  def config
-    @data[:config]
-  end
-
-  def results
-    @data[:results]
-  end
-
-  def logs
-    @data[:logs]
-  end
-
-  def groups
-    @data[:groups]
-  end
-
-  def hall_of_fame
-    @data[:hall_of_fame]
-  end
-
-  def version
-    Application::VERSION
-  end
-end

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

@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-
-require "json/pure"
-require_relative "array_formatter"
-
-class JSONFormatter < ArrayFormatter
-  def process
-    build_data
-    w @data.to_json # Write data into ouput file
-    deinit
-  end
-end

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

@@ -1,65 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "array_formatter"
-
-class ListFormatter < ArrayFormatter
-  def process
-    build_data
-    process_config
-    process_logs
-    process_groups
-    process_results
-    process_hof
-    deinit
-  end
-
-  private
-
-  def process_config
-    w "CONFIGURATION\n"
-    @data[:config].sort.each { |key, value| w "  * #{key} : #{value}\n" }
-    w "\n\n"
-  end
-
-  def process_logs
-    return if @data[:logs].size == 0
-
-    w "\nLOGS\n"
-    @data[:logs].each { |line| w "  * #{line}\n" }
-  end
-
-  def process_groups
-    return if @data[:groups].size == 0
-
-    w "\nGROUPS\n"
-    @data[:groups].each { |g| process_group g }
-  end
-
-  def process_results
-    w "\nRESULTS\n"
-    @data[:results].each do |key, value|
-      w "  * #{key} : #{value}\n"
-    end
-  end
-
-  def process_hof
-    return if @data[:hall_of_fame].size < 3
-
-    w "\nHALL OF FAME\n"
-    @data[:hall_of_fame].each do |line|
-      w "  #{line[0]} #{line[1]}\n"
-    end
-  end
-
-  private
-
-  def process_group(group)
-    tab = "  "
-    w "- #{group[:title]}\n"
-    group[:targets].each do |i|
-      w "#{tab * 2}#{format("%02d", i[:target_id].to_i)}"
-      w " (#{i[:score]}/#{i[:weight]}) "
-      w "#{i[:description]}\n"
-    end
-  end
-end

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

@@ -1,62 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "resume_array_formatter"
-
-# ResumeListFormatter class
-class ResumeListFormatter < ResumeArrayFormatter
-  def initialize(report)
-    super(report)
-    @data = {}
-  end
-
-  def process
-    build_data
-    process_config
-    process_cases
-    process_conn_errors
-    process_results
-    process_hof
-    deinit
-  end
-
-  private
-
-  def process_config
-    w "CONFIGURATION\n"
-    @data[:config].each do |key, value|
-      w "  * #{key}: #{trim(value)}\n"
-    end
-  end
-
-  def process_cases
-    w "CASES\n"
-    @data[:cases].each do |line|
-      w "  [#{line[:id]}] #{line[:members]}   :#{format("%3d", line[:grade])}\n"
-    end
-  end
-
-  def process_conn_errors
-    w "CONN ERRORS\n"
-    @data[:cases].each do |line|
-      line[:conn_status].each_pair do |h, e|
-        w "  * #{line[:id]} #{line[:members]} #{h} #{e}\n"
-      end
-    end
-  end
-
-  def process_results
-    w "\nRESULTS\n"
-    @data[:results].each do |key, value|
-      w "  * #{key}: #{value}\n"
-    end
-  end
-
-  def process_hof
-    return if @data[:hall_of_fame].size < 3
-
-    w "\nHALL OF FAME\n"
-    @data[:hall_of_fame].each do |line|
-      w " #{line[0]} : #{line[1]}\n"
-    end
-  end
-end

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

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-require "yaml"
-require_relative "array_formatter"
-
-class YAMLFormatter < ArrayFormatter
-  ##
-  # Process data from parent object and export it into YAML format.
-  # @return [nil]
-  def process
-    build_data
-    w @data.to_yaml # Write data into ouput file
-    deinit
-  end
-end