liri 0.3.1 → 0.4.0

data/lib/common/tests_result.rb

@@ -8,7 +8,7 @@ module Liri
   module Common
     # Esta clase se encarga de guardar y procesar el archivo de resultados
     class TestsResult
-      attr_reader :examples, :failures, :pending, :passed, :files_processed
+      attr_reader :examples, :failures, :pending, :passed
 
       def initialize(folder_path)
         @folder_path = folder_path
@@ -18,9 +18,9 @@ module Liri
         @passed = 0
         @finish_in = 0
         @files_load = 0
-        @files_processed = 0
         @failures_list = ''
         @failed_examples = ''
+        @failed_files = ''
       end
 
       def save(file_name, raw_tests_result)
@@ -29,34 +29,36 @@ module Liri
         file_path
       end
 
-      def build_file_name(agent_ip_address, tests_batch_number)
-        "batch_#{tests_batch_number}_agent_#{agent_ip_address}_tests_results"
+      def build_file_name(agent_ip_address, batch_num)
+        "batch_#{batch_num}_agent_#{agent_ip_address}_tests_results"
       end
 
       # Procesa el resultado crudo de las pruebas unitarias y lo devuelve en formato hash manejable
       # Ejemplo del hash retornado:
       # { examples: 0, failures: 0, pending: 0, passed: 0, finish_in: 0, files_load: 0,
       #   failures_list: '', failed_examples: '' }
-      def process(tests_result_file_name, files_processed)
+      def process(tests_result_file_name)
         file_path = File.join(@folder_path, '/', tests_result_file_name)
+        # A veces no se encuentra el archivo de resultados, la siguiente condicional es para evitar errores relativos a esto
+        return {} unless File.exist?(file_path)
+
         result_hash = process_tests_result_file(file_path)
-        result_hash[:files_processed] = files_processed
         update_partial_result(result_hash)
         result_hash
       end
 
       def print_summary
-        puts "\n#{@examples} examples, #{@failures} failures, #{@pending} pending\n\n"
+        Liri.logger.info("\n#{@examples} examples, #{@passed} passed, #{@failures} failures\n", true)
       end
 
-      def print_failures_list
-        puts "\nFailures: " unless @failures_list.empty?
-        puts @failures_list
+      def print_detailed_failures
+        Liri.logger.info("\nFailures: ", true) unless @failures_list.empty?
+        Liri.logger.info(@failures_list, true)
       end
 
-      def print_failed_examples
-        puts "\nFailed examples: " unless @failed_examples.empty?
-        puts @failed_examples
+      def print_summary_failures
+        Liri.logger.info("\nFailed examples: ", true) unless @failed_examples.empty?
+        Liri.logger.info(@failed_examples, true)
       end
 
       private
@@ -67,7 +69,7 @@ module Liri
       # {result: '.F', failures: '', examples: 2, failures: 1, failed_examples: ''}
       def process_tests_result_file(file_path)
         result_hash = { examples: 0, failures: 0, pending: 0, passed: 0, finish_in: 0, files_load: 0,
-                        failures_list: '', failed_examples: '' }
+                        failures_list: '', failed_examples: '', failed_files: '' }
         flag = ''
         @failures_lists_count = @failures
         File.foreach(file_path) do |line|
@@ -106,7 +108,10 @@ module Liri
             result_hash[:pending] = values[:pending]
             flag = ''
           when 'Failed'
-            result_hash[:failed_examples] << line if line.strip.start_with?('rspec')
+            if line.strip.start_with?('rspec')
+              result_hash[:failed_examples] << line
+              result_hash[:failed_files] << "#{failed_example(line)}\n"
+            end
           end
         end
 
@@ -118,9 +123,9 @@ module Liri
         @failures += hash_result[:failures]
         @pending += hash_result[:pending]
         @passed += hash_result[:passed]
-        @files_processed += hash_result[:files_processed]
         @failures_list << hash_result[:failures_list]
         @failed_examples << hash_result[:failed_examples]
+        @failed_files << hash_result[:failed_files]
       end
 
       def finish_in_values(line)
@@ -131,6 +136,13 @@ module Liri
         UnitTest::RspecResultParser.finished_summary_values(line)
       end
 
+      def failed_example(line)
+        # get string like this "/spec/failed_spec.rb:4"
+        failed_example = UnitTest::RspecResultParser.failed_example(line)
+        # return "failed_spec.rb:4"
+        failed_example.split("/").last
+      end
+
       def fix_failure_number(line)
         line_number_regex = /(\d+\))/
         if line.strip.start_with?(line_number_regex)

data/lib/common/text_time_parser.rb

@@ -38,8 +38,12 @@ module Liri
           when 'minute', 'minutes' then time * 60
           when 'hour', 'hours' then time * 3600
           when 'day', 'days' then time * 86_400
-                            end
-          time_in_seconds.to_f
+          end
+
+          # time in seconds puede contener valores BigDecimal como este 0.744e2 que al hacerle to_f devuelve 74.4
+          # Aún así conviene mantener el valor en BigDecimal para las operaciones matematicas y solo cuando se va a mostrar
+          # los datos en pantalla se debe hacer el to_f
+          time_in_seconds
         end
       end
     end

data/lib/common/tty_progressbar.rb

@@ -0,0 +1,70 @@
+# = tty_progressbar.rb
+#
+# @author Rodrigo Fernández
+#
+# == Módulo TtyProgressbar
+require "tty-progressbar"
+
+module Liri
+  module Common
+    # Este módulo se encarga de mostrar una barra de progreso
+    module TtyProgressbar
+      ANIMATION = [
+        "■□□□■□□□■□□□■□□□■□□□■□□□■□□□■□□□■□□□■□□□■□□□■□□□■□□□■□□□■□□□■□□□■□□□■□□□■□□□■□",
+        "□■□□□■□□□■□□□■□□□■□□□■□□□■□□□■□□□■□□□■□□□■□□□■□□□■□□□■□□□■□□□■□□□■□□□■□□□■□□□■",
+        "□□■□□□■□□□■□□□■□□□■□□□■□□□■□□□■□□□■□□□■□□□■□□□■□□□■□□□■□□□■□□□■□□□■□□□■□□□■□□□",
+        "□□□■□□□■□□□■□□□■□□□■□□□■□□□■□□□■□□□■□□□■□□□■□□□■□□□■□□□■□□□■□□□■□□□■□□□■□□□■□□",
+      ]
+
+      ANIMATION2 = [
+          "■□□□■□□□■□□□■□□□■□□",
+          "□■□□□■□□□■□□□■□□□■□",
+          "□□■□□□■□□□■□□□■□□□■",
+          "□□□■□□□■□□□■□□□■□□□",
+      ]
+      class << self
+        # Example:
+        #   Common::TtyProgressbar.start("Compressing source code |:bar| Time: :elapsed", total: nil, width: 80) do
+        #     ...code
+        #   end
+        def start(format, params = {})
+          params[:unknown] = ANIMATION[0]
+          progressbar = TTY::ProgressBar.new(format, params)
+          # Es importante iniciar la barra porque TimeFormatter.call accede a su start_time y si no se inició la barra
+          # entonces ocurre un error
+          progressbar.start
+          progressbar.use(Common::TtyProgressbar::TimeFormatter)
+
+          Thread.new do
+            animation_count = 0
+            while !progressbar.stopped?
+              progressbar.advance
+
+              progressbar.update(unknown: ANIMATION[animation_count])
+              animation_count += 1
+              animation_count = 0 if animation_count == 3
+
+              sleep(0.1)
+            end
+          end
+          yield
+          progressbar.update(total: 1) # Esto hace que la barra cambie a al estilo completado con un porcentaje del 100%
+          progressbar.stop
+        rescue TypeError
+          # Se captura la excepción solo para evitar un error en start_time mas abajo
+        end
+      end
+
+      # From
+      class TimeFormatter
+        include TTY::ProgressBar::Formatter[/:time/i]
+
+        def call(value) # specify how display string is formatted
+          # access current progress bar instance to read start time
+          elapsed = Duration.humanize(Time.now - progress.start_time, times_round: Liri.times_round, times_round_type: Liri.times_round_type)
+          value.gsub(matcher, elapsed)   # replace :time token with a value
+        end
+      end
+    end
+  end
+end

data/lib/common/unit_test/rspec_result_parser.rb

@@ -25,6 +25,16 @@ module Liri
             { examples: examples.to_i, failures: failures.to_i, pending: pending.to_i }
           end
 
+          # Received string like this "rspec ./spec/failed_spec.rb:4 # Liri debería fallar a propósito" and
+          # return string like this "/spec/failed_spec.rb:4"
+          # or for "rspec ./spec/system/management/budget_investments_spec.rb[1:3:1:3] # Budget Investments behaves like mappable At new_management_budget_investment_path Should create budget_investment with map"
+          # return "/spec/system/management/budget_investments_spec.rb[1:3:1:3]"
+          def failed_example(failed_example_line)
+            values = failed_example_line.to_s.match(/(\/.+.rb:\d+)/)
+            values ||= failed_example_line.to_s.match(/(\/.+.rb.*\])/)
+            values[1] # failed_example
+          end
+
           private
 
           def text_value_to_seconds(text)

data/lib/hash_extend.rb

@@ -56,4 +56,11 @@ class Hash
     keys.flatten.each { |key| delete(key) }
     self
   end
+
+  # Retorna un nuevo hash con los elementos borrados según las claves indicadas
+  def remove(*keys)
+    cloned_hash = self.clone
+    keys.flatten.each { |key| cloned_hash.delete(key) }
+    cloned_hash
+  end
 end

data/lib/liri.rb

@@ -3,7 +3,7 @@
 # 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)
@@ -44,16 +44,13 @@ module Liri
       @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)
@@ -66,39 +63,35 @@ module Liri
     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
-    end
-
-    def print_failed_examples
-      setup.print_failed_examples
+    def current_folder_ruby_and_gemset
+      "#{File.read('.ruby-version').strip}@#{File.read('.ruby-gemset').strip}"
     end
 
-    def print_agents_detailed_summary
-      setup.print_agents_detailed_summary
+    def ignored_folders_in_compress
+      setup.general.ignored_folders_in_compress
     end
 
-    def udp_request_delay
-      setup.udp_request_delay
+    def times_round
+      setup.general.times_round
     end
 
-    def current_folder_ruby_and_gemset
-      "#{File.read('.ruby-version').strip}@#{File.read('.ruby-gemset').strip}"
+    def times_round_type
+      setup.general.times_round_type.to_sym
     end
 
     private
@@ -113,7 +106,7 @@ module Liri
 
     # 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
@@ -121,7 +114,14 @@ module Liri
   # 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

data/lib/manager/credential.rb

@@ -31,6 +31,11 @@ module Liri
         else
           return nil, nil
         end
+      rescue Psych::SyntaxError
+        # Este error ocurre cuando se guardan caracteres raros en el archivo liri-credentials.yml
+        # en este caso se borra el archivo y se pide de nuevo la contraseña
+        delete_credentials
+        return nil, nil
       end
 
       def ask_credentials
@@ -42,6 +47,15 @@ module Liri
       def save_credentials(user, password)
         File.write(@file_path, "user: #{user}\npassword: #{password}")
       end
+
+      def delete_credentials
+        if File.exist?(@file_path)
+          File.delete(@file_path)
+          File.exist?(@file_path) ? false : true
+        else
+          false
+        end
+      end
     end
   end
 end