teuton 2.9.3 → 2.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b4752e08b15fd862f420e1d48adbd9993d85d195d1b4c4e3a038fd49496c266
-  data.tar.gz: 35b22222f598310ccb28f208a56a4ae6923585815b41cceea7ed1d3546c6b914
+  metadata.gz: 6df4861135eb226e52818814c68af43772f58cd196c5cd8008572a4bbaa26065
+  data.tar.gz: fe68c2d388c2e506641addcb32476c8de97c77224d50333a8026e2fc263656a2
 SHA512:
-  metadata.gz: 94c0548eea0557f8974d2f11640aa292cb6beaa446ea11f5b8c8927f0fafd846bf03bdb7d9114c82447e149534bc350521ba3998c441996c95aecc1a07341551
-  data.tar.gz: e6086e5451d2846bde79419d8cc3cf0c6d8dd332c966e2fee3c19f54c66569cc5f3c62e8aeb108a9c6f2e6cfe63e4190d70491b5aeb99d7dbc75cfe3f07991bc
+  metadata.gz: 3b853fecce334497ee93d289e90f67ce8ab1d6f3f78d67072d0ed424df431e1e967a3f529c20cec4089e76d05209b7854f1d311115ec5e385185bcbf6d8cacb5
+  data.tar.gz: 56d989afeeca6f82b9f03a8a3d1613814db19e47df0d4e301934affa03e8faff033c7d85a6c60d14b04b9764ca56392db66659d5238cb314f204594b07393676

data/docs/changelog/changelog.2.md

@@ -117,3 +117,12 @@ DSL send:
          /home/username/example/foo/start.rb
          or /home/username/example/foo.rb
 ```
+
+## [2.9.3] 20250402
+
+- [FIX] Error with telnet connections.
+
+## [2.9.4] 20250410
+
+- [FIX] Improve the markdown output of the readme.
+- [FIX] Telnet exitcode

data/docs/install/README.md

@@ -2,14 +2,14 @@
 
 # Installation
 
-There are 2 types of nodes/hosts, so there are 2 installations:
+There are 2 types of nodes (hosts), so there are 2 installations:
 
 | ID | Software | Description |
 | -- | -------- | ----------- |
 | **T-node** | [Teuton installation](t-node.md) | T-NODE host monitors one or severals S-NODE hosts |
 | **S-node** | [SSH server installation](s-node.md) | S-NODE hosts are monitorized by T-NODE host |
 
-Read [modes of use](modes_of_use.md) to know more about differents T-NODE/S-NODE schemes.
+> Read [modes of use](modes_of_use.md) to know more about differents T-NODE/S-NODE schemes.
 
 ## Tested OS list
 

data/docs/install/s-node.md

@@ -11,7 +11,7 @@ Install SSH server on every machine with S-NODE role.
 Run this command as `root` user:
 
 ```bash
-wget -qO- https://raw.githubusercontent.com/teuton-software/teuton/master/install/linux/linux_s-node_install.sh | bash
+wget -qO- https://raw.githubusercontent.com/teuton-software/teuton/master/install/linux/s-node_install.sh | bash
 ```
 
 **S-node Windows installation**
@@ -23,7 +23,7 @@ Requirements:
 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/master/install/windows/windows_s-node_install.ps1'))
+Set-ExecutionPolicy Bypass -Scope Process -Force; iex ((New-Object System.Net.WebClient).DownloadString('https://raw.githubusercontent.com/teuton-software/teuton/master/install/windows/s-node_install.ps1'))
 ```
 
 **S-node Mac OS X installation**
@@ -31,5 +31,5 @@ Set-ExecutionPolicy Bypass -Scope Process -Force; iex ((New-Object System.Net.We
 Run this command as `root` user:
 
 ```bash
-curl -sL https://raw.githubusercontent.com/teuton-software/teuton/master/install/mac/macosx_s-node_install.sh | bash
+curl -sL https://raw.githubusercontent.com/teuton-software/teuton/master/install/mac/s-node_install.sh | bash
 ```

data/docs/install/t-node.md

@@ -4,24 +4,19 @@
 
 # 1. Recommended
 
-**Installation**
-
+Installation:
 1. Install Ruby on your system.
 2. `gem install teuton`
 
 Run `teuton version` to check the installed version.
 
-**Update**
-
-`gem update teuton`.
-
-**Uninstall**
-
-`gem uninstall teuton`.
+> NOTE:
+> * Update: `gem update teuton`.
+> * Uninstall: `gem uninstall teuton`.
 
 # 2. Problems
 
-Don't find `teuton` command (OpenSUSE distro, for example), try this:
+Sometimes we don't find `teuton` command (OpenSUSE distro, for example), so try this:
 
 Option A:
 * `ruby -v`, display your current ruby version. Suppose it is "2.5".
@@ -40,7 +35,7 @@ If you don't know how to install Ruby on your system, execute this script to run
 Run this command as `root` user:
 
 ```bash
-wget -qO- https://raw.githubusercontent.com/teuton-software/teuton/master/install/linux/linux_t-node_install.sh | bash
+wget -qO- https://raw.githubusercontent.com/teuton-software/teuton/master/install/linux/t-node_install.sh | bash
 ```
 
 **T-node Windows installation**
@@ -52,7 +47,7 @@ Requirements:
 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/master/install/windows/windows_t-node_install.ps1'))
+Set-ExecutionPolicy Bypass -Scope Process -Force; iex ((New-Object System.Net.WebClient).DownloadString('https://raw.githubusercontent.com/teuton-software/teuton/master/install/windows/t-node_install.ps1'))
 ```
 
 **T-node Mac OS X installation**
@@ -60,7 +55,7 @@ Set-ExecutionPolicy Bypass -Scope Process -Force; iex ((New-Object System.Net.We
 Run this command as admin user (member of `admin` group):
 
 ```bash
-curl -sL https://raw.githubusercontent.com/teuton-software/teuton/master/install/mac/macosx_t-node_install.sh | bash
+curl -sL https://raw.githubusercontent.com/teuton-software/teuton/master/install/mac/t-node_install.sh | bash
 ```
 
 # 4. Vagrant/Docker

data/docs/learn/02-target.md

@@ -8,7 +8,7 @@ A [target](../dsl/target.md) is a feature you want to check. Targets are defined
 
 * [target](dsl/target.md): Description of the element to be tested.
 * [run](../dsl/run.md): Execute a command `id obiwan` on localhost.
-* [expect](../&dsl/expect.md): Verify that the result contains expected value.
+* [expect](../dsl/expect.md): Verify that the result contains expected value.
 
 ```ruby
 group "Learn about targets" do
@@ -28,17 +28,17 @@ end
 When the user exists, we expect this words: `uid=, (obiwan), gid=`.
 
 ```
-❯ id obiwan
+> id obiwan
 uid=1000(obiwan) gid=1000(obiwan) grupos=1000(obiwan)
 ```
 
 But when user does not exist, we expect different words: `id:, vader, no exist`.
 
 ```
-❯ id vader
+> id vader
 id: «vader»: no such user
 
-❯ echo $?
+> echo $?
 1
 
 ```

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

@@ -23,6 +23,8 @@ module DSL
     @action_counter += 1
     @action[:id] = @action_counter
     if @result.exitcode < 0
+      # When exitcode is less than zero, it is because there has been 
+      # an error in the remote connection (SSH or Telnet)
       @action[:check] = false
       @action[:result] = @action[:output]
     else

data/lib/teuton/case/execute/execute_base.rb

@@ -38,8 +38,12 @@ class ExecuteBase
   def encode_and_split(encoding, text)
     # Convert text to UTF-8 deleting unknown chars
     text ||= "" # Ensure text is not nil
-    flag = [:default, "UTF-8"].include? encoding
-    return text.encode("UTF-8", invalid: :replace).split("\n") if flag
+
+    # TODO: text.gsub!('\r', '')
+    if [:default, "UTF-8"].include? encoding
+      text.encode!("UTF-8", invalid: :replace, :undef => :replace, :replace => '')
+      return text.split("\n") 
+    end
 
     # Convert text from input ENCODING to UTF-8
     ec = Encoding::Converter.new(encoding.to_s, "UTF-8")
@@ -47,9 +51,9 @@ class ExecuteBase
       text = ec.convert(text)
     rescue => e
       puts "[ERROR] #{e}: Declare text encoding..."
-      puts "        run 'command', on: :host, :encoding => 'ISO-8859-1'"
+      puts "        run 'command', on: :host, encoding: 'ISO-8859-1'"
     end
 
-    text.split("\n")
+    text.split("\n").compact
   end
 end

data/lib/teuton/case/execute/execute_ssh.rb

@@ -89,6 +89,5 @@ class ExecuteSSH < ExecuteBase
     end
     result.exitcode = exitcode
     result.content = encode_and_split(action[:encoding], text)
-    result.content.compact!
   end
 end

data/lib/teuton/case/execute/execute_telnet.rb

@@ -1,7 +1,7 @@
 require "net/telnet"
-require "rainbow"
+# require "rainbow"
 require_relative "../../utils/project"
-require_relative "../../utils/verbose"
+# require_relative "../../utils/verbose"
 require_relative "execute_base"
 
 class ExecuteTelnet < ExecuteBase
@@ -9,48 +9,55 @@ class ExecuteTelnet < ExecuteBase
     action[:conn_type] = :telnet
     hostname = input_hostname.to_s
     ip = config.get((hostname + "_ip").to_sym)
-    username = config.get((hostname + "_username").to_sym).to_s
-    password = config.get((hostname + "_password").to_sym).to_s
+    port = config.get((hostname + "_port").to_sym)
+    mode = true
+    if port.to_i == 0
+      port = "23" 
+      mode = false
+    end
     text = ""
+    exitcode = -1
     begin
       if sessions[hostname].nil? || sessions[hostname] == :ok
         h = Net::Telnet.new(
           "Host" => ip,
+          "Port" => port,
+          "Telnetmode" => mode,
           "Timeout" => 30,
-          "Prompt" => /login|teuton|[$%#>]|PC1>/
+          "Prompt" => /login|teuton|[$%#>]/
         )
         # "Prompt" => Regexp.new(username[1, 40]))
         # "Prompt" => /[$%#>] \z/n)
-        h.login(username, password)
+        unless mode
+          username = config.get((hostname + "_username").to_sym).to_s
+          password = config.get((hostname + "_password").to_sym).to_s
+          h.login(username, password)
+        end
         h.cmd(action[:command]) { |i| text << i }
         h.close
         sessions[hostname] = :ok
+        exitcode = 0
       else
-        text = "TELNET: NO CONNECTION!"
+        text = "Telnet: NO CONNECTION!"
       end
     rescue Net::OpenTimeout
       sessions[hostname] = :nosession
       conn_status[hostname] = :open_timeout
-      # verbose Rainbow(Application.instance.letter[:error]).red.bright
       log(" ExceptionType=<Net::OpenTimeout> doing <telnet #{ip}>", :error)
       log(" └── Revise host IP!", :warn)
     rescue Net::ReadTimeout
       sessions[hostname] = :nosession
       conn_status[hostname] = :read_timeout
-      # verbose Rainbow(Application.instance.letter[:error]).red.bright
       log(" ExceptionType=<Net::ReadTimeout> doing <telnet #{ip}>", :error)
     rescue => e
       sessions[hostname] = :nosession
       conn_status[hostname] = :error
-      # verbose Rainbow(Application.instance.letter[:error]).red.bright
       log(" ExceptionType=<#{e.class}> doing telnet on <#{username}@#{ip}>" \
           " exec: #{action[:command]}", :error)
       log(" └── username=<#{username}>, password=<#{password}>," \
           " ip=<#{ip}>, HOSTID=<#{hostname}>", :warn)
     end
-    output = encode_and_split(action[:encoding], text)
-    result.exitcode = -1
-    result.content = output
-    result.content.compact!
+    result.exitcode = exitcode
+    result.content = encode_and_split(action[:encoding], text)
   end
 end

data/lib/teuton/readme/readme.rb

@@ -71,8 +71,8 @@ class Readme
     unless @required_hosts.empty?
       puts Lang.get(:hosts)
       puts "\n"
-      puts "| ID | Host | Configuration |"
-      puts "| --- | --- | --- |"
+      puts "| ID  | Host | Configuration |"
+      puts "| --- | ---- | ------------- |"
       @required_hosts.each_pair do |k, v|
         c = []
         v.each_pair { |k2, v2| c << "#{k2}=#{v2}" }
@@ -123,15 +123,15 @@ class Readme
       puts Lang.get(:global_params)
       puts "\n"
       puts "| Param | Value |"
-      puts "| --- | --- |"
+      puts "| ----- | ----- |"
       @global_params.each_pair { |k, v| puts "|#{k}|#{v}|" }
     end
     if @setted_params.size.positive?
       puts Lang.get(:created_params)
       puts "\n"
-      puts "| Param | Value |"
-      puts "| --- | --- |"
-      @setted_params.each_pair { |k, v| puts "|#{k}|#{v}|" }
+      puts "| Param |"
+      puts "| ----- |"
+      @setted_params.each_pair { |k, v| puts "|#{k}|" }
     end
   end
 end

data/lib/teuton/version.rb

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

data/lib/teuton.rb

@@ -22,7 +22,6 @@ module Teuton
   end
 
   def self.run(projectpath, options = {})
-    # Application.instance.add_input_params(projectpath, options)
     Project.add_input_params(projectpath, options)
     require_dsl_and_script("teuton/case_manager/dsl") # Define DSL
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: teuton
 version: !ruby/object:Gem::Version
-  version: 2.9.3
+  version: 2.9.4
 platform: ruby
 authors:
 - David Vargas Ruiz
 bindir: bin
 cert_chain: []
-date: 2025-04-02 00:00:00.000000000 Z
+date: 2025-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow