teuton 2.4.0 → 2.4.2

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# This is an extension of Result class
+# Extension of Result class
 class Result
   def eq(input)
     # Return true when content is equal than input
@@ -22,10 +22,10 @@ class Result
     end
     value == input
   end
-  alias eq? eq
-  alias equal eq
-  alias equal? eq
-  alias is_equal? eq
+  alias_method :eq?, :eq
+  alias_method :equal, :eq
+  alias_method :equal?, :eq
+  alias_method :is_equal?, :eq
 
   def neq(external)
     @expected = "Not equal to #{external}"
@@ -44,9 +44,9 @@ class Result
     end
     internal != external
   end
-  alias neq? neq
-  alias not_equal neq
-  alias not_equal? neq
+  alias_method :neq?, :neq
+  alias_method :not_equal, :neq
+  alias_method :not_equal?, :neq
 
   def ge(input)
     @expected = "Greater or equal to #{input}"
@@ -65,8 +65,8 @@ class Result
     end
     value >= input
   end
-  alias greater_or_equal ge
-  alias greater_or_equal? ge
+  alias_method :greater_or_equal, :ge
+  alias_method :greater_or_equal?, :ge
 
   def gt(input)
     @expected = "Greater than #{input}"
@@ -85,8 +85,8 @@ class Result
     end
     value > input
   end
-  alias greater gt
-  alias greater_than gt
+  alias_method :greater, :gt
+  alias_method :greater_than, :gt
 
   def le(input)
     @expected = "Lesser or equal to #{input}"
@@ -106,8 +106,8 @@ class Result
     end
     value <= input
   end
-  alias lesser_or_equal le
-  alias lesser_or_equal? le
+  alias_method :lesser_or_equal, :le
+  alias_method :lesser_or_equal?, :le
 
   def lt(input)
     @expected = "Lesser than #{input}"
@@ -126,9 +126,9 @@ class Result
     end
     value < input
   end
-  alias lesser lt
-  alias smaller lt
-  alias lesser_than lt
+  alias_method :lesser, :lt
+  alias_method :smaller, :lt
+  alias_method :lesser_than, :lt
 
   # Return 'true' if the parameter value is near to the target value.
   # To get this we consider a 10% desviation or less, as an acceptable result.
@@ -142,8 +142,7 @@ class Result
 
     false
   end
-  alias near_to near_to?
-  alias near? near_to?
-  alias near near_to?
+  alias_method :near_to, :near_to?
+  alias_method :near?, :near_to?
+  alias_method :near, :near_to?
 end
-# rubocop:enable Metrics/ClassLength

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# This is an extension of Result class
+# Result class extension
 class Result
   # TODO: Error line 102 undefined include? method for 0 Fixnum...
   def find(filter)
@@ -15,9 +15,9 @@ class Result
     end
     self
   end
-  alias grep find
-  alias grep! find
-  alias find! find
+  alias_method :grep, :find
+  alias_method :grep!, :find
+  alias_method :find!, :find
 
   def first
     @alterations << "first"
@@ -25,14 +25,21 @@ class Result
     self
   end
 
-  def not_find(p_filter)
-    @alterations << "not_find(#{p_filter})"
+  def not_find(filter)
+    @alterations << "not_find(#{filter})"
     return self if @content.size.zero?
 
-    @content.reject! { |i| i.include?(p_filter) }
+    case filter.class.to_s
+    when "Array"
+      filter.each { |i| not_find(i.to_s) }
+    when "String" || "Integer"
+      @content.reject! { |i| i.include?(filter.to_s) }
+    when "Regexp"
+      @content.reject! { |i| filter.match(i) }
+    end
     self
   end
-  alias grep_v not_find
+  alias_method :grep_v, :not_find
 
   def since(filter)
     @alterations << "since(#{filter})"

data/lib/teuton/case_manager/case_manager.rb

@@ -47,10 +47,12 @@ class CaseManager
   # @param args (Hash) Export options
   def export(args = {})
     if args.class != Hash
-      puts "[ERROR] CaseManager#export: Argument error!"
-      puts "  Source : export #{args} <#{args.class}>"
-      puts "  Usage  : export format: 'txt'"
-      raise "[ERROR] CaseManager#export: Argument error!"
+      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)
   end
@@ -61,12 +63,12 @@ class CaseManager
   def send(args = {})
     threads = []
     puts ""
-    # puts Rainbow("-" * 50).green
-    puts Rainbow("[INFO] Sending files...#{args}").color(:green)
+    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("[INFO] Finished").color(:green)
-    # puts Rainbow("-" * 50).green
+    puts Rainbow("Sending finished!").color(:green)
+    puts Rainbow("-" * 50).green
   end
 
   def show(options = {verbose: 1})

data/lib/teuton/check/show.rb

@@ -131,7 +131,7 @@ class Laboratory
       st.add_separator
       st.add_row ["Groups", @stats[:groups]]
       st.add_row ["Targets", @stats[:targets]]
-      st.add_row ["Goto", @stats[:hosts]]
+      st.add_row ["Runs", @stats[:hosts]]
       @hosts.each_pair { |k, v| st.add_row [" * #{k}", v] }
       st.add_row ["Uniques", @stats[:uniques]]
       st.add_row ["Logs", @stats[:uniques]]

data/lib/teuton/files/config.yaml

@@ -1,5 +1,4 @@
 ---
 global:
 cases:
-- tt_members: MEMBERS
-  tt_moodle_id: MOODLE_ID
+- tt_members: NAMES_TO-CHANGE

data/lib/teuton/files/start.rb

@@ -1,7 +1,7 @@
-group "GROUP NAME" do
-  target "TARGET_1 DESCRIPTION"
-  run "COMMAND_1"
-  expect "TEXT_1"
+group "NAME-TO-CHANGE" do
+  target "DESC_TO-CHANGE"
+  run "COMMAND_TO-CHANGE"
+  expect "TEXT_TO-CHANGE"
 end
 
 play do

data/lib/teuton/readme/dsl.rb

@@ -87,10 +87,18 @@ class Readme
   end
 
   # If a method call is missing, then delegate to concept parent.
-  def method_missing(method, args = {})
+  # def method_missing(method, args = {})
+  def method_missing(method, *args, &block)
     m = method.to_s
     if m[0] == "_"
       instance_eval("get(:#{m[1, m.size - 1]})", __FILE__, __LINE__)
+    elsif not Application.instance.macros[m].nil?
+      puts "macro exec: #{m}"
+      code = ""
+      args[0].keys.each { |key| code += "set(:#{key}, '#{args[0][key]}')\n" }
+      puts code
+      # instance_eval(code)
+      # Application.instance.macros[m].call
     end
   end
 

data/lib/teuton/readme/readme.rb

@@ -1,6 +1,7 @@
 require_relative "../application"
 require_relative "../utils/configfile_reader"
 require_relative "../case_manager/case/result/result"
+require_relative "../version"
 require_relative "dsl"
 require_relative "lang"
 
@@ -14,6 +15,11 @@ def use(filename)
   require_relative use[0]
 end
 
+def define_macro(name, *args, &block)
+  puts "macro: #{name}"
+  Application.instance.macros[name] = {args: args, block: block}
+end
+
 def group(name, &block)
   Application.instance.groups << {name: name, block: block}
 end
@@ -58,6 +64,7 @@ class Readme
     @verbose = app.verbose
     @result = Result.new
     @data = {}
+    @data[:macros] = []
     @data[:logs] = []
     @data[:groups] = []
     @data[:play] = []
@@ -86,7 +93,7 @@ class Readme
     puts "```"
     puts format(Lang.get(:testname), app.test_name)
     puts format(Lang.get(:date), Time.now)
-    puts format(Lang.get(:version), Application::VERSION)
+    puts format(Lang.get(:version), Teuton::VERSION)
     puts "```"
     puts "\n"
     puts "# #{app.test_name}\n"

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

@@ -1,4 +1,6 @@
 class BaseFormatter
+  attr_reader :ext
+
   def initialize(report)
     @head = report.head.clone
     @lines = report.lines.clone

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

@@ -22,6 +22,7 @@ module Formatter
     end
     formatter = klass.new(report)
     formatter.init(filename)
+    report.format = formatter.ext
     formatter.process(options)
   end
 

data/lib/teuton/report/show.rb

@@ -1,6 +1,14 @@
 require "rainbow"
+require "terminal-table"
 require_relative "../application"
 
+# | Verbosity level | Description |
+# | :-------------: | ----------- |
+# | 0               | No output   |
+# | 1               | Default output messages |
+# | 2               | Show hall of fame |
+# | 3               | Show final values |
+# | 4               | Show Initial values |
 class ShowReport
   def initialize(report)
     @report = report

data/lib/teuton/version.rb

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

data/lib/teuton.rb

@@ -38,7 +38,8 @@ module Teuton
       require_relative app.script_path
     rescue SyntaxError => e
       puts e.to_s
-      puts Rainbow.new("==> [FAIL] SyntaxError into file #{app.script_path}").red
+      puts Rainbow.new("[FAIL ] Reading file #{app.script_path}").red
+      puts Rainbow.new("[ERROR] Syntax Error!").red
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: teuton
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.4.2
 platform: ruby
 authors:
 - David Vargas Ruiz
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-27 00:00:00.000000000 Z
+date: 2023-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -150,18 +150,17 @@ extra_rdoc_files:
 - docs/commands/example_check.md
 - docs/commands/example_run.md
 - docs/dsl/README.md
-- docs/dsl/definition/expect.md
-- docs/dsl/definition/group.md
-- docs/dsl/definition/result.md
-- docs/dsl/definition/run_local.md
-- docs/dsl/definition/run_remote.md
-- docs/dsl/definition/target.md
-- docs/dsl/execution/export.md
-- docs/dsl/execution/play.md
-- docs/dsl/execution/send.md
-- docs/dsl/execution/show.md
-- docs/dsl/setting/get.md
-- docs/dsl/setting/set.md
+- docs/dsl/expect.md
+- docs/dsl/export.md
+- docs/dsl/get.md
+- docs/dsl/group.md
+- docs/dsl/play.md
+- docs/dsl/result.md
+- docs/dsl/run.md
+- docs/dsl/send.md
+- docs/dsl/set.md
+- docs/dsl/show.md
+- docs/dsl/target.md
 - docs/es/exit_code.md
 - docs/es/guess_os.md
 - docs/ideas/Challenge-Server-Project.md
@@ -171,23 +170,33 @@ extra_rdoc_files:
 - docs/install/README.md
 - docs/install/manual.md
 - docs/install/modes_of_use.md
-- docs/install/scripts.md
+- docs/install/s-node.md
+- docs/install/t-node.md
 - docs/install/vagrant_docker.md
-- docs/learn/01-target.md
-- docs/learn/02-config.md
+- docs/learn/01-cmd_new.md
+- docs/learn/02-target.md
 - docs/learn/03-remote_hosts.md
-- docs/learn/04-new_test.md
+- docs/learn/04-config.md
 - docs/learn/05-use.md
-- docs/learn/06-debug.md
-- docs/learn/07-log.md
-- docs/learn/08-readme.md
-- docs/learn/09-preserve.md
-- docs/learn/10-result.md
-- 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/06-cmd_check.md
+- docs/learn/07-target_weight.md
+- docs/learn/08-unique_values.md
+- docs/learn/09-send.md
+- docs/learn/10-debug.md
+- docs/learn/11-export.md
+- docs/learn/12-preserve.md
+- docs/learn/13-feedback.md
+- docs/learn/14-moodle_id.md
+- docs/learn/15-readme.md
+- docs/learn/16-include.md
+- docs/learn/17-alias.md
+- docs/learn/18-log.md
+- docs/learn/19-read_vars.md
+- docs/learn/20-macros.md
+- docs/learn/21-exit_codes.md
+- docs/learn/22-result.md
+- docs/learn/23-test-code.md
+- docs/learn/24-test-sql.md
 - docs/learn/README.md
 - docs/learn/videos.md
 - docs/videos.md
@@ -207,18 +216,17 @@ files:
 - docs/commands/example_check.md
 - docs/commands/example_run.md
 - docs/dsl/README.md
-- docs/dsl/definition/expect.md
-- docs/dsl/definition/group.md
-- docs/dsl/definition/result.md
-- docs/dsl/definition/run_local.md
-- docs/dsl/definition/run_remote.md
-- docs/dsl/definition/target.md
-- docs/dsl/execution/export.md
-- docs/dsl/execution/play.md
-- docs/dsl/execution/send.md
-- docs/dsl/execution/show.md
-- docs/dsl/setting/get.md
-- docs/dsl/setting/set.md
+- docs/dsl/expect.md
+- docs/dsl/export.md
+- docs/dsl/get.md
+- docs/dsl/group.md
+- docs/dsl/play.md
+- docs/dsl/result.md
+- docs/dsl/run.md
+- docs/dsl/send.md
+- docs/dsl/set.md
+- docs/dsl/show.md
+- docs/dsl/target.md
 - docs/es/exit_code.md
 - docs/es/guess_os.md
 - docs/ideas/Challenge-Server-Project.md
@@ -228,23 +236,33 @@ files:
 - docs/install/README.md
 - docs/install/manual.md
 - docs/install/modes_of_use.md
-- docs/install/scripts.md
+- docs/install/s-node.md
+- docs/install/t-node.md
 - docs/install/vagrant_docker.md
-- docs/learn/01-target.md
-- docs/learn/02-config.md
+- docs/learn/01-cmd_new.md
+- docs/learn/02-target.md
 - docs/learn/03-remote_hosts.md
-- docs/learn/04-new_test.md
+- docs/learn/04-config.md
 - docs/learn/05-use.md
-- docs/learn/06-debug.md
-- docs/learn/07-log.md
-- docs/learn/08-readme.md
-- docs/learn/09-preserve.md
-- docs/learn/10-result.md
-- 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/06-cmd_check.md
+- docs/learn/07-target_weight.md
+- docs/learn/08-unique_values.md
+- docs/learn/09-send.md
+- docs/learn/10-debug.md
+- docs/learn/11-export.md
+- docs/learn/12-preserve.md
+- docs/learn/13-feedback.md
+- docs/learn/14-moodle_id.md
+- docs/learn/15-readme.md
+- docs/learn/16-include.md
+- docs/learn/17-alias.md
+- docs/learn/18-log.md
+- docs/learn/19-read_vars.md
+- docs/learn/20-macros.md
+- docs/learn/21-exit_codes.md
+- docs/learn/22-result.md
+- docs/learn/23-test-code.md
+- docs/learn/24-test-sql.md
 - docs/learn/README.md
 - docs/learn/videos.md
 - docs/videos.md

data/docs/dsl/definition/run_local.md

@@ -1,33 +0,0 @@
-[<< back](../README.md)
-
-1. [Description](#description)
-2. [Usage](#usage)
-3. [Alias](#alias)
-4. [Example](#example)
-
-## Description
-
-Execute command on localhost and save output into result object.
-
-## Usage
-
-```ruby
-run "id COMMAND"
-```
-
-## Alias
-
-In fact it's the same as doing next:
-
-```ruby
-run "COMMAND", on: :localhost
-```
-
-## Example
-
-```ruby
-run "id david"
-```
-
-* This instruction execute "id david" command on local machine, and save results into **result** object.
-* Local machine is where the `Teuton` program is running.

data/docs/dsl/definition/target.md

@@ -1,40 +0,0 @@
-[<< back](../README.md)
-
-1. [Description](#description)
-2. [Usage](#usage)
-4. [Weight](#weight)
-
-## Description
-
-`target` instruction is used to begin new target/goal definition, and sets its description.
-
-## Usage
-
-```ruby
-target "Write here your description"
-```
-
-* Define target description. Use your own words to describe it, so everybody could understand what is going to be measured.
-* This text will be shown into reports to help us understand output information easily.
-
-## Weight
-
-By default weight is 1.0, but it's posible specified other value:
-
-```ruby
-target "Write here your description", weight: 2.5
-```
-
-## [DEPRECATED] Alias
-
-`goal` keyword is an alias of `target`. So it's the same:
-
-```ruby
-target "Write here your description"
-```
-
-or
-
-```ruby
-goal "Write here your description"
-```

data/docs/install/scripts.md

@@ -1,96 +0,0 @@
-[<< back](README.md)
-
-# Using scripts to install Teuton
-
-1. T-Node installation
-    * GNU/Linux
-    * MACOSX
-    * Windows
-2. S-Node installation
-    * GNU/Linux
-    * MACOSX
-    * Windows
-3. Tested OS list
-
----
-# 1. T-NODE installation
-
-* **T-node**: Host where Teuton software is installed. Monitor S-NODE hosts.
-
-## 1.1 T-NODE: GNU/Linux installation
-
-Run this command as `root` user:
-
-```bash
-wget -qO- https://raw.githubusercontent.com/teuton-software/teuton/devel/install/linux/linux_t-node_install.sh | bash
-```
-
-## 1.2 T-NODE: Windows installation
-
-Requirements:
-* Windows 7+ / Windows Server 2003+
-* PowerShell v2+
-
-Run this command on **PowerShell (PS)** as `Administrator` user:
-
-```powershell
-Set-ExecutionPolicy Bypass -Scope Process -Force; iex ((New-Object System.Net.WebClient).DownloadString('https://raw.githubusercontent.com/teuton-software/teuton/devel/install/windows/windows_t-node_install.ps1'))
-```
-
-## 1.3 T-NODE: Mac OS X installation
-
-Run this command as admin user (member of `admin` group):
-
-```bash
-curl -sL https://raw.githubusercontent.com/teuton-software/teuton/devel/install/mac/macosx_t-node_install.sh | bash
-```
-
----
-# 2. S-NODE installation
-
-* **S-node**: Host where SSH server is installed. This hosts are monitotized by T-NODE host.
-
-## 2.1 S-NODE: GNU/Linux installation
-
-Run this command as `root` user:
-
-```bash
-wget -qO- https://raw.githubusercontent.com/teuton-software/teuton/devel/install/linux/linux_s-node_install.sh | bash
-```
-
-## 2.2 S-NODE: Windows installation
-
-Requirements:
-* Windows 7+ / Windows Server 2003+
-* PowerShell v2+
-
-Run this command on **PowerShell (PS)** as `Administrator` user:
-
-```powershell
-Set-ExecutionPolicy Bypass -Scope Process -Force; iex ((New-Object System.Net.WebClient).DownloadString('https://raw.githubusercontent.com/teuton-software/teuton/devel/install/windows/windows_s-node_install.ps1'))
-```
-
-## 2.3 S-NODE: Mac OS X installation
-
-Run this command as `root` user:
-
-```bash
-curl -sL https://raw.githubusercontent.com/teuton-software/teuton/devel/install/mac/macosx_s-node_install.sh | bash
-```
-
----
-# 3. Tested OS list
-
-| Type      | O.S.      | Version        | Arch   | T-node | S-node |
-| --------- | --------- | -------------- | ------ | ------ | ------ |
-| GNU/Linux | CentOS    | 7              | x86-64 |        |        |
-|           | Debian    | 9.7.0          | x86-64 | Ok     |        |
-|           | Fedora    | Workstation 29 | x84-64 | Ok     |        |
-|           | LinuxMint | 18.3           | x86-64 | Ok     |        |
-|           | openSUSE  | Leap 15        | x86-64 | Ok     | Ok     |
-|           | Ubuntu    | 18.04          | x86-64 | Ok     | Ok     |
-| Microsoft | Windows   | 7 Enterprise   | x86    | Ok     |        |
-|           | Windows   | 10 Pro         | x86-64 | Ok     | Ok     |
-|           | Windows   | Server 2012 R2 | x86-64 |        |        |
-| Apple     | Mac OS X  | Capitán (10.11.6) | x86-64 | Ok  | Ok     |
-|           | Mac OS X  | Sierra (10.12)    | x86-64 | Ok  |        |