eac_tools 0.77.1 → 0.78.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f517b6d6540d86de71eb838d6bb96479c1991ec194ca1d60b420e3d7318f7f4
-  data.tar.gz: be11c1bbf741c6c9a39e6108c312f9cc2d11a75e924da7b59be2a5ffb4c569e6
+  metadata.gz: 8e227d70bad6dcda0603a56c57f8114622444ff56a3ddf61ff742be65ba94992
+  data.tar.gz: fce72f0ff11ad9c7cf4287351015bb8337a5b56af81d6edd386d13f821ff68ea
 SHA512:
-  metadata.gz: bf8108ddd620e8ca590551490a742d1f3bbf35090f3df2e5b11bcbff00c6c8625720468f13dd710a097e38cb815e5f012c2d93759d8facc8e62a82defdfba5ba
-  data.tar.gz: f8ef025927b82d16f5ab1f9ae34f2e60d648923a9a748fb93c466d8846523204a53a0f8344c47303c9c1bd5caaaa98b4c5c8bb129f1fe5962088cef5a839eba9
+  metadata.gz: 553f7235db1e49048bb2444554ed9f4a4c3cc2281a19ee054196f7bd4f6fbbc71951a4a87fe5a8bc09dc4b6b6165d59ffee2df92b70998e1d8f17fc84974eb52
+  data.tar.gz: f1c8903587ee95c26bf744c95f9704c7ffb27f75391e26f83e95544377655b36714029bae0e0b5232c230ba35752748169e08855d1f020e99478f72f148dfe38

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.77.1)
-      avm (~> 0.79)
+    eac_tools (0.78.0)
+      avm (~> 0.80)
       avm-eac_asciidoctor_base0 (~> 0.19)
       avm-eac_generic_base0 (~> 0.12, >= 0.12.1)
       avm-eac_latex_base0 (~> 0.3, >= 0.3.1)
@@ -11,13 +11,13 @@ PATH
       avm-eac_python_base0 (~> 0.2, >= 0.2.1)
       avm-eac_rails_base0 (~> 0.10, >= 0.10.3)
       avm-eac_rails_base1 (~> 0.9, >= 0.9.3)
-      avm-eac_redmine_base0 (~> 0.21)
+      avm-eac_redmine_base0 (~> 0.21, >= 0.21.1)
       avm-eac_redmine_plugin_base0 (~> 0.4)
-      avm-eac_ruby_base1 (~> 0.32)
+      avm-eac_ruby_base1 (~> 0.32, >= 0.32.1)
       avm-eac_webapp_base0 (~> 0.18, >= 0.18.2)
       avm-eac_wordpress_base0 (~> 0.3, >= 0.3.1)
       avm-git (~> 0.13, >= 0.13.4)
-      avm-tools (~> 0.155)
+      avm-tools (~> 0.156)
       eac_ruby_utils (~> 0.119, >= 0.119.2)
 
 PATH
@@ -86,9 +86,9 @@ PATH
 PATH
   remote: sub/avm-eac_redmine_base0
   specs:
-    avm-eac_redmine_base0 (0.21.0)
-      avm (~> 0.79)
-      avm-eac_generic_base0 (~> 0.12)
+    avm-eac_redmine_base0 (0.21.1)
+      avm (~> 0.80)
+      avm-eac_generic_base0 (~> 0.12, >= 0.12.1)
       avm-eac_rails_base1 (~> 0.9, >= 0.9.3)
       avm-eac_ubuntu_base0 (~> 0.5)
       curb (~> 0.9, >= 0.9.11)
@@ -106,9 +106,9 @@ PATH
 PATH
   remote: sub/avm-eac_ruby_base1
   specs:
-    avm-eac_ruby_base1 (0.32.0)
+    avm-eac_ruby_base1 (0.32.1)
       aranha-parsers (~> 0.21)
-      avm (~> 0.79)
+      avm (~> 0.80)
       avm-eac_generic_base0 (~> 0.12, >= 0.12.1)
       eac_envs-http (~> 0.4, >= 0.4.1)
       eac_ruby_utils (~> 0.119, >= 0.119.2)
@@ -163,10 +163,10 @@ PATH
 PATH
   remote: sub/avm-tools
   specs:
-    avm-tools (0.155.0)
+    avm-tools (0.156.0)
       aranha-parsers (~> 0.21)
-      avm (~> 0.79)
-      avm-eac_ruby_base1 (~> 0.31, >= 0.31.2)
+      avm (~> 0.80)
+      avm-eac_ruby_base1 (~> 0.32, >= 0.32.1)
       avm-eac_ubuntu_base0 (~> 0.5)
       avm-files (~> 0.6, >= 0.6.2)
       avm-git (~> 0.13, >= 0.13.4)
@@ -181,14 +181,14 @@ PATH
 PATH
   remote: sub/avm
   specs:
-    avm (0.79.0)
+    avm (0.80.0)
       aranha-parsers (~> 0.21)
-      eac_cli (~> 0.35, >= 0.35.1)
-      eac_config (~> 0.14)
+      eac_cli (~> 0.38)
+      eac_config (~> 0.14, >= 0.14.1)
       eac_docker (~> 0.7)
       eac_fs (~> 0.16)
       eac_git (~> 0.14, >= 0.14.1)
-      eac_ruby_utils (~> 0.119)
+      eac_ruby_utils (~> 0.119, >= 0.119.2)
       eac_templates (~> 0.5)
       filesize (~> 0.2)
       htmlbeautifier (~> 1.4, >= 1.4.2)
@@ -205,9 +205,9 @@ PATH
 PATH
   remote: sub/eac_config
   specs:
-    eac_config (0.14.0)
-      addressable (~> 2.8, >= 2.8.4)
-      eac_ruby_utils (~> 0.119)
+    eac_config (0.14.1)
+      addressable (~> 2.8, >= 2.8.5)
+      eac_ruby_utils (~> 0.119, >= 0.119.2)
 
 PATH
   remote: sub/eac_git

data/lib/eac_tools/version.rb

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

data/sub/avm/avm.gemspec

@@ -13,12 +13,12 @@ Gem::Specification.new do |s|
   s.files = Dir['{lib}/**/*']
 
   s.add_dependency 'aranha-parsers', '~> 0.21'
-  s.add_dependency 'eac_cli', '~> 0.35', '>= 0.35.1'
-  s.add_dependency 'eac_config', '~> 0.14'
+  s.add_dependency 'eac_cli', '~> 0.38'
+  s.add_dependency 'eac_config', '~> 0.14', '>= 0.14.1'
   s.add_dependency 'eac_docker', '~> 0.7'
   s.add_dependency 'eac_fs', '~> 0.16'
   s.add_dependency 'eac_git', '~> 0.14', '>= 0.14.1'
-  s.add_dependency 'eac_ruby_utils', '~> 0.119'
+  s.add_dependency 'eac_ruby_utils', '~> 0.119', '>= 0.119.2'
   s.add_dependency 'eac_templates', '~> 0.5'
   s.add_dependency 'filesize', '~> 0.2'
   s.add_dependency 'htmlbeautifier', '~> 1.4', '>= 1.4.2'

data/sub/avm/lib/avm/applications/base/local_instance.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'avm/instances/ids'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Applications
+    class Base
+      module LocalInstance
+        LOCAL_INSTANCE_SUFFIX = 'dev'
+
+        # @return [String]
+        def local_instance_id
+          ::Avm::Instances::Ids.build(id, local_instance_suffix)
+        end
+
+        # @return [String]
+        def local_instance_suffix
+          LOCAL_INSTANCE_SUFFIX
+        end
+
+        private
+
+        # @return [Avm::Instances::Base]
+        def local_instance_uncached
+          instance(local_instance_suffix)
+        end
+      end
+    end
+  end
+end

data/sub/avm/lib/avm/applications/base/local_source.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require 'avm/registry'
+require 'eac_config/node'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Applications
+    class Base
+      module LocalSource
+        # @return [Pathname]
+        def local_source_path
+          local_source_path_entry.value!.to_pathname
+        end
+
+        # @return [EacConfig::Entry]
+        def local_source_path_entry
+          ::EacConfig::Node.context.current.entry([local_instance_id, 'install', 'path'])
+        end
+
+        private
+
+        # @return [Avm::Sources::Base]
+        def local_source_uncached
+          ::Avm::Registry.sources.detect(local_source_path)
+        end
+      end
+    end
+  end
+end

data/sub/avm/lib/avm/applications/base/naming.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Applications
+    class Base
+      module Naming
+        DEFAULT_NAME = '_Undefined_'
+
+        # @return [String]
+        def default_name
+          DEFAULT_NAME
+        end
+
+        # @return [String]
+        def name
+          name_from_configuration || default_name
+        end
+
+        # @return [String]
+        def name_from_configuration
+          entry(::Avm::Instances::EntryKeys::NAME).optional_value
+        end
+      end
+    end
+  end
+end

data/sub/avm/lib/avm/applications/base/organization.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require 'avm/registry'
+
+module Avm
+  module Applications
+    class Base
+      module Organization
+        DEFAULT_ORGANIZATION = '_undefined_'
+        ORGANIZATION_CONFIG_KEY = 'organization'
+
+        # @return [String]
+        def default_organization
+          DEFAULT_ORGANIZATION
+        end
+
+        # @return [String, nil]
+        def organization_by_configuration
+          entry(ORGANIZATION_CONFIG_KEY).optional_value
+        end
+
+        # @return [String]
+        def organization
+          organization_by_configuration || default_organization
+        end
+      end
+    end
+  end
+end

data/sub/avm/lib/avm/applications/base.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 require 'avm/entries/base'
-require 'avm/instances/ids'
-require 'avm/registry'
 require 'eac_ruby_utils/core_ext'
 
 module Avm
@@ -13,7 +11,6 @@ module Avm
       include ::Avm::Entries::Base
 
       AVM_TYPE = 'Application'
-      LOCAL_INSTANCE_SUFFIX = 'dev'
 
       common_constructor :id do
         self.id = id.to_s
@@ -26,42 +23,6 @@ module Avm
       def instance(suffix)
         stereotype.instance_class.new(self, suffix)
       end
-
-      def name
-        entry(::Avm::Instances::EntryKeys::NAME).read
-      end
-
-      # @return [String]
-      def local_instance_id
-        ::Avm::Instances::Ids.build(id, local_instance_suffix)
-      end
-
-      # @return [Pathname]
-      def local_source_path
-        local_source_path_entry.value!.to_pathname
-      end
-
-      # @return [EacConfig::Entry]
-      def local_source_path_entry
-        ::EacConfig::Node.context.current.entry([local_instance_id, 'install', 'path'])
-      end
-
-      # @return [String]
-      def local_instance_suffix
-        LOCAL_INSTANCE_SUFFIX
-      end
-
-      private
-
-      # @return [Avm::Instances::Base]
-      def local_instance_uncached
-        instance(local_instance_suffix)
-      end
-
-      # @return [Avm::Sources::Base]
-      def local_source_uncached
-        ::Avm::Registry.sources.detect(local_source_path)
-      end
     end
   end
 end

data/sub/avm/lib/avm/instances/base/auto_values/database.rb

@@ -8,6 +8,7 @@ module Avm
       module AutoValues
         module Database
           LOCAL_ADDRESS = '127.0.0.1'
+          LOCAL_ADDRESSES = [LOCAL_ADDRESS, '::1', 'localhost'].freeze
           DEFAULT_EXTRA = ''
           DEFAULT_HOSTNAME = LOCAL_ADDRESS
           DEFAULT_LIMIT = 5

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

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

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

@@ -14,8 +14,8 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 2.7.0'
 
-  s.add_dependency 'avm', '~> 0.79'
-  s.add_dependency 'avm-eac_generic_base0', '~> 0.12'
+  s.add_dependency 'avm', '~> 0.80'
+  s.add_dependency 'avm-eac_generic_base0', '~> 0.12', '>= 0.12.1'
   s.add_dependency 'avm-eac_rails_base1', '~> 0.9', '>= 0.9.3'
   s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.5'
   s.add_dependency 'curb', '~> 0.9', '>= 0.9.11'

data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/base/database.rb

@@ -16,8 +16,8 @@ module Avm
           end
 
           def database_internal
-            entry(::Avm::Instances::EntryKeys::DATABASE_HOSTNAME).value ==
-              DATABASE_INTERNAL_HOSTNAME
+            ::Avm::Instances::Base::AutoValues::Database::LOCAL_ADDRESSES
+              .include?(entry(::Avm::Instances::EntryKeys::DATABASE_HOSTNAME).value)
           end
 
           def postgresql_version_default_value

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRedmineBase0
-    VERSION = '0.21.0'
+    VERSION = '0.21.1'
   end
 end

data/sub/avm-eac_ruby_base1/avm-eac_ruby_base1.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.files = Dir['{lib,locale,template}/**/*']
 
   s.add_dependency 'aranha-parsers', '~> 0.21'
-  s.add_dependency 'avm', '~> 0.79'
+  s.add_dependency 'avm', '~> 0.80'
   s.add_dependency 'avm-eac_generic_base0', '~> 0.12', '>= 0.12.1'
   s.add_dependency 'eac_envs-http', '~> 0.4', '>= 0.4.1'
   s.add_dependency 'eac_ruby_utils', '~> 0.119', '>= 0.119.2'

data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/update_dependency_requirements.rb

@@ -10,6 +10,8 @@ module Avm
         enable_simple_cache
         common_constructor :source, :gem_name
 
+        RUBOCOP_OK_CODES = [256].freeze
+
         def perform
           source.scm.commit_if_change(commit_message) { update_code }
         end
@@ -26,7 +28,8 @@ module Avm
 
         def format_gemspec
           source.rubocop_command.ignore_parent_exclusion(true).autocorrect(true)
-            .file(source.gemspec_path).system!
+            .file(source.gemspec_path)
+            .execute!(exit_outputs: RUBOCOP_OK_CODES.map { |k| [k, nil] }.to_h)
         end
 
         # @return [Array<String>]

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRubyBase1
-    VERSION = '0.32.0'
+    VERSION = '0.32.1'
   end
 end

data/sub/avm-tools/avm-tools.gemspec

@@ -17,8 +17,8 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 2.7.0'
 
   s.add_dependency 'aranha-parsers', '~> 0.21'
-  s.add_dependency 'avm', '~> 0.79'
-  s.add_dependency 'avm-eac_ruby_base1', '~> 0.31', '>= 0.31.2'
+  s.add_dependency 'avm', '~> 0.80'
+  s.add_dependency 'avm-eac_ruby_base1', '~> 0.32', '>= 0.32.1'
   s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.5'
   s.add_dependency 'avm-files', '~> 0.6', '>= 0.6.2'
   s.add_dependency 'avm-git', '~> 0.13', '>= 0.13.4'

data/sub/avm-tools/lib/avm/tools/runner/application/info.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require 'avm/tools/core_ext'
+
+module Avm
+  module Tools
+    class Runner
+      class Application
+        class Info
+          APPLICATION_PROPERTIES = {
+            id: 'ID',
+            name: 'Name',
+            organization: 'Organization'
+          }.freeze
+
+          runner_with :help, :output_item do
+            desc 'Show information about application.'
+          end
+
+          def run
+            run_output
+          end
+
+          # @return [Hash]
+          def item_hash
+            APPLICATION_PROPERTIES.inject({}) do |a, e|
+              a.merge(e.last => application.send(e.first).to_s)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-tools/lib/avm/tools/runner/application.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require 'avm/registry'
+require 'eac_ruby_base0/core_ext'
+
+module Avm
+  module Tools
+    class Runner
+      class Application
+        runner_with :help, :subcommands do
+          pos_arg :application_id
+          subcommands
+        end
+        for_context :application
+
+        private
+
+        def application_uncached
+          ::Avm::Registry.applications.detect(parsed.application_id)
+        end
+
+        require_sub __FILE__
+      end
+    end
+  end
+end

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

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.155.0'
+    VERSION = '0.156.0'
   end
 end

data/sub/eac_cli/lib/eac_cli/config/entry.rb

@@ -22,8 +22,9 @@ module EacCli
         root_node
       end
 
+      # @return [Object, nil]
       def value
-        value!
+        sub_entry.found? ? sub_value_to_return : nil
       end
 
       def value!

data/sub/eac_config/eac_config.gemspec

@@ -12,8 +12,8 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib}/**/*']
 
-  s.add_dependency 'addressable', '~> 2.8', '>= 2.8.4'
-  s.add_dependency 'eac_ruby_utils', '~> 0.119'
+  s.add_dependency 'addressable', '~> 2.8', '>= 2.8.5'
+  s.add_dependency 'eac_ruby_utils', '~> 0.119', '>= 0.119.2'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
 end

data/sub/eac_config/lib/eac_config/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacConfig
-  VERSION = '0.14.0'
+  VERSION = '0.14.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_tools
 version: !ruby/object:Gem::Version
-  version: 0.77.1
+  version: 0.78.0
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-10-18 00:00:00.000000000 Z
+date: 2023-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.79'
+        version: '0.80'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.79'
+        version: '0.80'
 - !ruby/object:Gem::Dependency
   name: avm-eac_asciidoctor_base0
   requirement: !ruby/object:Gem::Requirement
@@ -185,6 +185,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.21'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.21.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -192,6 +195,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.21'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.21.1
 - !ruby/object:Gem::Dependency
   name: avm-eac_redmine_plugin_base0
   requirement: !ruby/object:Gem::Requirement
@@ -213,6 +219,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.32'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.32.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -220,6 +229,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.32'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.32.1
 - !ruby/object:Gem::Dependency
   name: avm-eac_webapp_base0
   requirement: !ruby/object:Gem::Requirement
@@ -286,14 +298,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.155'
+        version: '0.156'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.155'
+        version: '0.156'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
   requirement: !ruby/object:Gem::Requirement
@@ -1013,6 +1025,8 @@ files:
 - sub/avm-tools/lib/avm/tools.rb
 - sub/avm-tools/lib/avm/tools/core_ext.rb
 - sub/avm-tools/lib/avm/tools/runner.rb
+- sub/avm-tools/lib/avm/tools/runner/application.rb
+- sub/avm-tools/lib/avm/tools/runner/application/info.rb
 - sub/avm-tools/lib/avm/tools/runner/application_stereotypes.rb
 - sub/avm-tools/lib/avm/tools/runner/application_stereotypes/list.rb
 - sub/avm-tools/lib/avm/tools/runner/applications.rb
@@ -1105,6 +1119,10 @@ files:
 - sub/avm/lib/avm/application_stereotypes/base.rb
 - sub/avm/lib/avm/applications.rb
 - sub/avm/lib/avm/applications/base.rb
+- sub/avm/lib/avm/applications/base/local_instance.rb
+- sub/avm/lib/avm/applications/base/local_source.rb
+- sub/avm/lib/avm/applications/base/naming.rb
+- sub/avm/lib/avm/applications/base/organization.rb
 - sub/avm/lib/avm/applications/base/publishing.rb
 - sub/avm/lib/avm/applications/base/stereotype.rb
 - sub/avm/lib/avm/data/callbacks.rb