avm-tools 0.97.0 → 0.101.0

data/lib/avm/files/appendable/templatized_directory.rb

@@ -17,7 +17,7 @@ module Avm
         def write_on(target_dir)
           raise 'Variables source not set' if appender.variables_source.blank?
 
-          ::EacRubyUtils::Templates::Directory.new(source_path).apply(
+          ::EacTemplates::Directory.new(source_path).apply(
             appender.variables_source,
             target_dir
           )

data/lib/avm/files/formatter.rb

@@ -9,7 +9,7 @@ module Avm
       include ::EacRubyUtils::Fs::Traversable
       require_sub __FILE__
       enable_simple_cache
-      enable_console_speaker
+      enable_speaker
       enable_listable
       lists.add_symbol :option, :apply, :recursive, :verbose
       common_constructor :source_paths, :options, default: [{}] do

data/lib/avm/git/auto_commit/rules/manual.rb

@@ -8,7 +8,7 @@ module Avm
       module Rules
         class Manual < ::Avm::Git::AutoCommit::Rules::Base
           class WithFile < ::Avm::Git::AutoCommit::Rules::Base::WithFile
-            enable_console_speaker
+            enable_speaker
 
             COMMIT_FORMAT = '%h - %s (%cr)'
             SKIP_OPTION = 's'

data/lib/avm/git/commit/file.rb

@@ -12,7 +12,7 @@ module Avm
 
         attr_reader :git, :diff_tree
 
-        # git: [EacLauncher::Git::Base]
+        # git: [Avm::Launcher::Git::Base]
         # diff_tree_tree: a line of command "git diff-tree --no-commit-id -r --full-index"'s output
         def initialize(git, diff_tree_line)
           @git = git

data/lib/avm/git/file_auto_fixup.rb

@@ -6,7 +6,7 @@ require 'eac_ruby_utils/core_ext'
 module Avm
   module Git
     class FileAutoFixup
-      enable_console_speaker
+      enable_speaker
       enable_simple_cache
       enable_listable
 

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'eac_launcher/git/base'
-require 'eac_ruby_utils/console/speaker'
+require 'avm/launcher/git/base'
+require 'eac_cli/speaker'
 require 'eac_ruby_utils/options_consumer'
 require 'eac_ruby_utils/require_sub'
 require 'eac_ruby_utils/simple_cache'
@@ -12,7 +12,7 @@ module Avm
     module Issue
       class Complete
         include ::EacRubyUtils::SimpleCache
-        include ::EacRubyUtils::Console::Speaker
+        include ::EacCli::Speaker
 
         attr_reader :skip_validations
 
@@ -21,7 +21,7 @@ module Avm
           dir, @skip_validations = consumer.consume_all(:dir, :skip_validations)
           validate_skip_validations
           consumer.validate
-          @git = ::EacLauncher::Git::Base.new(dir)
+          @git = ::Avm::Launcher::Git::Base.new(dir)
         end
 
         def start_banner

data/lib/avm/git/issue/deliver.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+require 'avm/core_ext'
+require 'clipboard'
+
+module Avm
+  module Git
+    module Issue
+      class Deliver
+        enable_simple_cache
+        enable_speaker
+
+        common_constructor :git_repo
+
+        def run
+          push
+          clipboard_copy_tracker_message
+          true
+        end
+
+        def start_banner
+          infov 'Branch name', branch_name
+          infov 'Commit ID', branch_commit_id
+          infov 'Push arguments', ::Shellwords.join(push_args)
+        end
+
+        private
+
+        def branch_commit_id
+          git_repo.rev_parse(branch_name)
+        end
+
+        def branch_name_uncached
+          git_repo.command('rev-parse', '--abbrev-ref', 'HEAD').execute!.strip
+        end
+
+        def clipboard_copy_tracker_message
+          ::Clipboard.copy(textile_tracker_message)
+          infov 'Copied to clipboard', textile_tracker_message
+        end
+
+        def push
+          git_repo.command(*push_args).system!
+        end
+
+        def push_args
+          %w[push origin --force] + ["#{branch_name}:refs/heads/#{branch_name}"]
+        end
+
+        def textile_tracker_message
+          "#{branch_name}: commit:#{branch_commit_id}."
+        end
+      end
+    end
+  end
+end

data/lib/avm/git/revision_test.rb

@@ -8,7 +8,7 @@ module Avm
   module Git
     class RevisionTest
       enable_simple_cache
-      enable_console_speaker
+      enable_speaker
       common_constructor :git, :sha1, :options
 
       def banner

data/lib/avm/git/subrepo_check.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require 'eac_launcher/git/base'
+require 'avm/launcher/git/base'
 require 'eac_ruby_utils/core_ext'
 
 module Avm
   module Git
     class SubrepoCheck
       require_sub __FILE__, include_modules: true
-      enable_console_speaker
+      enable_speaker
       enable_simple_cache
 
       BLANK_TEXT = 'BLANK'

data/lib/avm/git/subrepo_check/show_result.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'eac_launcher/git/base'
+require 'avm/launcher/git/base'
 require 'eac_ruby_utils/core_ext'
 
 module Avm

data/lib/avm/git/subrepo_checks.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require 'eac_launcher/git/base'
+require 'avm/launcher/git/base'
 require 'eac_ruby_utils/core_ext'
 
 module Avm
   module Git
     class SubrepoChecks
-      enable_console_speaker
+      enable_speaker
       enable_simple_cache
       attr_accessor :check_remote, :fix_parent
       common_constructor :repository

data/lib/avm/instances/base/dockerizable.rb

@@ -33,6 +33,7 @@ module Avm
 
         def docker_image_uncached
           r = docker_image_class.new(docker_image_options.fetch(:registry))
+          r.instance = self if r.respond_to?(:instance)
           r.version = docker_image_options[:version] if docker_image_options.key?(:version)
           r.snapshot = docker_image_options[:snapshot] if docker_image_options.key?(:snapshot)
           r

data/lib/avm/instances/base/entry_keys.rb

@@ -7,9 +7,14 @@ module Avm
     class Base
       module EntryKeys
         ::Avm::Instances::EntryKeys.all.each do |key|
-          define_method key.to_s.variableize do
+          method_name = key.to_s.variableize
+          define_method method_name do
             read_entry(key)
           end
+
+          define_method "#{method_name}_optional" do
+            read_entry(key, required: false)
+          end
         end
       end
     end

data/lib/avm/instances/docker_image.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'avm/docker/image'
+
+module Avm
+  module Instances
+    class DockerImage < ::Avm::Docker::Image
+      attr_accessor :instance
+
+      def stereotype_tag
+        instance.id
+      end
+    end
+  end
+end

data/lib/avm/instances/entries.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'eac_ruby_utils/core_ext'
-require 'avm/configs'
 require 'avm/instances/entry'
 
 module Avm
@@ -25,7 +24,7 @@ module Avm
 
       def full_entry_path(entry_suffix)
         unless entry_suffix.is_a?(::Array)
-          entry_suffix = ::EacRubyUtils::PathsHash.parse_entry_key(entry_suffix.to_s)
+          entry_suffix = ::EacConfig::PathsHash.parse_entry_key(entry_suffix.to_s)
         end
         (path_prefix + entry_suffix).join('.')
       end

data/lib/avm/instances/entry.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'avm/apps/config'
 require 'eac_ruby_utils/core_ext'
 
 module Avm
@@ -30,14 +31,14 @@ module Avm
       end
 
       def read(extra_options = {})
-        ::Avm.configs.read_entry(full_path, options.merge(extra_options))
+        ::Avm::Apps::Config.current.entry(full_path, options.merge(extra_options)).value
       end
 
       def suffix_as_array
         if suffix.is_a?(::Array)
           suffix.dup
         else
-          ::EacRubyUtils::PathsHash.parse_entry_key(suffix.to_s)
+          ::EacConfig::PathsHash.parse_entry_key(suffix.to_s)
         end
       end
 
@@ -46,7 +47,7 @@ module Avm
       end
 
       def write(value)
-        ::Avm.configs.configs.write_entry(full_path, value)
+        ::Avm::Apps::Config.current.entry(full_path).value = value
       end
     end
   end

data/lib/avm/instances/entry_keys.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'eac_ruby_utils/core_ext'
+
 module Avm
   module Instances
     module EntryKeys
@@ -42,6 +44,7 @@ module Avm
       {
         '' => %w[fs_path host_id source_instance_id],
         database: %w[id hostname limit name password port system timeout username],
+        docker: %w[registry],
         mailer: {
           '' => %w[id from reply_to],
           smtp: %w[address port domain username password authentication starttls_auto]

data/lib/avm/launcher/context.rb

@@ -0,0 +1,83 @@
+# frozen_string_literal: true
+
+require 'active_support/core_ext/hash/indifferent_access'
+require 'avm/launcher/context/instance_manager'
+require 'eac_ruby_utils/simple_cache'
+require 'eac_cli/speaker'
+require 'avm/launcher/context/instance_discovery'
+require 'avm/launcher/context/settings'
+require 'avm/launcher/paths/logical'
+require 'avm/launcher/project'
+
+module Avm
+  module Launcher
+    class Context
+      include ::EacRubyUtils::SimpleCache
+      include ::EacCli::Speaker
+
+      DEFAULT_PROJECTS_ROOT = '.'
+      DEFAULT_SETTINGS_FILE = ::File.join(ENV['HOME'], '.config', 'eac_launcher', 'settings.yml')
+      DEFAULT_CACHE_ROOT = ::File.join(ENV['HOME'], '.cache', 'eac_launcher')
+
+      class << self
+        attr_writer :current
+
+        def current
+          @current ||= default
+        end
+
+        def default
+          @default ||= Context.new
+        end
+      end
+
+      attr_reader :root, :settings, :cache_root
+      attr_accessor :publish_options, :recache, :instance_manager
+
+      def initialize(options = {})
+        @options = options.with_indifferent_access
+        @root = ::Avm::Launcher::Paths::Logical.new(self, nil, build_option(:projects_root), '/')
+        @settings = ::Avm::Launcher::Context::Settings.new(build_option(:settings_file))
+        @cache_root = build_option(:cache_root)
+        @publish_options = { new: false, confirm: false, stereotype: nil }
+        @instance_manager = ::Avm::Launcher::Context::InstanceManager.new(self)
+        @recache = false
+      end
+
+      def instance(name)
+        instances.find { |i| i.name == name }
+      end
+
+      def instances
+        @instance_manager.instances
+      end
+
+      def pending_instances
+        @instance_manager.pending_instances
+      end
+
+      private
+
+      def build_option(key)
+        @options[key] || env_option(key) || default_option(key)
+      end
+
+      def env_option(key)
+        ENV["EAC_LAUNCHER_#{key}".underscore.upcase]
+      end
+
+      def default_option(key)
+        self.class.const_get("DEFAULT_#{key}".underscore.upcase)
+      end
+
+      def projects_uncached
+        r = {}
+        instances.each do |i|
+          r[i.project_name] ||= []
+          r[i.project_name] << i
+        end
+        r.map { |name, instances| ::Avm::Launcher::Project.new(name, instances) }
+      end
+    end
+  end
+end

data/lib/avm/launcher/context/instance_discovery.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+require 'ruby-progressbar'
+require 'avm/launcher/instances/base'
+
+module Avm
+  module Launcher
+    class Context
+      class InstanceDiscovery
+        attr_reader :instances
+
+        def initialize(context)
+          @context = context
+          @progress = ::ProgressBar.create(title: 'Instance discovery', total: 1)
+          @instances = path_instances(@context.root, nil)
+        ensure
+          @progress&.finish
+        end
+
+        private
+
+        def path_instances(path, parent_instance)
+          update_progress_format(path)
+          on_rescued_path_instances(path) do |r|
+            if path.project?
+              parent_instance = ::Avm::Launcher::Instances::Base.instanciate(path, parent_instance)
+              r << path
+            end
+            children = path.children
+            update_progress_count(children)
+            r.concat(children.flat_map { |c| path_instances(c, parent_instance) })
+          end
+        end
+
+        def on_rescued_path_instances(path)
+          r = []
+          begin
+            yield(r) if path.included?
+          rescue StandardError => e
+            warn("#{path}: #{e}")
+          end
+          r
+        end
+
+        def update_progress_format(path)
+          @progress.format = "%t (Paths: %c/%C, Current: #{path.logical}) |%B| %a"
+        end
+
+        def update_progress_count(children)
+          @progress.total += children.count
+          @progress.increment
+        end
+      end
+    end
+  end
+end

data/lib/avm/launcher/context/instance_manager.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'eac_ruby_utils/core_ext'
-require 'eac_launcher/publish/check_result'
+require 'avm/launcher/publish/check_result'
 require('yaml')
 
 module Avm
@@ -31,7 +31,7 @@ module Avm
         end
 
         def search_instances
-          cache_instances(::EacLauncher::Context::InstanceDiscovery.new(context).instances)
+          cache_instances(::Avm::Launcher::Context::InstanceDiscovery.new(context).instances)
         end
 
         def cached_instances
@@ -67,7 +67,7 @@ module Avm
           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)
+            ::Avm::Launcher::Publish::CheckResult.pending_status?(v)
           end
         end
       end