avm-tools 0.69.3 → 0.72.0

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,53 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Instances
+    class Entry
+      class << self
+        def auto_value_method_name(suffix)
+          "auto_#{suffix.to_s.gsub('.', '_')}"
+        end
+      end
+
+      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
+        self.class.auto_value_method_name(suffix)
+      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

@@ -3,15 +3,48 @@
 module Avm
   module Instances
     module EntryKeys
-      {
-        database: %w[id hostname name password port system username],
-        web: %w[authority hostname path port scheme url userinfo]
-      }.each do |prefix, suffixes|
-        suffixes.each do |suffix|
-          key = "#{prefix}.#{suffix}"
+      class << self
+        def all
+          all_keys.to_a
+        end
+
+        def keys_consts_set(prefix, suffixes)
+          if suffixes.is_a?(::Hash)
+            keys_consts_set_from_hash(prefix, suffixes)
+          elsif suffixes.is_a?(::Enumerable)
+            keys_consts_set_from_enum(prefix, suffixes)
+          else
+            raise "Unmapped suffixes class: #{suffixes.class}"
+          end
+        end
+
+        def key_const_set(prefix, suffix)
+          key = [prefix, suffix].reject(&:blank?).join('.')
           const_set(key.gsub('.', '_').upcase, key)
+          all_keys << key
+        end
+
+        private
+
+        def all_keys
+          @all_keys ||= ::Set.new
+        end
+
+        def keys_consts_set_from_enum(prefix, suffixes)
+          suffixes.each { |suffix| key_const_set(prefix, suffix) }
+        end
+
+        def keys_consts_set_from_hash(prefix, suffixes)
+          suffixes.each { |k, v| keys_consts_set(prefix.to_s + (k.blank? ? '' : ".#{k}"), v) }
         end
       end
+
+      {
+        '' => %w[fs_path host_id source_instance_id],
+        database: %w[id hostname name password port system username],
+        ssh: %w[hostname port url username],
+        web: %w[authority hostname path port scheme url userinfo]
+      }.each { |prefix, suffixes| keys_consts_set(prefix, suffixes) }
     end
   end
 end

data/lib/avm/patches/i18n.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/self'
+require 'avm/self/root'
 require 'i18n'
 
 module Avm

data/lib/avm/patches/object/template.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/self'
+require 'avm/self/root'
 require 'eac_ruby_utils/patches/object/template'
 
 ::EacRubyUtils::Templates::Searcher.default.included_paths <<

data/lib/avm/rails/instance.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Avm
+  module Rails
+    module Instance
+      def bundle(*args)
+        the_gem.bundle(*args).chdir_root.envvar('RAILS_ENV', 'production')
+      end
+
+      def rake(*args)
+        bundle('exec', 'rake', *args)
+      end
+
+      def the_gem
+        @the_gem ||= ::EacRubyGemsUtils::Gem.new(::File.join(read_entry('fs_path')), host_env)
+      end
+    end
+  end
+end

data/lib/avm/self.rb

@@ -16,10 +16,6 @@ module Avm
       def instance
         @instance ||= ::Avm::Self::Instance.by_id('avm-tools_self')
       end
-
-      def root
-        ::Pathname.new('../..').expand_path(__dir__)
-      end
     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/self/root.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require 'pathname'
+
+module Avm
+  module Self
+    class << self
+      def root
+        ::Pathname.new('../../..').expand_path(__dir__)
+      end
+    end
+  end
+end

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

@@ -7,7 +7,7 @@ module Avm
     module EacWordpressBase0
       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/tools/runner/eac_rails_base0.rb

@@ -1,27 +1,22 @@
 # frozen_string_literal: true
 
+require 'eac_cli/core_ext'
 require 'eac_ruby_utils/console/docopt_runner'
 require 'eac_ruby_utils/simple_cache'
 require 'avm/eac_rails_base0/instance'
-require 'eac_ruby_utils/require_sub'
 ::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
 

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/rails_server.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require 'avm/instances/entry_keys'
+require 'eac_cli/core_ext'
+require 'eac_ruby_utils/console/docopt_runner'
+require 'shellwords'
+
+module Avm
+  module Tools
+    class Runner < ::EacRubyUtils::Console::DocoptRunner
+      class EacRailsBase0 < ::EacRubyUtils::Console::DocoptRunner
+        class RailsServer
+          runner_with
+
+          runner_definition do
+            desc 'Run the embbeded Rails web server.'
+            arg_opt '-e', '--environment', 'Specifies the environment to run this server under' \
+              ' (development/test/production).'
+          end
+
+          def run
+            infov 'Bundle args', ::Shellwords.join(bundle_args)
+            infov 'Result', command.system
+          end
+
+          protected
+
+          def bundle_args
+            ['exec', 'rails', 'server', '--port',
+             runner_context.call(:instance).read_entry(::Avm::Instances::EntryKeys::WEB_PORT)] +
+              parsed.environment.if_present([]) { |v| ['--environment', v] }
+          end
+
+          def command
+            runner_context.call(:instance).bundle(*bundle_args).chdir_root
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -79,7 +79,9 @@ module Avm
 
           def dev_instance_fs_path
             instance.if_present do |v|
-              v.application.instance('dev').read_entry_optional(:fs_path)
+              v.application.instance('dev').read_entry_optional(
+                ::Avm::Instances::EntryKeys::FS_PATH
+              )
             end
           end
 

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

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require 'avm/instances/base'
+require 'eac_cli/core_ext'
+require 'eac_ruby_utils/console/docopt_runner'
+
+module Avm
+  module Tools
+    class Runner < ::EacRubyUtils::Console::DocoptRunner
+      class Instance < ::EacRubyUtils::Console::DocoptRunner
+        require_sub __FILE__
+        runner_with
+
+        runner_definition do
+          desc 'Utilities for generic instances.'
+          pos_arg :instance_id
+          subcommands
+        end
+
+        private
+
+        def instance_uncached
+          ::Avm::Instances::Base.by_id(options['<instance_id>'])
+        end
+      end
+    end
+  end
+end

data/lib/avm/tools/runner/instance/info.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require 'avm/instances/entry_keys'
+require 'eac_cli/core_ext'
+require 'eac_ruby_utils/console/docopt_runner'
+
+module Avm
+  module Tools
+    class Runner < ::EacRubyUtils::Console::DocoptRunner
+      class Instance < ::EacRubyUtils::Console::DocoptRunner
+        class Info < ::EacRubyUtils::Console::DocoptRunner
+          runner_with
+
+          runner_definition do
+            desc 'Show info about a instance.'
+          end
+
+          def run
+            base_banner
+            entry_keys_banner
+          end
+
+          private
+
+          def base_banner
+            infov 'ID', instance.id
+            infov 'Application ID', instance.application.id
+            infov 'Suffix', instance.suffix
+          end
+
+          def entry_keys_banner
+            ::Avm::Instances::EntryKeys.all.each do |key|
+              infov key, instance.read_entry_optional(key)
+            end
+          end
+
+          def instance
+            context(:instance)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.69.3'
+    VERSION = '0.72.0'
   end
 end

data/template/avm/eac_rails_base0/apache_path/default.conf

@@ -0,0 +1,13 @@
+<IfModule mod_passenger.c>
+    Alias "%%WEB.PATH%%" "%%FS_PATH%%/public"
+    <Location "%%WEB.PATH%%">
+        PassengerBaseURI "%%WEB.PATH%%"
+        PassengerAppRoot "%%FS_PATH%%"
+        PassengerAppEnv production
+    </Location>
+    <Directory "%%FS_PATH%%/public">
+        Allow from all
+        Options -MultiViews
+        Require all granted
+    </Directory>
+</IfModule>