avm-tools 0.85.1 → 0.89.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43d475cc5c1bf70580258451dfada46e601167d1b4304f102fd334b21862a922
-  data.tar.gz: 0b2230eb8368b7315e437d7218144bbeaffe735887fa86fd6dec6647c545bd4a
+  metadata.gz: 9acbf7ad72627c97018d603c65da21c1875efea79caa7569059d5fd1aeb083e2
+  data.tar.gz: 8d0bb06826ece8223ed806348cf91f36c8117ebba3ceb05247b6947b54da44f0
 SHA512:
-  metadata.gz: 3d45fbfd1797ba0e24a1c44cec1a260c1a12b457f486991f55befde788de312959084d78717fedb7ef593731399aa9be9534512e3e9af1c71c7ac706cde3b262
-  data.tar.gz: 5d539d2be00bfc34491192fe927b98ec977af4f474790afaf03eda326b5db8749cbfa8e97ef98981c5663a444f3a703c6189a5b7688582b95cef44458648d7e1
+  metadata.gz: f249739403ccc5346e161f6481acd020d369a02b00b01da1b6c80addc6bcce58d2dc7724cf923929e146e3cac1b8e5e557e82f66cb9f501da8e44f30f358b5c8
+  data.tar.gz: a47f7c215bedfe5f870ba8a6bbbaf2e579c0c31b017546894c43e0421d75362b366dace3cfcd2bb9f72df7a3037866385b9c928e9389d558d0c39c1939928ea1

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

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require 'avm/eac_rails_base1/runner_with/rails_environment'
+require 'avm/eac_webapp_base0/runner'
+
+module Avm
+  module EacRailsBase1
+    class Runner < ::Avm::EacWebappBase0::Runner
+      class Log
+        runner_with :help, ::Avm::EacRailsBase1::RunnerWith::RailsEnvironment do
+          desc 'Read application\'s log.'
+          bool_opt '-f', '--follow', 'Output appended data as the log grows.'
+        end
+
+        def run
+          start_banner
+          tail_command.system
+        end
+
+        private
+
+        def log_path
+          ::File.join(rails_instance.read_entry('fs_path'), 'log', "#{rails_environment}.log")
+        end
+
+        def start_banner
+          infov 'Environment', rails_environment
+          infov 'Log path', log_path
+        end
+
+        def tail_command
+          rails_instance.host_env.command(*tail_command_args)
+        end
+
+        def tail_command_args
+          r = %w[tail]
+          r << '--follow' if parsed.follow?
+          r + [log_path]
+        end
+      end
+    end
+  end
+end

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

@@ -1,29 +1,15 @@
 # frozen_string_literal: true
 
 require 'avm/eac_rails_base1/instance'
+require 'avm/eac_rails_base1/runner_with/rails_environment'
 require 'eac_cli/runner'
 
 module Avm
   module EacRailsBase1
     module RunnerWith
       module Bundle
-        DEFAULT_RAILS_ENVIRONMENT_CONSTANT = 'DEFAULT_RAILS_ENVIRONMENT'
-
         common_concern do
-          include ::EacCli::Runner
-
-          runner_definition do
-            arg_opt '-e', '--environment', 'Specifies the environment for the runner to operate' \
-              ' (test/development/production). Default: "development".'
-          end
-        end
-
-        module ClassMethods
-          def default_rails_environment
-            const_get(DEFAULT_RAILS_ENVIRONMENT_CONSTANT)
-          rescue ::NameError
-            ::Avm::EacRailsBase1::Instance::DEFAULT_RAILS_ENVIRONMENT
-          end
+          include ::Avm::EacRailsBase1::RunnerWith::RailsEnvironment
         end
 
         def bundle_command
@@ -35,22 +21,6 @@ module Avm
           infov 'Rails environment', rails_environment
           bundle_command.system!
         end
-
-        def default_rails_environment
-          self.class.default_rails_environment
-        end
-
-        def rails_instance
-          if respond_to?(:runner_context)
-            runner_context.call(:instance)
-          else
-            context(:instance)
-          end
-        end
-
-        def rails_environment
-          parsed.environment.presence || default_rails_environment
-        end
       end
     end
   end

data/lib/avm/eac_rails_base1/runner_with/rails_environment.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+require 'avm/eac_rails_base1/instance'
+require 'eac_cli/runner'
+
+module Avm
+  module EacRailsBase1
+    module RunnerWith
+      module RailsEnvironment
+        DEFAULT_RAILS_ENVIRONMENT_CONSTANT = 'DEFAULT_RAILS_ENVIRONMENT'
+
+        common_concern do
+          include ::EacCli::Runner
+
+          runner_definition do
+            arg_opt '-e', '--environment', 'Specifies the environment for the runner to operate' \
+              ' (test/development/production). Default: "development".'
+          end
+        end
+
+        module ClassMethods
+          def default_rails_environment
+            const_get(DEFAULT_RAILS_ENVIRONMENT_CONSTANT)
+          rescue ::NameError
+            ::Avm::EacRailsBase1::Instance::DEFAULT_RAILS_ENVIRONMENT
+          end
+        end
+
+        def default_rails_environment
+          self.class.default_rails_environment
+        end
+
+        def rails_environment
+          parsed.environment.presence || default_rails_environment
+        end
+
+        def rails_instance
+          if respond_to?(:runner_context)
+            runner_context.call(:instance)
+          else
+            context(:instance)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/eac_webapp_base0/deploy.rb

@@ -17,10 +17,16 @@ module Avm
 
       enable_console_speaker
       enable_simple_cache
-      common_constructor :instance, :options, default: [{}]
+      enable_listable
+      lists.add_symbol :option, :appended_directories, :no_request_test, :reference
+      common_constructor :instance, :options, default: [{}] do
+        self.options = ::Avm::EacWebappBase0::Deploy.lists.option
+                                                    .hash_keys_validate!(options.symbolize_keys)
+      end
 
-      JOBS = %w[create_build_dir build_content append_instance_content write_on_target
-                setup_files_units assert_instance_branch request_test].freeze
+      REQUEST_TEST_JOB = 'request_test'
+      JOBS = (%w[create_build_dir build_content append_instance_content write_on_target
+                 setup_files_units assert_instance_branch] + [REQUEST_TEST_JOB]).freeze
       define_callbacks(*JOBS)
 
       def run
@@ -67,8 +73,14 @@ module Avm
 
       private
 
+      def jobs
+        r = JOBS.dup
+        r.delete(REQUEST_TEST_JOB) if options[OPTION_NO_REQUEST_TEST]
+        r
+      end
+
       def run_jobs
-        JOBS.each do |job|
+        jobs.each do |job|
           run_callbacks job do
             send(job)
           end

data/lib/avm/eac_webapp_base0/deploy/appended_directories.rb

@@ -17,7 +17,7 @@ module Avm
         end
 
         def appended_directories_from_options
-          options[:appended_directories] || []
+          options[OPTION_APPENDED_DIRECTORIES] || []
         end
       end
     end

data/lib/avm/eac_webapp_base0/deploy/git_info.rb

@@ -18,7 +18,7 @@ module Avm
         end
 
         def git_reference
-          options[:reference] || DEFAULT_REFERENCE
+          options[OPTION_REFERENCE] || DEFAULT_REFERENCE
         end
 
         def git_reference_found_uncached

data/lib/avm/eac_webapp_base0/instance.rb

@@ -11,6 +11,8 @@ module Avm
     class Instance < ::Avm::Instances::Base
       include ::Avm::Postgresql::InstanceWith
 
+      FILES_UNITS = [].freeze
+
       def stereotype_name
         self.class.name.desconstantize.demodulize
       end

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

@@ -2,34 +2,25 @@
 
 require 'avm/instances/runner'
 require 'avm/path_string'
-require 'eac_ruby_utils/console/docopt_runner'
-require 'eac_ruby_utils/console/speaker'
+require 'eac_cli/core_ext'
 
 module Avm
   module EacWebappBase0
     class Runner < ::Avm::Instances::Runner
-      class Deploy < ::EacRubyUtils::Console::DocoptRunner
-        include ::EacRubyUtils::Console::Speaker
-
-        DOC = <<~DOCOPT
-          Deploy for instance.
-
-          Usage:
-            __PROGRAM__ [options]
-            __PROGRAM__ -h | --help
-
-          Options:
-            -h --help                       Show this screen.
-            -r --reference=<git-reference>  Git reference to deploy.
-            -a --append-dirs=<append-dirs>  Append directories to deploy (List separated by ":").
-        DOCOPT
+      class Deploy
+        runner_with :help do
+          desc 'Deploy for instance.'
+          arg_opt '-r', '--reference', 'Git reference to deploy.'
+          arg_opt '-a', '--append-dirs', 'Append directories to deploy (List separated by ":").'
+          bool_opt '-T', '--no-request-test', 'Do not test web interface after deploy.'
+        end
 
         def deploy_class
-          context(:stereotype_module).const_get('Deploy')
+          runner_context.call(:stereotype_module).const_get('Deploy')
         end
 
         def run
-          result = deploy_class.new(context(:instance), deploy_options).run
+          result = deploy_class.new(runner_context.call(:instance), deploy_options).run
           if result.error?
             fatal_error result.to_s
           else
@@ -38,8 +29,9 @@ module Avm
         end
 
         def deploy_options
-          { reference: options.fetch('--reference'),
-            appended_directories: ::Avm::PathString.paths(options.fetch('--append-dirs')) }
+          { reference: parsed.reference,
+            appended_directories: ::Avm::PathString.paths(parsed.append_dirs),
+            no_request_test: parsed.no_request_test? }
         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/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/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
@@ -33,7 +31,7 @@ module Avm
       private
 
       def instance_uncached
-        self.class.instance_class.by_id(options.fetch('<instance-id>'))
+        self.class.instance_class.by_id(parsed.instance_id)
       end
     end
   end

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