teuton 2.4.5 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23e6309b8f112199998d8afd4517a06ec5b80ec4d68421ef67ef87b3c63684ef
-  data.tar.gz: b0c17aefadc82be10bc1c52de45fdaa65f070046bc30bad7a0416803c62c5daf
+  metadata.gz: 8d4dba357b30b42efc7a32e8389bd6c7dfa98e835f46907d2f4a3dbe7e5942e8
+  data.tar.gz: 0bb5add96b17f02f791568d02e2fc8ca698cc9138c9e25e9075d2e686fb6ba88
 SHA512:
-  metadata.gz: dc3e324bb363b77302758a8210e02a6258d94e99c0797806c2e2f02894a970a6ca6977984abcc7cd647982c9752b7e5799c762684ca14131d06a1260ecb49eab
-  data.tar.gz: b0bed729989027e9916b214b7421f88a172ef522197d1a5f589c2a5424f54688d5ea3695a3cded4410f2a68d63d5ef1687374b740b90ce91450558f03a1bcc37
+  metadata.gz: 694a956fde1cb64e76d78bf4513df7f011001654aef7d305c9ac54ea0df6748b945d8b0b69514c7172c2e56404093824dd59636f54e647b33d0b068d9d3ef5eb
+  data.tar.gz: 4a8d0fa96fdc396d2da7cd129b1458525abe0d6acb15944f965a3facc692980cd76c33d2321a4997a5e03e3af087eea020054ff308b62d37a9b848778d6c8b79

data/README.md

@@ -3,21 +3,16 @@
 
 [![Gem Version](https://badge.fury.io/rb/teuton.svg)](https://badge.fury.io/rb/teuton)
 ![GitHub](https://img.shields.io/github/license/dvarrui/teuton)
-![Gem](https://img.shields.io/gem/dv/teuton/2.4.0)
 
 _Create Unit Test for your machines. Test your infrastructure as code._
 
 ![logo](./docs/images/logo.png)
 
-Teuton is an infrastructure test tool, useful for:
+Infrastructure test, useful for:
 * Sysadmin teachers who want to evaluate students remote machines.
 * Sysadmin apprentices who want to evaluate their learning process as a game.
 * Professional sysadmin who want to monitor remote machines.
 
-Teuton allow us:
-* Write unit tests for real or virtual devices, using simple DSL.
-* Check compliance with requirements on local or remote devices.
-
 # Installation
 
 Install Ruby and then:
@@ -40,18 +35,19 @@ CASE RESULTS
 | CASE | MEMBERS   | GRADE | STATE |
 | 01   | anonymous | 100.0 | ✔     |
 +------+-----------+-------+-------+
-
 ```
 
 # Features
 
-* [Free Software License](LICENSE).
+* Simple DSL to define your tests: `target`, `run`,`expect` and more.
+* Remote devices only require SSH or Telnet service installed.
+* Output format: txt, html, json, yaml, etc.
 * Multiplatform.
-* Remote machines/devices only require SSH or Telnet service installed.
+* [Free Software License](LICENSE).
 
 # Documentation
 
-* [Learn](docs/learn/README.md)
+* [Getting started](docs/learn/README.md)
 * [Language reference](docs/dsl/README.md)
 * [Commands](docs/commands/README.md)
 * [Installation](docs/install/README.md)

data/docs/CHANGELOG.md

@@ -2,6 +2,8 @@
 
 # Changelog
 
+* [version 2.5](changelog/v2.5.md)
+* [version 2.4](changelog/v2.4.md)
 * [version 2.3](changelog/v2.3.md)
 * [version 2.2](changelog/v2.2.md)
 * [version 2.1](changelog/v2.1.md)

data/docs/changelog/todo.md

@@ -1,27 +1,20 @@
 
+
 ## TO-DO
 
 New features:
 - Parse new input format, and detect parse errors
 - Teuton readme --lang=es
 - Export files with other langs
+- Snode Dockerfile
 
 Revise:
 * verify get(:key) and get('key') works fine!
 * Formatter: xml,
 
-Revise documentation:
-* Doc learn 10,11, 12,13 y 14
-* 10 result and moodle_id
-* 12 alias
-* 13 include
-* 14 macro
-* Doc tt_include
-
 Internal changes:
 * Application to Settings
 * Laboratory to Checker
-* Colorize to Rainbow
 * Unify messages ERROR, INFO, WARN. etc
 * Create SendManager as ExportManager?
 * Add tt_label as alias of tt_members

data/docs/changelog/v2.5.md

@@ -0,0 +1,6 @@
+
+## [2.5.0]
+
+- ADD: "tt_moodle_max_score" global configuration param. Teuton grades (0-100) are divided by this value when exporting data into "moodle.csv" output file.
+- UPDATE: Revise documentation. Doc learn 10,11, 12,13 y 14. 10 result and moodle_id, 12 alias, 13 include, 14 macro, Doc tt_include
+- UPDATE: Internal changes. Remove Colorize gem and replace with Rainbow.

data/docs/changelog/v2.6.md

@@ -0,0 +1,4 @@
+
+## [2.6.0]
+
+- [ADD] When running local or SSH commands, stdout and stderr are captured and readed by "expect" sentence.

data/docs/commands/example_check.md

@@ -51,11 +51,10 @@ Example:
 :global:
 :cases:
 - :tt_members: VALUE
-
-Check OK!
 ```
 
 The check process notifies that
 * This test hasn't config file
 * and recommends content for our config file. But it isn't necessary for this example.
-* Syntax is OK!
+* exit_code 0 = Syntax ok.
+* exit code 1 = Syntax ERROR.

data/docs/diagram.md

@@ -0,0 +1,54 @@
+[<<back](../README.md)
+
+# Diagram
+
+```mermaid
+flowchart TB
+
+subgraph user
+  CLI --> Teuton
+end
+
+subgraph "create\nnew\nproject"
+  Teuton -- create --> Skeleton("Sekeleton\nFiles")
+end
+
+subgraph "check\nproject files"
+  Teuton -- check --> Laboratory("Laboratory\nDSL\nShow\nBuiltin!")
+end
+
+subgraph "create readme\nfrom project"
+  Teuton -- readme --> Readme("Readme\nDSL\nLang!")
+end
+
+subgraph manager
+  Teuton -- require --> manager/DSL
+  manager/DSL -- play --> CaseManager("CaseManager\ncheck_cases\nExportManager\nSendManager\nShowReport")
+  ReportManager --> HallOfFame
+end
+
+subgraph utils
+  manager/DSL -- use/macros/groups --> Application("Application\nNameFileFinder")
+  Readme --> ConfigFileReader
+  Laboratory --> ConfigFileReader
+  CaseManager --> ConfigFileReader
+  Verbose
+end
+
+subgraph "case folder"
+  CaseManager --> Case("Case\nConfig\nClose\nPlay\nRunner")
+  Case --> case/DSL
+end
+
+subgraph "result class"
+  Laboratory --> Result
+  Readme --> Result("Result\next_array\next_compare\next_filter")
+  Case --> Result
+end
+
+subgraph report
+  CaseManager --> Report
+  Report --> Formatter
+  Formatter --> files/template
+end
+```

data/docs/install/README.md

@@ -1,8 +1,8 @@
 [<< back](../../README.md)
 
-# Installation process
+# Installation
 
-There are 2 types of nodes/hosts:
+There are 2 types of nodes/hosts, so there are 2 installations:
 
 | ID | Software | Description |
 | -- | -------- | ----------- |
@@ -20,6 +20,7 @@ Read [modes of use](modes_of_use.md) to know more about differents T-NODE/S-NODE
 |           | Fedora    | Workstation 29 | x84-64 | Ok     |        |
 |           | LinuxMint | 18.3           | x86-64 | Ok     |        |
 |           | openSUSE  | Leap 15        | x86-64 | Ok     | Ok     |
+|           | openSUSE  | Tumbleweed     | x86-64 | Ok     | Ok     |
 |           | Ubuntu    | 18.04          | x86-64 | Ok     | Ok     |
 | Microsoft | Windows   | 7 Enterprise   | x86    | Ok     |        |
 |           | Windows   | 10 Pro         | x86-64 | Ok     | Ok     |

data/docs/learn/02-target.md

@@ -15,13 +15,31 @@ group "Learn about targets" do
 
   target "Create user david"
   run "id david"
-  expect "david"
+  expect ["uid=", "(david)", "gid="]
+
+  target "Delete user vader"
+  run "id vader"
+  expect ["id:", "vader", "no exist"]
 
 end
 ```
 
 > In this example, our localhost's OS is GNU/Linux (or any other compatible OS) because the command executed is `id david`.
 
+When the user exists, we expect this words: `uid=, (david), gid=`.
+
+```
+❯ id david
+uid=1000(david) gid=1000(david) grupos=1000(david)
+```
+
+But when user does not exist, we expect different words: `id:, vader, no exist`.
+
+```
+❯ id vader
+id: «vader»: no existe ese usuario
+```
+
 ## Execution section
 
 When we run this teuton test, the execution section (`play`) is processed. This seccion now contains this:
@@ -41,7 +59,7 @@ end
 Execute this command to run the test:
 
 ```console
-> teuton run examples/01-target
+> teuton run examples/02-target
 
 CASE RESULTS
 +------+-----------+-------+-------+
@@ -54,7 +72,7 @@ Report files are created into `var/02-target/` folder:
 
 ```console
 var
-└── 01-target
+└── 02-target
     ├── case-01.txt
     ├── moodle.csv
     └── resume.txt
@@ -63,35 +81,42 @@ var
 Let's see one report:
 
 ```
-> more var/02-target/case-01.txt
-
+❯ cat var/02-target/case-01.txt
 CONFIGURATION
 +-------------+-----------+
 | tt_members  | anonymous |
 | tt_sequence | false     |
 | tt_skip     | false     |
-| tt_testname | 01-target |
+| tt_testname | 02-target |
 +-------------+-----------+
 
+
 GROUPS
 - Learn about targets
     01 (1.0/1.0)
         Description : Create user david
         Command     : id david
         Duration    : 0.002 (local)
-        Alterations : find(david) & count
+        Alterations : find(uid=) & find((david)) & find(gid=) & count
+        Expected    : Greater than 0 (String)
+        Result      : 1 (Integer)
+    02 (1.0/1.0)
+        Description : Delete user vader
+        Command     : id vader
+        Duration    : 0.002 (local)
+        Alterations : find(id:) & find(vader) & find(no exist) & count
         Expected    : Greater than 0 (String)
         Result      : 1 (Integer)
 
 RESULTS
 +--------------+---------------------------+
 | case_id      | 01                        |
-| start_time   | 2022-12-24 13:31:28 +0000 |
-| finish_time  | 2022-12-24 13:31:28 +0000 |
-| duration     | 0.001880141               |
+| start_time   | 2023-04-10 09:09:30 +0100 |
+| finish_time  | 2023-04-10 09:09:30 +0100 |
+| duration     | 0.003863242               |
 | unique_fault | 0                         |
-| max_weight   | 1.0                       |
-| good_weight  | 1.0                       |
+| max_weight   | 2.0                       |
+| good_weight  | 2.0                       |
 | fail_weight  | 0.0                       |
 | fail_counter | 0                         |
 | grade        | 100                       |

data/docs/learn/03-remote_hosts.md

@@ -43,7 +43,7 @@ Define 1 target (item to be checked):
 group "Remote hosts" do
   target "Create user david"
   run "id david", on: :host1
-  expect "david"
+  expect [ "uid=", "(david)", "gid=" ]
 end
 ```
 

data/docs/learn/04-config.md

@@ -24,7 +24,7 @@ group "Reading params from config file" do
 
   target "Create user #{get(:username)}"
   run "id #{get(:username)}"
-  expect get(:username)
+  expect [ "uid=", "("+get(:username)+")", "gid=" ]
 
 end
 ```

data/docs/learn/06-cmd_check.md

@@ -14,7 +14,7 @@ Check Teuton test syntax and show statistics.
 (001) target      Create user get(username)
       weight      1.0
       run         'id get(username)' on host1
-      expect      get(username) (String)
+      expect      ["uid=", "(get(username))", "gid="] (Array)
 
 +----------------------------+
 | GROUP: Using file: network |
@@ -44,7 +44,4 @@ Check Teuton test syntax and show statistics.
 |  * hostname | 2     |
 | Sets        | 0     |
 +-------------+-------+
-+----------------------+
-| Revising CONFIG file |
-+----------------------+
 ```

data/docs/learn/07-target_weight.md

@@ -19,15 +19,13 @@ end
 ```
 
 ```
-❯ teuton check examples/07-target_weight
-
 +--------------------------+
 | GROUP: Using file: users |
 +--------------------------+
 (001) target      Create user get(username)
       weight      1.0
       run         'id get(username)' on host1
-      expect      get(username) (String)
+      expect      ["uid=", "(get(username))", "gid="] (Array)
 
 +----------------------------+
 | GROUP: Using file: network |

data/docs/learn/14-moodle_id.md

@@ -8,7 +8,7 @@ Teuton generates a file called `moodle.csv` with the grades of each student into
 
 ## tt_moodle_id
 
-Add a new field called `tt_moodle_id` to each case in "config.yaml". Fill it with the student's identification (For example, the email registered on the Moodle, or ID number, etc.).
+Add a new field called `tt_moodle_id` to each case in "config.yaml". Fill it with the student's Moodle identification. For example, registered email on or ID number on Moodle platform.
 
 Example:
 
@@ -21,4 +21,22 @@ cases:
   tt_moodle_id: obiwan@starwars.com
 ```
 
-Now, when running test "moodle.csv" will be generated with all student grades.
+Now, when after test execution, use "moodle.csv" output file to load students grades and feedback into your Moodle platform.
+
+## tt_moodle_max_score
+
+By default, teuton evaluates grades from 0 to 100. So grade max score is 100.0 by default. Sometimes teachers configure their moodle tasks with diferents max score, so it is necesary adjust Teuton output grades with Moodle input grades.
+
+We use `tt_moodle_max_score` to customize Moodle max score. So when Teuton export `moodle.csv` values, divides Teuton grades by this value.
+
+Example:
+
+```
+global:
+  tt_moodle_max_score: 10
+cases:
+- tt_members: Darth Vader
+  tt_moodle_id: vader@starwars.com
+- tt_members: Obiwan Kenobi
+  tt_moodle_id: obiwan@starwars.com
+```

data/docs/learn/README.md

@@ -17,7 +17,7 @@ Learn how write your own Teuton tests:
 1. [Export other FORMATS](11-export.md)
 1. [PRESERVE old reports](12-preserve.md)
 1. [Hide FEEDBACK from reports](13-feedback.md)
-1. [MOODLE ID](14-moodle_id.md)
+1. [MOODLE](14-moodle_id.md)
 1. [Build README from test](15-readme.md)
 1. [INCLUDE more configuration files](16-include.md)
 1. [ALIAS](17-alias.md)

data/lib/teuton/application.rb

@@ -70,9 +70,9 @@ class Application
     Rainbow.enabled = @options["color"]
     @options["panel"] = false if @options["panel"].nil?
 
-    return if @options["case"].nil?
-
-    a = @options["case"].split(",")
-    @options["case"] = a.collect!(&:to_i)
+    unless @options["case"].nil?
+      numbers = @options["case"].split(",")
+      @options["case"] = numbers.collect!(&:to_i)
+    end
   end
 end

data/lib/teuton/{case_manager/case → case}/case.rb

@@ -1,16 +1,16 @@
 # frozen_string_literal: true
 
-require_relative "../../application"
-require_relative "../../report/report"
-require_relative "../../report/show"
-require_relative "../utils"
-require_relative "main"
-require_relative "result/result"
+require_relative "../application"
+require_relative "../report/report"
+require_relative "../case_manager/utils"
+require_relative "../result/result"
+require_relative "dsl"
+require_relative "config"
+require_relative "close"
+require_relative "play"
+require_relative "runner"
 require_relative "builtin/main"
 
-# TODO: split Case class into several classes:
-# * Case, Action?, Session?, RunCommand class
-
 # Case class
 # * initialize
 # * export
@@ -29,9 +29,6 @@ class Case
   attr_reader :skip
   @@id = "01" # First case ID value
 
-  ##
-  # Initialize case from specified config
-  # @param config (Hash)
   def initialize(config)
     app = Application.instance
     @config = Case::Config.new(local: config, global: app.global)

data/lib/teuton/{case_manager/case → case}/config.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative "../../application"
+require_relative "../application"
 
 # Class Case::Config
 # * get

data/lib/teuton/{case_manager/case → case}/dsl/macro.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative "../../../application"
+require_relative "../../application"
 
 # DSL module methods: assert, missing_method
 module DSL

data/lib/teuton/case/dsl.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+require_relative "dsl/expect"
+require_relative "dsl/getset"
+require_relative "dsl/goto"
+require_relative "dsl/log"
+require_relative "dsl/macro"
+require_relative "dsl/send"
+require_relative "dsl/target"
+require_relative "dsl/unique"

data/lib/teuton/{case_manager/case → case}/play.rb

@@ -13,15 +13,11 @@ class Case
       return false
     end
     start_time = Time.now
-    if get(:tt_sequence) == true
-      play_in_sequence
-    else
-      play_in_parallel
-    end
+    play_groups_in_sequence
     fill_report(start_time, Time.now)
     close_opened_sessions
   end
-  alias start play
+  alias_method :start, :play
 
   def close_opened_sessions
     @sessions.each_value do |s|
@@ -31,14 +27,15 @@ class Case
 
   private
 
-  def play_in_parallel
+  def play_groups_in_sequence
+    verboseln "\n=> Starting case [#{@config.get(:tt_members)}]" if get(:tt_sequence) == true
     @groups.each do |t|
       @action[:groupname] = t[:name]
       instance_eval(&t[:block])
     end
   end
 
-  def play_in_sequence
+  def play_groups_in_parallel
     verboseln "Starting case [#{@config.get(:tt_members)}]"
     @groups.each do |t|
       verbose "* Processing [#{t[:name]}] "

data/lib/teuton/{case_manager/case → case}/runner.rb

@@ -100,6 +100,9 @@ class Case
       end
       text = if @sessions[hostname].instance_of? Net::SSH::Connection::Session
         @sessions[hostname].exec!(@action[:command])
+        # ssh.exec!("ls -l /home/jamis") do |channel, stream, data|
+        #   stdout << data if stream == :stdout
+        # end
       else
         "SSH: NO CONNECTION!"
       end

data/lib/teuton/case_manager/case_manager.rb

@@ -1,12 +1,13 @@
-require "rainbow"
-require "singleton"
 require_relative "../application"
+require_relative "../case/case"
 require_relative "../report/report"
-require_relative "../report/show"
 require_relative "../utils/configfile_reader"
-require_relative "case/case"
 require_relative "export_manager"
-require_relative "main"
+require_relative "send_manager"
+require_relative "show_report"
+require_relative "check_cases"
+require_relative "report"
+require_relative "utils"
 
 # This class does all the job
 # Organize the hole job, sending orders to others classes
@@ -18,7 +19,6 @@ require_relative "main"
 # * case_manager/hall_of_fame
 # * case_manager/report
 class CaseManager
-  include Singleton
   include Utils
   attr_reader :report, :cases
 
@@ -30,7 +30,6 @@ class CaseManager
 
   ##
   # Execute "play" order: Start every single case test
-  # @param block (Block)
   def play(&block)
     check_cases!
     instance_eval(&block)
@@ -42,37 +41,15 @@ class CaseManager
     export(format: i.to_sym) unless i.nil?
   end
 
-  ##
-  # Execute "export" order: Export every case report
-  # @param args (Hash) Export options
   def export(args = {})
-    if args.class != Hash
-      puts Rainbow("[ERROR] Argument error with 'export'!").red
-      puts Rainbow("  Code : CaseManager#export").red
-      puts Rainbow("  Line : export #{args}").red
-      puts Rainbow("  Use  : export format: 'txt'").red
-      puts ""
-      exit 1
-    end
-    ExportManager.run(@report, @cases, args)
+    ExportManager.new.call(@report, @cases, args)
   end
 
-  ##
-  # Execute "send" order: Send every case report
-  # @param args (Hash) Send options
   def send(args = {})
-    threads = []
-    puts ""
-    puts Rainbow("-" * 50).green
-    puts Rainbow("Sending files...#{args}").color(:green)
-    @cases.each { |c| threads << Thread.new { c.send(args) } }
-    threads.each(&:join)
-    puts Rainbow("Sending finished!").color(:green)
-    puts Rainbow("-" * 50).green
+    SendManager.new.call(@cases, args)
   end
 
   def show(options = {verbose: 1})
-    verbose = options[:verbose]
-    ShowReport.new(@report).call(verbose)
+    ShowReport.new(@report).call(options[:verbose])
   end
 end

data/lib/teuton/case_manager/dsl.rb

@@ -35,6 +35,6 @@ alias task group
 # Start test
 # @param block (Block) Extra code executed at the end.
 def play(&block)
-  CaseManager.instance.play(&block)
+  CaseManager.new.play(&block)
 end
 alias start play

data/lib/teuton/case_manager/export_manager.rb

@@ -1,14 +1,26 @@
 # frozen_string_literal: true
 
+require "rainbow"
 require_relative "../application"
 
-module ExportManager
+##
+# Execute "export" order: Export every case report
+# @param args (Hash) Export options
+class ExportManager
   ##
   # Run export function
   # @param main_report (Report)
   # @param cases (Array)
   # @param input (Hash) Selected export options
-  def self.run(main_report, cases, args)
+  def call(main_report, cases, args)
+    if args.class != Hash
+      puts Rainbow("[ERROR] Export argument error!").red
+      puts Rainbow("  Revise: export #{args}").red
+      puts Rainbow("  Use   : export format: 'txt'").red
+      puts ""
+      exit 1
+    end
+
     options = strings2symbols(args)
     if options[:format].nil?
       options[:format] = Application.instance.default[:format]
@@ -26,10 +38,12 @@ module ExportManager
     preserve_files if options[:preserve] == true
   end
 
+  private
+
   ##
   # Convert Hash String values into Symbol values
   # @param input (Hash)
-  private_class_method def self.strings2symbols(input)
+  def strings2symbols(input)
     args = {}
     input.each_pair do |key, value|
       args[key] = if value.instance_of? String
@@ -43,7 +57,7 @@ module ExportManager
 
   ##
   # Preserve output files for current project execution
-  private_class_method def self.preserve_files
+  def preserve_files
     app = Application.instance
     t = Time.now
     data = {year: t.year, month: t.month, day: t.day, hour: t.hour, min: t.min, sec: t.sec}

data/lib/teuton/case_manager/send_manager.rb

@@ -0,0 +1,17 @@
+require "rainbow"
+
+class SendManager
+  ##
+  # Execute "send" order: Send every case report
+  # @param args (Hash) Send options
+  def call(cases, args)
+    threads = []
+    puts ""
+    puts Rainbow("-" * 50).green
+    puts Rainbow("Sending files...#{args}").color(:green)
+    cases.each { |c| threads << Thread.new { c.send(args) } }
+    threads.each(&:join)
+    puts Rainbow("Sending finished!").color(:green)
+    puts Rainbow("-" * 50).green
+  end
+end

data/lib/teuton/case_manager/utils.rb

@@ -1,5 +1,7 @@
 require_relative "../application"
 require "fileutils"
+require "open3"
+require "rainbow"
 
 module Utils
   def ensure_dir(dirname)
@@ -33,11 +35,14 @@ module Utils
     return {exitstatus: 0, content: ""} if Application.instance.debug
 
     begin
-      text = `#{cmd}`
-      exitstatus = $CHILD_STATUS.exitstatus
+      # text = `#{cmd}`
+      # exitstatus = $CHILD_STATUS.exitstatus
+      text, status = Open3.capture2e(cmd)
+      exitstatus = status.exitstatus
     rescue => e
-      verbose "!"
-      puts("[ERROR] #{e}: Local exec: #{cmd}")
+      verbose Rainbow("!").green
+      text = e.to_s
+      exitstatus = 1
     end
     content = encode_and_split(encoding, text)
     {exitstatus: exitstatus, content: content}

data/lib/teuton/check/laboratory.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require_relative "../application"
-require_relative "../case_manager/case/result/result"
+require_relative "../result/result"
 require_relative "show"
 require_relative "dsl"
 require_relative "builtin"

data/lib/teuton/check/show.rb

@@ -16,7 +16,7 @@ class Laboratory
     revise_config_content
   end
 
-  def show_panelconfig
+  def show_onlyconfig
     @verbose = false
     process_content
     @verbose = true
@@ -69,9 +69,9 @@ class Laboratory
   end
 
   def recomended_config_content
-    verboseln Rainbow("[WARN] Configfile not found").bright.yellow
-    verboseln Rainbow("       #{@path[:config]}").white
-    verboseln Rainbow("[INFO] Recomended content:").bright.yellow
+    warn Rainbow("[WARN] Configfile not found").bright.yellow
+    warn Rainbow("       #{@path[:config]}").white
+    warn Rainbow("[INFO] Recomended content:").bright.yellow
     output = {global: nil, cases: []}
     output[:cases][0] = {}
     script_vars = find_script_vars
@@ -80,18 +80,14 @@ class Laboratory
   end
 
   def recomended_panelconfig_content
-    output = {global: {}, cases: nil}
+    output = {global: nil, cases: [{}]}
     script_vars = find_script_vars
-    script_vars.each { |i| output[:global][i] = "VALUE" }
+    # script_vars.each { |i| output[:global][i] = "VALUE" }
+    script_vars.each { |i| output[:cases][0][i] = "VALUE" }
     verboseln YAML.dump(output)
   end
 
   def revise_config_content
-    my_screen_table = Terminal::Table.new do |st|
-      st.add_row ["Revising CONFIG file"]
-    end
-    verboseln my_screen_table
-
     unless File.exist?(@path[:config])
       recomended_config_content
       return

data/lib/teuton/cli.rb

@@ -15,7 +15,8 @@ class CLI < Thor
   end
 
   map ["c", "-c", "--check"] => "check"
-  option :panelconfig, type: :boolean
+  option :onlyconfig, type: :boolean
+  option :color, type: :boolean
   option :cname, type: :string
   option :cpath, type: :string
   desc "check [OPTIONS] DIRECTORY", "Check test and config file content"
@@ -25,7 +26,7 @@ class CLI < Thor
 
     (2) teuton check PATH/TO/DIR --cname=demo , Check content of start.rb and demo.yaml files:
 
-    (3) teuton check PATH/TO/DIR --panelconfig  , Only show config file recomendations
+    (3) teuton check PATH/TO/DIR --onlyconfig  , Only show config file recomendations
 
     (4) teuton check PATH/TO/DIR/foo.rb , Check content of foo.rb and foo.yaml files.
 

data/lib/teuton/readme/readme.rb

@@ -1,6 +1,6 @@
 require_relative "../application"
 require_relative "../utils/configfile_reader"
-require_relative "../case_manager/case/result/result"
+require_relative "../result/result"
 require_relative "../version"
 require_relative "dsl"
 require_relative "lang"

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

@@ -16,13 +16,18 @@ class MoodleCSVFormatter < ResumeArrayFormatter
   private
 
   def process_cases
+    max = @data[:config][:tt_moodle_max_score] || 100.0
+    grade_adjust = max.to_f / 100.0
     # MoodleID, Grade, Feedback
     w "MoodleID, TeutonGrade, TeutonFeedback\n"
     @data[:cases].each do |line|
       moodle_id = line[:moodle_id]
       moodle_id = line[:moodle_id].split(",") if moodle_id.instance_of? String
       moodle_id.each do |id|
-        w "#{id.strip},#{line[:grade]},#{line[:moodle_feedback]}\n" unless line[:skip]
+        unless line[:skip]
+          grade = line[:grade].to_f * grade_adjust
+          w "#{id.strip},#{grade},#{line[:moodle_feedback]}\n"
+        end
       end
     end
   end

data/lib/teuton/{case_manager/case/result → result}/ext_array.rb

@@ -35,9 +35,9 @@ class Result
     @content.empty
   end
 
-  alias count! count
-  alias length count
-  alias len count
-  alias size count
-  alias empty? empty
+  alias_method :count!, :count
+  alias_method :length, :count
+  alias_method :len, :count
+  alias_method :size, :count
+  alias_method :empty?, :empty
 end

data/lib/teuton/{case_manager/case/result → result}/result.rb

@@ -66,7 +66,7 @@ class Result
     @content_backup = temp
     @content = temp.clone
   end
-  alias restore! restore
+  alias_method :restore!, :restore
 
   def value
     @content[0]

data/lib/teuton/version.rb

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

data/lib/teuton.rb

@@ -6,36 +6,34 @@ module Teuton
     Skeleton.create(path_to_new_dir)
   end
 
+  def self.check(projectpath, options = {})
+    Application.instance.add_input_params(projectpath, options)
+    require_dsl_and_script("teuton/check/laboratory") # Define DSL
+
+    app = Application.instance
+    lab = Laboratory.new(app.script_path, app.config_path)
+    if options[:onlyconfig]
+      lab.show_onlyconfig
+    else
+      lab.show
+    end
+  end
+
   def self.run(projectpath, options = {})
     Application.instance.add_input_params(projectpath, options)
-    require_dsl_and_script("teuton/case_manager/dsl") # Define DSL keywords
+    require_dsl_and_script("teuton/case_manager/dsl") # Define DSL
   end
 
   def self.readme(projectpath, options = {})
     # Create Readme file for a teuton test
     Application.instance.add_input_params(projectpath, options)
-    require_dsl_and_script("teuton/readme/readme") # Define DSL keywords
+    require_dsl_and_script("teuton/readme/readme") # Define DSL
 
     app = Application.instance
     readme = Readme.new(app.script_path, app.config_path)
     readme.show
   end
 
-  def self.check(projectpath, options = {})
-    Application.instance.add_input_params(projectpath, options)
-    require_dsl_and_script("teuton/check/laboratory") # Define DSL keywords
-
-    app = Application.instance
-    lab = Laboratory.new(app.script_path, app.config_path)
-    if options[:panelconfig]
-      lab.show_panelconfig
-    else
-      lab.show
-    end
-    puts Rainbow("Check OK!").green
-    exit 0
-  end
-
   private_class_method def self.require_dsl_and_script(dslpath)
     app = Application.instance
     require_relative dslpath

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: teuton
 version: !ruby/object:Gem::Version
-  version: 2.4.5
+  version: 2.6.0
 platform: ruby
 authors:
 - David Vargas Ruiz
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-24 00:00:00.000000000 Z
+date: 2023-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -131,10 +131,13 @@ extra_rdoc_files:
 - docs/changelog/v2.2.md
 - docs/changelog/v2.3.md
 - docs/changelog/v2.4.md
+- docs/changelog/v2.5.md
+- docs/changelog/v2.6.md
 - docs/changelog/version2.1.md
 - docs/commands/README.md
 - docs/commands/example_check.md
 - docs/commands/example_run.md
+- docs/diagram.md
 - docs/dsl/README.md
 - docs/dsl/expect.md
 - docs/dsl/export.md
@@ -197,10 +200,13 @@ files:
 - docs/changelog/v2.2.md
 - docs/changelog/v2.3.md
 - docs/changelog/v2.4.md
+- docs/changelog/v2.5.md
+- docs/changelog/v2.6.md
 - docs/changelog/version2.1.md
 - docs/commands/README.md
 - docs/commands/example_check.md
 - docs/commands/example_run.md
+- docs/diagram.md
 - docs/dsl/README.md
 - docs/dsl/expect.md
 - docs/dsl/export.md
@@ -254,38 +260,34 @@ files:
 - docs/videos.md
 - lib/teuton.rb
 - lib/teuton/application.rb
-- lib/teuton/case_manager/case/builtin/main.rb
-- lib/teuton/case_manager/case/builtin/package.rb
-- lib/teuton/case_manager/case/builtin/service.rb
-- lib/teuton/case_manager/case/builtin/teuton_file.rb
-- lib/teuton/case_manager/case/builtin/teuton_host.rb
-- lib/teuton/case_manager/case/builtin/user.rb
-- lib/teuton/case_manager/case/case.rb
-- lib/teuton/case_manager/case/close.rb
-- lib/teuton/case_manager/case/config.rb
-- lib/teuton/case_manager/case/dsl/expect.rb
-- lib/teuton/case_manager/case/dsl/getset.rb
-- lib/teuton/case_manager/case/dsl/goto.rb
-- lib/teuton/case_manager/case/dsl/log.rb
-- lib/teuton/case_manager/case/dsl/macro.rb
-- lib/teuton/case_manager/case/dsl/main.rb
-- lib/teuton/case_manager/case/dsl/send.rb
-- lib/teuton/case_manager/case/dsl/target.rb
-- lib/teuton/case_manager/case/dsl/unique.rb
-- lib/teuton/case_manager/case/main.rb
-- lib/teuton/case_manager/case/play.rb
-- lib/teuton/case_manager/case/result/ext_array.rb
-- lib/teuton/case_manager/case/result/ext_compare.rb
-- lib/teuton/case_manager/case/result/ext_filter.rb
-- lib/teuton/case_manager/case/result/result.rb
-- lib/teuton/case_manager/case/runner.rb
+- lib/teuton/case/builtin/main.rb
+- lib/teuton/case/builtin/package.rb
+- lib/teuton/case/builtin/service.rb
+- lib/teuton/case/builtin/teuton_file.rb
+- lib/teuton/case/builtin/teuton_host.rb
+- lib/teuton/case/builtin/user.rb
+- lib/teuton/case/case.rb
+- lib/teuton/case/close.rb
+- lib/teuton/case/config.rb
+- lib/teuton/case/dsl.rb
+- lib/teuton/case/dsl/expect.rb
+- lib/teuton/case/dsl/getset.rb
+- lib/teuton/case/dsl/goto.rb
+- lib/teuton/case/dsl/log.rb
+- lib/teuton/case/dsl/macro.rb
+- lib/teuton/case/dsl/send.rb
+- lib/teuton/case/dsl/target.rb
+- lib/teuton/case/dsl/unique.rb
+- lib/teuton/case/play.rb
+- lib/teuton/case/runner.rb
 - lib/teuton/case_manager/case_manager.rb
 - lib/teuton/case_manager/check_cases.rb
 - lib/teuton/case_manager/dsl.rb
 - lib/teuton/case_manager/export_manager.rb
 - lib/teuton/case_manager/hall_of_fame.rb
-- lib/teuton/case_manager/main.rb
 - lib/teuton/case_manager/report.rb
+- lib/teuton/case_manager/send_manager.rb
+- lib/teuton/case_manager/show_report.rb
 - lib/teuton/case_manager/utils.rb
 - lib/teuton/check/builtin.rb
 - lib/teuton/check/dsl.rb
@@ -317,7 +319,10 @@ files:
 - 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/result/ext_array.rb
+- lib/teuton/result/ext_compare.rb
+- lib/teuton/result/ext_filter.rb
+- lib/teuton/result/result.rb
 - lib/teuton/skeleton.rb
 - lib/teuton/utils/configfile_reader.rb
 - lib/teuton/utils/name_file_finder.rb

data/lib/teuton/case_manager/case/dsl/main.rb

@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "expect"
-require_relative "getset"
-require_relative "goto"
-require_relative "log"
-require_relative "macro"
-require_relative "send"
-require_relative "target"
-require_relative "unique"

data/lib/teuton/case_manager/case/main.rb

@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "dsl/main"
-require_relative "config"
-require_relative "close"
-require_relative "play"
-require_relative "runner"

data/lib/teuton/case_manager/main.rb

@@ -1,3 +0,0 @@
-require_relative "check_cases"
-require_relative "report"
-require_relative "utils"