avm-tools 0.69.2 → 0.71.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dfc5d456e6af7146005267a2cde8312b31b99dab08864cff3641607feabfca8a
-  data.tar.gz: 49a01ba7df2fdbd651cd89185ffc8b0dc3de1754bf590dfd3872cfaaaf210c6c
+  metadata.gz: 7f1459b957df5b13191a6411437651630d19ef6db3b12f62441d59238ede4679
+  data.tar.gz: 816d7f150ca0aa5e5cc573a77395b92c36fcba8fb41429f93dadc94f506233d8
 SHA512:
-  metadata.gz: 923ca13f3beda2ffc8c36ef97b13be6d503e92f8a7075a20f4ac692b6542d7a1c470492909ccfc39ef8888581e607ee7f5c086b1ccd07ad04e945a901f678e76
-  data.tar.gz: 98cc6fbb347ee06e2c0df2f490bff6898606ccd604aec40014ab75f2e633163c4087c1926e2cba9dba319bd6df7bc3ea7597aeea53536ceca4ccf437e205f178
+  metadata.gz: 422c93704e878d5894ac17e38f4df881d98a70ebd90696fa98fa9968b583710e2c2f7ff2f31cefb1df3fd9b01f2536d7ae6ee26ea35f6a98d5ae113415cec610
+  data.tar.gz: 3720efd94cdeb9dc295f53f7ac22e3460bf67f6e8c5ee1ef654ee4f3320de65138dfc70538d6bc2e2ae4f1b589c81960ca685af5685a4778f42158a59ce9118c

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
@@ -31,6 +31,7 @@ module Avm
 
         def clear_files
           infom "Removing all files under #{files_path}..."
+          instance.host_env.command('mkdir', '-p', files_path).execute!
           instance.host_env.command('find', files_path, '-mindepth', 1, '-delete').execute!
         end
       end

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_rails_base0/instance.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
 require 'avm/eac_webapp_base0/instance'
-require 'avm/stereotypes/rails/instance'
+require 'avm/rails/instance'
 
 module Avm
   module EacRailsBase0
     class Instance < ::Avm::EacWebappBase0::Instance
-      include ::Avm::Stereotypes::Rails::Instance
+      include ::Avm::Rails::Instance
 
       FILES_UNITS = { uploads: 'public/uploads' }.freeze
     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,24 +1,25 @@
 # 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'
+require 'avm/rails/instance'
 
 module Avm
   module EacRedmineBase0
     class Instance < ::Avm::EacWebappBase0::Instance
-      include ::Avm::Stereotypes::Rails::Instance
+      include ::Avm::Rails::Instance
 
       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/git/auto_commit_path.rb

@@ -6,9 +6,11 @@ module Avm
   module Git
     class AutoCommitPath
       enable_console_speaker
-      common_constructor :git, :path
+      common_constructor :git, :path do
+        self.path = path.to_pathname
+      end
 
-      CLASS_NAME_PATTERNS = [%r{lib/(.+)\.rb\z}, %r{app/[^/]+/(.+)\.rb\z}].freeze
+      CLASS_NAME_PATTERNS = [%r{lib/((?!.*/lib/).+)\.rb\z}, %r{app/[^/]+/(.+)\.rb\z}].freeze
 
       def run
         banner

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

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

data/vendor/eac_cli/lib/eac_cli/core_ext.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'eac_cli/patches'

data/vendor/eac_cli/lib/eac_cli/patches.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/require_sub'
+::EacRubyUtils.require_sub(__FILE__)

data/vendor/eac_cli/lib/eac_cli/patches/object.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+Dir["#{File.dirname(__FILE__)}/#{::File.basename(__FILE__, '.*')}/*.rb"].sort.each do |path|
+  require path
+end

data/vendor/eac_cli/lib/eac_cli/patches/object/runner_with.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'eac_cli/runner'
+require 'eac_cli/runner_with'
+
+class Object
+  def runner_with(*runners)
+    include ::EacCli::Runner
+    enable_simple_cache
+    enable_console_speaker
+    runners.each do |runner|
+      include runner_with_to_module(runner)
+    end
+  end
+
+  private
+
+  def runner_with_to_module(runner)
+    return runner if runner.is_a?(::Module)
+
+    "EacCli::RunnerWith::#{runner.to_s.camelize}".constantize
+  end
+end

data/vendor/eac_cli/lib/eac_cli/runner.rb

@@ -45,7 +45,7 @@ module EacCli
     module AfterClassMethods
       def create(*runner_context_args)
         r = new
-        r.runner_context = ::EacCli::Runner::Context.new(*runner_context_args)
+        r.runner_context = ::EacCli::Runner::Context.new(r, *runner_context_args)
         r
       end
 

data/vendor/eac_cli/lib/eac_cli/runner/context.rb

@@ -5,13 +5,30 @@ require 'eac_ruby_utils/core_ext'
 module EacCli
   module Runner
     class Context
-      attr_reader :argv, :parent, :program_name
+      attr_reader :argv, :parent, :program_name, :runner
 
-      def initialize(*context_args)
+      def initialize(runner, *context_args)
         options = context_args.extract_options!
         @argv = (context_args[0] || options.delete(:argv) || ARGV).dup.freeze
         @parent = context_args[1] || options.delete(:parent)
         @program_name = options.delete(:program_name)
+        @runner = runner
+      end
+
+      # Call a method in the runner or in one of it ancestors.
+      def call(method_name, *args)
+        return runner.send(method_name, *args) if runner.respond_to?(method_name)
+        return parent_call(method_name, *args) if parent.present?
+
+        raise ::NameError, "No method \"#{method_name}\" found in #{runner} or in its ancestors"
+      end
+
+      protected
+
+      def parent_call(method_name, *args)
+        return parent.context(method_name, *args) if parent.respond_to?(:context)
+
+        parent.runner_context.call(method_name, *args)
       end
     end
   end

data/vendor/eac_cli/lib/eac_cli/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacCli
-  VERSION = '0.7.0'
+  VERSION = '0.9.0'
 end

data/vendor/eac_git/lib/eac_git/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacGit
-  VERSION = '0.3.1'
+  VERSION = '0.3.2'
 end

data/vendor/eac_git/vendor/git-subrepo/lib/git-subrepo

@@ -8,6 +8,8 @@
 # Exit on any errors:
 set -e
 
+export FILTER_BRANCH_SQUELCH_WARNING=1
+
 # Import Bash+ helper functions:
 SOURCE="$BASH_SOURCE"
 while [[ -h $SOURCE ]]; do
@@ -549,7 +551,7 @@ subrepo:pull() {
     fi
   else
     o "Merge in changes from $refs_subrepo_fetch"
-    FAIL=false OUT=true RUN git merge "$refs_subrepo_fetch"
+    FAIL=false RUN git merge "$refs_subrepo_fetch"
     if ! OK; then
       say "The \"git merge\" command failed:"
       say
@@ -765,8 +767,8 @@ subrepo:branch() {
         o "Create with content"
         local PREVIOUS_IFS=$IFS
         IFS=$'\n'
-        local author_info=( $(git log -1 --format=%ad%n%ae%n%an "$commit") )
-        local commiter_info=( $(git log -1 --format=%cd%n%ce%n%cn "$commit") )
+        local author_info=( $(git log -1 --date=default --format=%ad%n%ae%n%an "$commit") )
+        local commiter_info=( $(git log -1 --date=default --format=%cd%n%ce%n%cn "$commit") )
         IFS=$PREVIOUS_IFS
 
         # When we create new commits we leave the author information unchanged
@@ -774,7 +776,7 @@ subrepo:branch() {
         # This should be analog how cherrypicking is handled allowing git
         # to store both the original author but also the responsible committer
         # that created the local version of the commit and pushed it.
-        prev_commit=$(git log -n 1 --format=%B "$commit" |
+        prev_commit=$(git log -n 1 --date=default --format=%B "$commit" |
           GIT_AUTHOR_DATE="${author_info[0]}" \
           GIT_AUTHOR_EMAIL="${author_info[1]}" \
           GIT_AUTHOR_NAME="${author_info[2]}" \
@@ -959,7 +961,7 @@ subrepo:clean() {
 
   o "Clean $subdir"
   git:remove-worktree
-  if [[ -e .git/$ref ]]; then
+  if git:branch-exists "$branch"; then
     o "Remove branch '$branch'."
     RUN git update-ref -d "$ref"
     clean_list+=("branch '$branch'")
@@ -1505,7 +1507,7 @@ assert-subdir-ready-for-init() {
     error "The subdir '$subdir' is already a subrepo."
   fi
   # Check that subdir is part of the repo
-  if [[ -z $(git log -1 -- $subdir) ]]; then
+  if [[ -z $(git log -1 --date=default -- $subdir) ]]; then
     error "The subdir '$subdir' is not part of this repo."
   fi
 }
@@ -1535,7 +1537,7 @@ get-all-subrepos() {
 add-subrepo() {
   if ! $ALL_wanted; then
     for path in "${subrepos[@]}"; do
-      [[ $1 =~ ^$path ]] && return
+      [[ $1/ =~ ^$path/ ]] && return
     done
   fi
   subrepos+=("$1")

data/vendor/eac_ruby_gems_utils/lib/eac_ruby_gems_utils/gem.rb

@@ -11,8 +11,9 @@ module EacRubyGemsUtils
 
     GEMSPEC_EXTNAME = '.gemspec'
 
-    common_constructor :root do
+    common_constructor :root, :host_env, default: [nil] do
       @root = ::Pathname.new(root).expand_path
+      self.host_env ||= ::EacRubyUtils::Envs.local
     end
 
     def to_s

data/vendor/eac_ruby_gems_utils/lib/eac_ruby_gems_utils/gem/command.rb

@@ -11,7 +11,7 @@ module EacRubyGemsUtils
 
       def initialize(gem, command_args, extra_options = {})
         @gem = gem
-        super(command_args, extra_options)
+        super(command_args, extra_options.merge(host_env: gem.host_env))
       end
 
       # Changes current directory to the gem's directory.

data/vendor/eac_ruby_gems_utils/lib/eac_ruby_gems_utils/tests/multiple/decorated_gem.rb

@@ -12,14 +12,12 @@ module EacRubyGemsUtils
           log('running "bundle install"...')
           return if bundle('install').execute.fetch(:exit_code).zero?
 
-          if can_remove_gemfile_lock?
-            log('"bundle install" failed, removing Gemfile.lock and trying again...')
-            gemfile_lock_path.unlink if gemfile_lock_path.exist?
-            bundle('install').execute!
-          else
+          unless can_remove_gemfile_lock?
             raise '"bundle install" failed and the Gemfile.lock is part of gem' \
-              '(Should be changed by developer)'
+                '(Should be changed by developer)'
           end
+
+          prepare_with_removable_gemfile_lock
         end
 
         def tests
@@ -33,6 +31,12 @@ module EacRubyGemsUtils
           infov self, message
         end
 
+        def prepare_with_removable_gemfile_lock
+          log('"bundle install" failed, removing Gemfile.lock and trying again...')
+          gemfile_lock_path.unlink if gemfile_lock_path.exist?
+          bundle('install').execute!
+        end
+
         def can_remove_gemfile_lock?
           !files.include?(gemfile_lock_path.relative_path_from(root))
         end

data/vendor/eac_ruby_gems_utils/lib/eac_ruby_gems_utils/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacRubyGemsUtils
-  VERSION = '0.7.2'
+  VERSION = '0.8.0'
 end

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/ruby/command.rb

@@ -8,7 +8,8 @@ module EacRubyUtils
     # A [EacRubyUtils::Envs::Command] which runs in a clean Ruby environment.
     class Command < ::EacRubyUtils::Envs::Command
       def initialize(bundle_args, extra_options = {})
-        super(::EacRubyUtils::Envs.local, bundle_args, extra_options)
+        host_env = extra_options.delete(:host_env)
+        super(host_env || ::EacRubyUtils::Envs.local, bundle_args, extra_options)
       end
 
       %w[system execute].each do |method_prefix|

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacRubyUtils
-  VERSION = '0.46.0'
+  VERSION = '0.47.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-tools
 version: !ruby/object:Gem::Version
-  version: 0.69.2
+  version: 0.71.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-09-27 00:00:00.000000000 Z
+date: 2020-10-14 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
@@ -421,6 +425,7 @@ files:
 - lib/avm/projects/stereotypes/ruby_gem/update.rb
 - lib/avm/projects/stereotypes/ruby_gem/version_bump.rb
 - lib/avm/rails.rb
+- lib/avm/rails/instance.rb
 - lib/avm/rails/runners.rb
 - lib/avm/rails/runners/bundle.rb
 - lib/avm/rails/runners/runner.rb
@@ -436,13 +441,11 @@ files:
 - lib/avm/self/docker_image.rb
 - lib/avm/self/instance.rb
 - lib/avm/self/instance/entry_keys.rb
+- lib/avm/self/root.rb
 - lib/avm/stereotypes.rb
 - 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
@@ -452,15 +455,16 @@ files:
 - lib/avm/stereotypes/postgresql/instance/data_unit.rb
 - lib/avm/stereotypes/postgresql/instance_with.rb
 - lib/avm/stereotypes/rails.rb
-- lib/avm/stereotypes/rails/instance.rb
 - lib/avm/sync.rb
 - lib/avm/tools.rb
 - 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
+- lib/avm/tools/runner/eac_rails_base0/rails_server.rb
 - lib/avm/tools/runner/eac_rails_base0/runner.rb
 - lib/avm/tools/runner/eac_redmine_base0.rb
 - lib/avm/tools/runner/eac_redmine_base0/bundle.rb
@@ -543,6 +547,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
@@ -560,6 +565,7 @@ files:
 - vendor/eac_cli/Gemfile
 - vendor/eac_cli/eac_cli.gemspec
 - vendor/eac_cli/lib/eac_cli.rb
+- vendor/eac_cli/lib/eac_cli/core_ext.rb
 - vendor/eac_cli/lib/eac_cli/default_runner.rb
 - vendor/eac_cli/lib/eac_cli/definition.rb
 - vendor/eac_cli/lib/eac_cli/definition/argument_option.rb
@@ -574,6 +580,9 @@ files:
 - vendor/eac_cli/lib/eac_cli/parser/options_collection.rb
 - vendor/eac_cli/lib/eac_cli/parser/parse_result.rb
 - vendor/eac_cli/lib/eac_cli/parser/positional_collection.rb
+- vendor/eac_cli/lib/eac_cli/patches.rb
+- vendor/eac_cli/lib/eac_cli/patches/object.rb
+- vendor/eac_cli/lib/eac_cli/patches/object/runner_with.rb
 - vendor/eac_cli/lib/eac_cli/runner.rb
 - vendor/eac_cli/lib/eac_cli/runner/context.rb
 - vendor/eac_cli/lib/eac_cli/runner_with.rb
@@ -828,10 +837,10 @@ files:
 - vendor/eac_ruby_gems_utils/lib/eac_ruby_gems_utils/tests/multiple/result.rb
 - vendor/eac_ruby_gems_utils/lib/eac_ruby_gems_utils/tests/rspec.rb
 - vendor/eac_ruby_gems_utils/lib/eac_ruby_gems_utils/version.rb
+- vendor/eac_ruby_gems_utils/spec/code/rubocop_check_spec.rb
 - vendor/eac_ruby_gems_utils/spec/lib/eac_ruby_gems_utils/gem/version_file_spec.rb
 - vendor/eac_ruby_gems_utils/spec/lib/eac_ruby_gems_utils/gem/version_file_spec_files/a_version_file.rb
 - vendor/eac_ruby_gems_utils/spec/lib/eac_ruby_gems_utils/gem_spec.rb
-- vendor/eac_ruby_gems_utils/spec/rubocop_check_spec.rb
 - vendor/eac_ruby_gems_utils/spec/spec_helper.rb
 - vendor/eac_ruby_gems_utils/spec/support/mygem/Gemfile
 - vendor/eac_ruby_gems_utils/spec/support/mygem/Gemfile.lock

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

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

@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-
-module Avm
-  module Stereotypes
-    module Rails
-      module Instance
-        def bundle(*args)
-          host_env.command('bundle', *args)
-                  .envvar('BUNDLE_GEMFILE', ::File.join(read_entry('fs_path'), 'Gemfile'))
-                  .envvar('RAILS_ENV', 'production')
-                  .chdir(read_entry('fs_path'))
-        end
-
-        def rake(*args)
-          bundle('exec', 'rake', *args)
-        end
-      end
-    end
-  end
-end