liri 0.1.0 → 0.3.0

data/lib/common/tests_result.rb

@@ -0,0 +1,115 @@
+# = tests_result.rb
+#
+# @author Rodrigo Fernández
+#
+# == Clase TestsResult
+
+module Liri
+  module Common
+    # Esta clase se encarga de guardar y procesar el archivo de resultados
+    class TestsResult
+      def initialize(folder_path)
+        @folder_path = folder_path
+        @example_quantity = 0
+        @failure_quantity = 0
+        @passed_quantity = 0
+        @failures = ''
+      end
+
+      def save(file_name, raw_tests_result)
+        file_path = File.join(@folder_path, '/', file_name)
+        File.write(file_path, raw_tests_result)
+        file_path
+      end
+
+      def build_file_name(agent_ip_address, tests_batch_number)
+        "batch_#{tests_batch_number}_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:
+      # {example_quantity: 2, failure_quantity: 1}
+      def process(tests_result_file_name)
+        file_path = File.join(@folder_path, '/', tests_result_file_name)
+        result_hash = process_tests_result_file(file_path)
+        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"
+      end
+
+      def print_failures
+        puts "\nFailures: " if !@failures.empty?
+        puts @failures
+      end
+
+      private
+
+      # 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: ''}
+      def process_tests_result_file(file_path)
+        result_hash = {failures: '', example_quantity: 0, failure_quantity: 0, passed_quantity: 0, failed_examples: ''}
+        flag = ''
+        File.foreach(file_path) do |line|
+          if flag == '' && line.strip.start_with?('Randomized')
+            flag = 'Randomized'
+            next
+          end
+
+          if ['Randomized', ''].include?(flag) && line.strip.start_with?('Failures')
+            flag = 'Failures'
+            next
+          end
+
+          if ['Randomized', 'Failures', ''].include?(flag) && line.strip.start_with?('Finished')
+            flag = 'Finished'
+            next
+          end
+
+          if ['Finished', ''].include?(flag) && line.strip.start_with?('Failed')
+            flag = 'Failed'
+            next
+          end
+
+          case flag
+          when 'Failures'
+            result_hash[:failures] << 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]
+            flag = ''
+          when 'Failed'
+            result_hash[:failed_examples] << line
+          end
+        end
+
+        result_hash
+      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]
+      end
+
+      def print_partial_result(result_hash)
+        result_hash[:passed_quantity].times do
+          print '.'
+        end
+
+        result_hash[:failure_quantity].times do
+          print 'F'
+        end
+      end
+
+    end
+  end
+end

data/lib/common/unit_test/rspec.rb

@@ -15,18 +15,8 @@ module Liri
           tests_count = 1
           tests_hash = {}
           test_files.each do |test_file|
-            File.open(test_file) do |file|
-              file.each_with_index do |line, index|
-                if line.strip.start_with?('it')
-                  absolute_file_path = file.to_path
-                  relative_file_path = absolute_file_path.sub(@source_code_folder_path + '/', '')
-
-                  test_line = relative_file_path + ":#{index + 1}"
-                  tests_hash[tests_count] = test_line
-                  tests_count += 1
-                end
-              end
-            end
+            tests_hash[tests_count] = test_file.sub(@source_code_folder_path + '/', '')
+            tests_count += 1
           end
           tests_hash
         end
@@ -50,40 +40,29 @@ module Liri
               raw_tests_result = %x|bash -lc 'rvm use #{Liri.current_folder_ruby_and_gemset}; rspec #{tests.join(' ')} --format progress'|
             end
 
-            hash_tests_result = process_tests_result(raw_tests_result)
-            hash_tests_result
+            return raw_tests_result
           end
         end
 
         private
+
         def test_files
           Dir[@tests_folder_path + "/**/*spec.rb"]
         end
 
-        # Recibe el resultado crudo de las pruebas unitarias
-        # Procesa el resultado y lo devuelve en formato hash manejable
-        # Ejemplo del hash retornado:
-        # {example_quantity: 2, failure_quantity: 1}
-        def process_tests_result(raw_test_results)
-          result_hash = {example_quantity: 0, failure_quantity: 0}
-          flag = ''
-          raw_test_results.each_line do |line|
-            if line.strip.start_with?('Finished')
-              flag = 'Finished'
-              next
-            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 flag == 'Finished'
-              puts ''
-              Liri.logger.info(line)
-              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
-              flag = ''
-            end
+          if line.strip.start_with?('=end')
+            @inside_comment = false
+            return false
           end
 
-          result_hash
+          return true if @inside_comment
         end
       end
     end

data/lib/liri.rb

@@ -3,20 +3,16 @@
 # 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.1.0'
-  SETUP_FOLDER_NAME = 'liri'
-  SETUP_FOLDER_PATH = File.join(Dir.pwd, '/', SETUP_FOLDER_NAME)
-  LOGS_FOLDER_NAME = 'logs'
-  MANAGER_LOGS_FOLDER_PATH = File.join(SETUP_FOLDER_PATH, '/', LOGS_FOLDER_NAME)
-  AGENT_LOGS_FOLDER_PATH = MANAGER_LOGS_FOLDER_PATH
-  AGENT_FOLDER_NAME = 'agent'
-  AGENT_FOLDER_PATH = File.join(SETUP_FOLDER_PATH, '/', AGENT_FOLDER_NAME)
-  MANAGER_FOLDER_NAME = 'manager'
-  MANAGER_FOLDER_PATH = File.join(SETUP_FOLDER_PATH, '/', MANAGER_FOLDER_NAME)
+  VERSION = '0.3.0'
 
   class << self
+    def set_setup(destination_folder_path)
+      load_setup_manager(destination_folder_path)
+    end
+
+    # Carga las configuraciones en memoria desde un archivo de configuracion
     def setup
-      @setup ||= load_setup
+      @setup
     end
 
     def logger
@@ -36,30 +32,16 @@ module Liri
       end
     end
 
-    def create_folders(program)
-      Dir.mkdir(SETUP_FOLDER_PATH) unless Dir.exist?(SETUP_FOLDER_PATH)
-
-      case program
-      when 'manager'
-        Dir.mkdir(MANAGER_LOGS_FOLDER_PATH) unless Dir.exist?(MANAGER_LOGS_FOLDER_PATH)
-        Dir.mkdir(MANAGER_FOLDER_PATH) unless Dir.exist?(MANAGER_FOLDER_PATH)
-      when 'agent'
-        Dir.mkdir(AGENT_FOLDER_PATH) unless Dir.exist?(AGENT_FOLDER_PATH)
-        Dir.mkdir(AGENT_LOGS_FOLDER_PATH) unless Dir.exist?(AGENT_LOGS_FOLDER_PATH)
-      end
-    end
-
-    def clean_folder(folder_path)
+    def clean_folder_content(folder_path)
       FileUtils.rm_rf(Dir.glob(folder_path + '/*')) if Dir.exist?(folder_path)
     end
 
     def reload_setup
-      @setup = load_setup
+      @setup = (@setup_manager ? @setup_manager.load : nil)
     end
 
     def delete_setup
-      liri_setup = Liri::Manager::Setup.new(SETUP_FOLDER_PATH)
-      liri_setup.delete
+      @setup_manager ? @setup_manager.delete_setup_folder : false
     end
 
     def init_exit(stop, threads, program)
@@ -75,7 +57,7 @@ module Liri
     end
 
     def kill(threads)
-      threads.each{|thread| Thread.kill(thread)}
+      threads.each{ |thread| Thread.kill(thread) }
     end
 
     def current_host_ip_address
@@ -99,22 +81,31 @@ module Liri
       setup.ports.tcp
     end
 
+    def print_failures
+      setup.print_failures
+    end
+
+    def udp_request_delay
+      setup.udp_request_delay
+    end
+
     def current_folder_ruby_and_gemset
       "#{File.read('.ruby-version').strip}@#{File.read('.ruby-gemset').strip}"
     end
 
     private
 
-    # Carga las configuraciones en memoria desde un archivo de configuracion
-    def load_setup
-      liri_setup = Liri::Manager::Setup.new(SETUP_FOLDER_PATH)
-      liri_setup.create unless File.exist?(liri_setup.path)
-      liri_setup.load
+    # Inicializa el objeto que gestiona las configuraciones
+    def load_setup_manager(destination_folder_path)
+      @setup_manager = Liri::Common::Setup.new(destination_folder_path)
+      @setup_manager.init
+      @setup = @setup_manager.load
+      @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: Liri.setup.log.stdout.show)
+      log = Liri::Common::Log.new('daily', folder_path: folder_path, file_name: file_name, stdout: setup.log.stdout.show)
       log
     end
   end