avm-tools 0.84.0 → 0.87.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6a742d3c0263c2512a52c5109e56336b275560ed7db3c94fe42792021c1762a
-  data.tar.gz: 3efdf68bf27d110a3a17ea012b208b6a59b40a05158f360f018423917fc55089
+  metadata.gz: 39b5ee493e22bb4e2eb77a9e62067e0de6dd23b3d3d4dd62ba2eeadedf183d22
+  data.tar.gz: 0d528d18932807487721a84c32a6c4d1f2906a015840ac360921fcbca78b493c
 SHA512:
-  metadata.gz: 1c1fcb15c0f44dc6a91081eed404f64e1a729fce4de417ada083f09b23149a7192b33d8ed67a4d087de84c161f43aca09b10dd9a51ec4c1ce645354c2cd62b96
-  data.tar.gz: 04bae047386b129d906a5ed2f8663ba0c0c3019a48b0b63603ac431ad4cc17163b92bae642daa9785d3c8d8277e1643d65da5ff612815e1110ae0566a8258086
+  metadata.gz: 4a7a88618b900c728d17a3ef9f492f1b0f42d74313190f8de7d532ebda8f89e27866eb9edbdee7043cfadfd075b71b44390d8c190191b11341120baef2489fea
+  data.tar.gz: e209c17b18ab7d34483054cb5545da9e946212ca857ae52ec18fa87b00704c3a589697ab1e0dfa1ec8b093afe55a8f8ea5a1e61487bda8ca717196d4e0e47679

data/lib/avm/git/file_auto_fixup.rb

@@ -7,8 +7,12 @@ module Avm
     class FileAutoFixup
       enable_console_speaker
       enable_simple_cache
+      enable_listable
+      lists.add_symbol :option, :select, :unique
 
-      common_constructor :git, :path
+      common_constructor :git, :path, :options, default: [{}] do
+        self.options = self.class.lists.option.hash_keys_validate!(options.symbolize_keys)
+      end
 
       COMMIT_FORMAT = '%h - %s (%cr)'
       COMMITS_SEARCH_INTERVAL = 'origin/master..HEAD'
@@ -18,8 +22,8 @@ module Avm
         start_banner
         if commits.count.zero?
           run_no_commits_found
-        elsif commits.count == 1
-          fixup_commit(commits.first)
+        elsif auto_selected_commit.present?
+          fixup_commit(auto_selected_commit)
         else
           run_commits_selection
         end
@@ -27,6 +31,10 @@ module Avm
 
       private
 
+      def auto_selected_commit_uncached
+        selected_commit_by_unique || select_commit_by_select
+      end
+
       def start_banner
         infov 'Path', path
         infov '  Commits found', commits.count
@@ -56,6 +64,17 @@ module Avm
         request_input('Which commit?', list: commits_by_position)
       end
 
+      def selected_commit_by_unique
+        return unless options[OPTION_UNIQUE]
+        return commits.first if commits.first
+      end
+
+      def select_commit_by_select
+        options[OPTION_SELECT].if_present(&:to_i).if_present do |v|
+          commits.find { |commit| commit.position == v }
+        end
+      end
+
       def commits_banner
         commits.each_with_index do |commit, _index|
           infov "    #{commit.position}", format_commit(commit)

data/lib/avm/instances/base/auto_values/database.rb

@@ -8,6 +8,7 @@ module Avm
       module AutoValues
         module Database
           DEFAULT_HOSTNAME = '127.0.0.1'
+          DEFAULT_LIMIT = 5
           DEFAULT_PORTS = {
             'postgresql' => 5432,
             'mysql' => 3306,
@@ -15,6 +16,7 @@ module Avm
             'sqlserver' => 1433
           }.freeze
           DEFAULT_SYSTEM = 'postgresql'
+          DEFAULT_TIMEOUT = 5000
 
           def auto_database_name
             inherited_entry_value(::Avm::Instances::EntryKeys::DATABASE_ID,
@@ -25,6 +27,10 @@ module Avm
             database_auto_common('hostname') || DEFAULT_HOSTNAME
           end
 
+          def auto_database_limit
+            database_auto_common('limit') || DEFAULT_LIMIT
+          end
+
           def auto_database_password
             database_auto_common('password')
           end
@@ -41,6 +47,10 @@ module Avm
             database_auto_common('system') || DEFAULT_SYSTEM
           end
 
+          def auto_database_timeout
+            database_auto_common('timeout') || DEFAULT_TIMEOUT
+          end
+
           private
 
           def database_auto_common(suffix)

data/lib/avm/instances/base/auto_values/filesystem.rb

@@ -20,12 +20,24 @@ module Avm
           end
 
           def auto_fs_url
+            auto_fs_url_with_ssh || auto_fs_url_without_ssh
+          end
+
+          def auto_fs_url_with_ssh
             read_entry_optional('ssh.url').if_present do |ssh_url|
               read_entry_optional('fs_path').if_present do |fs_path|
                 "#{ssh_url}#{fs_path}"
               end
             end
           end
+
+          def auto_fs_url_without_ssh
+            return nil if read_entry_optional('ssh.url').present?
+
+            read_entry_optional('fs_path').if_present do |fs_path|
+              "file://#{fs_path}"
+            end
+          end
         end
       end
     end

data/lib/avm/instances/entry_keys.rb

@@ -41,7 +41,7 @@ module Avm
 
       {
         '' => %w[fs_path host_id source_instance_id],
-        database: %w[id hostname name password port system username],
+        database: %w[id hostname limit name password port system timeout username],
         mailer: {
           '' => %w[id from reply_to],
           smtp: %w[address port domain username password authentication starttls_auto]

data/lib/avm/instances/runner.rb

@@ -1,11 +1,10 @@
 # frozen_string_literal: true
 
 require 'eac_cli/core_ext'
-require 'eac_ruby_utils/console/docopt_runner'
 
 module Avm
   module Instances
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
       class << self
         def instance_class
           ::Avm.const_get(stereotype_name).const_get('Instance')
@@ -20,9 +19,8 @@ module Avm
         end
       end
 
-      runner_with
       description = "Utilities for #{stereotype_name} instances."
-      runner_definition do
+      runner_with :help, :subcommands do
         desc description
         pos_arg 'instance-id'
         subcommands

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

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'avm/patches/class/i18n'
+
+module Avm
+  module Projects
+    module Stereotypes
+      class Git
+        class Update
+          require_sub __FILE__
+          enable_simple_cache
+          enable_console_speaker
+          common_constructor :instance
+
+          delegate :git_repo, to: :instance
+
+          def run
+            clean_all
+            selected_subrepos.map do |f|
+              infov 'Subrepo', f
+              on_speaker_node do |node|
+                node.stderr_line_prefix = '  '
+                ::Avm::Projects::Stereotypes::Git::Update::Subrepo.new(self, f).run
+              end
+            end
+          end
+
+          def selected_subrepos_uncached
+            git_repo.command('subrepo', '-q', 'status').execute!.split("\n").map(&:strip)
+                    .select(&:present?).map(&:to_pathname)
+          end
+
+          def clean_all
+            infom 'Cleaning'
+            git_repo.command('subrepo', 'clean', '--all').execute!
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,85 @@
+# frozen_string_literal: true
+
+require 'eac_launcher/git/base'
+require 'avm/git/commit'
+
+module Avm
+  module Projects
+    module Stereotypes
+      class Git
+        class Update
+          class Subrepo
+            TRANSLATE_CLASS = self
+
+            require_sub __FILE__, include_modules: true
+            enable_simple_cache
+            enable_console_speaker
+            common_constructor :parent_update, :subpath do
+              self.subpath = subpath.to_pathname
+            end
+
+            delegate :git_repo, :instance, to: :parent_update
+
+            def run
+              run_banner
+              if base_commit.sha1 == pull_commit.sha1
+                infom 'No new commit (No changes)'
+              elsif fix_message.present?
+                on_fix_message_present
+              else
+                warn 'No fix message found'
+              end
+            end
+
+            private
+
+            def base_commit_uncached
+              ::Avm::Git::Commit.new(git_repo, git_repo.rev_parse('HEAD'))
+            end
+
+            def on_fix_message_present
+              infom 'Fixing message...'
+              infov 'Message', fix_message
+              git_repo.command('commit', '--amend', '-m', fix_message).execute!
+            end
+
+            def pull_commit_uncached
+              base_commit
+              infom 'Pulling subrepo...'
+              git_repo.command('subrepo', 'pull', '--force', subpath).execute!
+              ::Avm::Git::Commit.new(
+                ::EacLauncher::Git::Base.new(git_repo.root_path.to_path),
+                git_repo.rev_parse('HEAD')
+              )
+            end
+
+            def run_banner
+              infov 'Base SHA1', base_commit.sha1
+              infov 'Pull SHA1', pull_commit.sha1
+            end
+
+            def fix_message
+              TRANSLATE_CLASS.translate(
+                fix_message_translate_key, subpath: subpath, name: subpath.basename,
+                                           __locale: instance.locale
+              )
+            end
+
+            def fix_message_translate_key
+              if gitrepo_only_changed?
+                :gitrepo_only_changed_fix_message
+              else
+                :content_updated_fix_message
+              end
+            end
+
+            def gitrepo_only_changed?
+              pull_commit.files.count == 1 &&
+                ::File.basename(pull_commit.files.first.path) == '.gitrepo'
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/tools/runner.rb

@@ -3,14 +3,12 @@
 require 'avm/self'
 require 'avm/tools/version'
 require 'eac_ruby_base0/runner'
-require 'eac_ruby_utils/console/docopt_runner'
-require 'eac_ruby_utils/core_ext'
 
 module Avm
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
-      include ::EacRubyBase0::Runner
+    class Runner
       require_sub __FILE__
+      include ::EacRubyBase0::Runner
 
       runner_definition do
         desc 'Tools for AVM.'

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

@@ -7,7 +7,7 @@ require 'eac_ruby_utils/core_ext'
 
 module Avm
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
       class EacRailsBase0 < ::Avm::EacRailsBase1::Runner
         require_sub __FILE__
       end

data/lib/avm/tools/runner/eac_rails_base0/apache_path.rb

@@ -7,7 +7,7 @@ require 'avm/eac_rails_base0/apache_path'
 
 module Avm
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
       class EacRailsBase0 < ::Avm::EacRailsBase1::Runner
         class ApachePath < ::EacRubyUtils::Console::DocoptRunner
           runner_with

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

@@ -7,7 +7,7 @@ require 'eac_ruby_utils/core_ext'
 
 module Avm
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
       class EacRedmineBase0 < ::Avm::EacRailsBase1::Runner
         require_sub __FILE__
       end

data/lib/avm/tools/runner/eac_redmine_base0/core_update.rb

@@ -7,7 +7,7 @@ require 'eac_ruby_utils/core_ext'
 
 module Avm
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
       class EacRedmineBase0 < ::Avm::EacRailsBase1::Runner
         class CoreUpdate < ::EacRubyUtils::Console::DocoptRunner
           include ::EacCli::DefaultRunner

data/lib/avm/tools/runner/eac_redmine_base0/docker.rb

@@ -4,7 +4,7 @@ require 'avm/docker/runner'
 
 module Avm
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
       class EacRedmineBase0 < ::Avm::EacRailsBase1::Runner
         class Docker < ::Avm::Docker::Runner
         end

data/lib/avm/tools/runner/eac_redmine_base0/project_rename.rb

@@ -5,7 +5,7 @@ require 'avm/eac_rails_base1/runner/code_runner'
 
 module Avm
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
       class EacRedmineBase0 < ::Avm::EacRailsBase1::Runner
         class ProjectRename
           runner_with ::Avm::EacRailsBase1::RunnerWith::Bundle do

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

@@ -7,7 +7,7 @@ require 'eac_ruby_utils/core_ext'
 
 module Avm
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
       class EacWordpressBase0 < ::Avm::EacWebappBase0::Runner
         require_sub __FILE__
       end

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

@@ -6,7 +6,7 @@ require 'eac_ruby_utils/console/docopt_runner'
 
 module Avm
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
       class EacWritingsBase0 < ::Avm::EacWebappBase0::Runner
         require_sub __FILE__
       end

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

@@ -6,7 +6,7 @@ require 'eac_ruby_utils/console/docopt_runner'
 
 module Avm
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
       class EacWritingsBase1 < ::Avm::EacWebappBase0::Runner
         require_sub __FILE__
       end

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

@@ -1,24 +1,16 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/console/docopt_runner'
-require 'eac_ruby_utils/core_ext'
+require 'eac_cli/core_ext'
 
 module Avm
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
-      class Files < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
+      class Files
         require_sub __FILE__
-
-        DOC = <<~DOCOPT
-          Files utilities for AVM.
-
-          Usage:
-            __PROGRAM__ [options] __SUBCOMMANDS__
-            __PROGRAM__ -h | --help
-
-          Options:
-            -h --help             Show this screen.
-        DOCOPT
+        runner_with :help, :subcommands do
+          desc 'Files utilities for AVM.'
+          subcommands
+        end
       end
     end
   end

data/lib/avm/tools/runner/files/format.rb

@@ -1,40 +1,31 @@
 # frozen_string_literal: true
 
 require 'avm/files/formatter'
+require 'eac_cli/core_ext'
 require 'eac_launcher/git/base'
-require 'eac_ruby_utils/console/docopt_runner'
-require 'eac_ruby_utils/core_ext'
 
 module Avm
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
-      class Files < ::EacRubyUtils::Console::DocoptRunner
-        class Format < ::EacRubyUtils::Console::DocoptRunner
-          include ::EacRubyUtils::Console::Speaker
-
-          DOC = <<~DOCOPT
-            Format files.
-
-            Usage:
-              __PROGRAM__ [options] [<paths>...]
-              __PROGRAM__ -h | --help
-
-            Options:
-              -h --help                 Show this screen.
-              -a --apply                Confirm changes.
-              -n --no-recursive         No recursive.
-              -v --verbose              Verbose
-              -d --git-dirty            Select Git dirty files to format.
-          DOCOPT
+    class Runner
+      class Files
+        class Format
+          runner_with :help do
+            desc 'Format files.'
+            bool_opt '-a', '--apply', 'Confirm changes.'
+            bool_opt '-n', '--no-recursive', 'No recursive.'
+            bool_opt '-v', '--verbose', 'Verbose'
+            bool_opt '-d', '--git-dirty', 'Select Git dirty files to format.'
+            pos_arg :paths, repeat: true, optional: true
+          end
 
           def run
             ::Avm::Files::Formatter.new(source_paths, formatter_options).run
           end
 
           def formatter_options
-            { ::Avm::Files::Formatter::OPTION_APPLY => options.fetch('--apply'),
-              ::Avm::Files::Formatter::OPTION_RECURSIVE => !options.fetch('--no-recursive'),
-              ::Avm::Files::Formatter::OPTION_VERBOSE => options.fetch('--verbose') }
+            { ::Avm::Files::Formatter::OPTION_APPLY => parsed.apply?,
+              ::Avm::Files::Formatter::OPTION_RECURSIVE => !parsed.no_recursive?,
+              ::Avm::Files::Formatter::OPTION_VERBOSE => parsed.verbose? }
           end
 
           def git
@@ -46,10 +37,10 @@ module Avm
           end
 
           def source_paths
-            if options.fetch('--git-dirty')
-              options.fetch('<paths>') + git_dirty_files
+            if parsed.git_dirty?
+              parsed.paths + git_dirty_files
             else
-              options.fetch('<paths>').if_present(%w[.])
+              parsed.paths.if_present(%w[.])
             end
           end
         end