eac_tools 0.69.1 → 0.70.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '009dade4ed624a02bbe58452512587fde89139f556705ca4dc04a7b7a07aa4db'
-  data.tar.gz: f5e0232487bf64235ced72c158e3fb4767ec03c10f12c2fab707d38dda29ddf2
+  metadata.gz: 6858be32721d74994abe63f9eb7652c535bbfc94eddc100187fdde6a5e81e48d
+  data.tar.gz: 904933c0b7844a730604735f778a547d6d7fe57fae367ed3982b3b03d27ac736
 SHA512:
-  metadata.gz: 51fb45c77591d5256b4af43189cdd5febf57cdaa2cf6a01059903b86f8f96c65dfcf4e25f413bcf3e1f644fb38abfb76d26d2b9d79deeeebc76e08e0c4eb5719
-  data.tar.gz: 22b81b2557a307b73cb2733d5f0d5c38e184770402ccdfa798ce1f5e75d4e7803792e1f9b16962020006d5c0289be39b95d87af0f8327229dab6510cc960909f
+  metadata.gz: 476ec657348113643c3b6a0c937c1f3c02ccab809287e69a53f29d6d03a609ef6f129338be568557b8d54b7ddd1e2aa1b2bf34ded38c5d2ebeef2fecfc7bb402
+  data.tar.gz: 73d93ad5bde69d50a32ff8d677ee5c7418b568f76ce6cf95016de84bb18f384ec8457293b717e2ed05d623489e7c13348bf511b58af58d4c6176a31b1727b884

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.69.1)
-      avm (~> 0.76)
+    eac_tools (0.70.0)
+      avm (~> 0.77)
       avm-eac_asciidoctor_base0 (~> 0.19)
       avm-eac_generic_base0 (~> 0.12)
       avm-eac_latex_base0 (~> 0.3, >= 0.3.1)
@@ -10,27 +10,16 @@ PATH
       avm-eac_postgresql_base0 (~> 0.5, >= 0.5.1)
       avm-eac_python_base0 (~> 0.2, >= 0.2.1)
       avm-eac_rails_base0 (~> 0.10, >= 0.10.2)
-      avm-eac_rails_base1 (~> 0.8, >= 0.8.4)
+      avm-eac_rails_base1 (~> 0.9)
       avm-eac_redmine_base0 (~> 0.20, >= 0.20.1)
       avm-eac_redmine_plugin_base0 (~> 0.4)
       avm-eac_ruby_base1 (~> 0.30, >= 0.30.3)
-      avm-eac_webapp_base0 (~> 0.17, >= 0.17.2)
+      avm-eac_webapp_base0 (~> 0.18)
       avm-eac_wordpress_base0 (~> 0.3, >= 0.3.1)
       avm-git (~> 0.13, >= 0.13.3)
       avm-tools (~> 0.151, >= 0.151.1)
       eac_ruby_utils (~> 0.117, >= 0.117.1)
 
-PATH
-  remote: sub/aranha-parsers
-  specs:
-    aranha-parsers (0.19.0)
-      activesupport (>= 4.0.0)
-      addressable (~> 2.8, >= 2.8.4)
-      eac_envs-http (~> 0.3, >= 0.3.2)
-      eac_ruby_utils (~> 0.117)
-      nokogiri (~> 1.15, >= 1.15.1)
-      ofx-parser (~> 1.1)
-
 PATH
   remote: sub/avm-eac_asciidoctor_base0
   specs:
@@ -88,11 +77,11 @@ PATH
 PATH
   remote: sub/avm-eac_rails_base1
   specs:
-    avm-eac_rails_base1 (0.8.4)
-      avm (~> 0.68)
-      avm-eac_ruby_base1 (~> 0.30, >= 0.30.2)
-      avm-eac_webapp_base0 (~> 0.15, >= 0.15.1)
-      eac_ruby_utils (~> 0.112)
+    avm-eac_rails_base1 (0.9.0)
+      avm (~> 0.77)
+      avm-eac_ruby_base1 (~> 0.30, >= 0.30.3)
+      avm-eac_webapp_base0 (~> 0.18)
+      eac_ruby_utils (~> 0.117, >= 0.117.1)
 
 PATH
   remote: sub/avm-eac_redmine_base0
@@ -127,21 +116,21 @@ PATH
 PATH
   remote: sub/avm-eac_ubuntu_base0
   specs:
-    avm-eac_ubuntu_base0 (0.4.3)
-      avm (~> 0.73)
-      eac_ruby_utils (~> 0.117)
+    avm-eac_ubuntu_base0 (0.5.0)
+      avm (~> 0.77)
+      eac_ruby_utils (~> 0.117, >= 0.117.1)
       eac_templates (~> 0.5)
 
 PATH
   remote: sub/avm-eac_webapp_base0
   specs:
-    avm-eac_webapp_base0 (0.17.2)
-      avm (~> 0.73)
+    avm-eac_webapp_base0 (0.18.0)
+      avm (~> 0.77)
       avm-eac_generic_base0 (~> 0.12)
       avm-eac_postgresql_base0 (~> 0.5, >= 0.5.1)
-      avm-eac_ubuntu_base0 (~> 0.4, >= 0.4.3)
+      avm-eac_ubuntu_base0 (~> 0.5)
       avm-files (~> 0.6, >= 0.6.2)
-      eac_ruby_utils (~> 0.117)
+      eac_ruby_utils (~> 0.117, >= 0.117.1)
 
 PATH
   remote: sub/avm-eac_wordpress_base0
@@ -192,8 +181,8 @@ PATH
 PATH
   remote: sub/avm
   specs:
-    avm (0.76.0)
-      aranha-parsers (~> 0.19)
+    avm (0.77.0)
+      aranha-parsers (~> 0.19, >= 0.19.1)
       eac_cli (~> 0.35, >= 0.35.1)
       eac_config (~> 0.12)
       eac_docker (~> 0.7)
@@ -299,6 +288,13 @@ GEM
       zeitwerk (~> 2.3)
     addressable (2.8.4)
       public_suffix (>= 2.0.2, < 6.0)
+    aranha-parsers (0.20.0)
+      activesupport (>= 4.0.0)
+      addressable (~> 2.8, >= 2.8.4)
+      eac_envs-http (~> 0.3, >= 0.3.2)
+      eac_ruby_utils (~> 0.117, >= 0.117.1)
+      nokogiri (~> 1.15, >= 1.15.2)
+      ofx-parser (~> 1.1)
     asciidoctor (2.0.20)
     ast (2.4.2)
     clipboard (1.3.6)
@@ -325,7 +321,7 @@ GEM
     faraday-multipart (1.0.4)
       multipart-post (~> 2)
     faraday-net_http (3.0.2)
-    faraday-retry (2.1.0)
+    faraday-retry (2.2.0)
       faraday (~> 2.0)
     filesize (0.2.0)
     git (1.18.0)
@@ -333,9 +329,9 @@ GEM
       rchardet (~> 1.8)
     hpricot (0.8.6)
     htmlbeautifier (1.4.2)
-    i18n (1.13.0)
+    i18n (1.14.0)
       concurrent-ruby (~> 1.0)
-    jaro_winkler (1.5.5)
+    jaro_winkler (1.5.6)
     minitar (0.9)
     minitest (5.18.0)
     multipart-post (2.3.0)
@@ -396,7 +392,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  aranha-parsers!
   avm!
   avm-eac_asciidoctor_base0!
   avm-eac_generic_base0!

data/lib/eac_tools/version.rb

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

data/sub/avm/avm.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib}/**/*']
 
-  s.add_dependency 'aranha-parsers', '~> 0.19'
+  s.add_dependency 'aranha-parsers', '~> 0.19', '>= 0.19.1'
   s.add_dependency 'eac_cli', '~> 0.35', '>= 0.35.1'
   s.add_dependency 'eac_config', '~> 0.12'
   s.add_dependency 'eac_docker', '~> 0.7'

data/sub/avm/lib/avm/entries/base/uri_components_entries_values/generic_component.rb

@@ -19,8 +19,25 @@ module Avm
             [prefix, component].join('_')
           end
 
-          def define_auto_method(&block)
-            entries_provider_class.define_method(auto_method_name, &block)
+          def define_auto_method
+            outer_self = self
+            entries_provider_class.define_method(auto_method_name) do
+              uri_component_entry_value(outer_self.entry_key_path.to_string)
+            end
+          end
+
+          def define_get_method
+            outer_self = self
+            entries_provider_class.define_method(get_method_name) do
+              read_entry(outer_self.entry_key_path.to_string)
+            end
+          end
+
+          def define_get_optional_method
+            outer_self = self
+            entries_provider_class.define_method(get_optional_method_name) do
+              read_entry_optional(outer_self.entry_key_path.to_string)
+            end
           end
 
           def define_inherited_value_proc_method(&block)
@@ -31,6 +48,16 @@ module Avm
             ::EacConfig::EntryPath.assert([prefix, component])
           end
 
+          # @return [String]
+          def get_method_name # rubocop:disable Naming/AccessorMethodName
+            component_method_name
+          end
+
+          # @return [String]
+          def get_optional_method_name # rubocop:disable Naming/AccessorMethodName
+            get_method_name + '_optional'
+          end
+
           def id_component
             @id_component ||= owner.component_factory('id')
           end
@@ -40,10 +67,9 @@ module Avm
           end
 
           def setup
-            outer_self = self
-            define_auto_method do
-              uri_component_entry_value(outer_self.entry_key_path.to_string)
-            end
+            define_auto_method
+            define_get_method
+            define_get_optional_method
           end
         end
       end

data/sub/avm/lib/avm/entries/base/uri_components_entries_values/url_component.rb

@@ -8,9 +8,9 @@ module Avm
     module Base
       class UriComponentsEntriesValues
         class UrlComponent < ::Avm::Entries::Base::UriComponentsEntriesValues::GenericComponent
-          def setup
+          def define_auto_method
             outer_self = self
-            define_auto_method do
+            entries_provider_class.define_method(auto_method_name) do
               inherited_entry_value(outer_self.id_component.entry_key_path.to_string,
                                     outer_self.entry_key_path.to_string) ||
                 outer_self.auto_install_url_by_parts(self)

data/sub/avm/lib/avm/instances/base/processes.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Instances
+    class Base
+      module Processes
+        # @return [Array<Avm::Instances::Process>]
+        def available_processes
+          processes.select(&:available?)
+        end
+
+        def on_disabled_processes(&block)
+          available_processes.each(&:disable)
+          block.call
+          available_processes.each(&:enable)
+        end
+
+        # @return [Array<Avm::Instances::Process>]
+        def processes
+          []
+        end
+      end
+    end
+  end
+end

data/sub/avm/lib/avm/instances/data/package.rb

@@ -17,6 +17,10 @@ module Avm
         def data_default_dump_path
           instance.data_default_dump_path.to_pathname
         end
+
+        def load(*args, &block)
+          instance.on_disabled_processes { super(*args, &block) }
+        end
       end
     end
   end

data/sub/avm/lib/avm/instances/data/unit.rb

@@ -20,6 +20,10 @@ module Avm
         def identifier
           instance.data_package.units.key(self) || raise("No identifier found for #{self}")
         end
+
+        def load(*args, &block)
+          instance.on_disabled_processes { super(*args, &block) }
+        end
       end
     end
   end

data/sub/avm/lib/avm/instances/process.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Instances
+    class Process
+      class << self
+        # @return [Symbol]
+        def default_id
+          name.demodulize.underscore.to_sym
+        end
+      end
+
+      acts_as_abstract :available?, :disable, :enable
+      common_constructor :instance, :id, default: [nil] do
+        self.id ||= (id || self.class.default_id).to_sym
+      end
+    end
+  end
+end

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

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

data/sub/avm-eac_rails_base1/avm-eac_rails_base1.gemspec

@@ -12,10 +12,10 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,template}/**/*']
 
-  s.add_dependency 'avm', '~> 0.68'
-  s.add_dependency 'avm-eac_ruby_base1', '~> 0.30', '>= 0.30.2'
-  s.add_dependency 'avm-eac_webapp_base0', '~> 0.15', '>= 0.15.1'
-  s.add_dependency 'eac_ruby_utils', '~> 0.112'
+  s.add_dependency 'avm', '~> 0.77'
+  s.add_dependency 'avm-eac_ruby_base1', '~> 0.30', '>= 0.30.3'
+  s.add_dependency 'avm-eac_webapp_base0', '~> 0.18'
+  s.add_dependency 'eac_ruby_utils', '~> 0.117', '>= 0.117.1'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
 end

data/sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/instances/base.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'avm/eac_rails_base1/instances/processes/tasks_scheduler'
 require 'avm/eac_rails_base1/instances/runners'
 require 'avm/eac_ruby_base1/instances/mixin'
 require 'avm/eac_ruby_base1/sources/base'
@@ -22,6 +23,11 @@ module Avm
           super.add_unit('database', database_unit)
         end
 
+        # @return [Array<Avm::Instances::Process>]
+        def processes
+          super + [::Avm::EacRailsBase1::Instances::Processes::TasksScheduler.new(self)]
+        end
+
         def rake(*args)
           bundle('exec', 'rake', *args)
         end

data/sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/instances/processes/daemon.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require 'avm/instances/process'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRailsBase1
+    module Instances
+      module Processes
+        class Daemon < ::Avm::Instances::Process
+          acts_as_abstract :command_name, :gem_name
+
+          # @return [Boolean]
+          def available?
+            instance.the_gem.gemfile_lock_gem_version(gem_name).present?
+          end
+
+          def disable
+            daemon_command(:stop).system!
+          end
+
+          def enable
+            daemon_command(:start).system!
+          end
+
+          private
+
+          def daemon_command(action)
+            instance.bundle('exec', command_name, action)
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/instances/processes/tasks_scheduler.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'avm/eac_rails_base1/instances/processes/daemon'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRailsBase1
+    module Instances
+      module Processes
+        class TasksScheduler < ::Avm::EacRailsBase1::Instances::Processes::Daemon
+          GEM_NAME = 'tasks_scheduler'
+          COMMAND_NAME = 'tasks_scheduler'
+
+          # @return [String]
+          def command_name
+            COMMAND_NAME
+          end
+
+          # @return [String]
+          def gem_name
+            GEM_NAME
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/instances/processes.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRailsBase1
+    module Instances
+      module Processes
+        require_sub __FILE__
+      end
+    end
+  end
+end

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRailsBase1
-    VERSION = '0.8.4'
+    VERSION = '0.9.0'
   end
 end

data/sub/avm-eac_ubuntu_base0/avm-eac_ubuntu_base0.gemspec

@@ -12,8 +12,8 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,template}/**/*']
 
-  s.add_dependency 'avm', '~> 0.73'
-  s.add_dependency 'eac_ruby_utils', '~> 0.117'
+  s.add_dependency 'avm', '~> 0.77'
+  s.add_dependency 'eac_ruby_utils', '~> 0.117', '>= 0.117.1'
   s.add_dependency 'eac_templates', '~> 0.5'
 
   s.add_development_dependency 'avm-eac_ubuntu_base0'

data/sub/avm-eac_ubuntu_base0/lib/avm/eac_ubuntu_base0/instances/base.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'avm/eac_ubuntu_base0/apache'
 require 'avm/eac_ubuntu_base0/docker_image'
 require 'avm/instances/base'
 
@@ -7,6 +8,11 @@ module Avm
   module EacUbuntuBase0
     module Instances
       class Base < ::Avm::Instances::Base
+        # @return [Avm::EacUbuntuBase0::Apache]
+        def apache
+          ::Avm::EacUbuntuBase0::Apache.new(host_env)
+        end
+
         def docker_image_class
           ::Avm::EacUbuntuBase0::DockerImage
         end

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacUbuntuBase0
-    VERSION = '0.4.3'
+    VERSION = '0.5.0'
   end
 end

data/sub/avm-eac_webapp_base0/avm-eac_webapp_base0.gemspec

@@ -12,12 +12,12 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,template}/**/*']
 
-  s.add_dependency 'avm', '~> 0.73'
+  s.add_dependency 'avm', '~> 0.77'
   s.add_dependency 'avm-eac_generic_base0', '~> 0.12'
   s.add_dependency 'avm-eac_postgresql_base0', '~> 0.5', '>= 0.5.1'
-  s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.4', '>= 0.4.3'
+  s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.5'
   s.add_dependency 'avm-files', '~> 0.6', '>= 0.6.2'
-  s.add_dependency 'eac_ruby_utils', '~> 0.117'
+  s.add_dependency 'eac_ruby_utils', '~> 0.117', '>= 0.117.1'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.2'
 end

data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/apache_base.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'avm/entries/jobs/base'
+require 'avm/eac_ubuntu_base0/apache'
+require 'eac_templates/core_ext'
+
+module Avm
+  module EacWebappBase0
+    module Instances
+      class ApacheBase
+        protected
+
+        def reload_apache
+          infom 'Reloading Apache...'
+          apache.service('reload')
+        end
+
+        private
+
+        # @return [Avm::EacUbuntuBase0::Apache]
+        def apache_uncached
+          instance.platform_instance.apache
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/apache_host.rb

@@ -3,12 +3,13 @@
 require 'eac_ruby_utils/core_ext'
 require 'avm/entries/jobs/base'
 require 'avm/eac_ubuntu_base0/apache'
+require 'avm/eac_webapp_base0/instances/apache_base'
 require 'eac_templates/core_ext'
 
 module Avm
   module EacWebappBase0
     module Instances
-      class ApacheHost
+      class ApacheHost < ::Avm::EacWebappBase0::Instances::ApacheBase
         APACHE_DIRECTORY_EXTRA_CONFIG_KEY = 'install.apache_directory_extra_config'
         JOBS = %w[write_available_no_ssl_site enable_no_ssl_site remove_ssl_site reload_apache
                   run_certbot enable_ssl_site reload_apache].freeze
@@ -31,10 +32,6 @@ module Avm
 
         private
 
-        def apache_uncached
-          ::Avm::EacUbuntuBase0::Apache.new(instance.host_env)
-        end
-
         def enable_no_ssl_site
           infom 'Enabling no SSL site...'
           no_ssl_site.enable
@@ -51,11 +48,6 @@ module Avm
           apache.site(instance.id)
         end
 
-        def reload_apache
-          infom 'Reloading Apache...'
-          apache.service('reload')
-        end
-
         def remove_ssl_site
           infom 'Removing SSL site...'
           ssl_site.remove

data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/apache_path.rb

@@ -2,12 +2,13 @@
 
 require 'avm/entries/jobs/base'
 require 'avm/eac_ubuntu_base0/apache'
+require 'avm/eac_webapp_base0/instances/apache_base'
 require 'eac_ruby_utils/core_ext'
 
 module Avm
   module EacWebappBase0
     module Instances
-      class ApachePath
+      class ApachePath < ::Avm::EacWebappBase0::Instances::ApacheBase
         JOBS = %w[write_available_conf enable_conf reload_apache].freeze
         include ::Avm::Entries::Jobs::Base
 
@@ -26,20 +27,11 @@ module Avm
 
         private
 
-        def apache_uncached
-          ::Avm::EacUbuntuBase0::Apache.new(instance.host_env)
-        end
-
         def enable_conf
           infom 'Enabling configuration...'
           conf.enable
         end
 
-        def reload_apache
-          infom 'Reloading Apache...'
-          apache.service('reload')
-        end
-
         def conf_uncached
           apache.conf(instance.id)
         end

data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/base/install.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require 'avm/entries/uri_builder'
+require 'avm/instances/entry_keys'
+
+module Avm
+  module EacWebappBase0
+    module Instances
+      class Base < ::Avm::Instances::Base
+        module Install
+          common_concern do
+            uri_components_entries_values 'install', %w[apache_resource_name]
+          end
+
+          def install_apache_resource_name_default_value
+            id
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/base.rb

@@ -4,6 +4,7 @@ require 'avm/instances/base'
 require 'avm/eac_postgresql_base0/instance_with'
 require 'avm/instances/data/files_unit'
 require 'avm/instances/data/package'
+require 'avm/eac_webapp_base0/instances/processes/web_server'
 require 'avm/eac_webapp_base0/instances/runners'
 require 'avm/eac_ubuntu_base0/instances/base'
 
@@ -11,10 +12,18 @@ module Avm
   module EacWebappBase0
     module Instances
       class Base < ::Avm::Instances::Base
-        require_sub __FILE__
+        require_sub __FILE__, include_modules: true
         include ::Avm::EacPostgresqlBase0::InstanceWith
         enable_simple_cache
 
+        # @return [Avm::EacUbuntuBase0::Apache::Resource, nil]
+        def apache_resource
+          %i[conf site]
+            .lazy
+            .map { |type| platform_instance.apache.send(type, install_apache_resource_name) }
+            .find(&:available?)
+        end
+
         def run_subcommand(subcommand_class, argv)
           subcommand_class.create(
             argv: argv,
@@ -26,6 +35,11 @@ module Avm
           pg_data_unit
         end
 
+        # @return [Array<Avm::Instances::Process>]
+        def processes
+          super + [::Avm::EacWebappBase0::Instances::Processes::WebServer.new(self)]
+        end
+
         private
 
         # @return [Avm::EacUbuntuBase0::Instances::Base]