avm-tools 0.98.0 → 0.99.0

data/lib/avm/tools/runner/git/issue.rb

@@ -8,42 +8,46 @@ module Avm
     class Runner
       class Git
         class Issue
-          runner_with :help do
+          runner_with :confirmation, :help do
             desc 'Closes a issue in a Git repository.'
             bool_opt '-f', '--uncomplete-unfail', 'Do not exit with error if issue is not' \
               ' completed or is invalid.'
             arg_opt '-s', '--skip-validations', 'Does not validate conditions on <validations>' \
               ' (Comma separated value).'
-            bool_opt '-y', '--yes', 'Does not ask for user confirmation.'
             bool_opt '--complete', 'Run complete task.'
+            bool_opt '--deliver', 'Run "deliver" task.'
+            bool_opt '--validate', 'Validate for "complete" task.'
           end
 
           def run
-            banner
-            return unless validate
-
+            run_validate if parsed.validate?
+            run_deliver if parsed.deliver?
             run_complete if parsed.complete?
             success('Done!')
           end
 
-          def banner
-            complete.start_banner
+          def help_extra_text
+            "Validations:\n#{doc_validations_list}"
           end
 
-          def validate
+          def run_validate
+            complete.start_banner
             return true if complete.valid?
 
             uncomplete_message('Some validation did not pass')
           end
 
           def run_complete
-            return complete.run if confirm?
+            return complete.run if confirm?('Confirm issue completion?')
 
             uncomplete_message('Issue was not completed')
           end
 
-          def doc
-            DOC.gsub('%%VALIDATIONS%%', doc_validations_list)
+          def run_deliver
+            deliver.start_banner
+            return deliver.run if confirm?('Confirm issue delivery?')
+
+            uncomplete_message('Issue was not delivered')
           end
 
           private
@@ -52,8 +56,8 @@ module Avm
             ::Avm::Git::Issue::Complete.new(git_complete_issue_options)
           end
 
-          def confirm?
-            parsed.yes? || request_input('Confirm issue completion?', bool: true)
+          def deliver_uncached
+            ::Avm::Git::Issue::Deliver.new(runner_context.call(:git_repo))
           end
 
           def skip_validations

data/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.98.0'
+    VERSION = '0.99.0'
   end
 end

data/lib/eac_launcher/context.rb

@@ -3,7 +3,7 @@
 require 'active_support/core_ext/hash/indifferent_access'
 require 'avm/launcher/context/instance_manager'
 require 'eac_ruby_utils/simple_cache'
-require 'eac_ruby_utils/console/speaker'
+require 'eac_cli/speaker'
 require 'eac_launcher/context/instance_discovery'
 require 'eac_launcher/context/settings'
 require 'eac_launcher/paths/logical'
@@ -12,7 +12,7 @@ require 'eac_launcher/project'
 module EacLauncher
   class Context
     include ::EacRubyUtils::SimpleCache
-    include ::EacRubyUtils::Console::Speaker
+    include ::EacCli::Speaker
 
     DEFAULT_PROJECTS_ROOT = '.'
     DEFAULT_SETTINGS_FILE = ::File.join(ENV['HOME'], '.config', 'eac_launcher', 'settings.yml')

data/lib/eac_launcher/git/publish_base.rb

@@ -9,7 +9,7 @@ module EacLauncher
   module Git
     class PublishBase < ::EacLauncher::Publish::Base
       include ::EacRubyUtils::SimpleCache
-      include ::EacRubyUtils::Console::Speaker
+      include ::EacCli::Speaker
 
       CHECKERS = %w[remote_url remote_fetch publish_remote_no_exist remote_equal remote_following
                     local_following].freeze

data/lib/eac_launcher/ruby/gem/build.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'tmpdir'
-require 'eac_ruby_utils/console/speaker'
+require 'eac_cli/speaker'
 require 'eac_ruby_utils/envs'
 require 'eac_launcher/ruby/gem/specification'
 
@@ -9,7 +9,7 @@ module EacLauncher
   module Ruby
     module Gem
       class Build
-        include ::EacRubyUtils::Console::Speaker
+        include ::EacCli::Speaker
 
         def initialize(original_gem_root)
           @original_gem_root = original_gem_root

data/vendor/avm-apps/lib/avm/apps/jobs/base.rb

@@ -10,7 +10,7 @@ module Avm
         common_concern do
           include ::ActiveSupport::Callbacks
 
-          enable_console_speaker
+          enable_speaker
           enable_simple_cache
           enable_listable
           common_constructor :instance, :options, default: [{}] do

data/vendor/avm-apps/lib/avm/apps/sources/configuration.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/configs'
+require 'eac_config/old_configs'
 require 'eac_ruby_utils/core_ext'
 require 'yaml'
 
 module Avm
   module Apps
     module Sources
-      class Configuration < ::EacRubyUtils::Configs
+      class Configuration < ::EacConfig::OldConfigs
         require_sub __FILE__
 
         FILENAMES = %w[.avm.yml .avm.yaml].freeze

data/vendor/avm-apps/lib/avm/apps/sources/configuration/_locale.rb

@@ -6,7 +6,7 @@ require 'i18n'
 module Avm
   module Apps
     module Sources
-      class Configuration < ::EacRubyUtils::Configs
+      class Configuration < ::EacConfig::OldConfigs
         LOCALE_KEY = :locale
 
         def locale

data/vendor/avm-apps/lib/avm/apps/sources/configuration/_rubocop.rb

@@ -3,7 +3,7 @@
 module Avm
   module Apps
     module Sources
-      class Configuration < ::EacRubyUtils::Configs
+      class Configuration < ::EacConfig::OldConfigs
         RUBOCOP_COMMAND_KEY = 'ruby.rubocop.command'
         RUBOCOP_GEMFILE_KEY = 'ruby.rubocop.gemfile'
 

data/vendor/avm-apps/lib/avm/apps/sources/configuration/_tests.rb

@@ -5,7 +5,7 @@ require 'avm/patches/eac_ruby_gems_utils/gem'
 module Avm
   module Apps
     module Sources
-      class Configuration < ::EacRubyUtils::Configs
+      class Configuration < ::EacConfig::OldConfigs
         BUNDLE_TEST_COMMAND_KEY = 'test.bundle_command'
         TEST_COMMAND_KEY = 'test.command'
 

data/vendor/avm-apps/lib/avm/apps/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Apps
-    VERSION = '0.2.0'
+    VERSION = '0.2.1'
   end
 end

data/vendor/avm-eac_asciidoctor_base0/avm-eac_asciidoctor_base0.gemspec

@@ -12,6 +12,7 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib}/**/*']
 
+  s.add_dependency 'asciidoctor', '~> 2.0', '>= 2.0.12'
   s.add_dependency 'eac_ruby_utils', '~> 0.63'
   s.add_dependency 'os'
   s.add_dependency 'rouge', '~> 3.26'

data/vendor/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/sources/build.rb

@@ -8,7 +8,7 @@ module Avm
     module Sources
       class Build
         require_sub __FILE__
-        enable_console_speaker
+        enable_speaker
         enable_simple_cache
         enable_listable
         lists.add_symbol :option, :target_directory

data/vendor/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/sources/build/file.rb

@@ -7,7 +7,7 @@ module Avm
     module Sources
       class Build
         class File
-          enable_console_speaker
+          enable_speaker
           common_constructor :build, :subpath
 
           def run

data/vendor/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module EacAsciidoctorBase0
-    VERSION = '0.2.0'
+    VERSION = '0.2.1'
   end
 end

data/vendor/eac_cli/eac_cli.gemspec

@@ -12,7 +12,10 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib}/**/*', 'Gemfile']
 
-  s.add_dependency 'eac_ruby_utils', '~> 0.55'
+  s.add_dependency 'colorize', '~> 0.8.1'
+  s.add_dependency 'docopt', '~> 0.6.1'
+  s.add_dependency 'eac_config', '~> 0.3'
+  s.add_dependency 'eac_ruby_utils', '~> 0.64'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.2'
 end

data/vendor/eac_cli/lib/eac_cli/default_runner.rb

@@ -7,7 +7,7 @@ module EacCli
   module DefaultRunner
     common_concern do
       include ::EacCli::RunnerWith::Help
-      enable_console_speaker
+      enable_speaker
       enable_simple_cache
     end
   end

data/vendor/eac_cli/lib/eac_cli/definition/help_formatter.rb

@@ -27,7 +27,7 @@ module EacCli
 
       def positional_argument(positional)
         if positional.subcommand?
-          ::EacRubyUtils::Console::DocoptRunner::SUBCOMMANDS_MACRO
+          ::EacCli::DocoptRunner::SUBCOMMANDS_MACRO
         else
           r = "<#{positional.name}>"
           r += '...' if positional.repeat?
@@ -52,7 +52,7 @@ module EacCli
       end
 
       def self_usage_arguments
-        [::EacRubyUtils::Console::DocoptRunner::PROGRAM_MACRO] +
+        [::EacCli::DocoptRunner::PROGRAM_MACRO] +
           definition.options_argument.if_present([]) { |_v| ['[options]'] } +
           self_usage_arguments_options +
           self_usage_arguments_positional

data/vendor/eac_cli/lib/eac_cli/docopt/doc_builder.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'eac_ruby_utils/core_ext'
-require 'eac_ruby_utils/console/docopt_runner'
+require 'eac_cli/docopt_runner'
 
 module EacCli
   module Docopt

data/vendor/eac_cli/lib/eac_cli/docopt/doc_builder/alternative.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'eac_ruby_utils/core_ext'
-require 'eac_ruby_utils/console/docopt_runner'
+require 'eac_cli/docopt_runner'
 
 module EacCli
   module Docopt
@@ -11,7 +11,7 @@ module EacCli
 
         def to_s
           (
-            [::EacRubyUtils::Console::DocoptRunner::PROGRAM_MACRO] +
+            [::EacCli::DocoptRunner::PROGRAM_MACRO] +
               alternative.options_argument?.if_present([]) { |_v| ['[options]'] } +
               options +
               positionals
@@ -36,7 +36,7 @@ module EacCli
 
         def positional(positional)
           if positional.subcommand?
-            ::EacRubyUtils::Console::DocoptRunner::SUBCOMMANDS_MACRO
+            ::EacCli::DocoptRunner::SUBCOMMANDS_MACRO
           else
             r = "<#{positional.name}>"
             r += '...' if positional.repeat?

data/vendor/eac_cli/lib/eac_cli/docopt/runner_extension.rb

@@ -3,7 +3,7 @@
 require 'eac_cli/docopt/doc_builder'
 require 'eac_cli/docopt/runner_context_replacement'
 require 'eac_cli/runner'
-require 'eac_ruby_utils/console/docopt_runner'
+require 'eac_cli/docopt_runner'
 
 module EacCli
   module Docopt
@@ -16,7 +16,7 @@ module EacCli
 
       class << self
         def check(klass)
-          return unless klass < ::EacRubyUtils::Console::DocoptRunner
+          return unless klass < ::EacCli::DocoptRunner
 
           ::EacCli::Runner.alias_runner_class_methods(klass, '', 'eac_cli')
           ::EacCli::Runner.alias_runner_class_methods(klass, 'original', '')

data/vendor/eac_cli/lib/eac_cli/docopt_runner.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require 'active_support/core_ext/hash/indifferent_access'
+require 'active_support/core_ext/hash/slice'
+require 'docopt'
+require 'eac_ruby_utils/contextualizable'
+require 'eac_ruby_utils/patches/hash/sym_keys_hash'
+Dir["#{__dir__}/#{::File.basename(__FILE__, '.*')}/_*.rb"].sort.each do |partial|
+  require partial
+end
+
+module EacCli
+  class DocoptRunner
+    include ::EacRubyUtils::Contextualizable
+
+    class << self
+      def create(settings = {})
+        new(settings)
+      end
+    end
+
+    attr_reader :settings
+
+    def initialize(settings = {})
+      @settings = settings.with_indifferent_access.freeze
+      check_subcommands
+    end
+
+    def options
+      @options ||= ::Docopt.docopt(target_doc, docopt_options)
+    end
+
+    def parent
+      settings[:parent]
+    end
+
+    protected
+
+    def docopt_options
+      settings.slice(:version, :argv, :help, :options_first).to_sym_keys_hash
+    end
+  end
+end

data/vendor/eac_cli/lib/eac_cli/docopt_runner/_class_methods.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module EacCli
+  class DocoptRunner
+    DOCOPT_ERROR_EXIT_CODE = 0xC0
+
+    class << self
+      def run(options = {})
+        create(options).send(:run)
+      rescue Docopt::Exit => e
+        STDERR.write(e.message + "\n")
+        ::Kernel.exit(DOCOPT_ERROR_EXIT_CODE)
+      end
+    end
+  end
+end

data/vendor/eac_cli/lib/eac_cli/docopt_runner/_doc.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module EacCli
+  class DocoptRunner
+    PROGRAM_MACRO = '__PROGRAM__'
+
+    def source_doc
+      setting_value(:doc)
+    end
+
+    def target_doc
+      source_doc.gsub(PROGRAM_MACRO, target_program_name).strip + "\n"
+    end
+
+    def source_program_name
+      setting_value(:program_name, false)
+    end
+
+    def target_program_name
+      [source_program_name, ENV['PROGRAM_NAME'], $PROGRAM_NAME].find(&:present?)
+    end
+  end
+end

data/vendor/eac_cli/lib/eac_cli/docopt_runner/_settings.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/settings_provider'
+
+module EacCli
+  class DocoptRunner
+    include ::EacRubyUtils::SettingsProvider
+
+    attr_reader :settings
+
+    private
+
+    def setting_value(key, required = true)
+      super(key, required: required, order: %w[method settings_object constant])
+    end
+  end
+end

data/vendor/eac_cli/lib/eac_cli/docopt_runner/_subcommands.rb

@@ -0,0 +1,152 @@
+# frozen_string_literal: true
+
+require 'active_support/core_ext/string/inflections'
+require 'shellwords'
+
+module EacCli
+  class DocoptRunner
+    SUBCOMMAND_ARG = '<subcommand>'
+    SUBCOMMAND_ARGS_ARG = '<subcommand-args>'
+    SUBCOMMANDS_MACRO = '__SUBCOMMANDS__'
+
+    def subcommands?
+      source_doc.include?(SUBCOMMANDS_MACRO)
+    end
+
+    def check_subcommands
+      return unless subcommands?
+
+      singleton_class.include(SubcommandsSupport)
+      check_subcommands_arg
+      return if singleton_class.method_defined?(:run)
+
+      singleton_class.send(:alias_method, :run, :run_with_subcommand)
+    end
+
+    module SubcommandsSupport
+      EXTRA_AVAILABLE_SUBCOMMANDS_METHOD_NAME = :extra_available_subcommands
+
+      def check_subcommands_arg
+        if subcommand_arg_as_list?
+          singleton_class.include(SubcommandsSupport::SubcommandArgAsList)
+        else
+          singleton_class.include(SubcommandsSupport::SubcommandArgAsArg)
+        end
+      end
+
+      def run_with_subcommand
+        if subcommand_name
+          check_valid_subcommand
+          subcommand_run
+        else
+          run_without_subcommand
+        end
+      end
+
+      def subcommand
+        @subcommand ||= subcommand_class_name(subcommand_name).constantize.create(
+          argv: subcommand_args,
+          program_name: subcommand_program,
+          parent: self
+        )
+      end
+
+      def subcommand_run
+        if !subcommand.is_a?(::EacCli::DocoptRunner) &&
+           subcommand.respond_to?(:run_run)
+          subcommand.run_run
+        else
+          subcommand.run
+        end
+      end
+
+      def target_doc
+        super.gsub(SUBCOMMANDS_MACRO,
+                   "#{target_doc_subcommand_arg} [#{SUBCOMMAND_ARGS_ARG}...]") +
+          "\n" + subcommands_target_doc
+      end
+
+      def docopt_options
+        super.merge(options_first: true)
+      end
+
+      def subcommand_class_name(subcommand)
+        "#{self.class.name}::#{subcommand.underscore.camelize}"
+      end
+
+      def subcommand_arg_as_list?
+        setting_value(:subcommand_arg_as_list, false) || false
+      end
+
+      def subcommand_args
+        options.fetch(SUBCOMMAND_ARGS_ARG)
+      end
+
+      def subcommand_program
+        subcommand_name
+      end
+
+      def available_subcommands
+        r = ::Set.new(setting_value(:subcommands, false) || auto_available_subcommands)
+        if respond_to?(EXTRA_AVAILABLE_SUBCOMMANDS_METHOD_NAME, true)
+          r += send(EXTRA_AVAILABLE_SUBCOMMANDS_METHOD_NAME)
+        end
+        r.sort
+      end
+
+      def auto_available_subcommands
+        self.class.constants
+            .map { |name| self.class.const_get(name) }
+            .select { |c| c.instance_of? Class }
+            .select { |c| c < ::EacCli::DocoptRunner }
+            .map { |c| c.name.demodulize.underscore.dasherize }
+      end
+
+      def run_without_subcommand
+        "Method #{__method__} should be overrided in #{self.class.name}"
+      end
+
+      protected
+
+      def check_valid_subcommand
+        return if available_subcommands.include?(subcommand_name)
+
+        raise ::Docopt::Exit, "\"#{subcommand_name}\" is not a valid subcommand" \
+          " (Valid: #{available_subcommands.join(', ')})"
+      end
+
+      module SubcommandArgAsArg
+        def target_doc_subcommand_arg
+          SUBCOMMAND_ARG
+        end
+
+        def subcommand_name
+          options.fetch(SUBCOMMAND_ARG)
+        end
+
+        def subcommands_target_doc
+          available_subcommands.inject("Subcommands:\n") do |a, e|
+            a + "  #{e}\n"
+          end
+        end
+      end
+
+      module SubcommandArgAsList
+        def target_doc_subcommand_arg
+          '(' + available_subcommands.join('|') + ')'
+        end
+
+        def subcommand_name
+          available_subcommands.each do |subcommand|
+            return subcommand if options.fetch(subcommand)
+          end
+          nil
+        end
+
+        def subcommands_target_doc
+          "\n"
+        end
+      end
+    end
+  end
+end