eac_tools 0.70.0 → 0.72.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6858be32721d74994abe63f9eb7652c535bbfc94eddc100187fdde6a5e81e48d
-  data.tar.gz: 904933c0b7844a730604735f778a547d6d7fe57fae367ed3982b3b03d27ac736
+  metadata.gz: 8f6313738261dc5ddc1c3c7a92ccaed70d82b98d0b2b776a46b667781ebed872
+  data.tar.gz: a059376b3323ba30386875cd12129c1c590007c3123f3c7332eab317f3ee49a1
 SHA512:
-  metadata.gz: 476ec657348113643c3b6a0c937c1f3c02ccab809287e69a53f29d6d03a609ef6f129338be568557b8d54b7ddd1e2aa1b2bf34ded38c5d2ebeef2fecfc7bb402
-  data.tar.gz: 73d93ad5bde69d50a32ff8d677ee5c7418b568f76ce6cf95016de84bb18f384ec8457293b717e2ed05d623489e7c13348bf511b58af58d4c6176a31b1727b884
+  metadata.gz: 628e59eb835b0778eeaba3c040c982cbc86ecaffc8d43a37c0431b087474e2d5ef27be9c73f4edd7d740765f3c68cf7ff07150911b9c0c4559a82dc830b4e1f6
+  data.tar.gz: 9dc783ce0fd9b07daff7889fce3a71dafc31518e0244af14b1667a2049db0e4352d2cf9c13ffed815effd141462950493510ba91af593425878f405e3696258b

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.70.0)
-      avm (~> 0.77)
+    eac_tools (0.72.0)
+      avm (~> 0.78)
       avm-eac_asciidoctor_base0 (~> 0.19)
       avm-eac_generic_base0 (~> 0.12)
       avm-eac_latex_base0 (~> 0.3, >= 0.3.1)
@@ -10,15 +10,15 @@ 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.9)
+      avm-eac_rails_base1 (~> 0.9, >= 0.9.1)
       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.18)
+      avm-eac_webapp_base0 (~> 0.18, >= 0.18.1)
       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)
+      avm-tools (~> 0.152)
+      eac_ruby_utils (~> 0.119)
 
 PATH
   remote: sub/avm-eac_asciidoctor_base0
@@ -77,10 +77,10 @@ PATH
 PATH
   remote: sub/avm-eac_rails_base1
   specs:
-    avm-eac_rails_base1 (0.9.0)
-      avm (~> 0.77)
+    avm-eac_rails_base1 (0.9.1)
+      avm (~> 0.78)
       avm-eac_ruby_base1 (~> 0.30, >= 0.30.3)
-      avm-eac_webapp_base0 (~> 0.18)
+      avm-eac_webapp_base0 (~> 0.18, >= 0.18.1)
       eac_ruby_utils (~> 0.117, >= 0.117.1)
 
 PATH
@@ -124,8 +124,8 @@ PATH
 PATH
   remote: sub/avm-eac_webapp_base0
   specs:
-    avm-eac_webapp_base0 (0.18.0)
-      avm (~> 0.77)
+    avm-eac_webapp_base0 (0.18.1)
+      avm (~> 0.78)
       avm-eac_generic_base0 (~> 0.12)
       avm-eac_postgresql_base0 (~> 0.5, >= 0.5.1)
       avm-eac_ubuntu_base0 (~> 0.5)
@@ -163,11 +163,11 @@ PATH
 PATH
   remote: sub/avm-tools
   specs:
-    avm-tools (0.151.1)
-      aranha-parsers (~> 0.19)
-      avm (~> 0.76)
+    avm-tools (0.152.0)
+      aranha-parsers (~> 0.21)
+      avm (~> 0.78)
       avm-eac_ruby_base1 (~> 0.30, >= 0.30.3)
-      avm-eac_ubuntu_base0 (~> 0.4, >= 0.4.3)
+      avm-eac_ubuntu_base0 (~> 0.5)
       avm-files (~> 0.6, >= 0.6.2)
       avm-git (~> 0.13, >= 0.13.3)
       clipboard (~> 1.3, >= 1.3.6)
@@ -181,8 +181,8 @@ PATH
 PATH
   remote: sub/avm
   specs:
-    avm (0.77.0)
-      aranha-parsers (~> 0.19, >= 0.19.1)
+    avm (0.78.0)
+      aranha-parsers (~> 0.20)
       eac_cli (~> 0.35, >= 0.35.1)
       eac_config (~> 0.12)
       eac_docker (~> 0.7)
@@ -205,9 +205,9 @@ PATH
 PATH
   remote: sub/eac_config
   specs:
-    eac_config (0.12.0)
-      addressable (~> 2.8, >= 2.8.1)
-      eac_ruby_utils (~> 0.107)
+    eac_config (0.13.0)
+      addressable (~> 2.8, >= 2.8.4)
+      eac_ruby_utils (~> 0.119)
 
 PATH
   remote: sub/eac_docker
@@ -219,14 +219,14 @@ PATH
 PATH
   remote: sub/eac_envs-http
   specs:
-    eac_envs-http (0.3.2)
+    eac_envs-http (0.4.0)
       eac_fs (~> 0.16)
-      eac_ruby_utils (~> 0.116)
-      faraday (~> 2.7, >= 2.7.4)
+      eac_ruby_utils (~> 0.117, >= 0.117.1)
+      faraday (~> 2.7, >= 2.7.6)
       faraday-follow_redirects (~> 0.3)
       faraday-gzip (~> 0.1)
       faraday-multipart (~> 1.0, >= 1.0.4)
-      faraday-retry (~> 2.1)
+      faraday-retry (~> 2.2)
 
 PATH
   remote: sub/eac_fs
@@ -246,10 +246,10 @@ PATH
 PATH
   remote: sub/eac_rest
   specs:
-    eac_rest (0.9.0)
-      eac_envs-http (~> 0.3, >= 0.3.1)
+    eac_rest (0.9.1)
+      eac_envs-http (~> 0.4)
       eac_fs (~> 0.16)
-      eac_ruby_utils (~> 0.112)
+      eac_ruby_utils (~> 0.117, >= 0.117.1)
 
 PATH
   remote: sub/eac_ruby_base0
@@ -263,7 +263,7 @@ PATH
 PATH
   remote: sub/eac_ruby_utils
   specs:
-    eac_ruby_utils (0.117.1)
+    eac_ruby_utils (0.119.0)
       activesupport (>= 4, < 7)
       addressable (~> 2.8, >= 2.8.4)
       bundler
@@ -280,7 +280,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.7.3)
+    activesupport (6.1.7.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -288,10 +288,10 @@ GEM
       zeitwerk (~> 2.3)
     addressable (2.8.4)
       public_suffix (>= 2.0.2, < 6.0)
-    aranha-parsers (0.20.0)
+    aranha-parsers (0.21.0)
       activesupport (>= 4.0.0)
       addressable (~> 2.8, >= 2.8.4)
-      eac_envs-http (~> 0.3, >= 0.3.2)
+      eac_envs-http (~> 0.4)
       eac_ruby_utils (~> 0.117, >= 0.117.1)
       nokogiri (~> 1.15, >= 1.15.2)
       ofx-parser (~> 1.1)
@@ -310,7 +310,7 @@ GEM
       rubocop (~> 0.80.1)
       rubocop-rails (~> 2.4.2)
       rubocop-rspec (~> 1.38.1)
-    faraday (2.7.5)
+    faraday (2.7.7)
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
     faraday-follow_redirects (0.3.0)
@@ -329,11 +329,11 @@ GEM
       rchardet (~> 1.8)
     hpricot (0.8.6)
     htmlbeautifier (1.4.2)
-    i18n (1.14.0)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
     jaro_winkler (1.5.6)
     minitar (0.9)
-    minitest (5.18.0)
+    minitest (5.18.1)
     multipart-post (2.3.0)
     net-ssh (4.2.0)
     nokogiri (1.15.2-x86_64-linux)
@@ -343,12 +343,13 @@ GEM
     os (1.1.4)
     parallel (1.23.0)
     parseconfig (1.1.2)
-    parser (3.2.2.1)
+    parser (3.2.2.3)
       ast (~> 2.4.1)
+      racc
     parslet (2.0.0)
     public_suffix (5.0.1)
-    racc (1.6.2)
-    rack (3.0.7)
+    racc (1.7.1)
+    rack (3.0.8)
     rainbow (3.1.1)
     rchardet (1.8.0)
     rexml (3.2.5)
@@ -365,7 +366,7 @@ GEM
     rspec-mocks (3.12.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-support (3.12.0)
+    rspec-support (3.12.1)
     rubocop (0.80.1)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)

data/lib/eac_tools/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacTools
-  VERSION = '0.70.0'
+  VERSION = '0.72.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', '>= 0.19.1'
+  s.add_dependency 'aranha-parsers', '~> 0.20'
   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/applications/base.rb

@@ -12,6 +12,7 @@ module Avm
       require_sub __FILE__, include_modules: true
       include ::Avm::Entries::Base
 
+      AVM_TYPE = 'application'
       LOCAL_INSTANCE_SUFFIX = 'dev'
 
       common_constructor :id do

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

@@ -12,9 +12,9 @@ module Avm
         end
 
         def on_disabled_processes(&block)
-          available_processes.each(&:disable)
-          block.call
-          available_processes.each(&:enable)
+          available_processes.inject(block) do |a, e|
+            -> { e.on_disabled(&a) }
+          end.call
         end
 
         # @return [Array<Avm::Instances::Process>]

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

@@ -12,10 +12,20 @@ module Avm
         end
       end
 
-      acts_as_abstract :available?, :disable, :enable
+      acts_as_abstract :available?, :disable, :enable, :enabled?
       common_constructor :instance, :id, default: [nil] do
         self.id ||= (id || self.class.default_id).to_sym
       end
+
+      def on_disabled(&block)
+        previous_enabled = enabled?
+        begin
+          disable if previous_enabled
+          block.call
+        ensure
+          enable if previous_enabled
+        end
+      end
     end
   end
 end

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

@@ -10,6 +10,7 @@ module Avm
 
       # @return [Array<Avm::Applications::Base>]
       def available
+        load_config
         detected.values
       end
 
@@ -26,6 +27,12 @@ module Avm
       def detected
         @detected ||= {}
       end
+
+      def load_config
+        ::Avm::Registry.config_objects.available.each do |id, type|
+          detect(id) if type == ::Avm::Applications::Base::AVM_TYPE
+        end
+      end
     end
   end
 end

data/sub/avm/lib/avm/registry/config_objects.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'avm/applications/base'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Registry
+    class ConfigObjects
+      def initialize(*args); end
+
+      # @return [Array<Avm::Applications::Base>]
+      def available
+        ::EacConfig::Node.context.current.entries('*.avm_type').node_entries
+          .map { |ne| [ne.path.first, ne.value] }
+      end
+    end
+  end
+end

data/sub/avm/lib/avm/registry.rb

@@ -7,8 +7,9 @@ module Avm
   module Registry
     require_sub __FILE__
     enable_listable
-    lists.add_symbol :category, :applications, :application_stereotypes, :file_formats, :instances,
-                     :launcher_stereotypes, :runners, :scms, :source_generators, :sources
+    lists.add_symbol :category, :applications, :application_stereotypes, :config_objects,
+                     :file_formats, :instances, :launcher_stereotypes, :runners, :scms,
+                     :source_generators, :sources
 
     class << self
       enable_simple_cache

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

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

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

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

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

@@ -23,6 +23,10 @@ module Avm
             daemon_command(:start).system!
           end
 
+          def enabled?
+            daemon_command(:status).execute.fetch(:exit_code).zero?
+          end
+
           private
 
           def daemon_command(action)

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

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

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

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,template}/**/*']
 
-  s.add_dependency 'avm', '~> 0.77'
+  s.add_dependency 'avm', '~> 0.78'
   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.5'

data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/processes/web_server.rb

@@ -16,6 +16,10 @@ module Avm
             apache_resource_change(__method__)
           end
 
+          def enabled?
+            instance.apache_resource.enabled?
+          end
+
           def disable
             apache_resource_change(__method__)
           end

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacWebappBase0
-    VERSION = '0.18.0'
+    VERSION = '0.18.1'
   end
 end

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

@@ -14,10 +14,10 @@ Gem::Specification.new do |s|
   s.bindir = 'exe'
   s.executables = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
 
-  s.add_dependency 'aranha-parsers', '~> 0.19'
-  s.add_dependency 'avm', '~> 0.76'
+  s.add_dependency 'aranha-parsers', '~> 0.21'
+  s.add_dependency 'avm', '~> 0.78'
   s.add_dependency 'avm-eac_ruby_base1', '~> 0.30', '>= 0.30.3'
-  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 'avm-git', '~> 0.13', '>= 0.13.3'
   s.add_dependency 'clipboard', '~> 1.3', '>= 1.3.6'

data/sub/avm-tools/lib/avm/tools/runner/applications/list.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'avm/tools/core_ext'
+
+module Avm
+  module Tools
+    class Runner
+      class Applications
+        class List
+          runner_with :help, :output
+
+          def run
+            infov 'Found', applications.count
+            run_output
+          end
+
+          def output_content
+            applications.map { |s| "#{s}\n" }.join
+          end
+
+          private
+
+          def applications_uncached
+            ::Avm::Registry.applications.available
+              .sort_by { |s| [s.id] }
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'eac_cli/core_ext'
+
+module Avm
+  module Tools
+    class Runner
+      class Applications
+        require_sub __FILE__
+        runner_with :help, :subcommands do
+          subcommands
+        end
+      end
+    end
+  end
+end

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

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.151.1'
+    VERSION = '0.152.0'
   end
 end

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.1'
-  s.add_dependency 'eac_ruby_utils', '~> 0.107'
+  s.add_dependency 'addressable', '~> 2.8', '>= 2.8.4'
+  s.add_dependency 'eac_ruby_utils', '~> 0.119'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
 end

data/sub/eac_config/lib/eac_config/entries.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require 'eac_config/entry_path'
+require 'eac_ruby_utils/core_ext'
+
+module EacConfig
+  class Entries
+    require_sub __FILE__
+    enable_simple_cache
+    common_constructor :root_node, :path do
+      self.path = ::EacConfig::EntryPath.assert(path)
+    end
+
+    def to_s
+      "#{self.class}[RootNode: #{root_node}, Path: #{path}]"
+    end
+
+    private
+
+    # @return [Array<EacConfig::Entries>]
+    def node_entries_uncached
+      node_entries_from_root + node_entries_from_load_path
+    end
+
+    # @return [Array<EacConfig::Entries>]
+    def node_entries_from_load_path_uncached
+      root_node.recursive_loaded_nodes.flat_map { |loaded_node| loaded_node.self_entries(path) }
+    end
+
+    # @return [Array<EacConfig::Entries>]
+    def node_entries_from_root_uncached
+      root_node.self_entries(path)
+    end
+  end
+end

data/sub/eac_config/lib/eac_config/entry_path.rb

@@ -58,5 +58,32 @@ module EacConfig
     def to_string
       parts.join(PART_SEPARATOR)
     end
+
+    # @param part [String]
+    # @return [EacConfig::EntryPath]
+    def with_first(part)
+      new_parts = parts.dup
+      new_parts.unshift(part)
+      self.class.new(new_parts)
+    end
+
+    # @return [EacConfig::EntryPath]
+    def without_first
+      new_parts = parts.dup
+      new_parts.shift
+      self.class.new(new_parts)
+    end
+
+    # @return [EacConfig::EntryPath]
+    def with_last(part)
+      self.class.new(parts + [part])
+    end
+
+    # @return [EacConfig::EntryPath]
+    def without_last
+      new_parts = parts.dup
+      new_parts.pop
+      self.class.new(new_parts)
+    end
   end
 end

data/sub/eac_config/lib/eac_config/envvars_node.rb

@@ -18,6 +18,12 @@ module EacConfig
       end
     end
 
+    # @param path [EacConfig::EntryPath]
+    # @return [Array<EacConfig::Entries>]
+    def self_entries(_path)
+      []
+    end
+
     def url
       URI
     end

data/sub/eac_config/lib/eac_config/node.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'eac_config/entries'
 require 'eac_config/entry'
 require 'eac_config/entry_path'
 require 'eac_config/load_path'
@@ -20,10 +21,15 @@ module EacConfig
     attr_accessor :write_node
 
     common_concern do
-      enable_abstract_methods
+      acts_as_abstract :self_entries
       include ::Comparable
     end
 
+    # @return [Array<EacConfig::Entries>]
+    def entries(path)
+      ::EacConfig::Entries.new(self, path)
+    end
+
     def entry(path)
       ::EacConfig::Entry.new(self, path)
     end

data/sub/eac_config/lib/eac_config/node_entry.rb

@@ -12,6 +12,7 @@ module EacConfig
     common_constructor :node, :path do
       self.path = ::EacConfig::EntryPath.assert(path)
     end
+    compare_by :node, :path
 
     abstract_methods :found?, :value, :value=
 

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

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