teuton 3.2.0 → 3.3.0

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

@@ -41,10 +41,10 @@ module Formatter
   def self.call(report, options, filename)
     klass = get(options[:format])
     if klass.nil?
-      warn Rainbow("[ERROR] Formatter:").bright.red
-      warn Rainbow("[ERROR] - Unkown format <#{options[:format]}>. Fix line <export format: FORMAT>").white
-      warn Rainbow("[ERROR] - Available formats: #{Formatter.available_formats.join(",")}.").white
-      exit 1
+      Logger.warn "Formatter:"
+      Logger.warn "- Unkown format <#{options[:format]}>. Fix line <export format: FORMAT>"
+      Logger.warn "- Available formats: #{Formatter.available_formats.join(",")}."
+      return
     end
     formatter = klass.new(report)
     formatter.init(filename)
@@ -55,13 +55,4 @@ module Formatter
   def self.get(format)
     LIST[format]
   end
-
-  # def self.hide_feedback(report)
-  #  report2 = report.clone
-  #  report2.groups.each do |group|
-  #    group.each do |item|
-  #      puts item
-  #    end
-  #  end
-  # end
 end

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

@@ -25,21 +25,21 @@ class ResumeTXTFormatter < ResumeArrayFormatter
   private
 
   def process_config
-    w "#{colorize("CONFIGURATION", :bg_blue)}\n"
-    my_screen_table = Terminal::Table.new do |st|
-      @data[:config].each do |key, value|
-        st.add_row [key.to_s, trim(value)]
-      end
+    w "#{colorize(" CONFIGURATION", :bg_blue)}\n"
+    table = Terminal::Table.new do |t|
+      t.style = {border: :unicode}
+      @data[:config].each { |key, value| t.add_row [key.to_s, trim(value)] }
     end
-    w "#{my_screen_table}\n\n"
+    w "#{table}\n\n"
   end
 
   def process_cases
-    w "#{colorize("CASES", :bg_blue)}\n"
-    my_screen_table = Terminal::Table.new do |st|
-      st.add_row %w[CASE MEMBERS GRADE STATE]
+    w "#{colorize(" CASES", :bg_blue)}\n"
+    table = Terminal::Table.new do |t|
+      t.style = {border: :unicode}
+      t.add_row %w[CASE MEMBERS GRADE STATE]
       @data[:cases].each do |line|
-        st.add_row [
+        t.add_row [
           line[:id],
           line[:members],
           format("  %<grade>3d", {grade: line[:grade]}),
@@ -47,38 +47,39 @@ class ResumeTXTFormatter < ResumeArrayFormatter
         ]
       end
     end
-    w "#{my_screen_table}\n\n"
+    w "#{table}\n\n"
   end
 
   def process_conn_errors
-    my_screen_table = Terminal::Table.new do |st|
-      st.add_row %w[CASE MEMBERS HOST ERROR]
+    table = Terminal::Table.new do |t|
+      t.style = {border: :unicode}
+      t.add_row %w[CASE MEMBERS HOST ERROR]
       @data[:cases].each do |line|
         line[:conn_status].each_pair do |h, e|
-          st.add_row [line[:id], line[:members], h, colorize(e, :red_bright)]
+          t.add_row [line[:id], line[:members], h, colorize(e, :red_bright)]
         end
       end
     end
-    return unless my_screen_table.rows.size > 1
+    return unless table.rows.size > 1
 
-    w "#{colorize("CONN ERRORS", :bg_blue)}\n#{my_screen_table}\n\n"
+    w "#{colorize(" CONN ERRORS", :bg_blue)}\n#{table}\n\n"
   end
 
   def process_results
-    w "#{colorize("RESULTS", :bg_blue)}\n"
-    my_screen_table = Terminal::Table.new do |st|
-      @data[:results].each do |key, value|
-        st.add_row [key.to_s, value.to_s]
-      end
+    w "#{colorize(" RESULTS", :bg_blue)}\n"
+    table = Terminal::Table.new do |t|
+      t.style = {border: :unicode}
+      @data[:results].each { |key, value| t.add_row([key.to_s, value.to_s]) }
     end
-    w "#{my_screen_table}\n\n"
+    w "#{table}\n\n"
   end
 
   def process_hof
     return if @data[:hall_of_fame].size < MIN_HALL_OF_FAME
 
-    w "#{colorize("HALL OF FAME", :bg_blue)}\n"
-    my_screen_table = Terminal::Table.new do |st|
+    w "#{colorize(" HALL OF FAME", :bg_blue)}\n"
+    table = Terminal::Table.new do |t|
+      t.style = {border: :unicode}
       @data[:hall_of_fame].each do |line|
         color = :green
         color = :red if line[0] < 50
@@ -88,10 +89,10 @@ class ResumeTXTFormatter < ResumeArrayFormatter
           text1 = colorize(text1, :bright)
           text2 = colorize(text2, :bright)
         end
-        st.add_row [text1, text2]
+        t.add_row [text1, text2]
       end
     end
-    w "#{my_screen_table}\n"
+    w "#{table}\n"
   end
 
   def colorize(text, option)
@@ -113,8 +114,8 @@ class ResumeTXTFormatter < ResumeArrayFormatter
     when :red_bright
       Rainbow(text).red.bright
     else
-      puts "[ERROR] ResumeTXTFormatter#colorize option=#{option}"
-      exit 1
+      Logger.warn "[ResumeTXTFormatter] colorize option=#{option}"
+      text
     end
   end
 end

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

@@ -61,10 +61,10 @@ class ResumeXMLFormatter < ResumeArrayFormatter
     end
     lines << "  </conn_errors>"
 
-    if lines.size > 2
-      w lines.join("\n")
-      w "\n"
-    end
+    return unless lines.size > 2
+
+    w lines.join("\n")
+    w "\n\n"
   end
 
   def process_results

data/lib/teuton/report/report.rb

@@ -9,10 +9,12 @@ class Report
   def initialize(id = "00")
     @id = id
     @filename = "case-#{@id}"
-    @output_dir = Project.value[:output_basedir]
+    @output_dir = Project.value[:output_dir]
+
     @head = {}
     @lines = []
     @tail = {unique_fault: 0}
+    # TODO
     # [String] with 1 char for every target in @lines
     # For example: "..F." means: good, good, fail and good
     @history = ""

data/lib/teuton/utils/config_file_reader.rb

@@ -61,9 +61,7 @@ module ConfigFileReader
     begin
       data = YAML.load(File.open(filepath))
     rescue => e
-      warn Rainbow("[ERROR] ConfigFileReader.read_yaml: #{e}").bright.red
-      warn Rainbow("[ERROR] Revise file content! <#{filepath}>").white
-      exit 1
+      raise Teuton::ConfigFileError.new(filepath, e)
     end
     data = convert_string_keys_to_symbol(data)
     data[:global] = data[:global] || {}
@@ -111,10 +109,7 @@ module ConfigFileReader
     begin
       data = YAML.load(File.open(filepath))
     rescue => e
-      warn Rainbow("[ERROR] Reading configurations from yaml:").bright.red
-      warn Rainbow("[ERROR] - File : #{filepath}").white
-      warn Rainbow("[ERROR] - Type : #{e}").white
-      exit 1
+      raise Teuton::ConfigFileError.new(filepath, e)
     end
     data[:tt_source_file] = relative_path(filepath)
     convert_string_keys_to_symbol(data)
@@ -124,10 +119,7 @@ module ConfigFileReader
     begin
       data = JSON.parse(File.read(filepath), symbolize_names: true)
     rescue => e
-      warn Rainbow("[ERROR] Reading configurations from json:").bright.red
-      warn Rainboe("[ERROR] - File : #{filepath}").white
-      warn Rainbow("[ERROR] - Type : #{e}").white
-      exit 1
+      raise Teuton::ConfigFileError.new(filepath, e)
     end
     data[:tt_source_file] = relative_path(filepath)
     convert_string_keys_to_symbol(data)

data/lib/teuton/utils/logger.rb

@@ -3,30 +3,35 @@ require "rainbow"
 class Logger
   @verbose = true
 
-  def self.verbose=(value)
-    @verbose = value
+  class << self
+    attr_writer :verbose
   end
 
-  def self.verbose
-    @verbose
+  class << self
+    attr_reader :verbose
+  end
+
+  def self.puts(message)
+    Kernel.puts message if @verbose
   end
 
   def self.info(message)
-    puts message if @verbose
+    text = Rainbow("Info | #{message}").white
+    Kernel.puts text if @verbose
   end
 
   def self.warn(message)
-    text = Rainbow(message).bright.yellow
-    info(text)
+    text = Rainbow("Warn | #{message}").bright.yellow
+    Kernel.warn text if @verbose
   end
 
   def self.error(message)
-    text = Rainbow(message).bright.red
-    info(text)
+    text = Rainbow("Error | #{message}").bright.red
+    Kernel.warn text if @verbose
   end
 
   def self.debug(message)
     text = Rainbow(message).white
-    info(text)
+    puts text if @verbose
   end
 end

data/lib/teuton/utils/name_file_finder.rb

@@ -1,4 +1,4 @@
-require "rainbow"
+require_relative "logger"
 
 class NameFileFinder
   attr_reader :options, :project_path, :script_path, :config_path, :testname
@@ -33,10 +33,7 @@ class NameFileFinder
     # Find project filenames into directory <folder path>
     # COMPLEX MODE: main RB file is <start.rb>
     script_path = File.join(folder_path, "start.rb")
-    unless File.exist? script_path
-      warn Rainbow("[ERROR] Main script file not found! <#{script_path}>").bright.red
-      exit 1
-    end
+    raise Teuton::MainScriptNotFoundError, script_path unless File.exist? script_path
 
     @project_path = folder_path
     @script_path = script_path
@@ -66,12 +63,7 @@ class NameFileFinder
   def find_filenames_from_rb(script_path)
     # SIMPLE MODE: We use script_path as main RB file
     # This must be fullpath to DSL script file
-    if File.extname(script_path) != ".rb"
-      warn Rainbow("[ERROR] Main script file not found!").bright.red
-      warn Rainbow("[ERROR] Not found <#{script_path}/start.rb>").white
-      warn Rainbow("[ERROR] Not found <#{script_path}.rb>").white
-      exit 1
-    end
+    raise Teuton::MainScriptNotFoundError, script_path if File.extname(script_path) != ".rb"
 
     @project_path = File.dirname(script_path)
     @script_path = script_path

data/lib/teuton/utils/project.rb

@@ -8,6 +8,7 @@ class Project
     @project[:running_basedir] = Dir.getwd
     @project[:output_basedir] = "var"
     @project[:output_dir] = @project[:output_basedir]
+    @project[:base_case_id] = "00"
     @project[:name] = "teuton"
     @project[:format] = :txt # Default export format
     @project[:debug] = false # Disable/enable local executions
@@ -18,12 +19,12 @@ class Project
       "quiet" => false
     }
     @project[:verbose] = true # Enable/disable screen outputs
-    @project[:global] = {}
     @project[:ialias] = {} # Hash of Internal alias
-    @project[:macros] = {}
+    @project[:global] = {}
     @project[:groups] = []
-    @project[:uses] = []
     @project[:hall_of_fame] = [] # Hall of fame content
+    @project[:macros] = {}
+    @project[:uses] = []
   end
 
   def self.value

data/lib/teuton/version.rb

@@ -1,5 +1,5 @@
 module Teuton
-  VERSION = "3.2.0".freeze
+  VERSION = "3.3.0".freeze
   APPNAME = "teuton".freeze
   GEMNAME = "teuton".freeze
   DOCKERNAME = "dvarrui/#{GEMNAME}".freeze

data/lib/teuton.rb

@@ -1,5 +1,5 @@
 require_relative "teuton/utils/project"
-# require_relative "teuton/version"
+require_relative "teuton/errors"
 
 module Teuton
   def self.create(path_to_new_dir)
@@ -36,15 +36,10 @@ module Teuton
   private_class_method def self.require_dsl_and_script(dslpath)
     # Load DSL file and then load script file
     require_relative dslpath
-    begin
-      mainscriptfile = Project.value[:script_path]
-      require_relative mainscriptfile
-    rescue => e
-      warn Rainbow("[ERROR] #{e}").bright.red
-      e.backtrace&.first(3)&.each do |line|
-        warn Rainbow("[ERROR]   #{line}").white
-      end
-      exit 1
-    end
+
+    mainscriptfile = Project.value[:script_path]
+    raise MainScriptNotFoundError.new(mainscriptfile) unless File.exist?(mainscriptfile)
+
+    require_relative mainscriptfile
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: teuton
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.3.0
 platform: ruby
 authors:
 - David Vargas Ruiz
@@ -184,7 +184,6 @@ extra_rdoc_files:
 - docs/learn/README.md
 - docs/modes_of_use.md
 - docs/more.md
-- docs/tutorial/es/nginx/README.md
 files:
 - LICENSE
 - README.md
@@ -250,8 +249,9 @@ files:
 - docs/learn/README.md
 - docs/modes_of_use.md
 - docs/more.md
-- docs/tutorial/es/nginx/README.md
 - lib/teuton.rb
+- lib/teuton/case/action/action.rb
+- lib/teuton/case/action/manager.rb
 - lib/teuton/case/builtin/main.rb
 - lib/teuton/case/builtin/package.rb
 - lib/teuton/case/builtin/service.rb
@@ -262,6 +262,7 @@ files:
 - lib/teuton/case/close.rb
 - lib/teuton/case/config.rb
 - lib/teuton/case/dsl/all.rb
+- lib/teuton/case/dsl/event.rb
 - lib/teuton/case/dsl/expect.rb
 - lib/teuton/case/dsl/expect_exitcode.rb
 - lib/teuton/case/dsl/expect_sequence.rb
@@ -305,12 +306,14 @@ files:
 - lib/teuton/check/dsl/run.rb
 - lib/teuton/check/main.rb
 - lib/teuton/check/show.rb
-- lib/teuton/cli.rb
-- lib/teuton/deprecated/utils.rb
+- lib/teuton/cli/app.rb
+- lib/teuton/cli/run.rb
+- lib/teuton/errors.rb
 - lib/teuton/files/config.yaml
 - lib/teuton/files/start.rb
 - lib/teuton/files/template/case.html
 - lib/teuton/files/template/resume.html
+- lib/teuton/readme/action.rb
 - lib/teuton/readme/dsl/all.rb
 - lib/teuton/readme/dsl/expect.rb
 - lib/teuton/readme/dsl/getset.rb