avm-tools 0.94.3 → 0.99.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 266e7f05ba459608c81b684bb675e5efab20d7be043e59424398a3c810cf1db9
-  data.tar.gz: f9b04149ba95fa4cd4b4aba277118918351727999ed1a363b4782f0cd5ffcd96
+  metadata.gz: 9ca31a9492b30e0e2f3a549262ae2e25bc42ff70ebbdf8581141b7aae3cb336f
+  data.tar.gz: '0590c35f7ee979814a50275ab7138dcb30ee98b93cb9f5a9ae38270d62d95e5e'
 SHA512:
-  metadata.gz: 1b2028e2aa894113dcbcee37742d302d1e12a363fddd5b569da22d84ea6c9e8f49ce87e9675af1bf8cef0b1a5d9e11dc94c969f61e71ff6ab1164371b145e987
-  data.tar.gz: 356839265fa90cc3d360af76194562840fa88aea67f0743814f22044263903fa5007b6617878610e19e43763bc5e238c6a37b697c379cccdf376ff61596ce1fa
+  metadata.gz: 1b507793500b03c94adbde17d019c7be366cf9f056c3656da04d84f1cc8387352d607570ba1197e369b9a1943de83553920883d5f659bdc03e14a3df0fee0c43
+  data.tar.gz: 65cc8c6f9831fbea86ea2e98892a539cb9d1c4d2acfe20b0eea45794560ef84ffc8995b1c7ab685446eda2202565571e46fea692ecf28cf1e79b74bf66a3a4b0

data/lib/avm/app_src.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+require 'avm/apps/sources/configuration'
+require 'eac_launcher/paths/real'
+require 'eac_ruby_utils/core_ext'
+require 'avm/projects/stereotypes'
+require 'i18n'
+
+module Avm
+  class AppSrc
+    enable_simple_cache
+    common_constructor :path do
+      self.path = path.to_pathname
+      source_stereotypes_mixins
+    end
+
+    delegate :to_s, to: :path
+
+    def locale
+      configuration.if_present(&:locale) || ::I18n.default_locale
+    end
+
+    # Backward compatibility with [EacLauncher::Paths::Logical].
+    # @return [EacLauncher::Paths::Real].
+    def real
+      ::EacLauncher::Paths::Real.new(path.to_path)
+    end
+
+    def run_job(job, job_args = [])
+      stereotypes.each { |stereotype| run_stereotype_job(stereotype, job, job_args) }
+    end
+
+    private
+
+    # @return [Avm::Apps::Sources::Configuration]
+    def configuration_uncached
+      ::Avm::Apps::Sources::Configuration.find_in_path(path)
+    end
+
+    def run_stereotype_job(stereotype, job, job_args)
+      job_class_method = "#{job}_class"
+      if stereotype.send(job_class_method).present?
+        puts stereotype.label + ": #{job} class found. Running..."
+        stereotype.send(job_class_method).new(self, *job_args).run
+      else
+        puts stereotype.label + ": #{job} class not found"
+      end
+    end
+
+    def stereotypes_uncached
+      ::Avm::Projects::Stereotypes.list.select { |s| s.match?(self) }
+    end
+
+    def source_stereotypes_mixins
+      stereotypes.each do |s|
+        s.local_project_mixin_module.if_present { |v| singleton_class.include(v) }
+      end
+    end
+  end
+end

data/lib/avm/configs.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/console/configs'
+require 'eac_cli/old_configs'
 
 module Avm
   class << self
     attr_reader :configs_storage_path
 
     def configs
-      @configs ||= ::EacRubyUtils::Console::Configs.new('avm-tools', configs_options)
+      @configs ||= ::EacCli::OldConfigs.new('avm-tools', configs_options)
     end
 
     def configs_options

data/lib/avm/core_ext.rb

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

data/lib/avm/data/package/dump.rb

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
+require 'avm/core_ext'
 require 'avm/files/rotate'
-require 'eac_ruby_utils/core_ext'
 require 'minitar'
 
 module Avm
   module Data
     class Package
       class Dump
-        enable_console_speaker
+        enable_speaker
         enable_listable
 
         DEFAULT_EXPIRE_TIME = 1.day

data/lib/avm/data/package/load.rb

@@ -7,7 +7,7 @@ module Avm
   module Data
     class Package
       class Load
-        enable_console_speaker
+        enable_speaker
 
         attr_reader :package, :data_file_path
 

data/lib/avm/data/unit.rb

@@ -9,7 +9,7 @@ module Avm
       include ::ActiveSupport::Callbacks
 
       define_callbacks :dump, :load
-      enable_console_speaker
+      enable_speaker
 
       %w[dump load].each do |action|
         method_name = "#{action}_command"

data/lib/avm/docker/container.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/core_ext'
+require 'avm/core_ext'
 require 'avm/executables'
 
 module Avm
   module Docker
     class Container
-      enable_console_speaker
+      enable_speaker
       common_constructor :instance
 
       def remove

data/lib/avm/docker/runner.rb

@@ -1,33 +1,25 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/console/docopt_runner'
-require 'eac_ruby_utils/core_ext'
+require 'avm/core_ext'
 require 'avm/docker/registry'
 
 module Avm
   module Docker
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
-      enable_console_speaker
+    class Runner
+      enable_speaker
       enable_simple_cache
 
-      DOC = <<~DOCOPT
-        Manipulate Docker images.
-
-        Usage:
-          __PROGRAM__ [options] [-B <build-arg>...] [-E <run-arg>...]
-          __PROGRAM__ -h | --help
-
-        Options:
-          -h --help     Show this help.
-          -n --registry-name=<registry-name>    Docker registry's name.
-          -p --push     Push the image to Docker registry.
-          -r --run      Run or start a container with builded image.
-          -B --build-arg=<build-arg>  Argument for "docker build".
-          -E --entrypoint-arg=<run-arg>    Argument for entrypoint on "docker run"
-          -c --clear  Remove container if exist before run.
-          -S --no-snapshot    Does not add "-snapshot" to image tag.
-          -V --no-version   Does not add version to image tag.
-      DOCOPT
+      runner_with :help do
+        desc 'Manipulate Docker images.'
+        arg_opt '-n', '--registry-name', 'Docker registry\'s name.'
+        bool_opt '-p', '--push', 'Push the image to Docker registry.'
+        bool_opt '-r', '--run', 'Run or start a container with builded image.'
+        arg_opt '-B', '--build-arg', 'Argument for "docker build".', repeat: true
+        arg_opt '-E', '--entrypoint-arg', 'Argument for entrypoint on "docker run"', repeat: true
+        bool_opt '-c', '--clear', 'Remove container if exist before run.'
+        bool_opt '-S', '--no-snapshot', 'Does not add "-snapshot" to image tag.'
+        bool_opt '-V', '--no-version', 'Does not add version to image tag.'
+      end
 
       def run
         setup
@@ -61,42 +53,42 @@ module Avm
       end
 
       def build_args
-        options.fetch('--build-arg')
+        parsed.build_arg
       end
 
       def entrypoint_args
-        options.fetch('--entrypoint-arg')
+        parsed.entrypoint_arg
       end
 
       def push
-        instance.docker_image.push if options.fetch('--push')
+        instance.docker_image.push if parsed.push?
       end
 
       def container_run
-        return unless options.fetch('--run')
+        return unless parsed.run?
 
         instance.docker_container.run(
           entrypoint_args: entrypoint_args,
-          clear: options.fetch('--clear')
+          clear: parsed.clear?
         )
       end
 
       def registry_uncached
-        options.fetch('--registry-name').if_present(::Avm::Docker::Registry.default) do |v|
+        parsed.registry_name.if_present(::Avm::Docker::Registry.default) do |v|
           ::Avm::Docker::Registry.new(v)
         end
       end
 
       def snapshot?
-        !options.fetch('--no-snapshot')
+        !parsed.no_snapshot?
       end
 
       def version?
-        !options.fetch('--no-version')
+        !parsed.no_version?
       end
 
       def instance
-        context(:instance)
+        runner_context.call(:instance)
       end
     end
   end

data/lib/avm/eac_asciidoctor_base0/deploy.rb

@@ -1,23 +1,23 @@
 # frozen_string_literal: true
 
 require 'avm/eac_webapp_base0/deploy'
-require 'avm/eac_asciidoctor_base0/project'
-require 'avm/eac_asciidoctor_base0/build'
+require 'avm/eac_asciidoctor_base0/sources/base'
+require 'avm/eac_asciidoctor_base0/sources/build'
 
 module Avm
   module EacAsciidoctorBase0
     class Deploy < ::Avm::EacWebappBase0::Deploy
       def build_content
-        ::Avm::EacAsciidoctorBase0::Build.new(
+        ::Avm::EacAsciidoctorBase0::Sources::Build.new(
           project,
-          ::Avm::EacAsciidoctorBase0::Build::OPTION_TARGET_DIRECTORY => build_dir
+          ::Avm::EacAsciidoctorBase0::Sources::Build::OPTION_TARGET_DIRECTORY => build_dir
         ).run
       end
 
       private
 
       def project_uncached
-        ::Avm::EacAsciidoctorBase0::Project.new(
+        ::Avm::EacAsciidoctorBase0::Sources::Base.new(
           instance.source_instance.read_entry(::Avm::Instances::EntryKeys::FS_PATH)
         )
       end

data/lib/avm/eac_rails_base1/runner/bundle.rb

@@ -2,7 +2,6 @@
 
 require 'avm/eac_rails_base1/runner_with/bundle'
 require 'eac_cli/core_ext'
-require 'eac_ruby_utils/console/docopt_runner'
 require 'shellwords'
 
 module Avm

data/lib/avm/eac_rails_base1/runner/code_runner.rb

@@ -2,7 +2,6 @@
 
 require 'avm/eac_rails_base1/runner_with/bundle'
 require 'eac_cli/core_ext'
-require 'eac_ruby_utils/console/docopt_runner'
 
 module Avm
   module EacRailsBase1

data/lib/avm/eac_rails_base1/runner/rails_server.rb

@@ -3,7 +3,6 @@
 require 'avm/eac_rails_base1/runner_with/bundle'
 require 'avm/instances/entry_keys'
 require 'eac_cli/core_ext'
-require 'eac_ruby_utils/console/docopt_runner'
 require 'shellwords'
 
 module Avm

data/lib/avm/eac_redmine_base0/core_update.rb

@@ -8,7 +8,7 @@ require 'eac_ruby_utils/core_ext'
 module Avm
   module EacRedmineBase0
     class CoreUpdate
-      enable_console_speaker
+      enable_speaker
       enable_simple_cache
       common_constructor :instance, :version, :url
 

data/lib/avm/eac_webapp_base0/runner/data/load.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'active_support/core_ext/numeric/time'
-require 'eac_ruby_utils/console/speaker'
+require 'eac_cli/speaker'
 require 'eac_ruby_utils/simple_cache'
 
 module Avm

data/lib/avm/eac_writings_base0/project_build.rb

@@ -9,7 +9,7 @@ module Avm
   module EacWritingsBase0
     class ProjectBuild
       require_sub __FILE__, include_modules: true
-      enable_console_speaker
+      enable_speaker
 
       CONTENT_VAR = '%%%CONTENT%%%'
 

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/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 '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
 

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/instances/configuration'
+require 'avm/apps/sources/configuration'
 require 'avm/result'
 require 'eac_ruby_utils/fs/temp'
 
@@ -35,7 +35,7 @@ module Avm
         end
 
         def configuration_uncached
-          ::Avm::Instances::Configuration.find_by_path(@git)
+          ::Avm::Apps::Sources::Configuration.find_by_path(@git)
         end
       end
     end

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