avm-tools 0.59.0 → 0.62.2

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

@@ -2,7 +2,7 @@
 
 require 'eac_ruby_utils/console/docopt_runner'
 require 'eac_ruby_utils/simple_cache'
-require 'avm/stereotypes/eac_redmine_base0/instance'
+require 'avm/eac_redmine_base0/instance'
 require 'eac_ruby_utils/require_sub'
 ::EacRubyUtils.require_sub(__FILE__)
 
@@ -26,7 +26,7 @@ module Avm
         private
 
         def instance_uncached
-          ::Avm::Stereotypes::EacRedmineBase0::Instance.by_id(options['<instance_id>'])
+          ::Avm::EacRedmineBase0::Instance.by_id(options['<instance_id>'])
         end
       end
     end

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

@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+require 'avm/eac_redmine_base0/core_update'
+require 'eac_cli/default_runner'
+require 'eac_ruby_utils/console/docopt_runner'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Tools
+    class Runner < ::EacRubyUtils::Console::DocoptRunner
+      class EacRedmineBase0 < ::EacRubyUtils::Console::DocoptRunner
+        class CoreUpdate < ::EacRubyUtils::Console::DocoptRunner
+          include ::EacCli::DefaultRunner
+
+          runner_definition do
+            arg_opt '-u', '--url', 'Core\'s package URL.'
+            arg_opt '-v', '--version', 'Core\'s version.'
+            desc 'Update instance\' core.'
+          end
+
+          def run
+            start_banner
+            validate
+            update
+          end
+
+          private
+
+          def start_banner
+            infov 'URL', url
+            infov 'Version', version
+          end
+
+          def update
+            ::Avm::EacRedmineBase0::CoreUpdate.new(context(:instance), version, url).run
+          end
+
+          def url
+            options.fetch('--url') || url_by_version
+          end
+
+          def url_by_version
+            options.fetch('--version').if_present do |v|
+              "https://www.redmine.org/releases/redmine-#{v}.tar.gz"
+            end
+          end
+
+          def validate
+            %w[url version].each do |attr|
+              fatal_error "\"#{attr}\" is blank. See avaiable options." if send(attr).blank?
+            end
+          end
+
+          def version
+            options.fetch('--version') || version_by_url
+          end
+
+          def version_by_url
+            options.fetch('--url').if_present do |v|
+              /(\d+.\d+.\d+)/.if_match(v, false) { |m| m[1] }
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/stereotypes/eac_redmine_base0/deploy'
+require 'avm/eac_redmine_base0/deploy'
 require 'avm/stereotypes/eac_webapp_base0/runner/deploy'
 
 module Avm

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

@@ -9,6 +9,7 @@ module Avm
     class Runner < ::EacRubyUtils::Console::DocoptRunner
       class Git < ::EacRubyUtils::Console::DocoptRunner
         class Issue < ::EacRubyUtils::Console::DocoptRunner
+          enable_simple_cache
           include ::EacRubyUtils::Console::Speaker
 
           DOC = <<~DOCOPT
@@ -20,6 +21,8 @@ module Avm
 
             Options:
               -h --help                             Show this screen.
+              -f --uncomplete-unfail                Do not exit with error if issue is not completed
+                                                    or is invalid.
               -s --skip-validations=<validations>   Does not validate conditions on <validations>
                                                     (Comma separated value).
               -y --yes                              Does not ask for user confirmation.
@@ -28,11 +31,30 @@ module Avm
             %%VALIDATIONS%%
           DOCOPT
 
-          def run
-            complete = ::Avm::Git::Issue::Complete.new(git_complete_issue_options)
+          UNCOMPLETE_MESSAGE =
+
+            def run
+              banner
+              return unless validate
+
+              run_complete if options.fetch('complete')
+              success('Done!')
+            end
+
+          def banner
             complete.start_banner
-            fatal_error('Some validation did not pass') unless complete.valid?
-            complete.run if options.fetch('complete') && confirm?
+          end
+
+          def validate
+            return true if complete.valid?
+
+            uncomplete_message('Some validation did not pass')
+          end
+
+          def run_complete
+            return complete.run if confirm?
+
+            uncomplete_message('Issue was not completed')
           end
 
           def doc
@@ -41,6 +63,10 @@ module Avm
 
           private
 
+          def complete_uncached
+            ::Avm::Git::Issue::Complete.new(git_complete_issue_options)
+          end
+
           def confirm?
             options.fetch('--yes') || request_input('Confirm issue completion?', bool: true)
           end
@@ -56,6 +82,19 @@ module Avm
           def doc_validations_list
             ::Avm::Git::Issue::Complete::VALIDATIONS.keys.map { |k| "  * #{k}" }.join("\n")
           end
+
+          def uncomplete_unfail?
+            options.fetch('--uncomplete-unfail')
+          end
+
+          def uncomplete_message(message)
+            if uncomplete_unfail?
+              warn(message)
+            else
+              fatal_error(message)
+            end
+            false
+          end
         end
       end
     end

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

@@ -20,7 +20,7 @@ module Avm
         private
 
         def instance_uncached
-          ::Avm::LocalProject::Instance.new(instance_path)
+          ::Avm::LocalProjects::Instance.new(instance_path)
         end
 
         def instance_path_uncached

data/lib/avm/tools/runner/local_project/update.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require 'avm/local_projects/jobs/update'
+require 'eac_ruby_utils/console/docopt_runner'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Tools
+    class Runner < ::EacRubyUtils::Console::DocoptRunner
+      class LocalProject < ::EacRubyUtils::Console::DocoptRunner
+        class Update < ::EacRubyUtils::Console::DocoptRunner
+          include ::EacCli::DefaultRunner
+
+          runner_definition do
+            desc 'Update local project.'
+          end
+
+          def run
+            infov 'Path', context(:instance).path
+            ::Avm::LocalProjects::Jobs::Update.new(context(:instance)).run
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.59.0'
+    VERSION = '0.62.2'
   end
 end

data/lib/eac_launcher/context.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 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_launcher/context/instance_discovery'
-require 'eac_launcher/context/instance_manager'
 require 'eac_launcher/context/settings'
 require 'eac_launcher/paths/logical'
 require 'eac_launcher/project'
@@ -39,7 +39,7 @@ module EacLauncher
       @settings = ::EacLauncher::Context::Settings.new(build_option(:settings_file))
       @cache_root = build_option(:cache_root)
       @publish_options = { new: false, confirm: false, stereotype: nil }
-      @instance_manager = ::EacLauncher::Context::InstanceManager.new(self)
+      @instance_manager = ::Avm::Launcher::Context::InstanceManager.new(self)
       @recache = false
     end
 

data/lib/eac_launcher/context/instance_discovery.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'ruby-progressbar'
-require 'eac_launcher/instances/base'
+require 'avm/launcher/instances/base'
 
 module EacLauncher
   class Context
@@ -22,7 +22,7 @@ module EacLauncher
         update_progress_format(path)
         on_rescued_path_instances(path) do |r|
           if path.project?
-            parent_instance = ::EacLauncher::Instances::Base.instanciate(path, parent_instance)
+            parent_instance = ::Avm::Launcher::Instances::Base.instanciate(path, parent_instance)
             r << path
           end
           children = path.children

data/lib/eac_launcher/git/base/dirty_files.rb

@@ -6,24 +6,15 @@ module EacLauncher
   module Git
     class Base < ::EacLauncher::Paths::Real
       module DirtyFiles
-        def dirty?
-          dirty_files.any?
-        end
+        delegate :dirty, to: :eac_git
 
         def dirty_files
-          execute!('status', '--porcelain', '--untracked-files').each_line.map do |line|
-            parse_status_line(line.gsub(/\n\z/, ''))
+          eac_git.dirty_files.map do |df|
+            ::OpenStruct.new(
+              df.to_h.merge(path: df.path.to_path, absolute_path: df.absolute_path.to_path)
+            )
           end
         end
-
-        private
-
-        def parse_status_line(line)
-          m = /\A(.)(.)\s(.+)\z/.match(line)
-          ::Kernel.raise "Status pattern does not match \"#{line}\"" unless m
-          ::OpenStruct.new(index: m[1], worktree: m[2], path: m[3],
-                           absolute_path: ::File.expand_path(m[3], self))
-        end
       end
     end
   end

data/lib/eac_launcher/git/sub_warp_base.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
-require 'eac_launcher/instances/error'
+require 'avm/projects/stereotype'
+require 'avm/launcher/errors/base'
 
 module EacLauncher
   module Git
@@ -11,7 +12,7 @@ module EacLauncher
         r = find_parent_instance(instance.parent)
         return r if r
 
-        ::EacLauncher::Instances::Error.new('Git parent not found')
+        ::EacLauncher::Instances::Errors::Base.new('Git parent not found')
       end
 
       def find_parent_instance(current)

data/lib/eac_launcher/instances.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'eac_launcher/instances/base'
-require 'eac_launcher/instances/error'
+require 'avm/launcher/errors/base'
+require 'avm/launcher/instances/base'
 require 'eac_launcher/instances/runner_helper'
 require 'eac_launcher/instances/settings'

data/lib/eac_launcher/instances/error.rb

@@ -1,8 +1,12 @@
 # frozen_string_literal: true
 
-module EacLauncher
-  module Instances
-    class Error < StandardError
+module Avm
+  module Launcher
+    module Instances
+      module Errors
+        class Error < StandardError
+        end
+      end
     end
   end
 end

data/lib/eac_launcher/paths/logical.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/stereotypes'
+require 'avm/projects/stereotypes'
 require 'eac_launcher/paths/real'
 
 module EacLauncher
@@ -68,7 +68,7 @@ module EacLauncher
       end
 
       def warped_uncached
-        if is_a?(::EacLauncher::Instances::Base)
+        if is_a?(::Avm::Launcher::Instances::Base)
           stereotypes.each do |s|
             return s.warp_class.new(self) if s.warp_class
           end

data/lib/eac_launcher/publish/base.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'eac_launcher/instances/error'
+require 'avm/launcher/errors/base'
 
 module EacLauncher
   module Publish
@@ -35,7 +35,7 @@ module EacLauncher
 
       def check_with_rescue
         internal_check
-      rescue ::EacLauncher::Instances::Error => e
+      rescue ::EacLauncher::Instances::Errors::Base => e
         ::EacLauncher::Publish::CheckResult.blocked("Error: #{e}")
       rescue ::EacLauncher::Git::Error => e
         ::EacLauncher::Publish::CheckResult.blocked("Git error: #{e}")

data/vendor/eac_git/lib/eac_git/local.rb

@@ -6,7 +6,7 @@ require 'eac_ruby_utils/core_ext'
 module EacGit
   # A Git repository in local filesystem.
   class Local
-    require_sub __FILE__
+    require_sub __FILE__, include_modules: true
 
     common_constructor :root_path do
       self.root_path = root_path.to_pathname

data/vendor/eac_git/lib/eac_git/local/dirty_files.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'ostruct'
+
+module EacGit
+  class Local
+    module DirtyFiles
+      STATUS_LINE_PATTERN = /\A(.)(.)\s(.+)\z/.freeze
+
+      def dirty?
+        dirty_files.any?
+      end
+
+      def dirty_file?(path)
+        absolute_path = path.to_pathname.expand_path(root_path)
+        dirty_files.any? do |df|
+          df.absolute_path == absolute_path
+        end
+      end
+
+      def dirty_files
+        command('status', '--porcelain', '--untracked-files').execute!.each_line.map do |line|
+          parse_status_line(line.gsub(/\n\z/, ''))
+        end
+      end
+
+      private
+
+      def parse_status_line(line)
+        STATUS_LINE_PATTERN.if_match(line) do |m|
+          ::OpenStruct.new(index: m[1], worktree: m[2], path: m[3].to_pathname,
+                           absolute_path: m[3].to_pathname.expand_path(root_path))
+        end
+      end
+    end
+  end
+end

data/vendor/eac_git/lib/eac_git/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacGit
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/console/docopt_runner/_class_methods.rb

@@ -3,7 +3,7 @@
 module EacRubyUtils
   module Console
     class DocoptRunner
-      DOCOPT_ERROR_EXIT_CODE = 0x22220000
+      DOCOPT_ERROR_EXIT_CODE = 0xC0
 
       class << self
         def run(options = {})

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/envs/ssh_env/identity_file.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'active_support/concern'
+require 'eac_ruby_utils/envs/ssh_env/dasho_options'
 require 'eac_ruby_utils/listable'
 require 'eac_ruby_utils/patches/object/if_present'
 
@@ -11,6 +12,7 @@ module EacRubyUtils
         extend ::ActiveSupport::Concern
 
         included do
+          include ::EacRubyUtils::Envs::SshEnv::DashoOptions
           add_nodasho_option('IdentityFile')
         end