avm-tools 0.69.3 → 0.70.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83ba40f1bd12e44664ec4bd6824bc269eb6a5012f51fdb7fdf38f90194f084d8
-  data.tar.gz: 872cf085c7de0dda3da9104b28b8a48ac100473ae902d4596e89295ee808b40b
+  metadata.gz: 4f29b6293211fb41769c831fee400ab44f3e7b23cce9a80cbe43fe66ff6c793f
+  data.tar.gz: b4ae8baa035b47388bf6266033a3a901911adbbf3841a4c5dc401bbf2e5081b8
 SHA512:
-  metadata.gz: 3654fc45fe954c2a3caaa7d9d0d6bfc2ad883d0e2f93cb85fe798f0e12785eeb1f2da2c72cc0921e514a48c9942f2a05cf2afc0788faa6e574af3af78195bf22
-  data.tar.gz: f14791c5d6f811644243763d6e2e3d6dfb0c6812dd1d55f2e7d96afc65ac16aea399178cb9fe335a047808e7a34a457741f5eda4598e196237d44e02a4bf133b
+  metadata.gz: 12892c4a448f9238bd4e3ec55e1c4f03761a0a29ed5fb0fcf5a65962c314eae74903a4e1412acdeef945b896dc44f6f22bdaf4a3c989b78edd8b2f880efb32fe
+  data.tar.gz: 1f24a30ed4cd5f821ade563da4e1e3595cc3416fec7037ff847a988d8dc49f932a45c15143a3637a155ed5372027e2fd3be66c97bf34f99b53f55e234a2553b5

data/lib/avm/data/instance/files_unit.rb

@@ -18,7 +18,7 @@ module Avm
         before_load :clear_files
 
         def files_path
-          ::File.join(instance.read_entry(:fs_path), fs_path_subpath)
+          ::File.join(instance.read_entry(::Avm::Instances::EntryKeys::FS_PATH), fs_path_subpath)
         end
 
         def dump_command

data/lib/avm/eac_rails_base0/apache_host.rb

@@ -6,7 +6,7 @@ module Avm
   module EacRailsBase0
     class ApacheHost < ::Avm::EacWebappBase0::ApacheHost
       def document_root
-        "#{instance.read_entry(:fs_path)}/public"
+        "#{instance.read_entry(::Avm::Instances::EntryKeys::FS_PATH)}/public"
       end
 
       def extra_content

data/lib/avm/eac_rails_base0/apache_path.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+require 'avm/eac_ubuntu_base0/apache'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRailsBase0
+    class ApachePath
+      enable_console_speaker
+      enable_simple_cache
+      common_constructor :instance, :options, default: [{}]
+
+      def run
+        write_available_conf
+        enable_conf
+        reload_apache
+        ::Avm::Result.success('Done')
+      end
+
+      def content
+        template.child('default.conf').apply(instance)
+      end
+
+      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
+
+      def write_available_conf
+        infom 'Writing available configuration...'
+        conf.write(content)
+      end
+    end
+  end
+end

data/lib/avm/eac_rails_base0/deploy.rb

@@ -42,7 +42,8 @@ module Avm
       def touch_restart_file
         infom 'Touching restart file...'
         instance.host_env.command(
-          'touch', ::File.join(instance.read_entry(:fs_path), 'tmp', 'restart.txt')
+          'touch', ::File.join(instance.read_entry(::Avm::Instances::EntryKeys::FS_PATH),
+                               'tmp', 'restart.txt')
         ).system!
       end
     end

data/lib/avm/eac_redmine_base0/deploy.rb

@@ -20,8 +20,8 @@ module Avm
       end
 
       def installer_path
-        ::File.join(instance.read_entry(:fs_path), 'plugins', 'redmine_installer', 'installer',
-                    'run.sh')
+        ::File.join(instance.read_entry(::Avm::Instances::EntryKeys::FS_PATH), 'plugins',
+                    'redmine_installer', 'installer', 'run.sh')
       end
 
       def install_task

data/lib/avm/eac_redmine_base0/instance.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'avm/eac_redmine_base0/data_unit'
-require 'avm/stereotypes/eac_ubuntu_base0/docker_image'
+require 'avm/eac_ubuntu_base0/docker_image'
 require 'avm/eac_webapp_base0/instance'
 require 'avm/stereotypes/rails/instance'
 
@@ -13,12 +13,13 @@ module Avm
       FILES_UNITS = { files: 'files' }.freeze
 
       def docker_image_class
-        ::Avm::Stereotypes::EacUbuntuBase0::DockerImage
+        ::Avm::EacUbuntuBase0::DockerImage
       end
 
       def docker_run_arguments
         [
-          '--volume', "#{read_entry(:fs_path)}:/home/myuser/eac_redmine_base0",
+          '--volume',
+          "#{read_entry(::Avm::Instances::EntryKeys::FS_PATH)}:/home/myuser/eac_redmine_base0",
           '--publish', "#{read_entry(:ssh_port)}:22",
           '--publish', "#{read_entry(:http_port)}:80",
           '--publish', "#{read_entry(:https_port)}:443"

data/lib/avm/eac_ubuntu_base0/apache.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacUbuntuBase0
+    class Apache
+      require_sub __FILE__
+      common_constructor :host_env
+
+      def etc_root
+        '/etc/apache2'
+      end
+
+      def service(command)
+        host_env.command('sudo', 'service', 'apache2', command)
+      end
+
+      { conf: :conf, site: :sites }.each do |type, directory_prefix|
+        define_method type do |name|
+          ::Avm::EacUbuntuBase0::Apache::Resource.new(self, type, directory_prefix, name)
+        end
+      end
+    end
+  end
+end

data/lib/avm/eac_ubuntu_base0/apache/resource.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacUbuntuBase0
+    class Apache
+      class Resource
+        common_constructor :apache, :type, :directory_prefix, :name
+
+        def available_path
+          ::File.join(apache.etc_root, "#{directory_prefix}-available", "#{name}.conf")
+        end
+
+        def available?
+          apache.host_env.file(available_path).exist?
+        end
+
+        def disable
+          apache.host_env.command('sudo', "a2dis#{type}", name).execute!
+        end
+
+        def enable
+          apache.host_env.command('sudo', "a2en#{type}", name).execute!
+        end
+
+        def enabled_path
+          ::File.join(apache.etc_root, "#{directory_prefix}-enabled", "#{name}.conf")
+        end
+
+        def enabled?
+          apache.host_env.file(enabled_path).exist?
+        end
+
+        def remove
+          remove_disabled
+          remove_available
+        end
+
+        def remove_available
+          raise 'Remove enabled before' if enabled?
+
+          apache.host_env.command('sudo', 'rm', '-f', available_path).execute! if available?
+        end
+
+        def remove_disabled
+          disable if enabled?
+          apache.host_env.command('sudo', 'rm', '-f', enabled_path).execute! if enabled?
+        end
+
+        def write(content)
+          ::EacRubyUtils::Envs.local.command('echo', content).pipe(
+            apache.host_env.command('sudo', 'tee', available_path)
+          ).execute!
+        end
+      end
+    end
+  end
+end

data/lib/avm/eac_ubuntu_base0/docker_image.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'avm/docker/image'
+
+module Avm
+  module EacUbuntuBase0
+    class DockerImage < ::Avm::Docker::Image
+      def stereotype_tag
+        'eac_ubuntu_base0'
+      end
+    end
+  end
+end

data/lib/avm/eac_webapp_base0/apache_host.rb

@@ -2,7 +2,7 @@
 
 require 'eac_ruby_utils/core_ext'
 require 'avm/patches/object/template'
-require 'avm/stereotypes/eac_ubuntu_base0/apache'
+require 'avm/eac_ubuntu_base0/apache'
 require 'avm/patches/object/template'
 
 module Avm
@@ -35,7 +35,7 @@ module Avm
       private
 
       def apache_uncached
-        ::Avm::Stereotypes::EacUbuntuBase0::Apache.new(instance.host_env)
+        ::Avm::EacUbuntuBase0::Apache.new(instance.host_env)
       end
 
       def enable_no_ssl_site

data/lib/avm/eac_webapp_base0/deploy.rb

@@ -32,7 +32,7 @@ module Avm
       def build_git_commit
         ::Avm::Git::Commit.new(git, commit_sha1).deploy_to_env_path(
           instance.host_env,
-          instance.read_entry(:fs_path)
+          instance.read_entry(::Avm::Instances::EntryKeys::FS_PATH)
         ).variables_source_set(instance)
       end
 
@@ -95,7 +95,7 @@ module Avm
       end
 
       def git_repository_path
-        instance.source_instance.read_entry(:fs_path)
+        instance.source_instance.read_entry(::Avm::Instances::EntryKeys::FS_PATH)
       end
     end
   end

data/lib/avm/eac_webapp_base0/deploy/file_unit.rb

@@ -27,7 +27,8 @@ module Avm
         end
 
         def target_path
-          ::File.join(instance.read_entry(:fs_path), fs_path_subpath.to_s)
+          ::File.join(instance.read_entry(::Avm::Instances::EntryKeys::FS_PATH),
+                      fs_path_subpath.to_s)
         end
 
         def link_source_target

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

@@ -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/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/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.69.3'
+    VERSION = '0.70.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>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-tools
 version: !ruby/object:Gem::Version
-  version: 0.69.3
+  version: 0.70.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-04 00:00:00.000000000 Z
+date: 2020-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -291,12 +291,16 @@ files:
 - lib/avm/docker/registry.rb
 - lib/avm/docker/runner.rb
 - lib/avm/eac_rails_base0/apache_host.rb
+- lib/avm/eac_rails_base0/apache_path.rb
 - lib/avm/eac_rails_base0/deploy.rb
 - lib/avm/eac_rails_base0/instance.rb
 - lib/avm/eac_redmine_base0/core_update.rb
 - lib/avm/eac_redmine_base0/data_unit.rb
 - lib/avm/eac_redmine_base0/deploy.rb
 - lib/avm/eac_redmine_base0/instance.rb
+- lib/avm/eac_ubuntu_base0/apache.rb
+- lib/avm/eac_ubuntu_base0/apache/resource.rb
+- lib/avm/eac_ubuntu_base0/docker_image.rb
 - lib/avm/eac_webapp_base0/apache_host.rb
 - lib/avm/eac_webapp_base0/deploy.rb
 - lib/avm/eac_webapp_base0/deploy/appended_directories.rb
@@ -380,7 +384,7 @@ files:
 - lib/avm/instances/configuration/_rubocop.rb
 - lib/avm/instances/configuration/_tests.rb
 - lib/avm/instances/entries.rb
-- lib/avm/instances/entries/entry_reader.rb
+- lib/avm/instances/entry.rb
 - lib/avm/instances/entry_keys.rb
 - lib/avm/launcher/context/instance_manager.rb
 - lib/avm/launcher/context/instance_manager/cached_instance.rb
@@ -440,9 +444,6 @@ files:
 - lib/avm/stereotypes/eac_rails_base0.rb
 - lib/avm/stereotypes/eac_redmine_base0.rb
 - lib/avm/stereotypes/eac_ubuntu_base0.rb
-- lib/avm/stereotypes/eac_ubuntu_base0/apache.rb
-- lib/avm/stereotypes/eac_ubuntu_base0/apache/site.rb
-- lib/avm/stereotypes/eac_ubuntu_base0/docker_image.rb
 - lib/avm/stereotypes/eac_webapp_base0.rb
 - lib/avm/stereotypes/eac_wordpress_base0/apache_host.rb
 - lib/avm/stereotypes/eac_wordpress_base0/deploy.rb
@@ -458,6 +459,7 @@ files:
 - lib/avm/tools/runner.rb
 - lib/avm/tools/runner/eac_rails_base0.rb
 - lib/avm/tools/runner/eac_rails_base0/apache_host.rb
+- lib/avm/tools/runner/eac_rails_base0/apache_path.rb
 - lib/avm/tools/runner/eac_rails_base0/bundle.rb
 - lib/avm/tools/runner/eac_rails_base0/data.rb
 - lib/avm/tools/runner/eac_rails_base0/deploy.rb
@@ -543,6 +545,7 @@ files:
 - lib/eac_launcher/vendor.rb
 - lib/eac_launcher/vendor/github.rb
 - lib/eac_launcher/version.rb
+- template/avm/eac_rails_base0/apache_path/default.conf
 - template/avm/eac_rails_base0/deploy/config/database.yml.template
 - template/avm/eac_redmine_base0/deploy/config/install.sh.template
 - template/avm/eac_redmine_base0/deploy/config/secrets.yml

data/lib/avm/instances/entries/entry_reader.rb

@@ -1,45 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/core_ext'
-
-module Avm
-  module Instances
-    module Entries
-      class EntryReader
-        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
-      end
-    end
-  end
-end

data/lib/avm/stereotypes/eac_ubuntu_base0/apache.rb

@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/core_ext'
-require 'eac_ruby_utils/require_sub'
-::EacRubyUtils.require_sub(__FILE__)
-
-module Avm
-  module Stereotypes
-    module EacUbuntuBase0
-      class Apache
-        common_constructor :host_env
-
-        def etc_root
-          '/etc/apache2'
-        end
-
-        def service(command)
-          host_env.command('sudo', 'service', 'apache2', command)
-        end
-
-        def site(name)
-          ::Avm::Stereotypes::EacUbuntuBase0::Apache::Site.new(self, name)
-        end
-      end
-    end
-  end
-end

data/lib/avm/stereotypes/eac_ubuntu_base0/apache/site.rb

@@ -1,61 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/core_ext'
-
-module Avm
-  module Stereotypes
-    module EacUbuntuBase0
-      class Apache
-        class Site
-          common_constructor :apache, :name
-
-          def available_path
-            ::File.join(apache.etc_root, 'sites-available', "#{name}.conf")
-          end
-
-          def available?
-            apache.host_env.file(available_path).exist?
-          end
-
-          def disable
-            apache.host_env.command('sudo', 'a2dissite', name).execute!
-          end
-
-          def enable
-            apache.host_env.command('sudo', 'a2ensite', name).execute!
-          end
-
-          def enabled_path
-            ::File.join(apache.etc_root, 'sites-enabled', "#{name}.conf")
-          end
-
-          def enabled?
-            apache.host_env.file(enabled_path).exist?
-          end
-
-          def remove
-            remove_disabled
-            remove_available
-          end
-
-          def remove_available
-            raise 'Remove enabled before' if enabled?
-
-            apache.host_env.command('sudo', 'rm', '-f', available_path).execute! if available?
-          end
-
-          def remove_disabled
-            disable if enabled?
-            apache.host_env.command('sudo', 'rm', '-f', enabled_path).execute! if enabled?
-          end
-
-          def write(content)
-            ::EacRubyUtils::Envs.local.command('echo', content).pipe(
-              apache.host_env.command('sudo', 'tee', available_path)
-            ).execute!
-          end
-        end
-      end
-    end
-  end
-end

data/lib/avm/stereotypes/eac_ubuntu_base0/docker_image.rb

@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/core_ext'
-require 'avm/docker/image'
-
-module Avm
-  module Stereotypes
-    module EacUbuntuBase0
-      class DockerImage < ::Avm::Docker::Image
-        def stereotype_tag
-          'eac_ubuntu_base0'
-        end
-      end
-    end
-  end
-end