avmtrf1-tools 0.22.0 → 0.22.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8bccc6c4cb6523d0317726266275394779bc7197c48816818e481f6220179c4
-  data.tar.gz: 63d1a3ee1390c28b63754fdd843d7c7a16d08a51892aaac5f475db7d29db0f46
+  metadata.gz: d14dbd6b203b4738683acb98348b9685d46731756d5ceb8aa10734ae1b5ccced
+  data.tar.gz: 004cc12cfcec52e57ce9775fd2daf2ff6947ce499f22e4dfb4a59cc58d3355a5
 SHA512:
-  metadata.gz: 64f9b323848fc332198cd8d137c65ee63d521a6a52029739863abe9b9b47d8f0c4ebe5a8a84faf05e2ee82df691cd6a63f248ceaf9f03e3d6b6e2b42fb4f3078
-  data.tar.gz: 547c3c71463934abdc0a6df478d31c7257e00b1cd6e4602b1b16f42f969928748de21ecc8f6c04a0986a66b74e56abdcd9c5c122434f62d822c35788ab4ce63d
+  metadata.gz: 5260afb111628922cab5cdc69ba48c436152b0703b4e9411468782ec8dfd9b3ae86cd1ba53323d6560e40119d0a7cfcce267a1342192402bca837829a1566aee
+  data.tar.gz: ea4788f19b07be09d665327ec2dc934d93bd8db281489edfd632ef3b3c6b0c85adba8293713b9a09e1ee72abaabe8d09dcbfee6f3cbb81f842ccd521230cb11b

data/lib/avmtrf1/esosti/entities/issue.rb

@@ -32,7 +32,7 @@ module Avmtrf1
             if content_hash?(data)
               sanitize_data(data.fetch('content'))
             else
-              data.map { |k, v| [k, sanitize_data(v)] }.to_h
+              data.transform_values { |v| sanitize_data(v) }
             end
           end
 

data/lib/avmtrf1/result.rb

@@ -9,7 +9,7 @@ module Avmtrf1
 
     lists.add_string :type, :success, :error, :neutral
 
-    lists.type.values.each do |type|
+    lists.type.values.each do |type| # rubocop:disable Style/HashEachMethods
       class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
         def self.#{type}(output)
           new(TYPE_#{type.upcase}, output)

data/lib/avmtrf1/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avmtrf1
   module Tools
-    VERSION = '0.22.0'
+    VERSION = '0.22.1'
   end
 end

data/template/avmtrf1/php/docker_image/aux/apache_user.sh

@@ -12,5 +12,23 @@ done
 DIR="$( cd -P "$( dirname "$SOURCE" )" >/dev/null 2>&1 && pwd )"
 source "$DIR/init.sh"
 
-infom "Alterando ID do usuário Apache..."
-usermod -u "$APACHE_USER_ID" "$APACHE_USER_NAME"
+if user_exist_by_id "$APACHE_USER_ID"; then
+  infom "ID de usuário \"$APACHE_USER_ID\" já existe"
+elif user_exist_by_name "$APACHE_USER_NAME"; then
+  infom "Alterando ID do usuário \"$APACHE_USER_NAME\"..."
+  usermod --uid "$APACHE_USER_ID" "$APACHE_USER_NAME"
+else
+  infom "Criando usuário \"$APACHE_USER_NAME\"..."
+  useradd --uid "$APACHE_USER_ID" "$APACHE_USER_NAME"
+fi
+
+if [[ "$APACHE_USER_ID" == '0' ]]; then
+  infom "\$APACHE_USER_ID é 0 (root). Apache executará com usuário padrão (Nenhuma alteração)"
+else
+  infom "Configurando usuário/grupo de execução do Apache..."
+  export APACHE_RUN_USER="$(id -nu "$APACHE_USER_ID")"
+  export APACHE_RUN_GROUP="$(id -ng "$APACHE_RUN_USER")"
+  infov "Execução do Apache"
+  infov '  * $APACHE_RUN_USER' "$APACHE_RUN_USER (ID: $APACHE_USER_ID)"
+  infov '  * $APACHE_RUN_GROUP' "$APACHE_RUN_GROUP (ID: $(id -g "$APACHE_RUN_USER"))"
+fi

data/template/avmtrf1/php/docker_image/aux/init.sh

@@ -12,7 +12,7 @@ export AUX_ROOT="$( cd -P "$( dirname "$SOURCE" )" >/dev/null 2>&1 && pwd )"
 source "$AUX_ROOT/lib.sh"
 
 # Nome do usuário Apache
-export APACHE_USER_NAME='www-data'
+export APACHE_USER_NAME='apache_app_user'
 
 # Diretório de templates
 export TEMPLATES_ROOT="$AUX_ROOT/templates"

data/template/avmtrf1/php/docker_image/aux/lib.sh

@@ -50,3 +50,11 @@ function text_set() {
   fi
   export $VARIABLE_NAME="$RESULT"
 }
+
+function user_exist_by_id() {
+  getent passwd "$1" > /dev/null
+}
+
+function user_exist_by_name() {
+  id -u "$1" > /dev/null
+}

data/template/avmtrf1/php/docker_image/aux/start.sh

@@ -13,12 +13,12 @@ DIR="$( cd -P "$( dirname "$SOURCE" )" >/dev/null 2>&1 && pwd )"
 source "$DIR/init.sh"
 
 "$AUX_ROOT/config_banner.sh"
-"$AUX_ROOT/apache_user.sh"
 "$AUX_ROOT/setup_apache_site.sh"
 "$AUX_ROOT/php_values.sh"
 "$AUX_ROOT/pear.sh"
 "$AUX_ROOT/php_composer.sh"
 "$AUX_ROOT/laravel.sh"
+source "$AUX_ROOT/apache_user.sh"
 if bool_r "$RUN_APACHE"; then
   "$AUX_ROOT/apache_foreground.sh"
 else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avmtrf1-tools
 version: !ruby/object:Gem::Version
-  version: 0.22.0
+  version: 0.22.1
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-10 00:00:00.000000000 Z
+date: 2020-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -188,28 +188,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.79.0
+        version: 0.80.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.79.0
+        version: 0.80.1
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.37.1
+        version: 1.38.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.37.1
+        version: 1.38.1
 - !ruby/object:Gem::Dependency
   name: ruby-oci8
   requirement: !ruby/object:Gem::Requirement