Skip to content

Commit

Permalink
Remplaza sip por msip de acuerdo a https://gitlab.com/pasosdeJesus/ms…
Browse files Browse the repository at this point in the history
  • Loading branch information
vtamara committed Jan 19, 2023
1 parent 61eddce commit 78ee94d
Show file tree
Hide file tree
Showing 72 changed files with 1,553 additions and 1,594 deletions.
8 changes: 4 additions & 4 deletions .env.plantilla
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ if (test "$CONFIG_HOSTS" = "") then {
export CONFIG_HOSTS="192.168.10.1"
} fi;
if (test "$RUTA_RELATIVA" = "") then {
export RUTA_RELATIVA=/sivel2_1/
export RUTA_RELATIVA=/sivel2_2/
} fi;
if (test "$DIRAP" = "") then {
export DIRAP=/var/www/htdocs/sivel2_1
export DIRAP=/var/www/htdocs/sivel2_2
} fi;
if (test "$RAILS_ENV" = "") then {
export RAILS_ENV=development
Expand All @@ -57,7 +57,7 @@ if (test "$PUERTORECVIVA" = "") then { # Puerto para recarga viva

# Despliegue en modo producción con unicorn
if (test "$RC" = "") then {
export RC=sivel2_1
export RC=sivel2_2
} fi;
if (test "$PUERTOUNICORN" = "") then {
export PUERTOUNICORN=3015
Expand All @@ -71,7 +71,7 @@ if (test "$ORIGEN_CORS" = "") then {
} fi;


# Configuraciones requeridas por sip
# Configuraciones requeridas por msip
if (test "$SIP_FORMATO_FECHA" = "") then {
export SIP_FORMATO_FECHA='dd/M/yyyy'
} fi;
Expand Down
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public/heb412/
public/sivel2/
public/sivel2_1/
.byebug_history
app/views/sip/hogar/
app/views/msip/hogar/
bin/u.sh
coverage/
bin/corre.sh
Expand All @@ -43,7 +43,7 @@ config/credentials.yml.enc
.env
*.cp
app/assets/builds/
app/javascript/controllers/sip
app/javascript/controllers/msip
app/javascript/controllers/mr519_gen
app/javascript/controllers/heb412_gen
app/javascript/controllers/cor1440_gen
Expand Down
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ test:
- cp db/structure.sql db/structure.sql.copia
- sed -e 's/provider = libc,//g;s/SET default_table_access_method.*/-- &/g' db/structure.sql.copia > db/structure.sql
- bin/rails db:drop db:create db:setup
- bin/rails sip:indices
- bin/rails msip:indices
script:
- CONFIG_HOSTS=www.example.com bin/rails test
- ./cc-test-reporter after-build -t simplecov --exit-code $?
Expand Down
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,12 @@ before_install:
- cp config/database.travis.yml config/database.yml
- cp config/application.rb.plantilla config/application.rb
- cp config/routes.rb.plantilla config/routes.rb
- cp config/initializers/sip.rb.plantilla config/initializers/sip.rb
- cp config/initializers/msip.rb.plantilla config/initializers/msip.rb
- cp config/initializers/punto_montaje.rb.plantilla config/initializers/punto_montaje.rb
- cp db/structure.sql db/structure.sql.copia # travis no soporta PostreSQL 10
- sed -e 's/provider = libc,//g;s/SET default_table_access_method.*/-- &/g' db/structure.sql.copia > db/structure.sql
- bundle exec rails db:setup
- bundle exec rails sip:indices
- bundle exec rails msip:indices

script:
- RAILS_ENV=test CONFIG_HOSTS=127.0.0.1 jest
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# CONTRIBUCIONES

Aplican los mismos lineamientos descritos en:
<https://github.com/pasosdeJesus/sip/blob/master/CONTRIBUTING.md>
<https://github.com/pasosdeJesus/msip/blob/master/CONTRIBUTING.md>

Respecto a la aplicación de prueba, una vez la configure e ingrese
a la aplicación desde un navegador en el punto de montaje `/sivel2`,
Expand Down
14 changes: 7 additions & 7 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -86,24 +86,24 @@ gem 'will_paginate' # Listados en páginas
# Motores que se sobrecargan vistas (a diferencia de las anteriores gemas,
# estas ponerse en orden de apilamiento lógico y no alfabético).

gem 'sip', # Motor generico
git: 'https://github.com/pasosdeJesus/sip.git', branch: :main
#path: '../sip'
gem 'msip', # Motor generico
git: 'https://github.com/pasosdeJesus/msip.git', branch: :main
#path: '../msip'

gem 'mr519_gen', # Motor de gestion de formularios y encuestas
git: 'https://github.com/pasosdeJesus/mr519_gen.git', branch: :main
git: 'https://github.com/pasosdeJesus/mr519_gen.git', branch: :msip
#path: '../mr519_gen'

gem 'heb412_gen', # Motor de nube y llenado de plantillas
git: 'https://github.com/pasosdeJesus/heb412_gen.git', branch: :main
git: 'https://github.com/pasosdeJesus/heb412_gen.git', branch: :msip
#path: '../heb412_gen'

gem 'sivel2_gen', # Motor para manejo de casos
git: 'https://github.com/pasosdeJesus/sivel2_gen.git', branch: :main
git: 'https://github.com/pasosdeJesus/sivel2_gen.git', branch: :msip
#path: '../sivel2_gen'

gem 'apo214', # Motor para manejo de casos
git: 'https://github.com/pasosdeJesus/apo214.git', branch: :main
git: 'https://github.com/pasosdeJesus/apo214.git', branch: :msip
#path: '../apo214'

group :development, :test do
Expand Down
168 changes: 85 additions & 83 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -19,57 +19,59 @@ GIT

GIT
remote: https://github.com/pasosdeJesus/apo214.git
revision: 3a9ba9c2ad1d2f664abe0e7dcafea8a7c6d31bcf
branch: main
revision: 01b1c3352583614e036642b569987c8bb03dd0e9
branch: msip
specs:
apo214 (2.1a1)
msip
rails
sip

GIT
remote: https://github.com/pasosdeJesus/heb412_gen.git
revision: 3b7062dd0cbed0f7428387437488c47e9ad98394
branch: main
revision: 9ec4cafd764c2fafaba12a598b7cbba320aa42ef
branch: msip
specs:
heb412_gen (2.1.0.beta1)
mr519_gen
msip
redcarpet
rspreadsheet
sip

GIT
remote: https://github.com/pasosdeJesus/mr519_gen.git
revision: a827f46c1600a36047f31a4c4fbb1d4b4ec13807
branch: main
revision: c7baab5d73d729ade208716dc225fc491da9973d
branch: msip
specs:
mr519_gen (2.1.0.beta1)
msip
rails
sip

GIT
remote: https://github.com/pasosdeJesus/sip.git
revision: 1a5f8fb9efc8a459c7c7061a5064eae47c05e777
remote: https://github.com/pasosdeJesus/msip.git
revision: 0f4dff0a6b63ea4acac59e70e189cfbfe3710033
branch: main
specs:
sip (2.1.0.beta1)
cancancan
coffee-rails
devise
devise-i18n
kt-paperclip
minitest
rails
rails-i18n
sassc-rails
simple_form
twitter_cldr
msip (2.2.0.alfa3)
cancancan (~> 3)
devise (~> 4)
devise-i18n (~> 1)
kt-paperclip (~> 7)
pg (~> 1)
rails (~> 7.0)
rails-i18n (~> 7)
sassc-rails (~> 2)
simple_form (~> 5)
sprockets-rails (~> 3)
stimulus-rails (~> 1)
twitter_cldr (~> 6)
will_paginate (~> 3)

GIT
remote: https://github.com/pasosdeJesus/sivel2_gen.git
revision: 1bb8ac062722d9fb5b90d4e73b8138052f017404
branch: main
revision: 2f4c0d55f5f2b87bf2751d5bac99f53d17ae2ac9
branch: msip
specs:
sivel2_gen (2.1.0.beta1)
sivel2_gen (2.2.0.beta1)
color
devise
rails
Expand All @@ -93,67 +95,67 @@ GIT
GEM
remote: https://rubygems.org/
specs:
actioncable (7.0.4)
actionpack (= 7.0.4)
activesupport (= 7.0.4)
actioncable (7.0.4.1)
actionpack (= 7.0.4.1)
activesupport (= 7.0.4.1)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailbox (7.0.4)
actionpack (= 7.0.4)
activejob (= 7.0.4)
activerecord (= 7.0.4)
activestorage (= 7.0.4)
activesupport (= 7.0.4)
actionmailbox (7.0.4.1)
actionpack (= 7.0.4.1)
activejob (= 7.0.4.1)
activerecord (= 7.0.4.1)
activestorage (= 7.0.4.1)
activesupport (= 7.0.4.1)
mail (>= 2.7.1)
net-imap
net-pop
net-smtp
actionmailer (7.0.4)
actionpack (= 7.0.4)
actionview (= 7.0.4)
activejob (= 7.0.4)
activesupport (= 7.0.4)
actionmailer (7.0.4.1)
actionpack (= 7.0.4.1)
actionview (= 7.0.4.1)
activejob (= 7.0.4.1)
activesupport (= 7.0.4.1)
mail (~> 2.5, >= 2.5.4)
net-imap
net-pop
net-smtp
rails-dom-testing (~> 2.0)
actionpack (7.0.4)
actionview (= 7.0.4)
activesupport (= 7.0.4)
actionpack (7.0.4.1)
actionview (= 7.0.4.1)
activesupport (= 7.0.4.1)
rack (~> 2.0, >= 2.2.0)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actiontext (7.0.4)
actionpack (= 7.0.4)
activerecord (= 7.0.4)
activestorage (= 7.0.4)
activesupport (= 7.0.4)
actiontext (7.0.4.1)
actionpack (= 7.0.4.1)
activerecord (= 7.0.4.1)
activestorage (= 7.0.4.1)
activesupport (= 7.0.4.1)
globalid (>= 0.6.0)
nokogiri (>= 1.8.5)
actionview (7.0.4)
activesupport (= 7.0.4)
actionview (7.0.4.1)
activesupport (= 7.0.4.1)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
activejob (7.0.4)
activesupport (= 7.0.4)
activejob (7.0.4.1)
activesupport (= 7.0.4.1)
globalid (>= 0.3.6)
activemodel (7.0.4)
activesupport (= 7.0.4)
activerecord (7.0.4)
activemodel (= 7.0.4)
activesupport (= 7.0.4)
activestorage (7.0.4)
actionpack (= 7.0.4)
activejob (= 7.0.4)
activerecord (= 7.0.4)
activesupport (= 7.0.4)
activemodel (7.0.4.1)
activesupport (= 7.0.4.1)
activerecord (7.0.4.1)
activemodel (= 7.0.4.1)
activesupport (= 7.0.4.1)
activestorage (7.0.4.1)
actionpack (= 7.0.4.1)
activejob (= 7.0.4.1)
activerecord (= 7.0.4.1)
activesupport (= 7.0.4.1)
marcel (~> 1.0)
mini_mime (>= 1.1.0)
activesupport (7.0.4)
activesupport (7.0.4.1)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
Expand Down Expand Up @@ -254,7 +256,7 @@ GEM
webrick (~> 1.7)
websocket-driver (>= 0.6, < 0.8)
ffi (1.15.5)
globalid (1.0.0)
globalid (1.0.1)
activesupport (>= 5.0)
hotwire-rails (0.1.3)
rails (>= 6.0.0)
Expand Down Expand Up @@ -323,25 +325,25 @@ GEM
puma (6.0.2)
nio4r (~> 2.0)
racc (1.6.2)
rack (2.2.5)
rack (2.2.6.2)
rack-cors (1.1.1)
rack (>= 2.0.0)
rack-test (2.0.2)
rack (>= 1.3)
rails (7.0.4)
actioncable (= 7.0.4)
actionmailbox (= 7.0.4)
actionmailer (= 7.0.4)
actionpack (= 7.0.4)
actiontext (= 7.0.4)
actionview (= 7.0.4)
activejob (= 7.0.4)
activemodel (= 7.0.4)
activerecord (= 7.0.4)
activestorage (= 7.0.4)
activesupport (= 7.0.4)
rails (7.0.4.1)
actioncable (= 7.0.4.1)
actionmailbox (= 7.0.4.1)
actionmailer (= 7.0.4.1)
actionpack (= 7.0.4.1)
actiontext (= 7.0.4.1)
actionview (= 7.0.4.1)
activejob (= 7.0.4.1)
activemodel (= 7.0.4.1)
activerecord (= 7.0.4.1)
activestorage (= 7.0.4.1)
activesupport (= 7.0.4.1)
bundler (>= 1.15.0)
railties (= 7.0.4)
railties (= 7.0.4.1)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
Expand All @@ -355,9 +357,9 @@ GEM
rails-i18n (7.0.6)
i18n (>= 0.7, < 2)
railties (>= 6.0.0, < 8)
railties (7.0.4)
actionpack (= 7.0.4)
activesupport (= 7.0.4)
railties (7.0.4.1)
actionpack (= 7.0.4.1)
activesupport (= 7.0.4.1)
method_source
rake (>= 12.2)
thor (~> 1.0)
Expand Down Expand Up @@ -476,6 +478,7 @@ DEPENDENCIES
kt-paperclip!
libxml-ruby
mr519_gen!
msip!
nokogiri (>= 1.11.1)
odf-report
pg
Expand All @@ -496,7 +499,6 @@ DEPENDENCIES
selenium-webdriver
simple_form
simplecov (< 0.18)
sip!
sivel2_gen!
spring
sprockets-rails
Expand All @@ -509,4 +511,4 @@ DEPENDENCIES
will_paginate

BUNDLED WITH
2.4.1
2.4.4
Loading

0 comments on commit 78ee94d

Please sign in to comment.