avm-tools 0.58.1 → 0.62.1

data/lib/avm/tools/runner/launcher/publish.rb

@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+require 'eac_launcher/instances/runner_helper'
+
+module Avm
+  module Tools
+    class Runner < ::EacRubyUtils::Console::DocoptRunner
+      class Launcher < ::EacRubyUtils::Console::DocoptRunner
+        class Publish < ::EacLauncher::Instances::RunnerHelper
+          DOC = <<~DOCOPT
+            Publica projetos ou instâncias.
+
+            Usage:
+              __PROGRAM__ [options] [<instance_path>...]
+              __PROGRAM__ -h | --help
+
+            Options:
+              -h --help             Show this screen.
+              --new                 Publish projects not published before.
+              -s --stereotype=<st>  Publish only for stereotype <stereotype>.
+              --all            Publish all instances.
+              -d --dry-run          "Dry run" publishing.
+              --pending             Publish only pending.
+              --recache             Rewrite instances cache.
+              --run                 Confirm publishing.
+
+          DOCOPT
+
+          def run
+            ::EacLauncher::Context.current.recache = options['--recache']
+            build_publish_options
+            instances.each do |i|
+              next unless i.options.publishable?
+
+              i.send(instance_method)
+            end
+          end
+
+          private
+
+          def dry_run?
+            options.fetch('--dry-run')
+          end
+
+          def instance_method
+            run? || dry_run? ? 'publish_run' : 'publish_check'
+          end
+
+          def build_publish_options
+            ::EacLauncher::Context.current.publish_options = publish_options
+          end
+
+          def publish_options
+            { new: options.fetch('--new'), stereotype: options.fetch('--stereotype'),
+              confirm: run? }
+          end
+
+          def run?
+            options.fetch('--run') && !dry_run?
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/console/docopt_runner'
+require 'eac_ruby_utils/core_ext'
+require 'avm/local_projects/instance'
+
+module Avm
+  module Tools
+    class Runner < ::EacRubyUtils::Console::DocoptRunner
+      class LocalProject < ::EacRubyUtils::Console::DocoptRunner
+        require_sub __FILE__
+        include ::EacCli::DefaultRunner
+
+        runner_definition do
+          desc 'Utilities for local projects.'
+          arg_opt '-C', '--path', 'Path to local project instance.'
+          subcommands
+        end
+
+        private
+
+        def instance_uncached
+          ::Avm::LocalProjects::Instance.new(instance_path)
+        end
+
+        def instance_path_uncached
+          (options.fetch('--path') || '.').to_pathname.expand_path
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+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 Info < ::EacRubyUtils::Console::DocoptRunner
+          include ::EacCli::DefaultRunner
+
+          runner_definition do
+            desc 'Show information about local project instance.'
+          end
+
+          def run
+            infov 'Path', context(:instance).path
+            infov 'Stereotypes', context(:instance).stereotypes.map(&:label).join(', ')
+          end
+        end
+      end
+    end
+  end
+end

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.58.1'
+    VERSION = '0.62.1'
   end
 end

data/lib/eac_launcher.rb

@@ -4,11 +4,10 @@ module EacLauncher
   require 'eac_launcher/context'
   require 'eac_launcher/paths'
   require 'eac_launcher/project'
-  require 'eac_launcher/stereotype'
+  require 'avm/projects/stereotype'
   require 'eac_launcher/git'
   require 'eac_launcher/instances'
   require 'eac_launcher/publish'
   require 'eac_launcher/ruby'
-  require 'eac_launcher/stereotypes'
   require 'eac_launcher/vendor'
 end

data/lib/eac_launcher/context/instance_manager.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'eac_launcher/publish/check_result'
 require('yaml')
 
 module EacLauncher

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/publish_base.rb

@@ -3,6 +3,7 @@
 require 'eac_ruby_utils/simple_cache'
 require 'eac_ruby_utils/simple_cache'
 require 'eac_launcher/publish/base'
+require 'eac_launcher/publish/check_result'
 
 module EacLauncher
   module Git

data/lib/eac_launcher/git/sub_warp_base.rb

@@ -15,7 +15,7 @@ module EacLauncher
       end
 
       def find_parent_instance(current)
-        if ::EacLauncher::Stereotype.git_stereotypes.any? { |s| current.stereotype?(s) }
+        if ::Avm::Projects::Stereotype.git_stereotypes.any? { |s| current.stereotype?(s) }
           return current
         end
 

data/lib/eac_launcher/git/warp_base.rb

@@ -2,7 +2,7 @@
 
 require 'eac_launcher/git/mirror_update'
 require 'eac_launcher/vendor/github'
-require 'eac_launcher/stereotypes/git/publish'
+require 'avm/projects/stereotypes/git/publish'
 
 module EacLauncher
   module Git
@@ -13,7 +13,7 @@ module EacLauncher
     class WarpBase < ::EacLauncher::Paths::Real
       include ::EacRubyUtils::SimpleCache
 
-      TARGET_REMOTE = ::EacLauncher::Stereotypes::Git::Publish::PUBLISH_GIT_REMOTE_NAME
+      TARGET_REMOTE = ::Avm::Projects::Stereotypes::Git::Publish::PUBLISH_GIT_REMOTE_NAME
 
       def initialize(instance)
         @instance = instance

data/lib/eac_launcher/instances/base.rb

@@ -48,7 +48,7 @@ module EacLauncher
         stereotypes.each do |s|
           next unless publish?(s)
 
-          infov(name, "publishing #{s.stereotype_name_in_color}")
+          infov(name, "publishing #{s.label}")
           s.publish_class.new(self).run
         end
       end
@@ -57,7 +57,7 @@ module EacLauncher
         stereotypes.each do |s|
           next unless publish?(s)
 
-          puts "#{name.to_s.cyan}|#{s.stereotype_name_in_color}|" \
+          puts "#{name.to_s.cyan}|#{s.label}|" \
             "#{s.publish_class.new(self).check}"
         end
       end

data/lib/eac_launcher/instances/runner_helper.rb

@@ -31,7 +31,7 @@ module EacLauncher
       end
 
       def instance_stereotypes(instance)
-        instance.stereotypes.map(&:stereotype_name_in_color).join(', ')
+        instance.stereotypes.map(&:label).join(', ')
       end
 
       def instance_label(instance)

data/lib/eac_launcher/paths/logical.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
+require 'avm/stereotypes'
 require 'eac_launcher/paths/real'
-require 'eac_launcher/stereotypes'
 
 module EacLauncher
   module Paths
@@ -55,7 +55,7 @@ module EacLauncher
       private
 
       def stereotypes_uncached
-        ::EacLauncher::Stereotype.stereotypes.select { |s| s.match?(self) }
+        ::Avm::Projects::Stereotype.stereotypes.select { |s| s.match?(self) }
       end
 
       def build_child(name)

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
 

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

@@ -2,6 +2,7 @@
 
 require 'active_support/concern'
 require 'eac_ruby_utils/boolean'
+require 'eac_ruby_utils/envs/ssh_env/dasho_options'
 
 module EacRubyUtils
   module Envs
@@ -10,6 +11,7 @@ module EacRubyUtils
         extend ::ActiveSupport::Concern
 
         included do
+          include ::EacRubyUtils::Envs::SshEnv::DashoOptions
           add_nodasho_option('Quiet')
         end
 

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/envs/ssh_env/terminal.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('Terminal')
           include ::EacRubyUtils::Listable
           lists.add_string :terminal_option, :auto, :disable, :enable, :force

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/listable/list.rb

@@ -33,6 +33,11 @@ module EacRubyUtils
         find_list_by_method(name) || super
       end
 
+      def hash_keys_validate!(hash, error_class = ::StandardError)
+        hash.keys.each { |key| value_validate!(key, error_class) }
+        hash
+      end
+
       def i18n_key
         "eac_ruby_utils.listable.#{class_i18n_key}.#{item}"
       end

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/require_sub.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'active_support/inflector'
+require 'eac_ruby_utils/listable'
 
 module EacRubyUtils
   class << self
@@ -10,15 +11,14 @@ module EacRubyUtils
   end
 
   class RequireSub
-    BASE_OPTION_KEY = :base
-    INCLUDE_MODULES_OPTION_KEY = :include_modules
-    REQUIRE_DEPENDENCY_OPTION_KEY = :require_dependency
+    include ::EacRubyUtils::Listable
+    lists.add_symbol :option, :base, :include_modules, :require_dependency
 
     attr_reader :file, :options
 
     def initialize(file, options = {})
       @file = file
-      @options = options
+      @options = self.class.lists.option.hash_keys_validate!(options)
     end
 
     def apply
@@ -29,7 +29,7 @@ module EacRubyUtils
     private
 
     def active_support_require(path)
-      return false unless options[REQUIRE_DEPENDENCY_OPTION_KEY]
+      return false unless options[OPTION_REQUIRE_DEPENDENCY]
 
       ::Kernel.require_dependency(path)
       true
@@ -46,7 +46,7 @@ module EacRubyUtils
     end
 
     def include_modules
-      return unless options[INCLUDE_MODULES_OPTION_KEY]
+      return unless options[OPTION_INCLUDE_MODULES]
 
       base.constants.each do |constant_name|
         constant = base.const_get(constant_name)
@@ -57,11 +57,11 @@ module EacRubyUtils
     end
 
     def base
-      options[BASE_OPTION_KEY] || raise('Option :base not setted')
+      options[OPTION_BASE] || raise('Option :base not setted')
     end
 
     def base?
-      options[BASE_OPTION_KEY] ? true : false
+      options[OPTION_BASE] ? true : false
     end
 
     def kernel_require(path)