avm-tools 0.68.0 → 0.70.0

data/lib/avm/git/issue/complete/_git_subrepos.rb

@@ -10,6 +10,7 @@ module Avm
         def git_subrepos_result
           return ::Avm::Result.error('Unclean workspace') unless clean_workspace?
 
+          infom 'Checking Git subrepos...'
           r = ::Avm::Git::SubrepoChecks.new(::EacGit::Local.new(@git)).add_all_subrepos
           r.check_remote = true
           r.result

data/lib/avm/instances/base/auto_values/filesystem.rb

@@ -5,8 +5,10 @@ module Avm
     class Base
       module AutoValues
         module Filesystem
+          FS_PATH_KEY = :fs_path
+
           def auto_fs_path
-            inherited_entry_value(:host_id, :fs_path) { |v| v + '/' + id }
+            inherited_entry_value(:host_id, FS_PATH_KEY) { |v| v + '/' + id }
           end
 
           def auto_data_fs_path

data/lib/avm/instances/entries.rb

@@ -1,13 +1,16 @@
 # frozen_string_literal: true
 
 require 'eac_ruby_utils/core_ext'
-require 'eac_ruby_utils/require_sub'
 require 'avm/configs'
-::EacRubyUtils.require_sub(__FILE__)
+require 'avm/instances/entry'
 
 module Avm
   module Instances
     module Entries
+      def entry(suffix, options = {})
+        ::Avm::Instances::Entry.new(self, suffix, options)
+      end
+
       def path_prefix
         @path_prefix ||= [id].freeze
       end
@@ -36,12 +39,6 @@ module Avm
       def other_entry_value(instance_id, entry_suffix)
         ::Avm::Instances::Base.by_id(instance_id).read_entry_optional(entry_suffix)
       end
-
-      private
-
-      def entry(suffix, options)
-        ::Avm::Instances::Entries::EntryReader.new(self, suffix, options)
-      end
     end
   end
 end

data/lib/avm/instances/entry.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Instances
+    class Entry
+      common_constructor :parent, :suffix, :options
+
+      def auto_value
+        parent.respond_to?(auto_value_method, true) ? parent.send(auto_value_method) : nil
+      end
+
+      def auto_value_method
+        "auto_#{suffix.to_s.gsub('.', '_')}"
+      end
+
+      def full_path
+        (parent.path_prefix + suffix_as_array).join('.')
+      end
+
+      def optional_value
+        read(required: false, noinput: true) || auto_value
+      end
+
+      def read(extra_options = {})
+        ::Avm.configs.read_entry(full_path, options.merge(extra_options))
+      end
+
+      def suffix_as_array
+        if suffix.is_a?(::Array)
+          suffix.dup
+        else
+          ::EacRubyUtils::PathsHash.parse_entry_key(suffix.to_s)
+        end
+      end
+
+      def value
+        optional_value || read
+      end
+
+      def write(value)
+        ::Avm.configs.configs.write_entry(full_path, value)
+      end
+    end
+  end
+end

data/lib/avm/instances/entry_keys.rb

@@ -12,6 +12,8 @@ module Avm
           const_set(key.gsub('.', '_').upcase, key)
         end
       end
+
+      FS_PATH = 'fs_path'
     end
   end
 end

data/lib/avm/self/instance.rb

@@ -3,7 +3,7 @@
 require 'avm/instances/base'
 require 'avm/self/docker_image'
 require 'avm/self/instance/entry_keys'
-require 'avm/stereotypes/eac_ubuntu_base0/docker_image'
+require 'avm/eac_ubuntu_base0/docker_image'
 
 module Avm
   module Self

data/lib/avm/stereotypes/eac_wordpress_base0/apache_host.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require 'avm/stereotypes/eac_webapp_base0/apache_host'
+require 'avm/eac_webapp_base0/apache_host'
 
 module Avm
   module Stereotypes
     module EacWordpressBase0
-      class ApacheHost < ::Avm::Stereotypes::EacWebappBase0::ApacheHost
+      class ApacheHost < ::Avm::EacWebappBase0::ApacheHost
         def document_root
-          instance.read_entry(:fs_path)
+          instance.read_entry(::Avm::Instances::EntryKeys::FS_PATH)
         end
 
         def extra_content

data/lib/avm/stereotypes/eac_wordpress_base0/deploy.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require 'avm/stereotypes/eac_webapp_base0/deploy'
+require 'avm/eac_webapp_base0/deploy'
 
 module Avm
   module Stereotypes
     module EacWordpressBase0
-      class Deploy < ::Avm::Stereotypes::EacWebappBase0::Deploy
+      class Deploy < ::Avm::EacWebappBase0::Deploy
       end
     end
   end

data/lib/avm/stereotypes/eac_wordpress_base0/instance.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
 require 'avm/instances/entry_keys'
-require 'avm/stereotypes/eac_webapp_base0/instance'
+require 'avm/eac_webapp_base0/instance'
 
 module Avm
   module Stereotypes
     module EacWordpressBase0
-      class Instance < ::Avm::Stereotypes::EacWebappBase0::Instance
+      class Instance < ::Avm::EacWebappBase0::Instance
         FILES_UNITS = { uploads: 'wp-content/uploads', themes: 'wp-content/themes' }.freeze
 
         def database_unit

data/lib/avm/tools/runner/eac_rails_base0.rb

@@ -1,32 +1,27 @@
 # frozen_string_literal: true
 
+require 'eac_cli/core_ext'
 require 'eac_ruby_utils/console/docopt_runner'
 require 'eac_ruby_utils/simple_cache'
-require 'avm/stereotypes/eac_rails_base0/instance'
-require 'eac_ruby_utils/require_sub'
+require 'avm/eac_rails_base0/instance'
 ::EacRubyUtils.require_sub(__FILE__)
 
 module Avm
   module Tools
     class Runner < ::EacRubyUtils::Console::DocoptRunner
       class EacRailsBase0 < ::EacRubyUtils::Console::DocoptRunner
-        include ::EacRubyUtils::SimpleCache
+        runner_with
 
-        DOC = <<~DOCOPT
-          Utilities for EacRailsBase0 instances.
-
-          Usage:
-            __PROGRAM__ [options] <instance_id> __SUBCOMMANDS__
-            __PROGRAM__ -h | --help
-
-          Options:
-            -h --help             Show this screen.
-        DOCOPT
+        runner_definition do
+          desc 'Utilities for EacRailsBase0 instances.'
+          pos_arg :instance_id
+          subcommands
+        end
 
         private
 
         def instance_uncached
-          ::Avm::Stereotypes::EacRailsBase0::Instance.by_id(options['<instance_id>'])
+          ::Avm::EacRailsBase0::Instance.by_id(options['<instance_id>'])
         end
       end
     end

data/lib/avm/tools/runner/eac_rails_base0/apache_host.rb

@@ -1,37 +1,14 @@
 # frozen_string_literal: true
 
+require 'avm/eac_webapp_base0/runner/apache_host'
 require 'eac_ruby_utils/console/docopt_runner'
-require 'eac_ruby_utils/console/speaker'
-require 'avm/stereotypes/eac_rails_base0/apache_host'
+require 'avm/eac_rails_base0/apache_host'
 
 module Avm
   module Tools
     class Runner < ::EacRubyUtils::Console::DocoptRunner
       class EacRailsBase0 < ::EacRubyUtils::Console::DocoptRunner
-        class ApacheHost < ::EacRubyUtils::Console::DocoptRunner
-          include ::EacRubyUtils::Console::Speaker
-
-          DOC = <<~DOCOPT
-            Deploy for EacRailsBase0 instance.
-
-            Usage:
-              __PROGRAM__ [options]
-              __PROGRAM__ -h | --help
-
-            Options:
-              -h --help                       Show this screen.
-          DOCOPT
-
-          def run
-            result = ::Avm::Stereotypes::EacRailsBase0::ApacheHost.new(
-              context(:instance)
-            ).run
-            if result.error?
-              fatal_error result.to_s
-            else
-              infov 'Result', result.label
-            end
-          end
+        class ApacheHost < ::Avm::EacWebappBase0::Runner::ApacheHost
         end
       end
     end

data/lib/avm/tools/runner/eac_rails_base0/apache_path.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require 'eac_cli/core_ext'
+require 'avm/eac_webapp_base0/runner/apache_host'
+require 'eac_ruby_utils/console/docopt_runner'
+require 'avm/eac_rails_base0/apache_path'
+
+module Avm
+  module Tools
+    class Runner < ::EacRubyUtils::Console::DocoptRunner
+      class EacRailsBase0 < ::EacRubyUtils::Console::DocoptRunner
+        class ApachePath < ::EacRubyUtils::Console::DocoptRunner
+          runner_with
+
+          runner_definition do
+            desc 'Configure Apache path configuration for instance.'
+          end
+
+          def run
+            if result.error?
+              fatal_error result.to_s
+            else
+              infov 'Result', result.label
+            end
+          end
+
+          def apache_path_uncached
+            ::Avm::EacRailsBase0::ApachePath.new(context(:instance))
+          end
+
+          def result_uncached
+            apache_path.run
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/tools/runner/eac_rails_base0/data.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require 'avm/stereotypes/eac_webapp_base0/runner/data'
+require 'avm/eac_webapp_base0/runner/data'
 require 'eac_ruby_utils/console/docopt_runner'
 
 module Avm
   module Tools
     class Runner < ::EacRubyUtils::Console::DocoptRunner
       class EacRailsBase0 < ::EacRubyUtils::Console::DocoptRunner
-        class Data < ::Avm::Stereotypes::EacWebappBase0::Runner::Data
+        class Data < ::Avm::EacWebappBase0::Runner::Data
         end
       end
     end

data/lib/avm/tools/runner/eac_rails_base0/deploy.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require 'avm/stereotypes/eac_rails_base0/deploy'
-require 'avm/stereotypes/eac_webapp_base0/runner/deploy'
+require 'avm/eac_rails_base0/deploy'
+require 'avm/eac_webapp_base0/runner/deploy'
 
 module Avm
   module Tools
     class Runner < ::EacRubyUtils::Console::DocoptRunner
       class EacRailsBase0 < ::EacRubyUtils::Console::DocoptRunner
-        class Deploy < ::Avm::Stereotypes::EacWebappBase0::Runner::Deploy
+        class Deploy < ::Avm::EacWebappBase0::Runner::Deploy
         end
       end
     end

data/lib/avm/tools/runner/eac_redmine_base0/data.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/stereotypes/eac_webapp_base0/runner/data'
+require 'avm/eac_webapp_base0/runner/data'
 require 'eac_ruby_utils/console/docopt_runner'
 
 module Avm

data/lib/avm/tools/runner/eac_redmine_base0/data/dump.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require 'avm/stereotypes/eac_webapp_base0/runner/data/dump'
+require 'avm/eac_webapp_base0/runner/data/dump'
 
 module Avm
   module Tools
     class Runner < ::EacRubyUtils::Console::DocoptRunner
       class EacRedmineBase0 < ::EacRubyUtils::Console::DocoptRunner
         class Data < ::EacRubyUtils::Console::DocoptRunner
-          class Dump < ::Avm::Stereotypes::EacWebappBase0::Runner::Data::Dump
+          class Dump < ::Avm::EacWebappBase0::Runner::Data::Dump
           end
         end
       end

data/lib/avm/tools/runner/eac_redmine_base0/deploy.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
 require 'avm/eac_redmine_base0/deploy'
-require 'avm/stereotypes/eac_webapp_base0/runner/deploy'
+require 'avm/eac_webapp_base0/runner/deploy'
 
 module Avm
   module Tools
     class Runner < ::EacRubyUtils::Console::DocoptRunner
       class EacRedmineBase0 < ::EacRubyUtils::Console::DocoptRunner
-        class Deploy < ::Avm::Stereotypes::EacWebappBase0::Runner::Deploy
+        class Deploy < ::Avm::EacWebappBase0::Runner::Deploy
         end
       end
     end

data/lib/avm/tools/runner/eac_redmine_base0/project_rename.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'avm/rails/runners/runner'
 require 'eac_cli/default_runner'
 
 module Avm

data/lib/avm/tools/runner/eac_wordpress_base0/apache_host.rb

@@ -1,37 +1,15 @@
 # frozen_string_literal: true
 
+require 'avm/eac_webapp_base0/runner/apache_host'
+require 'eac_cli/default_runner'
 require 'eac_ruby_utils/console/docopt_runner'
-require 'eac_ruby_utils/console/speaker'
 require 'avm/stereotypes/eac_wordpress_base0/apache_host'
 
 module Avm
   module Tools
     class Runner < ::EacRubyUtils::Console::DocoptRunner
       class EacWordpressBase0 < ::EacRubyUtils::Console::DocoptRunner
-        class ApacheHost < ::EacRubyUtils::Console::DocoptRunner
-          include ::EacRubyUtils::Console::Speaker
-
-          DOC = <<~DOCOPT
-            Configure Apache virtual host for EacWordpressBase0 instance.
-
-            Usage:
-              __PROGRAM__ [options]
-              __PROGRAM__ -h | --help
-
-            Options:
-              -h --help                       Show this screen.
-          DOCOPT
-
-          def run
-            result = ::Avm::Stereotypes::EacWordpressBase0::ApacheHost.new(
-              context(:instance)
-            ).run
-            if result.error?
-              fatal_error result.to_s
-            else
-              infov 'Result', result.label
-            end
-          end
+        class ApacheHost < ::Avm::EacWebappBase0::Runner::ApacheHost
         end
       end
     end

data/lib/avm/tools/runner/eac_wordpress_base0/data.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require 'avm/stereotypes/eac_webapp_base0/runner/data'
+require 'avm/eac_webapp_base0/runner/data'
 require 'eac_ruby_utils/console/docopt_runner'
 
 module Avm
   module Tools
     class Runner < ::EacRubyUtils::Console::DocoptRunner
       class EacWordpressBase0 < ::EacRubyUtils::Console::DocoptRunner
-        class Data < ::Avm::Stereotypes::EacWebappBase0::Runner::Data
+        class Data < ::Avm::EacWebappBase0::Runner::Data
         end
       end
     end

data/lib/avm/tools/runner/eac_wordpress_base0/deploy.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require 'avm/stereotypes/eac_webapp_base0/runner/deploy'
+require 'avm/eac_webapp_base0/runner/deploy'
 require 'avm/stereotypes/eac_wordpress_base0/deploy'
 
 module Avm
   module Tools
     class Runner < ::EacRubyUtils::Console::DocoptRunner
       class EacWordpressBase0 < ::EacRubyUtils::Console::DocoptRunner
-        class Deploy < ::Avm::Stereotypes::EacWebappBase0::Runner::Deploy
+        class Deploy < ::Avm::EacWebappBase0::Runner::Deploy
         end
       end
     end