avm-tools 0.83.0 → 0.87.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d469de0c152bb7c3b2f23bf083a10d66bed14ee4963cd6a6502ac8ef545145c9
-  data.tar.gz: 04a3077630a42a18df2a82ab7cf2874aa7f16b133d3ab99d899dc34e3231a571
+  metadata.gz: df3208595cdaefa7e6f51a5a14518064df146b2081e32365e3ad746326e844bb
+  data.tar.gz: 367b039c49b3ff3e9a8083bafe1c889656e924403014efbeec2f3032ccfe0247
 SHA512:
-  metadata.gz: a82ad8c06b90942d34e09e4c388a7b5335561026b5f4b63c62c1a623daca8c99ae10410caa70207e63cb3487b11c1aa84adab5a1a206e8c00cd5448a1c5ea4f3
-  data.tar.gz: 932ce1dad2c115a3a04998b4bed1697e179f257beba3f35af343f02f51274cbe8d25ace9f2ca9667289da18561dbcff9ab40dbe87fd04ebaaaac740efd601336
+  metadata.gz: 1e1aa08cda713c6600a551681f4f2d986e939675ba41bd5f270497f9dba564213906ae71890ce9ea00285a289d8edc626d70bd91aa31e2a381524bc19404d58b
+  data.tar.gz: 25c272f9097b2d48cf1d88ece314eef1361527644942c3b0e1e862709f60e155ac4db9a31b823432f72abd478eaec9f4218503932228a8bf0c44c30b3a3ee46b

data/lib/avm/eac_writings_base1/apache_host.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require 'avm/eac_webapp_base0/apache_host'
+
+module Avm
+  module EacWritingsBase1
+    class ApacheHost < ::Avm::EacWebappBase0::ApacheHost
+      def document_root
+        instance.read_entry(::Avm::Instances::EntryKeys::FS_PATH)
+      end
+
+      def extra_content
+        ''
+      end
+    end
+  end
+end

data/lib/avm/eac_writings_base1/build.rb

@@ -12,7 +12,7 @@ module Avm
       enable_listable
       lists.add_symbol :option, :target_directory
       common_constructor :project, :options, default: [{}] do
-        self.options = options.symbolize_keys
+        self.options = self.class.lists.option.hash_keys_validate!(options.symbolize_keys)
       end
 
       def run
@@ -27,7 +27,7 @@ module Avm
 
       def target_directory
         ::EacRubyUtils::Fs::ClearableDirectory.new(
-          options[OPTION_TARGET_DIRECTORY].if_present(default_target_directory)
+          options[OPTION_TARGET_DIRECTORY] || default_target_directory
         )
       end
 

data/lib/avm/eac_writings_base1/deploy.rb

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

data/lib/avm/eac_writings_base1/instance.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'avm/eac_webapp_base0/instance'
+
+module Avm
+  module EacWritingsBase1
+    class Instance < ::Avm::EacWebappBase0::Instance
+      FILES_UNITS = {}.freeze
+    end
+  end
+end

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

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'avm/eac_webapp_base0/runner'
+require 'avm/eac_writings_base1'
+require 'eac_ruby_utils/console/docopt_runner'
+
+module Avm
+  module Tools
+    class Runner
+      class EacWritingsBase1 < ::Avm::EacWebappBase0::Runner
+        require_sub __FILE__
+      end
+    end
+  end
+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