From 50947bc134dbbb54c67cc5543546f83efa60c19d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladimir=20T=C3=A1mara=20Pati=C3=B1o?=
 <vtamara@pasosdeJesus.org>
Date: Tue, 14 Mar 2023 18:35:19 -0500
Subject: [PATCH] Actualiza infraestrucura. Closes #119

---
 .gitignore       |  2 +-
 Gemfile          | 42 ++++++++++++++++++----------
 Gemfile.lock     | 71 ++++++++++++++++++++++++++++++++++--------------
 bin/regresion.sh |  2 +-
 yarn.lock        |  6 ++--
 5 files changed, 83 insertions(+), 40 deletions(-)

diff --git a/.gitignore b/.gitignore
index edde269..3e1f9ef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -50,4 +50,4 @@ app/javascript/controllers/sivel2_gen
 public/fasol/si/csv/
 public/fasol/sipub
 ref
-app/javascript/controllers/sip
+app/javascript/controllers/msip
diff --git a/Gemfile b/Gemfile
index 180ffa0..cada728 100644
--- a/Gemfile
+++ b/Gemfile
@@ -114,39 +114,51 @@ gem 'jos19',
   #path: '../jos19'
 
 group  :development, :test do
-  gem 'debug' # Depurar
 
-  gem 'colorize' # Colores en terminal
+  gem "brakeman"
 
-  gem 'dotenv-rails'
-end
+  gem "bundler-audit"
 
+  gem "code-scanning-rubocop"
 
-group :development do
-  gem 'erd'
+  gem "colorize"
+
+  gem "debug"
 
-  gem 'puma'
+  gem "dotenv-rails"
 
-  gem 'rails-erd'
+  gem "rails-erd"
 
-  gem 'redis'
+  gem "rubocop-minitest"
+
+  gem "rubocop-rails"
+
+  gem "rubocop-shopify"
+end
 
-  gem 'spring' # Acelera ejecutando en fondo. 
 
+group :development do
   gem 'web-console'
 end
 
 
 group :test do
-  gem 'cuprite'
 
-  gem 'capybara'
+  gem "capybara"
+
+  gem "connection_pool"
+
+  gem "cuprite"
+
+  gem "minitest", "~> 5.16"
+
+  gem "minitest-reporters"
 
-  gem 'rails-controller-testing'
+  gem "rails-controller-testing"
 
-  gem 'selenium-webdriver'
+  gem "simplecov"
 
-  gem 'simplecov'
+  gem "spork" # Un proceso para cada prueba -- acelera
 end
 
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 6d93fa1..92e0b4f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -175,6 +175,8 @@ GEM
     addressable (2.8.1)
       public_suffix (>= 2.0.2, < 6.0)
     andand (1.3.3)
+    ansi (1.5.0)
+    ast (2.4.2)
     babel-source (5.8.35)
     babel-transpiler (0.7.0)
       babel-source (>= 4.0, < 6)
@@ -183,7 +185,11 @@ GEM
     bindex (0.8.1)
     bootsnap (1.16.0)
       msgpack (~> 1.2)
+    brakeman (5.4.1)
     builder (3.2.4)
+    bundler-audit (0.9.1)
+      bundler (>= 1.2.0, < 3)
+      thor (~> 1.0)
     camertron-eprun (1.1.1)
     cancancan (3.5.0)
     capybara (3.38.0)
@@ -198,6 +204,8 @@ GEM
     choice (0.2.0)
     cldr-plurals-runtime-rb (1.1.0)
     climate_control (0.2.0)
+    code-scanning-rubocop (0.6.1)
+      rubocop (~> 1.0)
     coffee-rails (5.0.0)
       coffee-script (>= 2.2.0)
       railties (>= 5.2.0)
@@ -230,9 +238,6 @@ GEM
     dotenv-rails (2.8.1)
       dotenv (= 2.8.1)
       railties (>= 3.2)
-    erd (0.8.1)
-      nokogiri
-      ruby-graphviz
     erubi (1.12.0)
     execjs (2.8.1)
     ferrum (0.13)
@@ -257,6 +262,7 @@ GEM
       activesupport (>= 5.0.0)
     jsbundling-rails (1.1.1)
       railties (>= 6.0.0)
+    json (2.6.3)
     kgio (2.11.4)
     libxml-ruby (4.0.0)
     loofah (2.19.1)
@@ -276,6 +282,11 @@ GEM
     mini_mime (1.1.2)
     mini_portile2 (2.8.1)
     minitest (5.18.0)
+    minitest-reporters (1.6.0)
+      ansi
+      builder
+      minitest (>= 5.0)
+      ruby-progressbar
     msgpack (1.6.1)
     net-imap (0.3.4)
       date
@@ -295,6 +306,9 @@ GEM
       nokogiri (>= 1.10.0)
       rubyzip (>= 1.3.0)
     orm_adapter (0.5.0)
+    parallel (1.22.1)
+    parser (3.2.1.1)
+      ast (~> 2.4.1)
     parslet (2.0.0)
     pdf-core (0.9.0)
     pg (1.4.6)
@@ -307,8 +321,6 @@ GEM
       prawn (>= 1.0.0)
       rails (>= 3.2)
     public_suffix (5.0.1)
-    puma (6.1.1)
-      nio4r (~> 2.0)
     racc (1.6.2)
     rack (2.2.6.4)
     rack-cors (2.0.0)
@@ -353,13 +365,10 @@ GEM
       rake (>= 12.2)
       thor (~> 1.0)
       zeitwerk (~> 2.5)
+    rainbow (3.1.1)
     raindrops (0.20.1)
     rake (13.0.6)
     redcarpet (3.6.0)
-    redis (5.0.6)
-      redis-client (>= 0.9.0)
-    redis-client (0.14.0)
-      connection_pool
     regexp_parser (2.7.0)
     reline (0.3.2)
       io-console (~> 0.5)
@@ -370,8 +379,29 @@ GEM
     rspreadsheet (0.5.3)
       andand (>= 1.3)
       rubyzip (>= 1.3)
+    rubocop (1.48.1)
+      json (~> 2.3)
+      parallel (~> 1.10)
+      parser (>= 3.2.0.0)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.26.0, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.27.0)
+      parser (>= 3.2.1.0)
+    rubocop-minitest (0.29.0)
+      rubocop (>= 1.39, < 2.0)
+    rubocop-rails (2.18.0)
+      activesupport (>= 4.2.0)
+      rack (>= 1.1)
+      rubocop (>= 1.33.0, < 2.0)
+    rubocop-shopify (2.12.0)
+      rubocop (~> 1.44)
     ruby-graphviz (1.2.5)
       rexml
+    ruby-progressbar (1.13.0)
     rubyzip (2.3.2)
     sassc (2.4.0)
       ffi (~> 1.9)
@@ -381,10 +411,6 @@ GEM
       sprockets (> 3.0)
       sprockets-rails
       tilt
-    selenium-webdriver (4.8.1)
-      rexml (~> 3.2, >= 3.2.5)
-      rubyzip (>= 1.2.2, < 3.0)
-      websocket (~> 1.0)
     simple_form (5.2.0)
       actionpack (>= 5.2)
       activemodel (>= 5.2)
@@ -394,7 +420,7 @@ GEM
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
-    spring (4.1.1)
+    spork (0.9.2)
     sprockets (4.2.0)
       concurrent-ruby (~> 1.0)
       rack (>= 2.2.4, < 4)
@@ -420,6 +446,7 @@ GEM
       tzinfo
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
+    unicode-display_width (2.4.2)
     unicorn (6.1.0)
       kgio (~> 2.6)
       raindrops (~> 0.7)
@@ -431,7 +458,6 @@ GEM
       bindex (>= 0.4.0)
       railties (>= 6.0.0)
     webrick (1.8.1)
-    websocket (1.2.9)
     websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
@@ -450,19 +476,22 @@ DEPENDENCIES
   bcrypt
   best_in_place!
   bootsnap (>= 1.1.0)
+  brakeman
+  bundler-audit
   cancancan
   capybara
   cocoon!
+  code-scanning-rubocop
   coffee-rails
   color
   colorize
+  connection_pool
   cor1440_gen!
   cuprite
   debug
   devise
   devise-i18n
   dotenv-rails
-  erd
   heb412_gen!
   hotwire-rails
   jbuilder
@@ -470,6 +499,8 @@ DEPENDENCIES
   jsbundling-rails
   kt-paperclip!
   libxml-ruby
+  minitest (~> 5.16)
+  minitest-reporters
   mr519_gen!
   msip!
   nokogiri (>= 1.11.1)
@@ -479,7 +510,6 @@ DEPENDENCIES
   prawn
   prawn-table
   prawnto_2
-  puma
   rack
   rack-cors
   rails (~> 7.0)
@@ -487,15 +517,16 @@ DEPENDENCIES
   rails-erd
   rails-i18n
   redcarpet
-  redis
   rspreadsheet
+  rubocop-minitest
+  rubocop-rails
+  rubocop-shopify
   rubyzip (>= 2.0)
   sassc-rails
-  selenium-webdriver
   simple_form
   simplecov
   sivel2_gen!
-  spring
+  spork
   sprockets-rails
   stimulus-rails
   turbo-rails (~> 1.0)
diff --git a/bin/regresion.sh b/bin/regresion.sh
index 8c28aa1..1a80708 100755
--- a/bin/regresion.sh
+++ b/bin/regresion.sh
@@ -82,7 +82,7 @@ echo "== Unificando resultados de pruebas en directorio clásico coverage"
 mkdir -p coverage/
 rm -rf coverage/{*,.*}
 
-if (test "$RC" = "msip" -o "$rutaap" = "test/dummy/") then {
+if (test "$rutaap" = "test/dummy/" -a "$RC" != "heb412_gen") then {
   ${RAILS} app:msip:reporteregresion
 } else {
   ${RAILS} msip:reporteregresion
diff --git a/yarn.lock b/yarn.lock
index 29768f1..f7e602e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1388,9 +1388,9 @@ domexception@^2.0.1:
     webidl-conversions "^5.0.0"
 
 electron-to-chromium@^1.4.284:
-  version "1.4.329"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.329.tgz#ea54b67c981c814f16917b585acf3a667d4c997f"
-  integrity sha512-dcwPzNUG4+reo5z+wHnrl2eZMu4kz+nLQEeepxLEDTLDC7Mi7AVTM4NXWct1TZyu3G4oQgygaAfbByaBtPqw2Q==
+  version "1.4.330"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.330.tgz#4740378db7160d7210afb29800c74048cdf10a99"
+  integrity sha512-PqyefhybrVdjAJ45HaPLtuVaehiSw7C3ya0aad+rvmV53IVyXmYRk3pwIOb2TxTDTnmgQdn46NjMMaysx79/6Q==
 
 emittery@^0.8.1:
   version "0.8.1"