avm-tools 0.59.0 → 0.62.2

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/envs/ssh_env/quiet.rb

@@ -2,6 +2,7 @@
 
 require 'active_support/concern'
 require 'eac_ruby_utils/boolean'
+require 'eac_ruby_utils/envs/ssh_env/dasho_options'
 
 module EacRubyUtils
   module Envs
@@ -10,6 +11,7 @@ module EacRubyUtils
         extend ::ActiveSupport::Concern
 
         included do
+          include ::EacRubyUtils::Envs::SshEnv::DashoOptions
           add_nodasho_option('Quiet')
         end
 

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/envs/ssh_env/terminal.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'active_support/concern'
+require 'eac_ruby_utils/envs/ssh_env/dasho_options'
 require 'eac_ruby_utils/listable'
 require 'eac_ruby_utils/patches/object/if_present'
 
@@ -11,6 +12,7 @@ module EacRubyUtils
         extend ::ActiveSupport::Concern
 
         included do
+          include ::EacRubyUtils::Envs::SshEnv::DashoOptions
           add_nodasho_option('Terminal')
           include ::EacRubyUtils::Listable
           lists.add_string :terminal_option, :auto, :disable, :enable, :force

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/listable/list.rb

@@ -33,6 +33,11 @@ module EacRubyUtils
         find_list_by_method(name) || super
       end
 
+      def hash_keys_validate!(hash, error_class = ::StandardError)
+        hash.keys.each { |key| value_validate!(key, error_class) }
+        hash
+      end
+
       def i18n_key
         "eac_ruby_utils.listable.#{class_i18n_key}.#{item}"
       end

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/require_sub.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'active_support/inflector'
+require 'eac_ruby_utils/listable'
 
 module EacRubyUtils
   class << self
@@ -10,15 +11,14 @@ module EacRubyUtils
   end
 
   class RequireSub
-    BASE_OPTION_KEY = :base
-    INCLUDE_MODULES_OPTION_KEY = :include_modules
-    REQUIRE_DEPENDENCY_OPTION_KEY = :require_dependency
+    include ::EacRubyUtils::Listable
+    lists.add_symbol :option, :base, :include_modules, :require_dependency
 
     attr_reader :file, :options
 
     def initialize(file, options = {})
       @file = file
-      @options = options
+      @options = self.class.lists.option.hash_keys_validate!(options)
     end
 
     def apply
@@ -29,7 +29,7 @@ module EacRubyUtils
     private
 
     def active_support_require(path)
-      return false unless options[REQUIRE_DEPENDENCY_OPTION_KEY]
+      return false unless options[OPTION_REQUIRE_DEPENDENCY]
 
       ::Kernel.require_dependency(path)
       true
@@ -46,7 +46,7 @@ module EacRubyUtils
     end
 
     def include_modules
-      return unless options[INCLUDE_MODULES_OPTION_KEY]
+      return unless options[OPTION_INCLUDE_MODULES]
 
       base.constants.each do |constant_name|
         constant = base.const_get(constant_name)
@@ -57,11 +57,11 @@ module EacRubyUtils
     end
 
     def base
-      options[BASE_OPTION_KEY] || raise('Option :base not setted')
+      options[OPTION_BASE] || raise('Option :base not setted')
     end
 
     def base?
-      options[BASE_OPTION_KEY] ? true : false
+      options[OPTION_BASE] ? true : false
     end
 
     def kernel_require(path)

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-tools
 version: !ruby/object:Gem::Version
-  version: 0.59.0
+  version: 0.62.2
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-25 00:00:00.000000000 Z
+date: 2020-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -274,6 +274,7 @@ files:
 - Gemfile
 - exe/avm
 - lib/avm.rb
+- lib/avm/cached_download.rb
 - lib/avm/configs.rb
 - lib/avm/data.rb
 - lib/avm/data/instance.rb
@@ -289,6 +290,10 @@ files:
 - lib/avm/docker/image.rb
 - lib/avm/docker/registry.rb
 - lib/avm/docker/runner.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/executables.rb
 - lib/avm/files.rb
 - lib/avm/files/formatter.rb
@@ -358,8 +363,16 @@ files:
 - lib/avm/instances/entries.rb
 - lib/avm/instances/entries/entry_reader.rb
 - lib/avm/instances/entry_keys.rb
+- lib/avm/launcher/context/instance_manager.rb
+- lib/avm/launcher/context/instance_manager/cached_instance.rb
+- lib/avm/launcher/context/instance_manager/cached_instances.rb
+- lib/avm/launcher/errors/base.rb
+- lib/avm/launcher/errors/non_project.rb
+- lib/avm/launcher/instances/base.rb
+- lib/avm/launcher/instances/base/cache.rb
 - lib/avm/local_projects.rb
 - lib/avm/local_projects/instance.rb
+- lib/avm/local_projects/jobs/update.rb
 - lib/avm/patches.rb
 - lib/avm/patches/object/template.rb
 - lib/avm/path_string.rb
@@ -367,6 +380,7 @@ files:
 - lib/avm/projects/stereotype.rb
 - lib/avm/projects/stereotypes.rb
 - lib/avm/projects/stereotypes/git.rb
+- lib/avm/projects/stereotypes/git/local_project_mixin.rb
 - lib/avm/projects/stereotypes/git/publish.rb
 - lib/avm/projects/stereotypes/git/warp.rb
 - lib/avm/projects/stereotypes/git_subrepo.rb
@@ -378,7 +392,9 @@ files:
 - lib/avm/projects/stereotypes/rails_application.rb
 - lib/avm/projects/stereotypes/redmine_plugin.rb
 - lib/avm/projects/stereotypes/ruby_gem.rb
+- lib/avm/projects/stereotypes/ruby_gem/local_project_mixin.rb
 - lib/avm/projects/stereotypes/ruby_gem/publish.rb
+- lib/avm/projects/stereotypes/ruby_gem/update.rb
 - lib/avm/rails.rb
 - lib/avm/rails/runners.rb
 - lib/avm/rails/runners/bundle.rb
@@ -401,9 +417,6 @@ files:
 - lib/avm/stereotypes/eac_rails_base0/deploy.rb
 - lib/avm/stereotypes/eac_rails_base0/instance.rb
 - lib/avm/stereotypes/eac_redmine_base0.rb
-- lib/avm/stereotypes/eac_redmine_base0/data_unit.rb
-- lib/avm/stereotypes/eac_redmine_base0/deploy.rb
-- lib/avm/stereotypes/eac_redmine_base0/instance.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
@@ -429,6 +442,7 @@ files:
 - 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
@@ -439,6 +453,7 @@ files:
 - 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
+- lib/avm/tools/runner/eac_redmine_base0/core_update.rb
 - lib/avm/tools/runner/eac_redmine_base0/data.rb
 - lib/avm/tools/runner/eac_redmine_base0/data/dump.rb
 - lib/avm/tools/runner/eac_redmine_base0/deploy.rb
@@ -468,6 +483,7 @@ files:
 - lib/avm/tools/runner/launcher/publish.rb
 - lib/avm/tools/runner/local_project.rb
 - lib/avm/tools/runner/local_project/info.rb
+- lib/avm/tools/runner/local_project/update.rb
 - lib/avm/tools/runner/ruby.rb
 - lib/avm/tools/runner/ruby/gems.rb
 - lib/avm/tools/runner/ruby/gems/generate.rb
@@ -478,7 +494,6 @@ files:
 - lib/eac_launcher.rb
 - lib/eac_launcher/context.rb
 - lib/eac_launcher/context/instance_discovery.rb
-- lib/eac_launcher/context/instance_manager.rb
 - lib/eac_launcher/context/settings.rb
 - lib/eac_launcher/git.rb
 - lib/eac_launcher/git/base.rb
@@ -494,8 +509,6 @@ files:
 - lib/eac_launcher/git/sub_warp_base.rb
 - lib/eac_launcher/git/warp_base.rb
 - lib/eac_launcher/instances.rb
-- lib/eac_launcher/instances/base.rb
-- lib/eac_launcher/instances/base/cache.rb
 - lib/eac_launcher/instances/error.rb
 - lib/eac_launcher/instances/runner_helper.rb
 - lib/eac_launcher/instances/settings.rb
@@ -513,6 +526,8 @@ files:
 - lib/eac_launcher/vendor.rb
 - lib/eac_launcher/vendor/github.rb
 - lib/eac_launcher/version.rb
+- template/avm/eac_redmine_base0/deploy/config/install.sh.template
+- template/avm/eac_redmine_base0/deploy/config/secrets.yml
 - template/avm/ruby/gems/generator/gemspec.template
 - template/avm/ruby/gems/generator/root_lib.template
 - template/avm/ruby/gems/generator/static/Gemfile
@@ -522,8 +537,6 @@ files:
 - template/avm/self/docker_image/Dockerfile
 - template/avm/self/docker_image/entrypoint.sh
 - template/avm/stereotypes/eac_rails_base0/deploy/config/database.yml.template
-- template/avm/stereotypes/eac_redmine_base0/deploy/config/install.sh.template
-- template/avm/stereotypes/eac_redmine_base0/deploy/config/secrets.yml
 - template/avm/stereotypes/eac_ubuntu_base0/docker_image/Dockerfile
 - template/avm/stereotypes/eac_webapp_base0/apache_host/no_ssl.conf
 - template/avm/stereotypes/eac_wordpress_base0/deploy/wp-config.php.template
@@ -552,6 +565,7 @@ files:
 - vendor/eac_git/lib/eac_git.rb
 - vendor/eac_git/lib/eac_git/executables.rb
 - vendor/eac_git/lib/eac_git/local.rb
+- vendor/eac_git/lib/eac_git/local/dirty_files.rb
 - vendor/eac_git/lib/eac_git/local/subrepo.rb
 - vendor/eac_git/lib/eac_git/local/subrepo/config.rb
 - vendor/eac_git/lib/eac_git/remote.rb
@@ -960,7 +974,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Tools for AVM.

data/lib/avm/stereotypes/eac_redmine_base0/data_unit.rb

@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/data/instance/unit'
-require 'eac_ruby_utils/core_ext'
-require 'open-uri'
-
-module Avm
-  module Stereotypes
-    module EacRedmineBase0
-      class DataUnit < ::Avm::Data::Instance::Unit
-        common_constructor :instance
-
-        EXTENSION = '.tar'
-
-        def do_dump(data_path)
-          ::File.open(data_path, 'wb') do |file|
-            file << URI.parse(export_url).read
-          end
-        end
-
-        def export_url
-          uri = ::Addressable::URI.parse(instance.read_entry('web.url')) + '/backup/export'
-          uri.query_values = { key: instance.read_entry('admin.api_key') }
-          uri.to_s
-        end
-      end
-    end
-  end
-end

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

@@ -1,38 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/stereotypes/eac_webapp_base0/deploy'
-require 'eac_ruby_utils/ruby'
-
-module Avm
-  module Stereotypes
-    module EacRedmineBase0
-      class Deploy < ::Avm::Stereotypes::EacWebappBase0::Deploy
-        set_callback :assert_instance_branch, :after, :run_installer
-
-        def run_installer
-          infom 'Running installer'
-          ::EacRubyUtils::Ruby.on_clean_environment do
-            installer_command.system!
-          end
-        end
-
-        def installer_command
-          instance.host_env.command(installer_path, install_task)
-        end
-
-        def installer_path
-          ::File.join(instance.read_entry(:fs_path), 'plugins', 'redmine_installer', 'installer',
-                      'run.sh')
-        end
-
-        def install_task
-          if instance.read_entry_optional('web.path').present?
-            'redmine_as_apache_path'
-          else
-            'redmine_as_apache_base'
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,40 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/stereotypes/eac_redmine_base0/data_unit'
-require 'avm/stereotypes/eac_ubuntu_base0/docker_image'
-require 'avm/stereotypes/eac_webapp_base0/instance'
-require 'avm/stereotypes/rails/instance'
-
-module Avm
-  module Stereotypes
-    module EacRedmineBase0
-      class Instance < ::Avm::Stereotypes::EacWebappBase0::Instance
-        include ::Avm::Stereotypes::Rails::Instance
-
-        FILES_UNITS = { files: 'files' }.freeze
-
-        def docker_image_class
-          ::Avm::Stereotypes::EacUbuntuBase0::DockerImage
-        end
-
-        def docker_run_arguments
-          [
-            '--volume', "#{read_entry(: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"
-          ]
-        end
-
-        def data_package
-          @data_package ||= ::Avm::Data::Instance::Package.new(
-            self,
-            units: {
-              all: ::Avm::Stereotypes::EacRedmineBase0::DataUnit.new(self)
-            }
-          )
-        end
-      end
-    end
-  end
-end

data/lib/eac_launcher/context/instance_manager.rb

@@ -1,94 +0,0 @@
-# frozen_string_literal: true
-
-require('yaml')
-
-module EacLauncher
-  class Context
-    class InstanceManager
-      include ::EacRubyUtils::SimpleCache
-
-      def initialize(context)
-        @context = context
-      end
-
-      def publish_state_set(instance, stereotype_name, check_status)
-        data = cached_instances_file_content_uncached
-        data[instance.logical] ||= {}
-        data[instance.logical][:publish_state] ||= {}
-        data[instance.logical][:publish_state][stereotype_name] = check_status
-        write_cache_file(data)
-      end
-
-      def pending_instances
-        instances.select { |instance| pending_instance?(instance) }
-      end
-
-      private
-
-      def instances_uncached
-        (cached_instances || search_instances).select(&:included?)
-      end
-
-      def search_instances
-        cache_instances(::EacLauncher::Context::InstanceDiscovery.new(@context).instances)
-      end
-
-      def cached_instances
-        return nil if @context.recache
-        return nil unless cached_instances_file_content
-
-        CachedInstances.new(cached_instances_file_content).instances
-      end
-
-      def cached_instances_file_content_uncached
-        r = YAML.load_file(cache_file_path)
-        r.is_a?(::Hash) ? r : nil
-      rescue Errno::ENOENT
-        nil
-      end
-
-      def cache_instances(instances)
-        write_cache_file(Hash[instances.map { |i| [i.logical, i.to_h] }])
-        instances
-      end
-
-      def write_cache_file(data)
-        ::File.write(cache_file_path, data.to_yaml)
-      end
-
-      def cache_file_path
-        ::File.join(@context.cache_root, 'instances.yml')
-      end
-
-      def pending_instance?(instance)
-        data = cached_instances_file_content
-        return false unless data[instance.logical]
-        return false unless data[instance.logical][:publish_state].is_a?(Hash)
-
-        data[instance.logical][:publish_state].any? do |_k, v|
-          ::EacLauncher::Publish::CheckResult.pending_status?(v)
-        end
-      end
-
-      class CachedInstances
-        def initialize(content)
-          @content = content
-          @instances = {}
-        end
-
-        def instances
-          @content.keys.map { |k| by_logical_path(k) }
-        end
-
-        def by_logical_path(key)
-          return @instances[key] if @instances.key?(key)
-
-          h = @content[key]
-          parent_instance = h[:parent] ? by_logical_path(h[:parent]) : nil
-          path = ::EacLauncher::Paths::Logical.from_h(@context, h)
-          @instances[key] = ::EacLauncher::Instances::Base.instanciate(path, parent_instance)
-        end
-      end
-    end
-  end
-end