liri 0.2.1 → 0.4.0

data/lib/common/unit_test/rspec.rb

@@ -14,22 +14,10 @@ module Liri
         def all_tests
           tests_count = 1
           tests_hash = {}
-          test_files.each do |test_file|
-            File.open(test_file) do |file|
-              @inside_comment = false
-              file.each_with_index do |line, index|
-                next if line_inside_comment_block(line)
-
-                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
+          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
           tests_hash
         end
@@ -49,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
@@ -62,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,47 @@
+# = 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
+
+          # 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)
+            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,14 @@ class Hash
   #   hash
   #     => {}
   def remove!(*keys)
-    keys.flatten.each{|key| self.delete(key) }
+    keys.flatten.each { |key| delete(key) }
     self
   end
-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,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.2.1'
+  VERSION = '0.4.0'
 
   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
@@ -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,38 +63,42 @@ 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
-      setup.print_failures
+    def current_folder_ruby_and_gemset
+      "#{File.read('.ruby-version').strip}@#{File.read('.ruby-gemset').strip}"
     end
 
-    def udp_request_delay
-      setup.udp_request_delay
+    def ignored_folders_in_compress
+      setup.general.ignored_folders_in_compress
     end
 
-    def current_folder_ruby_and_gemset
-      "#{File.read('.ruby-version').strip}@#{File.read('.ruby-gemset').strip}"
+    def times_round
+      setup.general.times_round
+    end
+
+    def times_round_type
+      setup.general.times_round_type.to_sym
     end
 
     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
@@ -105,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
@@ -113,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,17 +31,31 @@ 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
         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
 
       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