eac_tools 0.45.1 → 0.45.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c529e1c368fe44c68e5bbaafd5258fab08baefca7852a4c5bd2285825352374e
-  data.tar.gz: 464f786052703260b2d4b7364fd3edbeae7403020036108f1faeb6a49df0e426
+  metadata.gz: d5895138920c46d129b675b1e7f264baae15f265aaceac01b77ec06c519b0b92
+  data.tar.gz: 4c1abea1083c04b96cacac8e9cf12b5bb3a688ac22bccdcf400c23b50eed7dc0
 SHA512:
-  metadata.gz: 14972773fe50b2bcb87738798c0608d78557a3c60d1c57bfb36d4590fe024b91a121b360b7f8cd8cbe058d827c90886a62b133127a4d744e2609924fb92ce792
-  data.tar.gz: 98e35772f9f6152c3e7f69b7667bf195e3280fd4ffb7ba1bf25be23968473b3403ecbdbbc37c11c05483cba11e9b43fc8be8099159117b324fdbc83ee5ab114f
+  metadata.gz: be4d60eb73a687e391c59ef23d7c0ff8845c49a6c6f5cd80f70019339f07673a8ce9597a7c8b4c79ff4e8dbb978702229eee24a13bc077268f1cf6bcb91eb316
+  data.tar.gz: 8728eae853dc90dace706b001f144caf36885871c208f8a4f9786bc730939aff3cbf2d9838ac2fe0b4738827489a9d463c1c23c9d2b1c212e11ccaf504fcc93c

data/Gemfile.lock

@@ -1,15 +1,15 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.45.1)
-      avm (~> 0.56)
+    eac_tools (0.45.2)
+      avm (~> 0.56, >= 0.56.1)
       avm-eac_asciidoctor_base0 (~> 0.12)
       avm-eac_generic_base0 (~> 0.8)
       avm-eac_latex_base0 (~> 0.3)
       avm-eac_php_base0 (~> 0.3)
       avm-eac_rails_base0 (~> 0.8, >= 0.8.1)
       avm-eac_rails_base1 (~> 0.7)
-      avm-eac_redmine_base0 (~> 0.16)
+      avm-eac_redmine_base0 (~> 0.16, >= 0.16.1)
       avm-eac_redmine_plugin_base0 (~> 0.3)
       avm-eac_ruby_base1 (~> 0.27, >= 0.27.1)
       avm-eac_webapp_base0 (~> 0.12, >= 0.12.2)
@@ -88,15 +88,15 @@ PATH
 PATH
   remote: sub/avm-eac_redmine_base0
   specs:
-    avm-eac_redmine_base0 (0.16.0)
-      avm (~> 0.44)
-      avm-eac_generic_base0 (~> 0.5)
-      avm-eac_rails_base1 (~> 0.6)
+    avm-eac_redmine_base0 (0.16.1)
+      avm (~> 0.56, >= 0.56.1)
+      avm-eac_generic_base0 (~> 0.8)
+      avm-eac_rails_base1 (~> 0.7)
       avm-eac_ubuntu_base0 (~> 0.3)
       curb (~> 0.9, >= 0.9.11)
-      eac_fs (~> 0.12, >= 0.12.3)
+      eac_fs (~> 0.15)
       eac_rest (~> 0.6, >= 0.6.1)
-      eac_ruby_utils (~> 0.104)
+      eac_ruby_utils (~> 0.107, >= 0.107.1)
 
 PATH
   remote: sub/avm-eac_redmine_plugin_base0
@@ -173,13 +173,13 @@ PATH
 PATH
   remote: sub/avm
   specs:
-    avm (0.56.0)
+    avm (0.56.1)
       aranha-parsers (~> 0.14, >= 0.14.4)
-      eac_cli (~> 0.29)
+      eac_cli (~> 0.30)
       eac_config (~> 0.12)
       eac_docker (~> 0.5)
       eac_fs (~> 0.15)
-      eac_git (~> 0.13)
+      eac_git (~> 0.14)
       eac_ruby_utils (~> 0.107, >= 0.107.1)
       eac_templates (~> 0.3, >= 0.3.2)
       filesize (~> 0.2)

data/lib/eac_tools/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacTools
-  VERSION = '0.45.1'
+  VERSION = '0.45.2'
 end

data/sub/avm/avm.gemspec

@@ -13,11 +13,11 @@ Gem::Specification.new do |s|
   s.files = Dir['{lib}/**/*']
 
   s.add_dependency 'aranha-parsers', '~> 0.14', '>= 0.14.4'
-  s.add_dependency 'eac_cli', '~> 0.29'
+  s.add_dependency 'eac_cli', '~> 0.30'
   s.add_dependency 'eac_config', '~> 0.12'
   s.add_dependency 'eac_docker', '~> 0.5'
   s.add_dependency 'eac_fs', '~> 0.15'
-  s.add_dependency 'eac_git', '~> 0.13'
+  s.add_dependency 'eac_git', '~> 0.14'
   s.add_dependency 'eac_ruby_utils', '~> 0.107', '>= 0.107.1'
   s.add_dependency 'eac_templates', '~> 0.3', '>= 0.3.2'
   s.add_dependency 'filesize', '~> 0.2'

data/sub/avm/lib/avm/entries/uri_builder.rb

@@ -46,8 +46,10 @@ module Avm
         field_get(translate_field(avm_field))
       end
 
+      # @return [String, nil]
       def field_get(name)
-        data[name.to_sym].if_present(&:to_s)
+        v = data[name.to_sym]
+        v.nil? ? nil : v.to_s
       end
 
       def field_set(field, value)

data/sub/avm/lib/avm/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Avm
-  VERSION = '0.56.0'
+  VERSION = '0.56.1'
 end

data/sub/avm/spec/lib/avm/instances/base_spec.rb

@@ -22,7 +22,9 @@ RSpec.describe ::Avm::Instances::Base do
       ::Avm::Instances::EntryKeys::INSTALL_HOSTNAME => 'myhost.com',
       ::Avm::Instances::EntryKeys::INSTALL_USERNAME => 'myuser',
       ::Avm::Instances::EntryKeys::INSTALL_GROUPNAME => 'myuser',
-      ::Avm::Instances::EntryKeys::INSTALL_URL => 'ssh://otheruser@otherhost.com'
+      ::Avm::Instances::EntryKeys::INSTALL_URL => 'ssh://otheruser@otherhost.com',
+      ::Avm::Instances::EntryKeys::WEB_URL => 'https://app0.net',
+      ::Avm::Instances::EntryKeys::WEB_PATH => ''
     },
     'app_2' => {
       ::Avm::Instances::EntryKeys::DATABASE_HOSTNAME => '127.0.0.1',

data/sub/avm/spec/lib/avm/instances/base_spec_files/config.yml

@@ -2,6 +2,8 @@
 app_0:
   install:
     id: app_1
+  web:
+    url: https://app0.net
 app_1:
   install:
     id: app_2

data/sub/avm-eac_redmine_base0/avm-eac_redmine_base0.gemspec

@@ -12,14 +12,14 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,locale,template}/**/*']
 
-  s.add_dependency 'avm', '~> 0.44'
-  s.add_dependency 'avm-eac_generic_base0', '~> 0.5'
-  s.add_dependency 'avm-eac_rails_base1', '~> 0.6'
+  s.add_dependency 'avm', '~> 0.56', '>= 0.56.1'
+  s.add_dependency 'avm-eac_generic_base0', '~> 0.8'
+  s.add_dependency 'avm-eac_rails_base1', '~> 0.7'
   s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.3'
   s.add_dependency 'curb', '~> 0.9', '>= 0.9.11'
-  s.add_dependency 'eac_fs', '~> 0.12', '>= 0.12.3'
+  s.add_dependency 'eac_fs', '~> 0.15'
   s.add_dependency 'eac_rest', '~> 0.6', '>= 0.6.1'
-  s.add_dependency 'eac_ruby_utils', '~> 0.104'
+  s.add_dependency 'eac_ruby_utils', '~> 0.107', '>= 0.107.1'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
 end

data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRedmineBase0
-    VERSION = '0.16.0'
+    VERSION = '0.16.1'
   end
 end

data/sub/avm-eac_redmine_base0/template/avm/eac_redmine_base0/instances/deploy/config/install.sh.template

@@ -22,8 +22,8 @@ export address_path='%%WEB.PATH%%'
 
 # Git
 export git_repositories_hierarchical_organisation=false
-export gitolite_user='%%GIT.USERNAME%%'
-export gitolite_user_home="/var/lib/${gitolite_user}"
+export gitolite_user='%%GITOLITE.USERNAME%%'
+export gitolite_user_home='%%GITOLITE.PATH%%'
 export redmine_git_hosting_ssh_key_name=redmine_git_hosting_id
 
 # Mail settings

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_tools
 version: !ruby/object:Gem::Version
-  version: 0.45.1
+  version: 0.45.2
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-11 00:00:00.000000000 Z
+date: 2022-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm
@@ -17,6 +17,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.56'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.56.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,6 +27,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.56'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.56.1
 - !ruby/object:Gem::Dependency
   name: avm-eac_asciidoctor_base0
   requirement: !ruby/object:Gem::Requirement
@@ -121,6 +127,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.16'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.16.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -128,6 +137,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.16'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.16.1
 - !ruby/object:Gem::Dependency
   name: avm-eac_redmine_plugin_base0
   requirement: !ruby/object:Gem::Requirement