avm-tools 0.98.0 → 0.99.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a8cd450cfc4285226ff31b7a2183ae8cb87c3cb3b688548251bd5b92c25f9c3
-  data.tar.gz: 4865bc83bfa9a0f04c76fce01c546d3c8df123f63647d4fdbcd6ebfc9389aaed
+  metadata.gz: 9ca31a9492b30e0e2f3a549262ae2e25bc42ff70ebbdf8581141b7aae3cb336f
+  data.tar.gz: '0590c35f7ee979814a50275ab7138dcb30ee98b93cb9f5a9ae38270d62d95e5e'
 SHA512:
-  metadata.gz: 8bfbd03718cedd613906c9c550db8d1ac5ff05a4e904bce261d13382bbb20f10d7e5ab72de57f396499f5616356a7419b2fca3a65ed7fa7a3d8f7d6e0ff48841
-  data.tar.gz: 97fbf67954eca6d3e64d8165c6c523a092a3b50442d506858ea412a7c1849285b7d90364679773a91927b6298d1b01fad73bbcb5edadb73bf1cf2a59608c3033
+  metadata.gz: 1b507793500b03c94adbde17d019c7be366cf9f056c3656da04d84f1cc8387352d607570ba1197e369b9a1943de83553920883d5f659bdc03e14a3df0fee0c43
+  data.tar.gz: 65cc8c6f9831fbea86ea2e98892a539cb9d1c4d2acfe20b0eea45794560ef84ffc8995b1c7ab685446eda2202565571e46fea692ecf28cf1e79b74bf66a3a4b0

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

@@ -6,7 +6,7 @@ require 'avm/docker/registry'
 module Avm
   module Docker
     class Runner
-      enable_console_speaker
+      enable_speaker
       enable_simple_cache
 
       runner_with :help do

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

@@ -7,7 +7,7 @@ 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_checks.rb

@@ -6,7 +6,7 @@ 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/entries.rb

@@ -25,7 +25,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

@@ -37,7 +37,7 @@ module Avm
         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
 

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

@@ -8,7 +8,7 @@ module Avm
     class Context
       class InstanceManager
         class CachedInstance
-          enable_console_speaker
+          enable_speaker
           enable_simple_cache
           common_constructor :cached_instances, :data
 

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

@@ -10,7 +10,7 @@ module Avm
         class << self
           def extend_object(object)
             object.extend ::EacRubyUtils::SimpleCache
-            object.extend ::EacRubyUtils::Console::Speaker
+            object.extend ::EacCli::Speaker
             object.extend ::Avm::Launcher::Instances::Base::Cache
             super
           end

data/lib/avm/patches/object/template.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'avm/self/root'
-require 'eac_ruby_utils/patches/object/template'
+require 'eac_templates/patches/object/template'
 
-::EacRubyUtils::Templates::Searcher.default.included_paths <<
+::EacTemplates::Searcher.default.included_paths <<
   ::Avm::Self.root.join('template').to_path

data/lib/avm/projects/stereotypes/git/update.rb

@@ -10,7 +10,7 @@ module Avm
         class Update
           require_sub __FILE__
           enable_simple_cache
-          enable_console_speaker
+          enable_speaker
           common_constructor :instance
 
           delegate :git_repo, to: :instance

data/lib/avm/projects/stereotypes/git/update/subrepo.rb

@@ -13,7 +13,7 @@ module Avm
 
             require_sub __FILE__, include_modules: true
             enable_simple_cache
-            enable_console_speaker
+            enable_speaker
             common_constructor :parent_update, :subpath do
               self.subpath = subpath.to_pathname
             end

data/lib/avm/projects/stereotypes/ruby_gem/publish.rb

@@ -4,7 +4,7 @@ require 'curb'
 require 'json'
 require 'eac_ruby_utils/simple_cache'
 require 'rubygems'
-require 'eac_ruby_utils/console/speaker'
+require 'eac_cli/speaker'
 require 'eac_launcher/publish/base'
 require 'eac_launcher/publish/check_result'
 require 'eac_launcher/ruby/gem'
@@ -15,7 +15,7 @@ module Avm
       class RubyGem
         class Publish < ::EacLauncher::Publish::Base
           include ::EacRubyUtils::SimpleCache
-          include ::EacRubyUtils::Console::Speaker
+          include ::EacCli::Speaker
 
           protected
 

data/lib/avm/projects/stereotypes/ruby_gem/update.rb

@@ -10,7 +10,7 @@ module Avm
         class Update
           TRANSLATE_CLASS = self
 
-          enable_console_speaker
+          enable_speaker
           common_constructor :instance
 
           def run

data/lib/avm/projects/stereotypes/ruby_gem/version_bump.rb

@@ -8,7 +8,7 @@ module Avm
     module Stereotypes
       class RubyGem
         class VersionBump
-          enable_console_speaker
+          enable_speaker
           common_constructor :instance, :target_version
 
           def run

data/lib/avm/ruby/gems/generator.rb

@@ -11,7 +11,7 @@ module Avm
         JOBS = %w[root_directory gemspec root_lib version_lib static gemfile_lock].freeze
         TEMPLATE_VARIABLES = %w[lib_path name root_module].freeze
 
-        enable_console_speaker
+        enable_speaker
         enable_simple_cache
         common_constructor :root_directory, :options, default: [{}] do
           self.root_directory = root_directory.to_pathname
@@ -61,11 +61,11 @@ module Avm
         protected
 
         def apply_to_root_directory(template, subpath)
-          if template.is_a?(::EacRubyUtils::Templates::Directory)
+          if template.is_a?(::EacTemplates::Directory)
             template.children.each do |child|
               apply_to_root_directory(child, subpath.join(child.basename))
             end
-          elsif template.is_a?(::EacRubyUtils::Templates::File)
+          elsif template.is_a?(::EacTemplates::File)
             template.apply_to_file(template_variables, root_directory.join(subpath))
           else
             raise "Unknown template object: #{template}"

data/lib/avm/ruby/rubocop.rb

@@ -7,7 +7,7 @@ module Avm
   module Ruby
     class Rubocop
       require_sub __FILE__
-      enable_console_speaker
+      enable_speaker
       enable_simple_cache
       common_constructor :base_path, :rubocop_args
       set_callback :initialize, :after do

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

@@ -1,8 +1,7 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/require_sub'
+require 'avm/core_ext'
 require 'eac_launcher/git/base'
-::EacRubyUtils.require_sub(__FILE__)
 
 module Avm
   module Tools
@@ -26,6 +25,11 @@ module Avm
         def git
           @git ||= ::EacLauncher::Git::Base.by_root(repository_path)
         end
+
+        # @return [[EacGit::Local]]
+        def git_repo
+          git.eac_git
+        end
       end
     end
   end

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/console/speaker'
+require 'eac_cli/speaker'
 require 'eac_ruby_utils/simple_cache'
 require 'eac_launcher/git/base'
 require 'filesize'