lib/liri.rb in liri-0.3.1 vs lib/liri.rb in liri-0.4.0

- old
+ new

@@ -1,11 +1,11 @@ # frozen_string_literal: true # Este modulo contiene datos del programa que son reutilizados en otras partes de la aplicacion module Liri NAME = 'liri' # El gemspec requiere que el nombre este en minusculas - VERSION = '0.3.1' + VERSION = '0.4.0' class << self def set_setup(destination_folder_path, program, manager_tests_results_folder_time: nil) load_setup_manager(destination_folder_path, program, manager_tests_results_folder_time: manager_tests_results_folder_time) end @@ -42,20 +42,17 @@ def delete_setup @setup_manager ? @setup_manager.delete_setup_folder : false end - def init_exit(stop, threads, program) + def init_exit(stop, threads) threads = threads.compact kill(threads) if stop # Con la siguiente línea se asegura que los hilos no mueran antes de que finalize el programa principal # Fuente: https://underc0de.org/foro/ruby/hilos-en-ruby/ threads.each{|thread| thread.join} - #rescue SignalException => e - #puts "\nEjecución del #{program} terminada manualmente\n" - #kill(threads) end def kill(threads) threads.each{ |thread| Thread.kill(thread) } end @@ -64,45 +61,41 @@ addr = Socket.ip_address_list.select(&:ipv4?).detect{|addr| addr.ip_address != '127.0.0.1'} addr.ip_address end def compression_class - "Liri::Common::Compressor::#{setup.library.compression}" + "Liri::Common::Compressor::#{setup.general.library.compression}" end def unit_test_class - "Liri::Common::UnitTest::#{setup.library.unit_test}" + "Liri::Common::UnitTest::#{setup.general.library.unit_test}" end def udp_port - setup.ports.udp + setup.general.ports.udp end def tcp_port - setup.ports.tcp + setup.general.ports.tcp end - def print_failures_list - setup.print_failures_list + def current_folder_ruby_and_gemset + "#{File.read('.ruby-version').strip}@#{File.read('.ruby-gemset').strip}" end - def print_failed_examples - setup.print_failed_examples + def ignored_folders_in_compress + setup.general.ignored_folders_in_compress end - def print_agents_detailed_summary - setup.print_agents_detailed_summary + def times_round + setup.general.times_round end - def udp_request_delay - setup.udp_request_delay + def times_round_type + setup.general.times_round_type.to_sym end - def current_folder_ruby_and_gemset - "#{File.read('.ruby-version').strip}@#{File.read('.ruby-gemset').strip}" - end - private # Inicializa el objeto que gestiona las configuraciones def load_setup_manager(destination_folder_path, program, manager_tests_results_folder_time: nil) @setup_manager = Liri::Common::Setup.new(destination_folder_path, program, manager_tests_results_folder_time: manager_tests_results_folder_time) @@ -111,18 +104,25 @@ @setup_manager end # Inicializa y configura la librería encargada de loguear def load_logger(folder_path = nil, file_name = nil) - log = Liri::Common::Log.new('daily', folder_path: folder_path, file_name: file_name, stdout: setup.log.stdout.show) + log = Liri::Common::Log.new('daily', folder_path: folder_path, file_name: file_name, stdout: setup.general.log.stdout.show) log end end # EXCEPTIONS class FileNotFoundError < StandardError def initialize(file_path) - msg = "No se encuentra el archivo #{file_path}" + msg = "File not found #{file_path}" + super(msg) + end + end + + class InxiCommandNotFoundError < StandardError + def initialize + msg = "Inxi command not found" super(msg) end end end