liri 0.3.0 → 0.3.1

data/lib/common/tests_result.rb

@@ -8,12 +8,19 @@ 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
+
       def initialize(folder_path)
         @folder_path = folder_path
-        @example_quantity = 0
-        @failure_quantity = 0
-        @passed_quantity = 0
-        @failures = ''
+        @examples = 0
+        @failures = 0
+        @pending = 0
+        @passed = 0
+        @finish_in = 0
+        @files_load = 0
+        @files_processed = 0
+        @failures_list = ''
+        @failed_examples = ''
       end
 
       def save(file_name, raw_tests_result)
@@ -28,22 +35,28 @@ module Liri
 
       # Procesa el resultado crudo de las pruebas unitarias y lo devuelve en formato hash manejable
       # Ejemplo del hash retornado:
-      # {example_quantity: 2, failure_quantity: 1}
-      def process(tests_result_file_name)
+      # { 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)
         file_path = File.join(@folder_path, '/', tests_result_file_name)
         result_hash = process_tests_result_file(file_path)
+        result_hash[:files_processed] = files_processed
         update_partial_result(result_hash)
-        #print_partial_result(result_hash)
         result_hash
       end
 
       def print_summary
-        puts "\n#{@example_quantity} examples, #{@failure_quantity} failures\n"
+        puts "\n#{@examples} examples, #{@failures} failures, #{@pending} pending\n\n"
+      end
+
+      def print_failures_list
+        puts "\nFailures: " unless @failures_list.empty?
+        puts @failures_list
       end
 
-      def print_failures
-        puts "\nFailures: " if !@failures.empty?
-        puts @failures
+      def print_failed_examples
+        puts "\nFailed examples: " unless @failed_examples.empty?
+        puts @failed_examples
       end
 
       private
@@ -51,10 +64,12 @@ module Liri
       # Recibe el resultado crudo de las pruebas unitarias
       # Procesa el archivo con los resultados crudos y lo devuelve en formato hash manejable
       # Ejemplo del hash retornado:
-      # {result: '.F', failures: '', example_quantity: 2, failure_quantity: 1, failed_examples: ''}
+      # {result: '.F', failures: '', examples: 2, failures: 1, failed_examples: ''}
       def process_tests_result_file(file_path)
-        result_hash = {failures: '', example_quantity: 0, failure_quantity: 0, passed_quantity: 0, failed_examples: ''}
+        result_hash = { examples: 0, failures: 0, pending: 0, passed: 0, finish_in: 0, files_load: 0,
+                        failures_list: '', failed_examples: '' }
         flag = ''
+        @failures_lists_count = @failures
         File.foreach(file_path) do |line|
           if flag == '' && line.strip.start_with?('Randomized')
             flag = 'Randomized'
@@ -67,6 +82,9 @@ module Liri
           end
 
           if ['Randomized', 'Failures', ''].include?(flag) && line.strip.start_with?('Finished')
+            values = finish_in_values(line)
+            result_hash[:finish_in] = values[:finish_in]
+            result_hash[:files_load] = values[:files_load]
             flag = 'Finished'
             next
           end
@@ -78,15 +96,17 @@ module Liri
 
           case flag
           when 'Failures'
-            result_hash[:failures] << line
+            line = fix_failure_number(line)
+            result_hash[:failures_list] << line
           when 'Finished'
-            values = line.to_s.match(/([\d]+) example.?, ([\d]+) failure.?/)
-            result_hash[:example_quantity] = values[1].to_i
-            result_hash[:failure_quantity] = values[2].to_i
-            result_hash[:passed_quantity] = result_hash[:example_quantity] - result_hash[:failure_quantity]
+            values = finished_summary_values(line)
+            result_hash[:examples] = values[:examples]
+            result_hash[:failures] = values[:failures]
+            result_hash[:passed] = result_hash[:examples] - result_hash[:failures]
+            result_hash[:pending] = values[:pending]
             flag = ''
           when 'Failed'
-            result_hash[:failed_examples] << line
+            result_hash[:failed_examples] << line if line.strip.start_with?('rspec')
           end
         end
 
@@ -94,22 +114,31 @@ module Liri
       end
 
       def update_partial_result(hash_result)
-        @example_quantity += hash_result[:example_quantity]
-        @failure_quantity += hash_result[:failure_quantity]
-        @passed_quantity += hash_result[:passed_quantity]
-        @failures << hash_result[:failures]
+        @examples += hash_result[:examples]
+        @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]
       end
 
-      def print_partial_result(result_hash)
-        result_hash[:passed_quantity].times do
-          print '.'
-        end
+      def finish_in_values(line)
+        UnitTest::RspecResultParser.finish_in_values(line)
+      end
 
-        result_hash[:failure_quantity].times do
-          print 'F'
-        end
+      def finished_summary_values(line)
+        UnitTest::RspecResultParser.finished_summary_values(line)
       end
 
+      def fix_failure_number(line)
+        line_number_regex = /(\d+\))/
+        if line.strip.start_with?(line_number_regex)
+          @failures_lists_count += 1
+          line.gsub!(line_number_regex, "#{@failures_lists_count})")
+        end
+        line
+      end
     end
   end
 end

data/lib/common/text_time_parser.rb

@@ -0,0 +1,47 @@
+# = text_time_parser.rb
+#
+# @author Rodrigo Fernández
+#
+# == Clase TextTimeParser
+
+require 'bigdecimal'
+
+module Liri
+  module Common
+    # Esta clase parsea texto en horas, minutos y segundos a un valor decimal en segundos
+    class TextTimeParser
+      class << self
+        def to_seconds(text_time)
+          values = text_time.split(' ')
+          case values.size
+          when 2 # cuando se tiene por ejemplo '15 minutes'
+            text_time_to_seconds(values[0], values[1])
+          when 4 # cuando se tiene por ejemplo '1 minute 5 seconds'
+            text_time_to_seconds(values[0], values[1]) + text_time_to_seconds(values[2], values[3])
+          when 6 # cuando se tiene por ejemplo '1 hour 30 minutes 25 seconds'
+            text_time_to_seconds(values[0], values[1]) +
+              text_time_to_seconds(values[2], values[3]) +
+              text_time_to_seconds(values[4], values[5])
+          end
+          # queda pendiente agregar el caso de dias, horas, minutos y segundos, además hace falta verificar como lo muestra Rspec
+        end
+
+        private
+
+        def text_time_to_seconds(number, text)
+          # Se usa BigDecimal porque
+          # En una multiplicación normal: (203.033*3600).to_f = 730918.7999999999
+          # Con BigDecimal: (BigDecimal('203.033') * 3600).to_f = 730918.8
+          time = BigDecimal(number)
+          time_in_seconds = case text
+          when 'second', 'seconds' then time
+          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
+      end
+    end
+  end
+end

data/lib/common/unit_test/rspec.rb

@@ -14,7 +14,8 @@ module Liri
         def all_tests
           tests_count = 1
           tests_hash = {}
-          test_files.each do |test_file|
+          sorted_test_files = test_files.sort
+          sorted_test_files.each do |test_file|
             tests_hash[tests_count] = test_file.sub(@source_code_folder_path + '/', '')
             tests_count += 1
           end
@@ -36,8 +37,8 @@ module Liri
             # raw_tests_result = %x|bundle exec rspec #{tests.join(' ')} --format progress|
             # Descomentar para el entorno de producción
             raw_tests_result = ''
-            Liri::Common::Benchmarking.start(start_msg: "Ejecutando conjunto de pruebas. Espere... ") do
-              raw_tests_result = %x|bash -lc 'rvm use #{Liri.current_folder_ruby_and_gemset}; rspec #{tests.join(' ')} --format progress'|
+            Liri::Common::Benchmarking.start(start_msg: "Running tests batch. Wait... ") do
+              raw_tests_result = %x|bash -lc 'rvm use #{Liri.current_folder_ruby_and_gemset}; rspec #{tests.join(' ')}'|
             end
 
             return raw_tests_result
@@ -49,21 +50,6 @@ module Liri
         def test_files
           Dir[@tests_folder_path + "/**/*spec.rb"]
         end
-
-        # Revisa si la línea se encuentra dentro de un bloque comentado
-        def line_inside_comment_block(line)
-          if line.strip.start_with?('=begin')
-            @inside_comment = true
-            return true
-          end
-
-          if line.strip.start_with?('=end')
-            @inside_comment = false
-            return false
-          end
-
-          return true if @inside_comment
-        end
       end
     end
   end

data/lib/common/unit_test/rspec_result_parser.rb

@@ -0,0 +1,37 @@
+# = rspec_result_parser.rb
+#
+# @author Rodrigo Fernández
+#
+# == Clase RspecResultParser
+
+module Liri
+  module Common
+    module UnitTest
+      # Esta clase parsea texto de resultado en rspec a volores numéricos
+      class RspecResultParser
+        class << self
+          def finish_in_values(finish_in_line)
+            values = finish_in_line.to_s.match(/Finished in (.+)\(files took (.+) to load\)/)
+            finish_in_text = values[1]
+            files_load_text = values[2]
+            { finish_in: text_value_to_seconds(finish_in_text), files_load: text_value_to_seconds(files_load_text) }
+          end
+
+          def finished_summary_values(finished_summary_line)
+            values = finished_summary_line.to_s.match(/(.+) examples*, (.+) failures*,*\s*(\d*)/)
+            examples = values[1]
+            failures = values[2]
+            pending = values[3].empty? ? '0' : values[3]
+            { examples: examples.to_i, failures: failures.to_i, pending: pending.to_i }
+          end
+
+          private
+
+          def text_value_to_seconds(text)
+            TextTimeParser.to_seconds(text)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/hash_extend.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # = hash_extend.rb
 #
 # @author Rodrigo Fernández
@@ -14,8 +16,8 @@ class Hash
   #     => {dos: 'dos'}
   #   hash.sample(2)
   #     => {uno: 'uno', tres: 'tres'}
-  def sample(quantity=1)
-    sample_keys = self.keys.sample(quantity)
+  def sample(quantity = 1)
+    sample_keys = keys.sample(quantity)
     sample_values = {}
     sample_keys.each do |sample_key|
       sample_values[sample_key] = self[sample_key]
@@ -32,8 +34,8 @@ class Hash
   #     => {dos: 'dos'}
   #   hash.sample(2)
   #     => {uno: 'uno', tres: 'tres'}
-  def sample!(quantity=1)
-    samples = self.sample(quantity)
+  def sample!(quantity = 1)
+    samples = sample(quantity)
     remove!(samples.keys)
     samples
   end
@@ -51,7 +53,7 @@ class Hash
   #   hash
   #     => {}
   def remove!(*keys)
-    keys.flatten.each{|key| self.delete(key) }
+    keys.flatten.each { |key| delete(key) }
     self
   end
-end
+end

data/lib/liri.rb

@@ -3,11 +3,11 @@
 # 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.0'
+  VERSION = '0.3.1'
 
   class << self
-    def set_setup(destination_folder_path)
-      load_setup_manager(destination_folder_path)
+    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
 
     # Carga las configuraciones en memoria desde un archivo de configuracion
@@ -81,8 +81,16 @@ module Liri
       setup.ports.tcp
     end
 
-    def print_failures
-      setup.print_failures
+    def print_failures_list
+      setup.print_failures_list
+    end
+
+    def print_failed_examples
+      setup.print_failed_examples
+    end
+
+    def print_agents_detailed_summary
+      setup.print_agents_detailed_summary
     end
 
     def udp_request_delay
@@ -96,8 +104,8 @@ module Liri
     private
 
     # Inicializa el objeto que gestiona las configuraciones
-    def load_setup_manager(destination_folder_path)
-      @setup_manager = Liri::Common::Setup.new(destination_folder_path)
+    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)
       @setup_manager.init
       @setup = @setup_manager.load
       @setup_manager

data/lib/manager/credential.rb

@@ -35,7 +35,7 @@ module Liri
 
       def ask_credentials
         local_user = get_local_user
-        password = ask("Ingrese contraseña del usuario #{local_user}: ") { |q| q.echo = "*" }
+        password = ask("Enter password of user #{local_user}: ") { |q| q.echo = "*" }
         return local_user, password
       end