teuton 2.3.7 → 2.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec3ce7a6b9c34c5ee3aba1203009dbe2a9c334e413ad695795f73e351fd466f0
-  data.tar.gz: 99d57501268057252084f3175a3f728e855200fc0319714229fb2f820e1ffef3
+  metadata.gz: 44964e011d270c87d22b3571bd8637a1da2397dd66ad69cc869c591ed12147f2
+  data.tar.gz: 835924c003e68e42f697613c03324ff207b772ed7ed39601627a5d5a8a8c924a
 SHA512:
-  metadata.gz: a476ced60b6439210596dcf224d3dcac7f27edf63b6683f3dd32458f173afd27e33d434f1611ff8572659440f96a96ad0078ff549ce3f3b2e113bf0c0e77cb82
-  data.tar.gz: 3c4d5866483aa04ec9559992c4cf5512a095c91b61a7058f454f511865c82d7d14e8986be87d2bb3f9a06d9828079066144be373b8307caca719443eafe179d5
+  metadata.gz: 17f65a4398602b5baaa80fa86f801c953462c76021cc630dd4d5c6634e26459b34bececd59aa7e2a78f2fd8d1bf5b77214f3883052a44ce743a7da524695faa8
+  data.tar.gz: 2f376375fa4186d5eb3414f422d81ccd5035f33303b8091cd0166e494512e0e1bad7d8dbb7dd797b1c80bb1b5637b4ecc71189d6863c5ef7fcf2b723aa2a987c

data/README.md

@@ -1,12 +1,11 @@
 
 [![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.3.6)
+![Gem](https://img.shields.io/gem/dv/teuton/2.3.8)
 
 # TEUTON
 
-_Create Unit Test for your machines, and
-test your infraestructure as code._
+_Create Unit Test for your machines. Test your infraestructure as code._
 
 ![logo](./docs/images/logo.png)
 
@@ -24,7 +23,7 @@ Teuton allow us:
 * [Installation](https://github.com/teuton-software/teuton/tree/master/docs/install/README.md)
     * Install Ruby on your system.
     * Install Teuton as normal user: `gem install --user-install teuton` (or install as superuser `gem install teuton`).
-* [Videos, blogs, news](docs/videos.md)
+* [Blogs and videos](docs/videos.md)
 * [Learning](docs/learn/README.md)
 * [Commands](docs/commands/README.md)
 * [Language reference](docs/dsl/README.md)

data/docs/CHANGELOG.md

@@ -2,7 +2,27 @@
 
 # Changelog
 
-* [version 2.4](changelog/v2.4.md)
+## TO-DO
+
+- Teuton readme --lang=es
+
+## [2.4.0]
+
+New features:
+- Add new DSL keyword: expect_last, expect_fisrt
+- New doc and example: learn-15-exit_codes
+- Remove os gem.
+- Change test output colors to green as use others test tools.
+
+Bug fixed:
+- All "expect*" keywords must require 2 arguments. The second is optional.
+
+Revise
+- Remove colors to log text
+- teuton readme: macros, getvars, expect_last, expect_first
+- Formatter: xml, csv, list, etc.
+
+
 * [version 2.2](changelog/v2.2.md)
 * [version 2.1](changelog/v2.1.md)
 * [version 2.0](changelog/v2.0.md)

data/docs/learn/14-alias.md

@@ -0,0 +1,47 @@
+[<< back](README.md)
+
+# Example: 14-alias
+
+Supongamos que tenemos un test como el siguiente:
+
+```ruby
+group "Using alias" do
+  target "Verify user #{get(:super)} with key alias."
+  run "id #{get(:super)}"
+  expect get(:super)
+
+  target "Verify user #{_username} with method alias."
+  run "id #{_username}"
+  expect _username
+end
+```
+
+Tenemos sólo 2 targets pero podríamos tener muchos más.
+
+> Recordemos que `_username` es equivalente a `get(:username)`
+
+Sabemos que el fichero de configuración debe definir los valores para los parámetros `super` y `username`. Queremos aprovechar un fichero de configuración que ya teníamos de otro test, pero tiene el siguiente contenido:
+
+```yaml
+# Version 1
+# File: config.yaml
+global:
+cases:
+- tt_members: Anonymous
+  superuser: root
+  username: obiwan
+```
+
+Podemos comprobar que nuestro test require el parámetro `super` pero el fichero de configuración lo ha nombrado como `superuser`.
+
+```yaml
+# Version 2
+# File: config.yaml
+alias:
+  super: :superuser
+global:
+cases:
+- tt_members: Anonymous
+  superuser: root
+  username: obiwan
+```

data/docs/videos.md

@@ -1,19 +1,20 @@
 [<< back](../README.md)
 
-# News
+# Blogs
 
-* [Introducción a Teuton](https://elpuig.xeill.net/Members/vcarceler/articulos/introduccion-a-teuton): iniciarse en el uso de Teutón gracias al fantástico artículo de Víctor Carceler.
-* [Verificar prácticas de GNS3 con Teuton](https://elpuig.xeill.net/Members/juanmorote/articulos/verificar-practicas-de-gns3-con-teuton): GNS3 es un excelente simulador de red Open Source que además se entiende con Teuton a las mil maravillas.
+* ES - [Introducción a Teuton](https://elpuig.xeill.net/Members/vcarceler/articulos/introduccion-a-teuton): iniciarse en el uso de Teutón gracias al fantástico artículo de Víctor Carceler.
+* ES - [Verificar prácticas de GNS3 con Teuton](https://elpuig.xeill.net/Members/juanmorote/articulos/verificar-practicas-de-gns3-con-teuton): GNS3 es un excelente simulador de red Open Source que además se entiende con Teuton a las mil maravillas.
 
 # Videos
 
+Teuton:
+* [Apuntes FP Informática - I Congreso Virtual - Mayo 2020](https://youtu.be/RxIV26BAoGo)
+* [Teuton Software 2.1 - Tutorial - Oct 2020](https://youtu.be/cyBN-rOYQeY)
+
 Teuton en el 2016 se llamaba "sysadmingame".
-* [CHAPI16 - Presentación sysadmingame chapi16 - Abril 2016](https://youtu.be/cNJaB5xzHHQ)
+* ES -[CHAPI16 - Presentación sysadmingame chapi16 - Abril 2016](https://youtu.be/cNJaB5xzHHQ)
 * sysadmingame:
     1. [Instalación del programa](https://youtu.be/dnyMq9_KDco)
     2. [Crear un caso simple](https://youtu.be/0e2g5Izvc6c)
     3. [Crear un caso complejo](https://youtu.be/ebEK6OXH8kQ)
 
-Teuton:
-* [Apuntes FP Informática - I Congreso Virtual - Mayo 2020](https://youtu.be/RxIV26BAoGo)
-* [Teuton Software 2.1 - Tutorial - Oct 2020](https://youtu.be/cyBN-rOYQeY)

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

@@ -76,46 +76,30 @@ class Case
     tempfile :default
   end
 
-  ##
-  # Export Case with specific output format
-  # @param format (Symbol)
   def export(format)
     return if skip?
 
     @report.export format
   end
 
-  ##
-  # Return case report filename
-  # @return String
   def filename
     @report.filename
   end
 
-  ##
-  # Return case grade
-  # @return grade
   def grade
     return 0.0 if skip
 
     @report.tail[:grade]
   end
 
-  ## Return case members
-  # @return members
   def members
     return "-" if skip
 
     @report.head[:tt_members] || "noname"
   end
 
-  ##
-  # Return case skip value
-  # @return skip
   alias skip? skip
 
-  ##
-  # Show case report data on screen
   def show
     @report.show
   end

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

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-# Class Case#close
 class Case
   def close(uniques)
     fails = 0

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

@@ -32,8 +32,8 @@ module DSL
   # * Invoke macro (assert)
   def method_missing(method, args = {})
     a = method.to_s
-    if a.start_with?("_") && a.end_with?("_")
-      return instance_eval("get(:#{a[1, a.size - 2]})", __FILE__, __LINE__)
+    if a.start_with?("_")
+      return instance_eval("get(:#{a[1, a.size - 1]})", __FILE__, __LINE__)
     end
     return macro a[6, a.size], args if a[0, 6] == "macro_"
     macro a, args

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

@@ -7,8 +7,6 @@
 # * fill_report
 # * close_opened_sessions
 class Case
-  ##
-  # Execute "play" order on this case
   def play
     if skip?
       verbose "Skipping case <#{@config.get(:tt_members)}>\n"
@@ -34,9 +32,6 @@ class Case
 
   private
 
-  ##
-  # Execute every play#group in parallel
-  # TO-DO: Under construction!
   def play_in_parallel
     @groups.each do |t|
       @action[:groupname] = t[:name]
@@ -44,8 +39,6 @@ class Case
     end
   end
 
-  ##
-  # Execute every play#group in sequence
   def play_in_sequence
     verboseln "Starting case [#{@config.get(:tt_members)}]"
     @groups.each do |t|
@@ -57,8 +50,6 @@ class Case
     verboseln "\n"
   end
 
-  ##
-  # Fill case report with time information
   def fill_report(start_time, finish_time)
     @report.head.merge! @config.global
     @report.head.merge! @config.local

data/lib/teuton/case_manager/dsl.rb

@@ -1,8 +1,6 @@
 require_relative "../application"
 require_relative "case_manager"
 
-# Define filename to be used into our test
-# @param filename (String) Filename to be required
 def use(filename)
   filename += ".rb"
   app = Application.instance
@@ -14,9 +12,6 @@ def use(filename)
   app.uses << File.basename(findfiles.first)
 end
 
-# Define macro. That's a name to predefined target-run-expect evaluation.
-# @param name (String) macro name
-# @param block (Block) macro code
 def define_macro(name, *args, &block)
   Application.instance.macros[name] = {args: args, block: block}
 end

data/lib/teuton/check/dsl.rb

@@ -3,14 +3,10 @@
 ##
 # Include Teuton DSL keywords into Laboratory class
 class Laboratory
-  ##
-  # Execute Teuton DSL readme keyword
   def readme(_text)
     # Usefull for "teuton readme" command action.
   end
 
-  ##
-  # Execute Teuton DSL target keyword
   def target(desc, args = {})
     @stats[:targets] += 1
     @targetid += 1
@@ -20,55 +16,36 @@ class Laboratory
   end
   alias goal target
 
-  ##
-  # Execute Teuton DSL run keyword
-  def run(command, args = {})
-    args[:exec] = command
-    host = :localhost
-    host = args[:on] if args[:on]
-    goto(host, args)
-  end
-
-  ##
-  # Execute Teuton DSL goto keyword
-  def goto(host = :localhost, args = {})
-    result.reset
-    args[:on] = host unless args[:on]
-
-    if @hosts[host]
-      @hosts[host] += 1
-    else
-      @hosts[host] = 1
-    end
-    verboseln "      run         '#{args[:exec]}' on #{args[:on]}"
-  end
-
-  ##
-  # Execute Teuton DSL expect keyword
   def expect(cond)
     verboseln "      alter       #{result.alterations}" unless result.alterations.empty?
     verboseln "      expect      #{cond} (#{cond.class})"
     verboseln ""
   end
 
-  ##
-  # Execute Teuton DSL expect_one keyword
-  def expect_one(cond)
-    verboseln "      alter       #{result.alterations}" unless result.alterations.empty?
-    verboseln "      expect_one  #{cond} (#{cond.class})"
+  def expect_first(cond)
+    verboseln "      alter        #{result.alterations}" unless result.alterations.empty?
+    verboseln "      expect_first #{cond} (#{cond.class})"
+    verboseln ""
+  end
+
+  def expect_last(cond)
+    verboseln "      alter        #{result.alterations}" unless result.alterations.empty?
+    verboseln "      expect_last #{cond} (#{cond.class})"
     verboseln ""
   end
 
-  ##
-  # Execute Teuton DSL expect_none keyword
   def expect_none(cond)
     verboseln "      alter       #{result.alterations}" unless result.alterations.empty?
     verboseln "      expect_none #{cond} (#{cond.class})"
     verboseln ""
   end
 
-  ##
-  # Execute Teuton DSL get keyword
+  def expect_one(cond)
+    verboseln "      alter       #{result.alterations}" unless result.alterations.empty?
+    verboseln "      expect_one  #{cond} (#{cond.class})"
+    verboseln ""
+  end
+
   def get(varname)
     @stats[:gets] += 1
 
@@ -81,23 +58,37 @@ class Laboratory
     "get(#{varname})"
   end
 
-  # If a method call is missing, then try to call get(var)
-  # rubocop:disable Style/MissingRespondToMissing
-  def method_missing(method)
+  def run(command, args = {})
+    args[:exec] = command
+    host = :localhost
+    host = args[:on] if args[:on]
+    goto(host, args)
+  end
+
+  def goto(host = :localhost, args = {})
+    result.reset
+    args[:on] = host unless args[:on]
+
+    if @hosts[host]
+      @hosts[host] += 1
+    else
+      @hosts[host] = 1
+    end
+    verboseln "      run         '#{args[:exec]}' on #{args[:on]}"
+  end
+
+  # Check macros and _get_vars
+  def method_missing(method, *args, &block)
     a = method.to_s
-    instance_eval("get(:#{a[0, a.size - 1]})", __FILE__, __LINE__) if a[a.size - 1] == "?"
+    if args.nil? && block.nil?
+      instance_eval("get(:#{a[0, a.size - 1]})", __FILE__, __LINE__) if a[a.size - 1] == "?"
+    end
   end
-  # rubocop:enable Style/MissingRespondToMissing
 
-  ##
-  # Execute Teuton DSL gett keyword
-  # Same as get keyword, but show pretty output when used by readme command.
   def gett(option)
     get(option)
   end
 
-  ##
-  # Execute Teuton DSL unique keyword
   def unique(key, _value)
     @stats[:uniques] += 1
 
@@ -105,15 +96,11 @@ class Laboratory
     verboseln ""
   end
 
-  ##
-  # Execute Teuton DSL log keyword
   def log(text = "", type = :info)
     @stats[:logs] += 1
     verboseln "      log    [#{type}]: " + text.to_s
   end
 
-  ##
-  # Execute Teuton DSL set keyword
   def set(key, value)
     @stats[:sets] += 1
 

data/lib/teuton/check/laboratory.rb

@@ -6,9 +6,6 @@ require_relative "show"
 require_relative "dsl"
 require_relative "builtin"
 
-##
-# DSL use: import filename instructions
-# @param filename (String)
 def use(filename)
   filename += ".rb"
   app = Application.instance
@@ -19,18 +16,18 @@ def use(filename)
   require_relative use[0]
 end
 
-##
-# DSL group: Define a group of test
-# @param name (String or Symbol)
-# @param block (Proc)
 def group(name, &block)
   Application.instance.groups << {name: name, block: block}
 end
 alias task group
 
-##
-# DSL start: Define main teuton test execution
-# @param block (Proc)
+def define_macro(name, *args, &block)
+  Application.instance.macros[name] = {args: args, block: block}
+end
+alias def_macro define_macro
+alias defmacro define_macro
+
+
 def start(&block)
   # Don't do nothing. We are checking test not running it
 end

data/lib/teuton/check/show.rb

@@ -9,8 +9,6 @@ require_relative "../utils/configfile_reader"
 # * show_stats
 # * show_config
 class Laboratory
-  ##
-  # Display DSL checking on screen
   def show
     @verbose = true
     process_content
@@ -18,8 +16,6 @@ class Laboratory
     revise_config_content
   end
 
-  ##
-  # Display config for teuton panel on screen
   def show_panelconfig
     @verbose = false
     process_content

data/lib/teuton/readme/dsl.rb

@@ -69,6 +69,8 @@ class Readme
     result.reset
   end
   alias expect_any expect
+  alias expect_first expect
+  alias expect_last expect
   alias expect_none expect
   alias expect_one expect
 

data/lib/teuton/readme/lang.rb

@@ -7,9 +7,9 @@ module Lang
       version: "Teuton version : %s",
       testname: "Test unit name : %s",
       date: "Date           : %s",
-      hosts: "\n\#\#\# Required hosts\n",
-      params: "\n\#\#\# Required params\n",
-      goto: "\nGo to [%s](\#required-hosts) host, and do next:\n",
+      hosts: "\n### Required hosts\n",
+      params: "\n### Required params\n",
+      goto: "\nGo to [%s](#required-hosts) host, and do next:\n",
       global: "\nGlobal parameters that can be modified:\n",
       created: "\nParams created during challenge execution:\n"
     }
@@ -17,9 +17,9 @@ module Lang
       version: "Versión de Teuton : %s",
       testname: "Nombre del test   : %s",
       date: "Fecha             : %s",
-      hosts: "\n\#\#\# Máquinas que se necesitan\n",
-      params: "\n\#\#\# Parámetros de necesarios\n",
-      goto: "\nIr a la máquina [%s](\#required-hosts), y hacer lo siguiente:\n",
+      hosts: "\n### Máquinas que se necesitan\n",
+      params: "\n### Parámetros de necesarios\n",
+      goto: "\nIr a la máquina [%s](#required-hosts), y hacer lo siguiente:\n",
       global: "\nParámetros globales que pueden ser modificados:\n",
       created: "\nParámetros creados durante la ejecución del reto:\n"
     }

data/lib/teuton/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: teuton
 version: !ruby/object:Gem::Version
-  version: 2.3.7
+  version: 2.3.9
 platform: ruby
 authors:
 - David Vargas Ruiz
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-22 00:00:00.000000000 Z
+date: 2022-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement
@@ -122,20 +122,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.15'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.15'
 description: |2
     Intrastructure test, useful for:
     (1) Sysadmin teachers to evaluate students remote machines.
@@ -156,7 +142,6 @@ extra_rdoc_files:
 - docs/changelog/v2.0.md
 - docs/changelog/v2.1.md
 - docs/changelog/v2.2.md
-- docs/changelog/v2.4.md
 - docs/changelog/version2.1.md
 - docs/commands/README.md
 - docs/commands/example_check.md
@@ -198,6 +183,7 @@ extra_rdoc_files:
 - docs/learn/11-moodle_id.md
 - docs/learn/12-get_vars.md
 - docs/learn/13-include.md
+- docs/learn/14-alias.md
 - docs/learn/16-exit_codes.md
 - docs/learn/README.md
 - docs/learn/videos.md
@@ -210,7 +196,6 @@ files:
 - docs/changelog/v2.0.md
 - docs/changelog/v2.1.md
 - docs/changelog/v2.2.md
-- docs/changelog/v2.4.md
 - docs/changelog/version2.1.md
 - docs/commands/README.md
 - docs/commands/example_check.md
@@ -252,6 +237,7 @@ files:
 - docs/learn/11-moodle_id.md
 - docs/learn/12-get_vars.md
 - docs/learn/13-include.md
+- docs/learn/14-alias.md
 - docs/learn/16-exit_codes.md
 - docs/learn/README.md
 - docs/learn/videos.md
@@ -342,14 +328,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.9
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: Teuton (Infrastructure test)

data/docs/changelog/v2.4.md

@@ -1,16 +0,0 @@
-
-## [2.4.0]
-
-New features:
-- Add new DSL keyword: expect_last, expect_fisrt
-- New doc and example: learn-15-exit_codes
-- Remove os gem.
-- Change test output colors to green as use others test tools.
-
-Bug fixed:
-- All "expect*" keywords must require 2 arguments. The second is optional.
-
-Revise
-- Remove colors to log text
-- teuton readme: macros, getvars, expect_last, expect_first
-- Formatter: xml, csv, list, etc.